@teambit/merging 0.0.151 → 0.0.159

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

@@ -8,6 +8,7 @@ import { LaneId } from '@teambit/lane-id';
 import { Lane, Version } from '@teambit/legacy/dist/scope/models';
 import ConsumerComponent from '@teambit/legacy/dist/consumer/component/consumer-component';
 import { MergeResultsThreeWay } from '@teambit/legacy/dist/consumer/versions-ops/merge-version/three-way-merge';
+import { CheckoutMain } from '@teambit/checkout';
 import { DivergeData } from '@teambit/legacy/dist/scope/component-ops/diverge-data';
 export declare type ComponentMergeStatus = {
     currentComponent?: ConsumerComponent | null;
@@ -22,8 +23,9 @@ export declare type ComponentMergeStatus = {
 export declare class MergingMain {
     private workspace;
     private snapping;
+    private checkout;
     private consumer;
-    constructor(workspace: Workspace, snapping: SnappingMain);
+    constructor(workspace: Workspace, snapping: SnappingMain, checkout: CheckoutMain);
     /**
      * merge components according to the "values" param.
      * if the first param is a version, then merge the component ids to that version.
@@ -64,6 +66,7 @@ export declare class MergingMain {
     otherLaneName: string, // the lane name we want to merged to our lane. (can be also "main").
     options?: {
         resolveUnrelated?: MergeStrategy;
+        ignoreConfigChanges?: boolean;
     }): Promise<ComponentMergeStatus>;
     private applyVersion;
     private abortMerge;
@@ -75,5 +78,5 @@ export declare class MergingMain {
     static slots: never[];
     static dependencies: import("@teambit/harmony").Aspect[];
     static runtime: import("@teambit/harmony").RuntimeDefinition;
-    static provider([cli, workspace, snapping]: [CLIMain, Workspace, SnappingMain]): Promise<MergingMain>;
+    static provider([cli, workspace, snapping, checkout]: [CLIMain, Workspace, SnappingMain, CheckoutMain]): Promise<MergingMain>;
 }

package/dist/merging.main.runtime.js

@@ -222,7 +222,7 @@ function _manyComponentsWriter() {
 }
 
 function _checkoutVersion() {
-  const data = _interopRequireWildcard(require("@teambit/legacy/dist/consumer/versions-ops/checkout-version"));
+  const data = require("@teambit/legacy/dist/consumer/versions-ops/checkout-version");
 
   _checkoutVersion = function () {
     return data;
@@ -251,6 +251,26 @@ function _noCommonSnap() {
   return data;
 }
 
+function _checkout() {
+  const data = require("@teambit/checkout");
+
+  _checkout = function () {
+    return data;
+  };
+
+  return data;
+}
+
+function _componentId() {
+  const data = require("@teambit/component-id");
+
+  _componentId = function () {
+    return data;
+  };
+
+  return data;
+}
+
 function _mergeCmd() {
   const data = require("./merge-cmd");
 
@@ -271,20 +291,17 @@ function _merging() {
   return data;
 }
 
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
 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 MergingMain {
-  constructor(workspace, snapping) {
+  constructor(workspace, snapping, checkout) {
     var _this$workspace;
 
     this.workspace = workspace;
     this.snapping = snapping;
+    this.checkout = checkout;
     (0, _defineProperty2().default)(this, "consumer", void 0);
     this.consumer = (_this$workspace = this.workspace) === null || _this$workspace === void 0 ? void 0 : _this$workspace.consumer;
   }
@@ -303,9 +320,9 @@ class MergingMain {
     const firstValue = _ramda().default.head(values);
 
     if (resolve) {
-      mergeResults = await this.resolveMerge(consumer, values, message, build);
+      mergeResults = await this.resolveMerge(values, message, build);
     } else if (abort) {
-      mergeResults = await this.abortMerge(consumer, values);
+      mergeResults = await this.abortMerge(values);
     } else if (!_bitId().BitId.isValidVersion(firstValue)) {
       const bitIds = this.getComponentsToMerge(consumer, values); // @todo: version could be the lane only or remote/lane
 
@@ -515,10 +532,19 @@ class MergingMain {
     };
 
     const currentComponent = await getCurrentComponent();
-    const componentModificationStatus = await consumer.getComponentStatusById(currentComponent.id);
 
-    if (componentModificationStatus.modified) {
-      return returnUnmerged(`unable to merge ${id.toStringWithoutVersion()}, the component is modified, please snap/tag it first`);
+    const isModified = async () => {
+      const componentModificationStatus = await consumer.getComponentStatusById(currentComponent.id);
+      if (!componentModificationStatus.modified) return false;
+      if (!existingBitMapId) return false;
+      const baseComponent = await modelComponent.loadVersion(existingBitMapId.version, consumer.scope.objects);
+      return options !== null && options !== void 0 && options.ignoreConfigChanges ? consumer.isComponentSourceCodeModified(baseComponent, currentComponent) : true;
+    };
+
+    const isComponentModified = await isModified();
+
+    if (isComponentModified) {
+      return returnUnmerged(`component is modified, please snap/tag it first`);
     }
 
     const laneHeadIsDifferentThanCheckedOut = localLane && (existingBitMapId === null || existingBitMapId === void 0 ? void 0 : existingBitMapId.version) && ((_modelComponent$laneH = modelComponent.laneHeadLocal) === null || _modelComponent$laneH === void 0 ? void 0 : _modelComponent$laneH.toString()) !== (existingBitMapId === null || existingBitMapId === void 0 ? void 0 : existingBitMapId.version);
@@ -735,27 +761,27 @@ class MergingMain {
     };
   }
 
-  async abortMerge(consumer, values) {
-    const ids = this.getIdsForUnmerged(consumer, values); // @ts-ignore not clear yet what to do with other flags
-
-    const results = await (0, _checkoutVersion().default)(consumer, {
+  async abortMerge(values) {
+    const consumer = this.workspace.consumer;
+    const ids = await this.getIdsForUnmerged(values);
+    const results = await this.checkout.checkout({
       ids,
       reset: true
     });
-    ids.forEach(id => consumer.scope.objects.unmergedComponents.removeComponent(id.name));
+    ids.forEach(id => consumer.scope.objects.unmergedComponents.removeComponent(id.fullName));
     await consumer.scope.objects.unmergedComponents.write();
     return {
       abortedComponents: results.components
     };
   }
 
-  async resolveMerge(consumer, values, snapMessage, build) {
-    const ids = this.getIdsForUnmerged(consumer, values); // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!
+  async resolveMerge(values, snapMessage, build) {
+    const ids = await this.getIdsForUnmerged(values); // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!
 
     const {
       snappedComponents
     } = await this.snapping.snap({
-      legacyBitIds: _bitId().BitIds.fromArray(ids),
+      legacyBitIds: _bitId().BitIds.fromArray(ids.map(id => id._legacy)),
       build,
       message: snapMessage
     });
@@ -802,22 +828,22 @@ class MergingMain {
     });
   }
 
-  getIdsForUnmerged(consumer, idsStr) {
+  async getIdsForUnmerged(idsStr) {
     if (idsStr && idsStr.length) {
-      const bitIds = idsStr.map(id => consumer.getParsedId(id));
-      bitIds.forEach(id => {
-        const entry = consumer.scope.objects.unmergedComponents.getEntry(id.name);
+      const componentIds = await this.workspace.resolveMultipleComponentIds(idsStr);
+      componentIds.forEach(id => {
+        const entry = this.workspace.consumer.scope.objects.unmergedComponents.getEntry(id.fullName);
 
         if (!entry) {
           throw new (_generalError().default)(`unable to merge-resolve ${id.toString()}, it is not marked as unresolved`);
         }
       });
-      return bitIds;
+      return componentIds;
     }
 
-    const unresolvedComponents = consumer.scope.objects.unmergedComponents.getComponents();
+    const unresolvedComponents = this.workspace.consumer.scope.objects.unmergedComponents.getComponents();
     if (!unresolvedComponents.length) throw new (_generalError().default)(`all components are resolved already, nothing to do`);
-    return unresolvedComponents.map(u => new (_bitId().BitId)(u.id));
+    return unresolvedComponents.map(u => _componentId().ComponentID.fromLegacy(new (_bitId().BitId)(u.id)));
   }
 
   getComponentsToMerge(consumer, ids) {
@@ -829,8 +855,8 @@ class MergingMain {
     return ids.map(id => consumer.getParsedId(id));
   }
 
-  static async provider([cli, workspace, snapping]) {
-    const merging = new MergingMain(workspace, snapping);
+  static async provider([cli, workspace, snapping, checkout]) {
+    const merging = new MergingMain(workspace, snapping, checkout);
     cli.register(new (_mergeCmd().MergeCmd)(merging));
     return merging;
   }
@@ -839,7 +865,7 @@ class MergingMain {
 
 exports.MergingMain = MergingMain;
 (0, _defineProperty2().default)(MergingMain, "slots", []);
-(0, _defineProperty2().default)(MergingMain, "dependencies", [_cli().CLIAspect, _workspace().default, _snapping().default]);
+(0, _defineProperty2().default)(MergingMain, "dependencies", [_cli().CLIAspect, _workspace().default, _snapping().default, _checkout().CheckoutAspect]);
 (0, _defineProperty2().default)(MergingMain, "runtime", _cli().MainRuntime);
 
 _merging().MergingAspect.addRuntime(MergingMain);

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

@@ -1 +1 @@
-{"version":3,"names":["MergingMain","constructor","workspace","snapping","consumer","merge","values","mergeStrategy","abort","resolve","noSnap","message","build","skipDependencyInstallation","ConsumerNotFound","mergeResults","firstValue","R","head","resolveMerge","abortMerge","BitId","isValidVersion","bitIds","getComponentsToMerge","mergeComponentsFromRemote","version","ids","tail","mergeVersion","onDestroy","snapMessage","currentLaneId","getCurrentLaneId","currentLaneObject","getCurrentLaneObject","allComponentsStatus","getAllComponentsStatus","failedComponents","filter","c","unmergedMessage","unmergedLegitimately","length","failureMsgs","map","failedComponent","chalk","bold","id","toString","red","join","BitError","mergeSnaps","laneId","localLane","componentWithConflict","find","component","hasConflicts","getMergeStrategyInteractive","componentStatus","failureMessage","unchangedLegitimately","succeededComponents","componentsResults","mapSeries","currentComponent","resolvedUnrelated","modelComponent","scope","getModelComponent","updatedLaneId","isDefault","LaneId","from","name","applyVersion","remoteHead","getRef","leftUnresolvedConflicts","install","undefined","dedupe","updateExisting","import","objects","add","persist","unmergedComponents","write","mergeSnapResults","snapResolvedComponents","components","getComponentMergeStatus","otherLaneName","options","returnUnmerged","msg","getModelComponentIfExist","unmerged","getEntry","toStringWithoutVersion","repo","otherLaneHead","existingBitMapId","bitMap","getBitIdIfExist","ignoreVersion","componentOnLane","loadVersion","isRemoved","getCurrentId","idOnLane","getComponent","changeVersion","getHeadAsTagIfExist","currentId","divergeData","getDivergeData","componentFromModel","getCurrentComponent","loadComponent","getConsumerComponent","componentModificationStatus","getComponentStatusById","modified","laneHeadIsDifferentThanCheckedOut","laneHeadLocal","localHead","Ref","Error","err","NoCommonSnap","resolveUnrelated","isDiverged","isLocalAhead","isRemoteAhead","baseSnap","commonSnapBeforeDiverge","baseComponent","otherComponent","currentLaneName","toLaneId","threeWayMerge","otherLabel","currentLabel","filesStatus","unmergedComponent","remote","lane","handleResolveUnrelated","unrelated","addEntry","markAllFilesAsUnchanged","files","forEach","file","pathNormalizeToLinux","relative","FileStatus","unchanged","MergeOptions","ours","addComponent","remoteId","idToLoad","theirs","componentWithDependencies","loadComponentWithDependenciesFromModel","updated","modifiedStatus","modifiedFiles","applyModifiedVersion","manyComponentsWriter","ManyComponentsWriter","componentsWithDependencies","installNpmPackages","override","writeConfig","verbose","writeDists","writePackageJson","writeAll","manual","unmergedPaths","f","conflict","filePath","setHead","markVersionAsLocal","getIdsForUnmerged","results","checkoutVersion","reset","removeComponent","abortedComponents","snappedComponents","snap","legacyBitIds","BitIds","fromArray","resolvedComponents","localLaneObject","tmp","Tmp","componentsStatus","Promise","all","bitId","remoteScopeName","remoteLaneId","remoteLanes","laneIdStr","clear","getComponents","logger","debug","r","idsStr","getParsedId","entry","GeneralError","unresolvedComponents","u","hasWildcard","componentsList","ComponentsList","listComponentsByIdsWithWildcard","provider","cli","merging","register","MergeCmd","CLIAspect","WorkspaceAspect","SnappingAspect","MainRuntime","MergingAspect","addRuntime"],"sources":["merging.main.runtime.ts"],"sourcesContent":["import { CLIAspect, CLIMain, MainRuntime } from '@teambit/cli';\nimport WorkspaceAspect, { Workspace } from '@teambit/workspace';\nimport R from 'ramda';\nimport { Consumer } from '@teambit/legacy/dist/consumer';\nimport ComponentsList from '@teambit/legacy/dist/consumer/component/components-list';\nimport {\n  ApplyVersionResults,\n  MergeStrategy,\n  mergeVersion,\n  ApplyVersionResult,\n  FailedComponents,\n  FileStatus,\n  getMergeStrategyInteractive,\n  MergeOptions,\n} from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport { ConsumerNotFound } from '@teambit/legacy/dist/consumer/exceptions';\nimport SnappingAspect, { SnappingMain } from '@teambit/snapping';\nimport hasWildcard from '@teambit/legacy/dist/utils/string/has-wildcard';\nimport mapSeries from 'p-map-series';\nimport { BitId, BitIds } from '@teambit/legacy/dist/bit-id';\nimport { BitError } from '@teambit/bit-error';\nimport GeneralError from '@teambit/legacy/dist/error/general-error';\nimport { LaneId } from '@teambit/lane-id';\nimport logger from '@teambit/legacy/dist/logger/logger';\nimport { AutoTagResult } from '@teambit/legacy/dist/scope/component-ops/auto-tag';\nimport { getDivergeData } from '@teambit/legacy/dist/scope/component-ops/get-diverge-data';\nimport { UnmergedComponent } from '@teambit/legacy/dist/scope/lanes/unmerged-components';\nimport { Lane, Version } from '@teambit/legacy/dist/scope/models';\nimport { Ref } from '@teambit/legacy/dist/scope/objects';\nimport chalk from 'chalk';\nimport { Tmp } from '@teambit/legacy/dist/scope/repositories';\nimport { pathNormalizeToLinux } from '@teambit/legacy/dist/utils';\nimport ManyComponentsWriter from '@teambit/legacy/dist/consumer/component-ops/many-components-writer';\nimport ConsumerComponent from '@teambit/legacy/dist/consumer/component/consumer-component';\nimport checkoutVersion, { applyModifiedVersion } from '@teambit/legacy/dist/consumer/versions-ops/checkout-version';\nimport threeWayMerge, {\n  MergeResultsThreeWay,\n} from '@teambit/legacy/dist/consumer/versions-ops/merge-version/three-way-merge';\nimport { NoCommonSnap } from '@teambit/legacy/dist/scope/exceptions/no-common-snap';\nimport { DivergeData } from '@teambit/legacy/dist/scope/component-ops/diverge-data';\nimport { MergeCmd } from './merge-cmd';\nimport { MergingAspect } from './merging.aspect';\n\nexport type ComponentMergeStatus = {\n  currentComponent?: ConsumerComponent | null;\n  componentFromModel?: Version;\n  id: BitId;\n  unmergedMessage?: string;\n  unmergedLegitimately?: boolean; // failed to merge but for a legitimate reason, such as, up-to-date\n  mergeResults?: MergeResultsThreeWay | null;\n  divergeData?: DivergeData;\n  resolvedUnrelated?: MergeStrategy;\n};\n\nexport class MergingMain {\n  private consumer: Consumer;\n  constructor(private workspace: Workspace, private snapping: SnappingMain) {\n    this.consumer = this.workspace?.consumer;\n  }\n\n  /**\n   * merge components according to the \"values\" param.\n   * if the first param is a version, then merge the component ids to that version.\n   * otherwise, merge from the remote head to the local.\n   */\n  async merge(\n    values: string[],\n    mergeStrategy: MergeStrategy,\n    abort: boolean,\n    resolve: boolean,\n    noSnap: boolean,\n    message: string,\n    build: boolean,\n    skipDependencyInstallation: boolean\n  ): Promise<ApplyVersionResults> {\n    if (!this.workspace) throw new ConsumerNotFound();\n    const consumer: Consumer = this.workspace.consumer;\n    let mergeResults;\n    const firstValue = R.head(values);\n    if (resolve) {\n      mergeResults = await this.resolveMerge(consumer, values, message, build);\n    } else if (abort) {\n      mergeResults = await this.abortMerge(consumer, values);\n    } else if (!BitId.isValidVersion(firstValue)) {\n      const bitIds = this.getComponentsToMerge(consumer, values);\n      // @todo: version could be the lane only or remote/lane\n      mergeResults = await this.mergeComponentsFromRemote(\n        consumer,\n        bitIds,\n        mergeStrategy,\n        noSnap,\n        message,\n        build,\n        skipDependencyInstallation\n      );\n    } else {\n      const version = firstValue;\n      const ids = R.tail(values);\n      const bitIds = this.getComponentsToMerge(consumer, ids);\n      mergeResults = await mergeVersion(consumer, version, bitIds, mergeStrategy);\n    }\n    await consumer.onDestroy();\n    return mergeResults;\n  }\n\n  /**\n   * when user is on main, it merges the remote main components into local.\n   * when user is on a lane, it merges the remote lane components into the local lane.\n   */\n  async mergeComponentsFromRemote(\n    consumer: Consumer,\n    bitIds: BitId[],\n    mergeStrategy: MergeStrategy,\n    noSnap: boolean,\n    snapMessage: string,\n    build: boolean,\n    skipDependencyInstallation: boolean\n  ): Promise<ApplyVersionResults> {\n    const currentLaneId = consumer.getCurrentLaneId();\n    const currentLaneObject = await consumer.getCurrentLaneObject();\n    const allComponentsStatus = await this.getAllComponentsStatus(bitIds, currentLaneId, currentLaneObject);\n    const failedComponents = allComponentsStatus.filter((c) => c.unmergedMessage && !c.unmergedLegitimately);\n    if (failedComponents.length) {\n      const failureMsgs = failedComponents\n        .map(\n          (failedComponent) =>\n            `${chalk.bold(failedComponent.id.toString())} - ${chalk.red(failedComponent.unmergedMessage as string)}`\n        )\n        .join('\\n');\n      throw new BitError(`unable to merge due to the following failures:\\n${failureMsgs}`);\n    }\n\n    return this.mergeSnaps({\n      mergeStrategy,\n      allComponentsStatus,\n      laneId: currentLaneId,\n      localLane: currentLaneObject,\n      noSnap,\n      snapMessage,\n      build,\n      skipDependencyInstallation,\n    });\n  }\n\n  /**\n   * merge multiple components according to the \"allComponentsStatus\".\n   */\n  async mergeSnaps({\n    mergeStrategy,\n    allComponentsStatus,\n    laneId,\n    localLane,\n    noSnap,\n    snapMessage,\n    build,\n    skipDependencyInstallation,\n  }: {\n    mergeStrategy: MergeStrategy;\n    allComponentsStatus: ComponentMergeStatus[];\n    laneId: LaneId;\n    localLane: Lane | null;\n    noSnap: boolean;\n    snapMessage: string;\n    build: boolean;\n    skipDependencyInstallation?: boolean;\n  }): Promise<ApplyVersionResults> {\n    const consumer = this.workspace.consumer;\n    const componentWithConflict = allComponentsStatus.find(\n      (component) => component.mergeResults && component.mergeResults.hasConflicts\n    );\n    if (componentWithConflict && !mergeStrategy) {\n      mergeStrategy = await getMergeStrategyInteractive();\n    }\n    const failedComponents: FailedComponents[] = allComponentsStatus\n      .filter((componentStatus) => componentStatus.unmergedMessage)\n      .map((componentStatus) => ({\n        id: componentStatus.id,\n        failureMessage: componentStatus.unmergedMessage as string,\n        unchangedLegitimately: componentStatus.unmergedLegitimately,\n      }));\n    const succeededComponents = allComponentsStatus.filter((componentStatus) => !componentStatus.unmergedMessage);\n    // do not use Promise.all for applyVersion. otherwise, it'll write all components in parallel,\n    // which can be an issue when some components are also dependencies of others\n    const componentsResults = await mapSeries(\n      succeededComponents,\n      async ({ currentComponent, id, mergeResults, resolvedUnrelated }) => {\n        const modelComponent = await consumer.scope.getModelComponent(id);\n        const updatedLaneId = laneId.isDefault() ? LaneId.from(laneId.name, id.scope as string) : laneId;\n        return this.applyVersion({\n          currentComponent,\n          id,\n          mergeResults,\n          mergeStrategy,\n          remoteHead: modelComponent.getRef(id.version as string) as Ref,\n          laneId: updatedLaneId,\n          localLane,\n          resolvedUnrelated,\n        });\n      }\n    );\n\n    const leftUnresolvedConflicts = componentWithConflict && mergeStrategy === 'manual';\n\n    if (!skipDependencyInstallation && !leftUnresolvedConflicts) {\n      await this.workspace.install(undefined, {\n        dedupe: true,\n        updateExisting: false,\n        import: false,\n      });\n    }\n\n    if (localLane) consumer.scope.objects.add(localLane);\n\n    await consumer.scope.objects.persist(); // persist anyway, if localLane is null it should save all main heads\n\n    await consumer.scope.objects.unmergedComponents.write();\n\n    // if one of the component has conflict, don't snap-merge. otherwise, some of the components would be snap-merged\n    // and some not. besides the fact that it could by mistake tag dependent, it's a confusing state. better not snap.\n    const mergeSnapResults =\n      noSnap || leftUnresolvedConflicts ? null : await this.snapResolvedComponents(consumer, snapMessage, build);\n\n    return {\n      components: componentsResults,\n      failedComponents,\n      mergeSnapResults,\n      leftUnresolvedConflicts,\n    };\n  }\n\n  /**\n   * this function gets called from two different commands:\n   * 1. \"bit merge <ids...>\", when merging a component from a remote to the local.\n   * in this case, the remote and local are on the same lane or both on main.\n   * 2. \"bit lane merge\", when merging from one lane to another.\n   * @param id\n   * @param localLane\n   * @param otherLaneName\n   * @param existingOnWorkspaceOnly\n   * @returns\n   */\n  async getComponentMergeStatus(\n    id: BitId, // the id.version is the version we want to merge to the current component\n    localLane: Lane | null, // currently checked out lane. if on main, then it's null.\n    otherLaneName: string, // the lane name we want to merged to our lane. (can be also \"main\").\n    options?: { resolveUnrelated?: MergeStrategy }\n  ): Promise<ComponentMergeStatus> {\n    const consumer = this.workspace.consumer;\n    const componentStatus: ComponentMergeStatus = { id };\n    const returnUnmerged = (msg: string, unmergedLegitimately = false) => {\n      componentStatus.unmergedMessage = msg;\n      componentStatus.unmergedLegitimately = unmergedLegitimately;\n      return componentStatus;\n    };\n    const modelComponent = await consumer.scope.getModelComponentIfExist(id);\n    if (!modelComponent) {\n      return returnUnmerged(\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 returnUnmerged(\n        `component ${id.toStringWithoutVersion()} is in during-merge state a previous merge, please snap/tag it first (or use bit merge --resolve/--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 componentOnLane: Version = await modelComponent.loadVersion(version, consumer.scope.objects);\n    if (componentOnLane.isRemoved()) {\n      return returnUnmerged(`component has been removed`, true);\n    }\n    const getCurrentId = () => {\n      if (existingBitMapId) return existingBitMapId;\n      if (localLane) {\n        const idOnLane = localLane.getComponent(id);\n        if (!idOnLane) return null;\n        return idOnLane.id.changeVersion(idOnLane.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, otherLaneHead, null, false);\n      return { currentComponent: null, componentFromModel: componentOnLane, id, mergeResults: null, 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    const componentModificationStatus = await consumer.getComponentStatusById(currentComponent.id);\n    if (componentModificationStatus.modified) {\n      return returnUnmerged(\n        `unable to merge ${id.toStringWithoutVersion()}, the component is modified, please snap/tag it first`\n      );\n    }\n    const laneHeadIsDifferentThanCheckedOut =\n      localLane && existingBitMapId?.version && modelComponent.laneHeadLocal?.toString() !== existingBitMapId?.version;\n    const localHead = laneHeadIsDifferentThanCheckedOut ? Ref.from(existingBitMapId.version) : null;\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(repo, modelComponent, otherLaneHead, localHead, false);\n    if (divergeData.err) {\n      if (divergeData.err instanceof NoCommonSnap && options?.resolveUnrelated) {\n        if (options?.resolveUnrelated === 'theirs') {\n          // just override with the model data\n          return {\n            currentComponent,\n            componentFromModel: componentOnLane,\n            id,\n            mergeResults: null,\n            divergeData,\n            resolvedUnrelated: 'theirs',\n          };\n        }\n        if (options?.resolveUnrelated === 'ours') {\n          return {\n            currentComponent,\n            id,\n            mergeResults: null,\n            divergeData,\n            resolvedUnrelated: 'ours',\n          };\n        }\n        throw new Error(\n          `unsupported strategy \"${options?.resolveUnrelated}\" of resolve-unrelated. supported strategies are: [ours, theirs]`\n        );\n      }\n      return returnUnmerged(\n        `unable to traverse ${currentComponent.id.toString()} history. error: ${divergeData.err.message}`\n      );\n    }\n    if (!divergeData.isDiverged()) {\n      if (divergeData.isLocalAhead()) {\n        // do nothing!\n        return returnUnmerged(`component ${currentComponent.id.toString()} is ahead, nothing to merge`, true);\n      }\n      if (divergeData.isRemoteAhead()) {\n        // just override with the model data\n        return {\n          currentComponent,\n          componentFromModel: componentOnLane,\n          id,\n          mergeResults: null,\n          divergeData,\n        };\n      }\n      // we know that localHead and remoteHead are set, so if none of them is ahead they must be equal\n      return returnUnmerged(`component ${currentComponent.id.toString()} is already merged`, true);\n    }\n    const baseSnap = divergeData.commonSnapBeforeDiverge as Ref; // must be set when isTrueMerge\n    const baseComponent: Version = await modelComponent.loadVersion(baseSnap.toString(), repo);\n    const otherComponent: Version = await modelComponent.loadVersion(otherLaneHead.toString(), repo);\n    const currentLaneName = localLane?.toLaneId().toString() || 'main';\n    const mergeResults = await threeWayMerge({\n      consumer,\n      otherComponent,\n      otherLabel: `${otherLaneHead.toString()} (${otherLaneName})`,\n      currentComponent,\n      currentLabel: `${currentId.version} (${currentLaneName})`,\n      baseComponent,\n    });\n    return { currentComponent, id, mergeResults, divergeData };\n  }\n\n  private async applyVersion({\n    currentComponent,\n    id,\n    mergeResults,\n    mergeStrategy,\n    remoteHead,\n    laneId,\n    localLane,\n    resolvedUnrelated,\n  }: {\n    currentComponent: ConsumerComponent | null | undefined;\n    id: BitId;\n    mergeResults: MergeResultsThreeWay | null | undefined;\n    mergeStrategy: MergeStrategy;\n    remoteHead: Ref;\n    laneId: LaneId;\n    localLane: Lane | null;\n    resolvedUnrelated?: MergeStrategy;\n  }): Promise<ApplyVersionResult> {\n    const consumer = this.workspace.consumer;\n    let filesStatus = {};\n    const unmergedComponent: UnmergedComponent = {\n      // @ts-ignore\n      id: { name: id.name, scope: id.scope },\n      head: remoteHead,\n      remote: laneId.scope, // @todo: remove. it has been deprecated around 0.0.832\n      lane: laneId.name, // @todo: remove. it has been deprecated around 0.0.832\n      laneId,\n    };\n    id = currentComponent ? currentComponent.id : id;\n\n    const modelComponent = await consumer.scope.getModelComponent(id);\n    const handleResolveUnrelated = () => {\n      if (!currentComponent) throw new Error('currentComponent must be defined when resolvedUnrelated');\n      if (!localLane) throw new Error('localLane must be defined when resolvedUnrelated');\n      const head = modelComponent.getRef(currentComponent.id.version as string);\n      if (!head) throw new Error(`unable to get the head for resolved-unrelated ${id.toString()}`);\n      unmergedComponent.laneId = localLane.toLaneId();\n      unmergedComponent.head = head;\n      unmergedComponent.unrelated = true;\n      consumer.scope.objects.unmergedComponents.addEntry(unmergedComponent);\n      return { id, filesStatus };\n    };\n\n    const markAllFilesAsUnchanged = () => {\n      if (!currentComponent) throw new Error(`applyVersion expect to get currentComponent for ${id.toString()}`);\n      currentComponent.files.forEach((file) => {\n        filesStatus[pathNormalizeToLinux(file.relative)] = FileStatus.unchanged;\n      });\n    };\n    if (mergeResults && mergeResults.hasConflicts && mergeStrategy === MergeOptions.ours) {\n      markAllFilesAsUnchanged();\n      consumer.scope.objects.unmergedComponents.addEntry(unmergedComponent);\n      return { id, filesStatus };\n    }\n    if (resolvedUnrelated && resolvedUnrelated === 'ours') {\n      markAllFilesAsUnchanged();\n      localLane?.addComponent({ id, head: remoteHead });\n      return handleResolveUnrelated();\n    }\n    const remoteId = id.changeVersion(remoteHead.toString());\n    const idToLoad = !mergeResults || mergeStrategy === MergeOptions.theirs ? remoteId : id;\n    const componentWithDependencies = await consumer.loadComponentWithDependenciesFromModel(idToLoad);\n    const files = componentWithDependencies.component.files;\n    files.forEach((file) => {\n      // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n      filesStatus[pathNormalizeToLinux(file.relative)] = FileStatus.updated;\n    });\n\n    if (mergeResults) {\n      // update files according to the merge results\n      const { filesStatus: modifiedStatus, modifiedFiles } = applyModifiedVersion(files, mergeResults, mergeStrategy);\n      componentWithDependencies.component.files = modifiedFiles;\n      filesStatus = { ...filesStatus, ...modifiedStatus };\n    }\n\n    const manyComponentsWriter = new ManyComponentsWriter({\n      consumer,\n      componentsWithDependencies: [componentWithDependencies],\n      installNpmPackages: false,\n      override: true,\n      writeConfig: false, // @todo: should write if config exists before, needs to figure out how to do it.\n      verbose: false, // @todo: do we need a flag here?\n      writeDists: true, // @todo: do we need a flag here?\n      writePackageJson: false,\n    });\n    await manyComponentsWriter.writeAll();\n\n    // if mergeResults, the head snap is going to be updated on a later phase when snapping with two parents\n    // otherwise, update the head of the current lane or main\n    if (mergeResults) {\n      if (mergeResults.hasConflicts && mergeStrategy === MergeOptions.manual) {\n        unmergedComponent.unmergedPaths = mergeResults.modifiedFiles.filter((f) => f.conflict).map((f) => f.filePath);\n      }\n      consumer.scope.objects.unmergedComponents.addEntry(unmergedComponent);\n    } else if (localLane) {\n      localLane.addComponent({ id, head: remoteHead });\n      if (resolvedUnrelated) {\n        // must be \"theirs\"\n        return handleResolveUnrelated();\n      }\n    } else {\n      // this is main\n      modelComponent.setHead(remoteHead);\n      // mark it as local, otherwise, when importing this component from a remote, it'll override it.\n      modelComponent.markVersionAsLocal(remoteHead.toString());\n      consumer.scope.objects.add(modelComponent);\n    }\n\n    return { id, filesStatus };\n  }\n\n  private async abortMerge(consumer: Consumer, values: string[]): Promise<ApplyVersionResults> {\n    const ids = this.getIdsForUnmerged(consumer, values);\n    // @ts-ignore not clear yet what to do with other flags\n    const results = await checkoutVersion(consumer, { ids, reset: true });\n    ids.forEach((id) => consumer.scope.objects.unmergedComponents.removeComponent(id.name));\n    await consumer.scope.objects.unmergedComponents.write();\n    return { abortedComponents: results.components };\n  }\n\n  private async resolveMerge(\n    consumer: Consumer,\n    values: string[],\n    snapMessage: string,\n    build: boolean\n  ): Promise<ApplyVersionResults> {\n    const ids = this.getIdsForUnmerged(consumer, values);\n    // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n    const { snappedComponents } = await this.snapping.snap({\n      legacyBitIds: BitIds.fromArray(ids),\n      build,\n      message: snapMessage,\n    });\n    return { resolvedComponents: snappedComponents };\n  }\n\n  private async getAllComponentsStatus(\n    bitIds: BitId[],\n    laneId: LaneId,\n    localLaneObject: Lane | null\n  ): Promise<ComponentMergeStatus[]> {\n    const tmp = new Tmp(this.consumer.scope);\n    try {\n      const componentsStatus = await Promise.all(\n        bitIds.map(async (bitId) => {\n          const remoteScopeName = laneId.isDefault() ? bitId.scope : laneId.scope;\n          const remoteLaneId = LaneId.from(laneId.name, remoteScopeName as string);\n          const remoteHead = await this.consumer.scope.objects.remoteLanes.getRef(remoteLaneId, bitId);\n          const laneIdStr = remoteLaneId.toString();\n          if (!remoteHead)\n            throw new BitError(`unable to find a remote head of \"${bitId.toStringWithoutVersion()}\" in \"${laneIdStr}\"`);\n          return this.getComponentMergeStatus(bitId.changeVersion(remoteHead.toString()), localLaneObject, laneIdStr);\n        })\n      );\n      await tmp.clear();\n      return componentsStatus;\n    } catch (err: any) {\n      await tmp.clear();\n      throw err;\n    }\n  }\n\n  private async snapResolvedComponents(\n    consumer: Consumer,\n    snapMessage: string,\n    build: boolean\n  ): Promise<null | { snappedComponents: ConsumerComponent[]; autoSnappedResults: AutoTagResult[] }> {\n    const unmergedComponents = consumer.scope.objects.unmergedComponents.getComponents();\n    logger.debug(`merge-snaps, snapResolvedComponents, total ${unmergedComponents.length.toString()} components`);\n    if (!unmergedComponents.length) return null;\n    const ids = BitIds.fromArray(unmergedComponents.map((r) => new BitId(r.id)));\n    return this.snapping.snap({\n      legacyBitIds: ids,\n      build,\n      message: snapMessage,\n    });\n  }\n\n  private getIdsForUnmerged(consumer: Consumer, idsStr?: string[]): BitId[] {\n    if (idsStr && idsStr.length) {\n      const bitIds = idsStr.map((id) => consumer.getParsedId(id));\n      bitIds.forEach((id) => {\n        const entry = consumer.scope.objects.unmergedComponents.getEntry(id.name);\n        if (!entry) {\n          throw new GeneralError(`unable to merge-resolve ${id.toString()}, it is not marked as unresolved`);\n        }\n      });\n      return bitIds;\n    }\n    const unresolvedComponents = consumer.scope.objects.unmergedComponents.getComponents();\n    if (!unresolvedComponents.length) throw new GeneralError(`all components are resolved already, nothing to do`);\n    return unresolvedComponents.map((u) => new BitId(u.id));\n  }\n\n  private getComponentsToMerge(consumer: Consumer, ids: string[]): BitId[] {\n    if (hasWildcard(ids)) {\n      const componentsList = new ComponentsList(consumer);\n      return componentsList.listComponentsByIdsWithWildcard(ids);\n    }\n    return ids.map((id) => consumer.getParsedId(id));\n  }\n\n  static slots = [];\n  static dependencies = [CLIAspect, WorkspaceAspect, SnappingAspect];\n  static runtime = MainRuntime;\n  static async provider([cli, workspace, snapping]: [CLIMain, Workspace, SnappingMain]) {\n    const merging = new MergingMain(workspace, snapping);\n    cli.register(new MergeCmd(merging));\n    return merging;\n  }\n}\n\nMergingAspect.addRuntime(MergingMain);\n"],"mappings":"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"}
+{"version":3,"names":["MergingMain","constructor","workspace","snapping","checkout","consumer","merge","values","mergeStrategy","abort","resolve","noSnap","message","build","skipDependencyInstallation","ConsumerNotFound","mergeResults","firstValue","R","head","resolveMerge","abortMerge","BitId","isValidVersion","bitIds","getComponentsToMerge","mergeComponentsFromRemote","version","ids","tail","mergeVersion","onDestroy","snapMessage","currentLaneId","getCurrentLaneId","currentLaneObject","getCurrentLaneObject","allComponentsStatus","getAllComponentsStatus","failedComponents","filter","c","unmergedMessage","unmergedLegitimately","length","failureMsgs","map","failedComponent","chalk","bold","id","toString","red","join","BitError","mergeSnaps","laneId","localLane","componentWithConflict","find","component","hasConflicts","getMergeStrategyInteractive","componentStatus","failureMessage","unchangedLegitimately","succeededComponents","componentsResults","mapSeries","currentComponent","resolvedUnrelated","modelComponent","scope","getModelComponent","updatedLaneId","isDefault","LaneId","from","name","applyVersion","remoteHead","getRef","leftUnresolvedConflicts","install","undefined","dedupe","updateExisting","import","objects","add","persist","unmergedComponents","write","mergeSnapResults","snapResolvedComponents","components","getComponentMergeStatus","otherLaneName","options","returnUnmerged","msg","getModelComponentIfExist","unmerged","getEntry","toStringWithoutVersion","repo","otherLaneHead","existingBitMapId","bitMap","getBitIdIfExist","ignoreVersion","componentOnLane","loadVersion","isRemoved","getCurrentId","idOnLane","getComponent","changeVersion","getHeadAsTagIfExist","currentId","divergeData","getDivergeData","componentFromModel","getCurrentComponent","loadComponent","getConsumerComponent","isModified","componentModificationStatus","getComponentStatusById","modified","baseComponent","ignoreConfigChanges","isComponentSourceCodeModified","isComponentModified","laneHeadIsDifferentThanCheckedOut","laneHeadLocal","localHead","Ref","Error","err","NoCommonSnap","resolveUnrelated","isDiverged","isLocalAhead","isRemoteAhead","baseSnap","commonSnapBeforeDiverge","otherComponent","currentLaneName","toLaneId","threeWayMerge","otherLabel","currentLabel","filesStatus","unmergedComponent","remote","lane","handleResolveUnrelated","unrelated","addEntry","markAllFilesAsUnchanged","files","forEach","file","pathNormalizeToLinux","relative","FileStatus","unchanged","MergeOptions","ours","addComponent","remoteId","idToLoad","theirs","componentWithDependencies","loadComponentWithDependenciesFromModel","updated","modifiedStatus","modifiedFiles","applyModifiedVersion","manyComponentsWriter","ManyComponentsWriter","componentsWithDependencies","installNpmPackages","override","writeConfig","verbose","writeDists","writePackageJson","writeAll","manual","unmergedPaths","f","conflict","filePath","setHead","markVersionAsLocal","getIdsForUnmerged","results","reset","removeComponent","fullName","abortedComponents","snappedComponents","snap","legacyBitIds","BitIds","fromArray","_legacy","resolvedComponents","localLaneObject","tmp","Tmp","componentsStatus","Promise","all","bitId","remoteScopeName","remoteLaneId","remoteLanes","laneIdStr","clear","getComponents","logger","debug","r","idsStr","componentIds","resolveMultipleComponentIds","entry","GeneralError","unresolvedComponents","u","ComponentID","fromLegacy","hasWildcard","componentsList","ComponentsList","listComponentsByIdsWithWildcard","getParsedId","provider","cli","merging","register","MergeCmd","CLIAspect","WorkspaceAspect","SnappingAspect","CheckoutAspect","MainRuntime","MergingAspect","addRuntime"],"sources":["merging.main.runtime.ts"],"sourcesContent":["import { CLIAspect, CLIMain, MainRuntime } from '@teambit/cli';\nimport WorkspaceAspect, { Workspace } from '@teambit/workspace';\nimport R from 'ramda';\nimport { Consumer } from '@teambit/legacy/dist/consumer';\nimport ComponentsList from '@teambit/legacy/dist/consumer/component/components-list';\nimport {\n  ApplyVersionResults,\n  MergeStrategy,\n  mergeVersion,\n  ApplyVersionResult,\n  FailedComponents,\n  FileStatus,\n  getMergeStrategyInteractive,\n  MergeOptions,\n} from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport { ConsumerNotFound } from '@teambit/legacy/dist/consumer/exceptions';\nimport SnappingAspect, { SnappingMain } from '@teambit/snapping';\nimport hasWildcard from '@teambit/legacy/dist/utils/string/has-wildcard';\nimport mapSeries from 'p-map-series';\nimport { BitId, BitIds } from '@teambit/legacy/dist/bit-id';\nimport { BitError } from '@teambit/bit-error';\nimport GeneralError from '@teambit/legacy/dist/error/general-error';\nimport { LaneId } from '@teambit/lane-id';\nimport logger from '@teambit/legacy/dist/logger/logger';\nimport { AutoTagResult } from '@teambit/legacy/dist/scope/component-ops/auto-tag';\nimport { getDivergeData } from '@teambit/legacy/dist/scope/component-ops/get-diverge-data';\nimport { UnmergedComponent } from '@teambit/legacy/dist/scope/lanes/unmerged-components';\nimport { Lane, Version } from '@teambit/legacy/dist/scope/models';\nimport { Ref } from '@teambit/legacy/dist/scope/objects';\nimport chalk from 'chalk';\nimport { Tmp } from '@teambit/legacy/dist/scope/repositories';\nimport { pathNormalizeToLinux } from '@teambit/legacy/dist/utils';\nimport ManyComponentsWriter from '@teambit/legacy/dist/consumer/component-ops/many-components-writer';\nimport ConsumerComponent from '@teambit/legacy/dist/consumer/component/consumer-component';\nimport { applyModifiedVersion } from '@teambit/legacy/dist/consumer/versions-ops/checkout-version';\nimport threeWayMerge, {\n  MergeResultsThreeWay,\n} from '@teambit/legacy/dist/consumer/versions-ops/merge-version/three-way-merge';\nimport { NoCommonSnap } from '@teambit/legacy/dist/scope/exceptions/no-common-snap';\nimport { CheckoutAspect, CheckoutMain } from '@teambit/checkout';\nimport { ComponentID } from '@teambit/component-id';\nimport { DivergeData } from '@teambit/legacy/dist/scope/component-ops/diverge-data';\nimport { MergeCmd } from './merge-cmd';\nimport { MergingAspect } from './merging.aspect';\n\nexport type ComponentMergeStatus = {\n  currentComponent?: ConsumerComponent | null;\n  componentFromModel?: Version;\n  id: BitId;\n  unmergedMessage?: string;\n  unmergedLegitimately?: boolean; // failed to merge but for a legitimate reason, such as, up-to-date\n  mergeResults?: MergeResultsThreeWay | null;\n  divergeData?: DivergeData;\n  resolvedUnrelated?: MergeStrategy;\n};\n\nexport class MergingMain {\n  private consumer: Consumer;\n  constructor(private workspace: Workspace, private snapping: SnappingMain, private checkout: CheckoutMain) {\n    this.consumer = this.workspace?.consumer;\n  }\n\n  /**\n   * merge components according to the \"values\" param.\n   * if the first param is a version, then merge the component ids to that version.\n   * otherwise, merge from the remote head to the local.\n   */\n  async merge(\n    values: string[],\n    mergeStrategy: MergeStrategy,\n    abort: boolean,\n    resolve: boolean,\n    noSnap: boolean,\n    message: string,\n    build: boolean,\n    skipDependencyInstallation: boolean\n  ): Promise<ApplyVersionResults> {\n    if (!this.workspace) throw new ConsumerNotFound();\n    const consumer: Consumer = this.workspace.consumer;\n    let mergeResults;\n    const firstValue = R.head(values);\n    if (resolve) {\n      mergeResults = await this.resolveMerge(values, message, build);\n    } else if (abort) {\n      mergeResults = await this.abortMerge(values);\n    } else if (!BitId.isValidVersion(firstValue)) {\n      const bitIds = this.getComponentsToMerge(consumer, values);\n      // @todo: version could be the lane only or remote/lane\n      mergeResults = await this.mergeComponentsFromRemote(\n        consumer,\n        bitIds,\n        mergeStrategy,\n        noSnap,\n        message,\n        build,\n        skipDependencyInstallation\n      );\n    } else {\n      const version = firstValue;\n      const ids = R.tail(values);\n      const bitIds = this.getComponentsToMerge(consumer, ids);\n      mergeResults = await mergeVersion(consumer, version, bitIds, mergeStrategy);\n    }\n    await consumer.onDestroy();\n    return mergeResults;\n  }\n\n  /**\n   * when user is on main, it merges the remote main components into local.\n   * when user is on a lane, it merges the remote lane components into the local lane.\n   */\n  async mergeComponentsFromRemote(\n    consumer: Consumer,\n    bitIds: BitId[],\n    mergeStrategy: MergeStrategy,\n    noSnap: boolean,\n    snapMessage: string,\n    build: boolean,\n    skipDependencyInstallation: boolean\n  ): Promise<ApplyVersionResults> {\n    const currentLaneId = consumer.getCurrentLaneId();\n    const currentLaneObject = await consumer.getCurrentLaneObject();\n    const allComponentsStatus = await this.getAllComponentsStatus(bitIds, currentLaneId, currentLaneObject);\n    const failedComponents = allComponentsStatus.filter((c) => c.unmergedMessage && !c.unmergedLegitimately);\n    if (failedComponents.length) {\n      const failureMsgs = failedComponents\n        .map(\n          (failedComponent) =>\n            `${chalk.bold(failedComponent.id.toString())} - ${chalk.red(failedComponent.unmergedMessage as string)}`\n        )\n        .join('\\n');\n      throw new BitError(`unable to merge due to the following failures:\\n${failureMsgs}`);\n    }\n\n    return this.mergeSnaps({\n      mergeStrategy,\n      allComponentsStatus,\n      laneId: currentLaneId,\n      localLane: currentLaneObject,\n      noSnap,\n      snapMessage,\n      build,\n      skipDependencyInstallation,\n    });\n  }\n\n  /**\n   * merge multiple components according to the \"allComponentsStatus\".\n   */\n  async mergeSnaps({\n    mergeStrategy,\n    allComponentsStatus,\n    laneId,\n    localLane,\n    noSnap,\n    snapMessage,\n    build,\n    skipDependencyInstallation,\n  }: {\n    mergeStrategy: MergeStrategy;\n    allComponentsStatus: ComponentMergeStatus[];\n    laneId: LaneId;\n    localLane: Lane | null;\n    noSnap: boolean;\n    snapMessage: string;\n    build: boolean;\n    skipDependencyInstallation?: boolean;\n  }): Promise<ApplyVersionResults> {\n    const consumer = this.workspace.consumer;\n    const componentWithConflict = allComponentsStatus.find(\n      (component) => component.mergeResults && component.mergeResults.hasConflicts\n    );\n    if (componentWithConflict && !mergeStrategy) {\n      mergeStrategy = await getMergeStrategyInteractive();\n    }\n    const failedComponents: FailedComponents[] = allComponentsStatus\n      .filter((componentStatus) => componentStatus.unmergedMessage)\n      .map((componentStatus) => ({\n        id: componentStatus.id,\n        failureMessage: componentStatus.unmergedMessage as string,\n        unchangedLegitimately: componentStatus.unmergedLegitimately,\n      }));\n    const succeededComponents = allComponentsStatus.filter((componentStatus) => !componentStatus.unmergedMessage);\n    // do not use Promise.all for applyVersion. otherwise, it'll write all components in parallel,\n    // which can be an issue when some components are also dependencies of others\n    const componentsResults = await mapSeries(\n      succeededComponents,\n      async ({ currentComponent, id, mergeResults, resolvedUnrelated }) => {\n        const modelComponent = await consumer.scope.getModelComponent(id);\n        const updatedLaneId = laneId.isDefault() ? LaneId.from(laneId.name, id.scope as string) : laneId;\n        return this.applyVersion({\n          currentComponent,\n          id,\n          mergeResults,\n          mergeStrategy,\n          remoteHead: modelComponent.getRef(id.version as string) as Ref,\n          laneId: updatedLaneId,\n          localLane,\n          resolvedUnrelated,\n        });\n      }\n    );\n\n    const leftUnresolvedConflicts = componentWithConflict && mergeStrategy === 'manual';\n\n    if (!skipDependencyInstallation && !leftUnresolvedConflicts) {\n      await this.workspace.install(undefined, {\n        dedupe: true,\n        updateExisting: false,\n        import: false,\n      });\n    }\n\n    if (localLane) consumer.scope.objects.add(localLane);\n\n    await consumer.scope.objects.persist(); // persist anyway, if localLane is null it should save all main heads\n\n    await consumer.scope.objects.unmergedComponents.write();\n\n    // if one of the component has conflict, don't snap-merge. otherwise, some of the components would be snap-merged\n    // and some not. besides the fact that it could by mistake tag dependent, it's a confusing state. better not snap.\n    const mergeSnapResults =\n      noSnap || leftUnresolvedConflicts ? null : await this.snapResolvedComponents(consumer, snapMessage, build);\n\n    return {\n      components: componentsResults,\n      failedComponents,\n      mergeSnapResults,\n      leftUnresolvedConflicts,\n    };\n  }\n\n  /**\n   * this function gets called from two different commands:\n   * 1. \"bit merge <ids...>\", when merging a component from a remote to the local.\n   * in this case, the remote and local are on the same lane or both on main.\n   * 2. \"bit lane merge\", when merging from one lane to another.\n   * @param id\n   * @param localLane\n   * @param otherLaneName\n   * @param existingOnWorkspaceOnly\n   * @returns\n   */\n  async getComponentMergeStatus(\n    id: BitId, // the id.version is the version we want to merge to the current component\n    localLane: Lane | null, // currently checked out lane. if on main, then it's null.\n    otherLaneName: string, // the lane name we want to merged to our lane. (can be also \"main\").\n    options?: { resolveUnrelated?: MergeStrategy; ignoreConfigChanges?: boolean }\n  ): Promise<ComponentMergeStatus> {\n    const consumer = this.workspace.consumer;\n    const componentStatus: ComponentMergeStatus = { id };\n    const returnUnmerged = (msg: string, unmergedLegitimately = false) => {\n      componentStatus.unmergedMessage = msg;\n      componentStatus.unmergedLegitimately = unmergedLegitimately;\n      return componentStatus;\n    };\n    const modelComponent = await consumer.scope.getModelComponentIfExist(id);\n    if (!modelComponent) {\n      return returnUnmerged(\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 returnUnmerged(\n        `component ${id.toStringWithoutVersion()} is in during-merge state a previous merge, please snap/tag it first (or use bit merge --resolve/--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 componentOnLane: Version = await modelComponent.loadVersion(version, consumer.scope.objects);\n    if (componentOnLane.isRemoved()) {\n      return returnUnmerged(`component has been removed`, true);\n    }\n    const getCurrentId = () => {\n      if (existingBitMapId) return existingBitMapId;\n      if (localLane) {\n        const idOnLane = localLane.getComponent(id);\n        if (!idOnLane) return null;\n        return idOnLane.id.changeVersion(idOnLane.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, otherLaneHead, null, false);\n      return { currentComponent: null, componentFromModel: componentOnLane, id, mergeResults: null, 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    const isModified = async () => {\n      const componentModificationStatus = await consumer.getComponentStatusById(currentComponent.id);\n      if (!componentModificationStatus.modified) return false;\n      if (!existingBitMapId) return false;\n      const baseComponent = await modelComponent.loadVersion(\n        existingBitMapId.version as string,\n        consumer.scope.objects\n      );\n      return options?.ignoreConfigChanges\n        ? consumer.isComponentSourceCodeModified(baseComponent, currentComponent)\n        : true;\n    };\n\n    const isComponentModified = await isModified();\n\n    if (isComponentModified) {\n      return returnUnmerged(`component is modified, please snap/tag it first`);\n    }\n    const laneHeadIsDifferentThanCheckedOut =\n      localLane && existingBitMapId?.version && modelComponent.laneHeadLocal?.toString() !== existingBitMapId?.version;\n    const localHead = laneHeadIsDifferentThanCheckedOut ? Ref.from(existingBitMapId.version) : null;\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(repo, modelComponent, otherLaneHead, localHead, false);\n    if (divergeData.err) {\n      if (divergeData.err instanceof NoCommonSnap && options?.resolveUnrelated) {\n        if (options?.resolveUnrelated === 'theirs') {\n          // just override with the model data\n          return {\n            currentComponent,\n            componentFromModel: componentOnLane,\n            id,\n            mergeResults: null,\n            divergeData,\n            resolvedUnrelated: 'theirs',\n          };\n        }\n        if (options?.resolveUnrelated === 'ours') {\n          return {\n            currentComponent,\n            id,\n            mergeResults: null,\n            divergeData,\n            resolvedUnrelated: 'ours',\n          };\n        }\n        throw new Error(\n          `unsupported strategy \"${options?.resolveUnrelated}\" of resolve-unrelated. supported strategies are: [ours, theirs]`\n        );\n      }\n      return returnUnmerged(\n        `unable to traverse ${currentComponent.id.toString()} history. error: ${divergeData.err.message}`\n      );\n    }\n    if (!divergeData.isDiverged()) {\n      if (divergeData.isLocalAhead()) {\n        // do nothing!\n        return returnUnmerged(`component ${currentComponent.id.toString()} is ahead, nothing to merge`, true);\n      }\n      if (divergeData.isRemoteAhead()) {\n        // just override with the model data\n        return {\n          currentComponent,\n          componentFromModel: componentOnLane,\n          id,\n          mergeResults: null,\n          divergeData,\n        };\n      }\n      // we know that localHead and remoteHead are set, so if none of them is ahead they must be equal\n      return returnUnmerged(`component ${currentComponent.id.toString()} is already merged`, true);\n    }\n    const baseSnap = divergeData.commonSnapBeforeDiverge as Ref; // must be set when isTrueMerge\n    const baseComponent: Version = await modelComponent.loadVersion(baseSnap.toString(), repo);\n    const otherComponent: Version = await modelComponent.loadVersion(otherLaneHead.toString(), repo);\n    const currentLaneName = localLane?.toLaneId().toString() || 'main';\n    const mergeResults = await threeWayMerge({\n      consumer,\n      otherComponent,\n      otherLabel: `${otherLaneHead.toString()} (${otherLaneName})`,\n      currentComponent,\n      currentLabel: `${currentId.version} (${currentLaneName})`,\n      baseComponent,\n    });\n    return { currentComponent, id, mergeResults, divergeData };\n  }\n\n  private async applyVersion({\n    currentComponent,\n    id,\n    mergeResults,\n    mergeStrategy,\n    remoteHead,\n    laneId,\n    localLane,\n    resolvedUnrelated,\n  }: {\n    currentComponent: ConsumerComponent | null | undefined;\n    id: BitId;\n    mergeResults: MergeResultsThreeWay | null | undefined;\n    mergeStrategy: MergeStrategy;\n    remoteHead: Ref;\n    laneId: LaneId;\n    localLane: Lane | null;\n    resolvedUnrelated?: MergeStrategy;\n  }): Promise<ApplyVersionResult> {\n    const consumer = this.workspace.consumer;\n    let filesStatus = {};\n    const unmergedComponent: UnmergedComponent = {\n      // @ts-ignore\n      id: { name: id.name, scope: id.scope },\n      head: remoteHead,\n      remote: laneId.scope, // @todo: remove. it has been deprecated around 0.0.832\n      lane: laneId.name, // @todo: remove. it has been deprecated around 0.0.832\n      laneId,\n    };\n    id = currentComponent ? currentComponent.id : id;\n\n    const modelComponent = await consumer.scope.getModelComponent(id);\n    const handleResolveUnrelated = () => {\n      if (!currentComponent) throw new Error('currentComponent must be defined when resolvedUnrelated');\n      if (!localLane) throw new Error('localLane must be defined when resolvedUnrelated');\n      const head = modelComponent.getRef(currentComponent.id.version as string);\n      if (!head) throw new Error(`unable to get the head for resolved-unrelated ${id.toString()}`);\n      unmergedComponent.laneId = localLane.toLaneId();\n      unmergedComponent.head = head;\n      unmergedComponent.unrelated = true;\n      consumer.scope.objects.unmergedComponents.addEntry(unmergedComponent);\n      return { id, filesStatus };\n    };\n\n    const markAllFilesAsUnchanged = () => {\n      if (!currentComponent) throw new Error(`applyVersion expect to get currentComponent for ${id.toString()}`);\n      currentComponent.files.forEach((file) => {\n        filesStatus[pathNormalizeToLinux(file.relative)] = FileStatus.unchanged;\n      });\n    };\n    if (mergeResults && mergeResults.hasConflicts && mergeStrategy === MergeOptions.ours) {\n      markAllFilesAsUnchanged();\n      consumer.scope.objects.unmergedComponents.addEntry(unmergedComponent);\n      return { id, filesStatus };\n    }\n    if (resolvedUnrelated && resolvedUnrelated === 'ours') {\n      markAllFilesAsUnchanged();\n      localLane?.addComponent({ id, head: remoteHead });\n      return handleResolveUnrelated();\n    }\n    const remoteId = id.changeVersion(remoteHead.toString());\n    const idToLoad = !mergeResults || mergeStrategy === MergeOptions.theirs ? remoteId : id;\n    const componentWithDependencies = await consumer.loadComponentWithDependenciesFromModel(idToLoad);\n    const files = componentWithDependencies.component.files;\n    files.forEach((file) => {\n      // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n      filesStatus[pathNormalizeToLinux(file.relative)] = FileStatus.updated;\n    });\n\n    if (mergeResults) {\n      // update files according to the merge results\n      const { filesStatus: modifiedStatus, modifiedFiles } = applyModifiedVersion(files, mergeResults, mergeStrategy);\n      componentWithDependencies.component.files = modifiedFiles;\n      filesStatus = { ...filesStatus, ...modifiedStatus };\n    }\n\n    const manyComponentsWriter = new ManyComponentsWriter({\n      consumer,\n      componentsWithDependencies: [componentWithDependencies],\n      installNpmPackages: false,\n      override: true,\n      writeConfig: false, // @todo: should write if config exists before, needs to figure out how to do it.\n      verbose: false, // @todo: do we need a flag here?\n      writeDists: true, // @todo: do we need a flag here?\n      writePackageJson: false,\n    });\n    await manyComponentsWriter.writeAll();\n\n    // if mergeResults, the head snap is going to be updated on a later phase when snapping with two parents\n    // otherwise, update the head of the current lane or main\n    if (mergeResults) {\n      if (mergeResults.hasConflicts && mergeStrategy === MergeOptions.manual) {\n        unmergedComponent.unmergedPaths = mergeResults.modifiedFiles.filter((f) => f.conflict).map((f) => f.filePath);\n      }\n      consumer.scope.objects.unmergedComponents.addEntry(unmergedComponent);\n    } else if (localLane) {\n      localLane.addComponent({ id, head: remoteHead });\n      if (resolvedUnrelated) {\n        // must be \"theirs\"\n        return handleResolveUnrelated();\n      }\n    } else {\n      // this is main\n      modelComponent.setHead(remoteHead);\n      // mark it as local, otherwise, when importing this component from a remote, it'll override it.\n      modelComponent.markVersionAsLocal(remoteHead.toString());\n      consumer.scope.objects.add(modelComponent);\n    }\n\n    return { id, filesStatus };\n  }\n\n  private async abortMerge(values: string[]): Promise<ApplyVersionResults> {\n    const consumer = this.workspace.consumer;\n    const ids = await this.getIdsForUnmerged(values);\n    const results = await this.checkout.checkout({ ids, reset: true });\n    ids.forEach((id) => consumer.scope.objects.unmergedComponents.removeComponent(id.fullName));\n    await consumer.scope.objects.unmergedComponents.write();\n    return { abortedComponents: results.components };\n  }\n\n  private async resolveMerge(values: string[], snapMessage: string, build: boolean): Promise<ApplyVersionResults> {\n    const ids = await this.getIdsForUnmerged(values);\n    // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n    const { snappedComponents } = await this.snapping.snap({\n      legacyBitIds: BitIds.fromArray(ids.map((id) => id._legacy)),\n      build,\n      message: snapMessage,\n    });\n    return { resolvedComponents: snappedComponents };\n  }\n\n  private async getAllComponentsStatus(\n    bitIds: BitId[],\n    laneId: LaneId,\n    localLaneObject: Lane | null\n  ): Promise<ComponentMergeStatus[]> {\n    const tmp = new Tmp(this.consumer.scope);\n    try {\n      const componentsStatus = await Promise.all(\n        bitIds.map(async (bitId) => {\n          const remoteScopeName = laneId.isDefault() ? bitId.scope : laneId.scope;\n          const remoteLaneId = LaneId.from(laneId.name, remoteScopeName as string);\n          const remoteHead = await this.consumer.scope.objects.remoteLanes.getRef(remoteLaneId, bitId);\n          const laneIdStr = remoteLaneId.toString();\n          if (!remoteHead)\n            throw new BitError(`unable to find a remote head of \"${bitId.toStringWithoutVersion()}\" in \"${laneIdStr}\"`);\n          return this.getComponentMergeStatus(bitId.changeVersion(remoteHead.toString()), localLaneObject, laneIdStr);\n        })\n      );\n      await tmp.clear();\n      return componentsStatus;\n    } catch (err: any) {\n      await tmp.clear();\n      throw err;\n    }\n  }\n\n  private async snapResolvedComponents(\n    consumer: Consumer,\n    snapMessage: string,\n    build: boolean\n  ): Promise<null | { snappedComponents: ConsumerComponent[]; autoSnappedResults: AutoTagResult[] }> {\n    const unmergedComponents = consumer.scope.objects.unmergedComponents.getComponents();\n    logger.debug(`merge-snaps, snapResolvedComponents, total ${unmergedComponents.length.toString()} components`);\n    if (!unmergedComponents.length) return null;\n    const ids = BitIds.fromArray(unmergedComponents.map((r) => new BitId(r.id)));\n    return this.snapping.snap({\n      legacyBitIds: ids,\n      build,\n      message: snapMessage,\n    });\n  }\n\n  private async getIdsForUnmerged(idsStr?: string[]): Promise<ComponentID[]> {\n    if (idsStr && idsStr.length) {\n      const componentIds = await this.workspace.resolveMultipleComponentIds(idsStr);\n      componentIds.forEach((id) => {\n        const entry = this.workspace.consumer.scope.objects.unmergedComponents.getEntry(id.fullName);\n        if (!entry) {\n          throw new GeneralError(`unable to merge-resolve ${id.toString()}, it is not marked as unresolved`);\n        }\n      });\n      return componentIds;\n    }\n    const unresolvedComponents = this.workspace.consumer.scope.objects.unmergedComponents.getComponents();\n    if (!unresolvedComponents.length) throw new GeneralError(`all components are resolved already, nothing to do`);\n    return unresolvedComponents.map((u) => ComponentID.fromLegacy(new BitId(u.id)));\n  }\n\n  private getComponentsToMerge(consumer: Consumer, ids: string[]): BitId[] {\n    if (hasWildcard(ids)) {\n      const componentsList = new ComponentsList(consumer);\n      return componentsList.listComponentsByIdsWithWildcard(ids);\n    }\n    return ids.map((id) => consumer.getParsedId(id));\n  }\n\n  static slots = [];\n  static dependencies = [CLIAspect, WorkspaceAspect, SnappingAspect, CheckoutAspect];\n  static runtime = MainRuntime;\n  static async provider([cli, workspace, snapping, checkout]: [CLIMain, Workspace, SnappingMain, CheckoutMain]) {\n    const merging = new MergingMain(workspace, snapping, checkout);\n    cli.register(new MergeCmd(merging));\n    return merging;\n  }\n}\n\nMergingAspect.addRuntime(MergingMain);\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AAAA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AAEA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AAUA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AAEA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AAGA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AAEA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AAGA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AAEA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;;;;;AAaO,MAAMA,WAAN,CAAkB;EAEvBC,WAAW,CAASC,SAAT,EAAuCC,QAAvC,EAAuEC,QAAvE,EAA+F;IAAA;;IAAA,KAAtFF,SAAsF,GAAtFA,SAAsF;IAAA,KAAxDC,QAAwD,GAAxDA,QAAwD;IAAA,KAAxBC,QAAwB,GAAxBA,QAAwB;IAAA;IACxG,KAAKC,QAAL,sBAAgB,KAAKH,SAArB,oDAAgB,gBAAgBG,QAAhC;EACD;EAED;AACF;AACA;AACA;AACA;;;EACa,MAALC,KAAK,CACTC,MADS,EAETC,aAFS,EAGTC,KAHS,EAITC,OAJS,EAKTC,MALS,EAMTC,OANS,EAOTC,KAPS,EAQTC,0BARS,EASqB;IAC9B,IAAI,CAAC,KAAKZ,SAAV,EAAqB,MAAM,KAAIa,8BAAJ,GAAN;IACrB,MAAMV,QAAkB,GAAG,KAAKH,SAAL,CAAeG,QAA1C;IACA,IAAIW,YAAJ;;IACA,MAAMC,UAAU,GAAGC,gBAAA,CAAEC,IAAF,CAAOZ,MAAP,CAAnB;;IACA,IAAIG,OAAJ,EAAa;MACXM,YAAY,GAAG,MAAM,KAAKI,YAAL,CAAkBb,MAAlB,EAA0BK,OAA1B,EAAmCC,KAAnC,CAArB;IACD,CAFD,MAEO,IAAIJ,KAAJ,EAAW;MAChBO,YAAY,GAAG,MAAM,KAAKK,UAAL,CAAgBd,MAAhB,CAArB;IACD,CAFM,MAEA,IAAI,CAACe,cAAA,CAAMC,cAAN,CAAqBN,UAArB,CAAL,EAAuC;MAC5C,MAAMO,MAAM,GAAG,KAAKC,oBAAL,CAA0BpB,QAA1B,EAAoCE,MAApC,CAAf,CAD4C,CAE5C;;MACAS,YAAY,GAAG,MAAM,KAAKU,yBAAL,CACnBrB,QADmB,EAEnBmB,MAFmB,EAGnBhB,aAHmB,EAInBG,MAJmB,EAKnBC,OALmB,EAMnBC,KANmB,EAOnBC,0BAPmB,CAArB;IASD,CAZM,MAYA;MACL,MAAMa,OAAO,GAAGV,UAAhB;;MACA,MAAMW,GAAG,GAAGV,gBAAA,CAAEW,IAAF,CAAOtB,MAAP,CAAZ;;MACA,MAAMiB,MAAM,GAAG,KAAKC,oBAAL,CAA0BpB,QAA1B,EAAoCuB,GAApC,CAAf;MACAZ,YAAY,GAAG,MAAM,IAAAc,4BAAA,EAAazB,QAAb,EAAuBsB,OAAvB,EAAgCH,MAAhC,EAAwChB,aAAxC,CAArB;IACD;;IACD,MAAMH,QAAQ,CAAC0B,SAAT,EAAN;IACA,OAAOf,YAAP;EACD;EAED;AACF;AACA;AACA;;;EACiC,MAAzBU,yBAAyB,CAC7BrB,QAD6B,EAE7BmB,MAF6B,EAG7BhB,aAH6B,EAI7BG,MAJ6B,EAK7BqB,WAL6B,EAM7BnB,KAN6B,EAO7BC,0BAP6B,EAQC;IAC9B,MAAMmB,aAAa,GAAG5B,QAAQ,CAAC6B,gBAAT,EAAtB;IACA,MAAMC,iBAAiB,GAAG,MAAM9B,QAAQ,CAAC+B,oBAAT,EAAhC;IACA,MAAMC,mBAAmB,GAAG,MAAM,KAAKC,sBAAL,CAA4Bd,MAA5B,EAAoCS,aAApC,EAAmDE,iBAAnD,CAAlC;IACA,MAAMI,gBAAgB,GAAGF,mBAAmB,CAACG,MAApB,CAA4BC,CAAD,IAAOA,CAAC,CAACC,eAAF,IAAqB,CAACD,CAAC,CAACE,oBAA1D,CAAzB;;IACA,IAAIJ,gBAAgB,CAACK,MAArB,EAA6B;MAC3B,MAAMC,WAAW,GAAGN,gBAAgB,CACjCO,GADiB,CAEfC,eAAD,IACG,GAAEC,gBAAA,CAAMC,IAAN,CAAWF,eAAe,CAACG,EAAhB,CAAmBC,QAAnB,EAAX,CAA0C,MAAKH,gBAAA,CAAMI,GAAN,CAAUL,eAAe,CAACL,eAA1B,CAAqD,EAHzF,EAKjBW,IALiB,CAKZ,IALY,CAApB;MAMA,MAAM,KAAIC,oBAAJ,EAAc,mDAAkDT,WAAY,EAA5E,CAAN;IACD;;IAED,OAAO,KAAKU,UAAL,CAAgB;MACrB/C,aADqB;MAErB6B,mBAFqB;MAGrBmB,MAAM,EAAEvB,aAHa;MAIrBwB,SAAS,EAAEtB,iBAJU;MAKrBxB,MALqB;MAMrBqB,WANqB;MAOrBnB,KAPqB;MAQrBC;IARqB,CAAhB,CAAP;EAUD;EAED;AACF;AACA;;;EACkB,MAAVyC,UAAU,CAAC;IACf/C,aADe;IAEf6B,mBAFe;IAGfmB,MAHe;IAIfC,SAJe;IAKf9C,MALe;IAMfqB,WANe;IAOfnB,KAPe;IAQfC;EARe,CAAD,EAkBiB;IAC/B,MAAMT,QAAQ,GAAG,KAAKH,SAAL,CAAeG,QAAhC;IACA,MAAMqD,qBAAqB,GAAGrB,mBAAmB,CAACsB,IAApB,CAC3BC,SAAD,IAAeA,SAAS,CAAC5C,YAAV,IAA0B4C,SAAS,CAAC5C,YAAV,CAAuB6C,YADpC,CAA9B;;IAGA,IAAIH,qBAAqB,IAAI,CAAClD,aAA9B,EAA6C;MAC3CA,aAAa,GAAG,MAAM,IAAAsD,2CAAA,GAAtB;IACD;;IACD,MAAMvB,gBAAoC,GAAGF,mBAAmB,CAC7DG,MAD0C,CAClCuB,eAAD,IAAqBA,eAAe,CAACrB,eADF,EAE1CI,GAF0C,CAErCiB,eAAD,KAAsB;MACzBb,EAAE,EAAEa,eAAe,CAACb,EADK;MAEzBc,cAAc,EAAED,eAAe,CAACrB,eAFP;MAGzBuB,qBAAqB,EAAEF,eAAe,CAACpB;IAHd,CAAtB,CAFsC,CAA7C;IAOA,MAAMuB,mBAAmB,GAAG7B,mBAAmB,CAACG,MAApB,CAA4BuB,eAAD,IAAqB,CAACA,eAAe,CAACrB,eAAjE,CAA5B,CAf+B,CAgB/B;IACA;;IACA,MAAMyB,iBAAiB,GAAG,MAAM,IAAAC,qBAAA,EAC9BF,mBAD8B,EAE9B,OAAO;MAAEG,gBAAF;MAAoBnB,EAApB;MAAwBlC,YAAxB;MAAsCsD;IAAtC,CAAP,KAAqE;MACnE,MAAMC,cAAc,GAAG,MAAMlE,QAAQ,CAACmE,KAAT,CAAeC,iBAAf,CAAiCvB,EAAjC,CAA7B;MACA,MAAMwB,aAAa,GAAGlB,MAAM,CAACmB,SAAP,KAAqBC,gBAAA,CAAOC,IAAP,CAAYrB,MAAM,CAACsB,IAAnB,EAAyB5B,EAAE,CAACsB,KAA5B,CAArB,GAAoEhB,MAA1F;MACA,OAAO,KAAKuB,YAAL,CAAkB;QACvBV,gBADuB;QAEvBnB,EAFuB;QAGvBlC,YAHuB;QAIvBR,aAJuB;QAKvBwE,UAAU,EAAET,cAAc,CAACU,MAAf,CAAsB/B,EAAE,CAACvB,OAAzB,CALW;QAMvB6B,MAAM,EAAEkB,aANe;QAOvBjB,SAPuB;QAQvBa;MARuB,CAAlB,CAAP;IAUD,CAf6B,CAAhC;IAkBA,MAAMY,uBAAuB,GAAGxB,qBAAqB,IAAIlD,aAAa,KAAK,QAA3E;;IAEA,IAAI,CAACM,0BAAD,IAA+B,CAACoE,uBAApC,EAA6D;MAC3D,MAAM,KAAKhF,SAAL,CAAeiF,OAAf,CAAuBC,SAAvB,EAAkC;QACtCC,MAAM,EAAE,IAD8B;QAEtCC,cAAc,EAAE,KAFsB;QAGtCC,MAAM,EAAE;MAH8B,CAAlC,CAAN;IAKD;;IAED,IAAI9B,SAAJ,EAAepD,QAAQ,CAACmE,KAAT,CAAegB,OAAf,CAAuBC,GAAvB,CAA2BhC,SAA3B;IAEf,MAAMpD,QAAQ,CAACmE,KAAT,CAAegB,OAAf,CAAuBE,OAAvB,EAAN,CAhD+B,CAgDS;;IAExC,MAAMrF,QAAQ,CAACmE,KAAT,CAAegB,OAAf,CAAuBG,kBAAvB,CAA0CC,KAA1C,EAAN,CAlD+B,CAoD/B;IACA;;IACA,MAAMC,gBAAgB,GACpBlF,MAAM,IAAIuE,uBAAV,GAAoC,IAApC,GAA2C,MAAM,KAAKY,sBAAL,CAA4BzF,QAA5B,EAAsC2B,WAAtC,EAAmDnB,KAAnD,CADnD;IAGA,OAAO;MACLkF,UAAU,EAAE5B,iBADP;MAEL5B,gBAFK;MAGLsD,gBAHK;MAILX;IAJK,CAAP;EAMD;EAED;AACF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;;EAC+B,MAAvBc,uBAAuB,CAC3B9C,EAD2B,EAChB;EACXO,SAF2B,EAEH;EACxBwC,aAH2B,EAGJ;EACvBC,OAJ2B,EAKI;IAAA;;IAC/B,MAAM7F,QAAQ,GAAG,KAAKH,SAAL,CAAeG,QAAhC;IACA,MAAM0D,eAAqC,GAAG;MAAEb;IAAF,CAA9C;;IACA,MAAMiD,cAAc,GAAG,CAACC,GAAD,EAAczD,oBAAoB,GAAG,KAArC,KAA+C;MACpEoB,eAAe,CAACrB,eAAhB,GAAkC0D,GAAlC;MACArC,eAAe,CAACpB,oBAAhB,GAAuCA,oBAAvC;MACA,OAAOoB,eAAP;IACD,CAJD;;IAKA,MAAMQ,cAAc,GAAG,MAAMlE,QAAQ,CAACmE,KAAT,CAAe6B,wBAAf,CAAwCnD,EAAxC,CAA7B;;IACA,IAAI,CAACqB,cAAL,EAAqB;MACnB,OAAO4B,cAAc,CAClB,aAAYjD,EAAE,CAACC,QAAH,EAAc,gFADR,CAArB;IAGD;;IACD,MAAMmD,QAAQ,GAAGjG,QAAQ,CAACmE,KAAT,CAAegB,OAAf,CAAuBG,kBAAvB,CAA0CY,QAA1C,CAAmDrD,EAAE,CAAC4B,IAAtD,CAAjB;;IACA,IAAIwB,QAAJ,EAAc;MACZ,OAAOH,cAAc,CAClB,aAAYjD,EAAE,CAACsD,sBAAH,EAA4B,2GADtB,CAArB;IAGD;;IACD,MAAMC,IAAI,GAAGpG,QAAQ,CAACmE,KAAT,CAAegB,OAA5B;IACA,MAAM7D,OAAO,GAAGuB,EAAE,CAACvB,OAAnB;IACA,MAAM+E,aAAa,GAAGnC,cAAc,CAACU,MAAf,CAAsBtD,OAAtB,CAAtB;IACA,MAAMgF,gBAAgB,GAAGtG,QAAQ,CAACuG,MAAT,CAAgBC,eAAhB,CAAgC3D,EAAhC,EAAoC;MAAE4D,aAAa,EAAE;IAAjB,CAApC,CAAzB;IACA,MAAMC,eAAwB,GAAG,MAAMxC,cAAc,CAACyC,WAAf,CAA2BrF,OAA3B,EAAoCtB,QAAQ,CAACmE,KAAT,CAAegB,OAAnD,CAAvC;;IACA,IAAIuB,eAAe,CAACE,SAAhB,EAAJ,EAAiC;MAC/B,OAAOd,cAAc,CAAE,4BAAF,EAA+B,IAA/B,CAArB;IACD;;IACD,MAAMe,YAAY,GAAG,MAAM;MACzB,IAAIP,gBAAJ,EAAsB,OAAOA,gBAAP;;MACtB,IAAIlD,SAAJ,EAAe;QACb,MAAM0D,QAAQ,GAAG1D,SAAS,CAAC2D,YAAV,CAAuBlE,EAAvB,CAAjB;QACA,IAAI,CAACiE,QAAL,EAAe,OAAO,IAAP;QACf,OAAOA,QAAQ,CAACjE,EAAT,CAAYmE,aAAZ,CAA0BF,QAAQ,CAAChG,IAAT,CAAcgC,QAAd,EAA1B,CAAP;MACD,CANwB,CAOzB;;;MACA,MAAMhC,IAAI,GAAGoD,cAAc,CAAC+C,mBAAf,EAAb;;MACA,IAAInG,IAAJ,EAAU;QACR,OAAO+B,EAAE,CAACmE,aAAH,CAAiBlG,IAAjB,CAAP;MACD;;MACD,OAAO,IAAP;IACD,CAbD;;IAcA,MAAMoG,SAAS,GAAGL,YAAY,EAA9B;;IACA,IAAI,CAACK,SAAL,EAAgB;MACd,MAAMC,WAAW,GAAG,MAAM,IAAAC,gCAAA,EAAehB,IAAf,EAAqBlC,cAArB,EAAqCmC,aAArC,EAAoD,IAApD,EAA0D,KAA1D,CAA1B;MACA,OAAO;QAAErC,gBAAgB,EAAE,IAApB;QAA0BqD,kBAAkB,EAAEX,eAA9C;QAA+D7D,EAA/D;QAAmElC,YAAY,EAAE,IAAjF;QAAuFwG;MAAvF,CAAP;IACD;;IACD,MAAMG,mBAAmB,GAAG,MAAM;MAChC,IAAIhB,gBAAJ,EAAsB,OAAOtG,QAAQ,CAACuH,aAAT,CAAuBjB,gBAAvB,CAAP;MACtB,OAAOtG,QAAQ,CAACmE,KAAT,CAAeqD,oBAAf,CAAoCN,SAApC,CAAP;IACD,CAHD;;IAIA,MAAMlD,gBAAgB,GAAG,MAAMsD,mBAAmB,EAAlD;;IACA,MAAMG,UAAU,GAAG,YAAY;MAC7B,MAAMC,2BAA2B,GAAG,MAAM1H,QAAQ,CAAC2H,sBAAT,CAAgC3D,gBAAgB,CAACnB,EAAjD,CAA1C;MACA,IAAI,CAAC6E,2BAA2B,CAACE,QAAjC,EAA2C,OAAO,KAAP;MAC3C,IAAI,CAACtB,gBAAL,EAAuB,OAAO,KAAP;MACvB,MAAMuB,aAAa,GAAG,MAAM3D,cAAc,CAACyC,WAAf,CAC1BL,gBAAgB,CAAChF,OADS,EAE1BtB,QAAQ,CAACmE,KAAT,CAAegB,OAFW,CAA5B;MAIA,OAAOU,OAAO,SAAP,IAAAA,OAAO,WAAP,IAAAA,OAAO,CAAEiC,mBAAT,GACH9H,QAAQ,CAAC+H,6BAAT,CAAuCF,aAAvC,EAAsD7D,gBAAtD,CADG,GAEH,IAFJ;IAGD,CAXD;;IAaA,MAAMgE,mBAAmB,GAAG,MAAMP,UAAU,EAA5C;;IAEA,IAAIO,mBAAJ,EAAyB;MACvB,OAAOlC,cAAc,CAAE,iDAAF,CAArB;IACD;;IACD,MAAMmC,iCAAiC,GACrC7E,SAAS,KAAIkD,gBAAJ,aAAIA,gBAAJ,uBAAIA,gBAAgB,CAAEhF,OAAtB,CAAT,IAA0C,0BAAA4C,cAAc,CAACgE,aAAf,gFAA8BpF,QAA9B,SAA6CwD,gBAA7C,aAA6CA,gBAA7C,uBAA6CA,gBAAgB,CAAEhF,OAA/D,CAD5C;IAEA,MAAM6G,SAAS,GAAGF,iCAAiC,GAAGG,cAAA,CAAI5D,IAAJ,CAAS8B,gBAAgB,CAAChF,OAA1B,CAAH,GAAwC,IAA3F;;IAEA,IAAI,CAAC+E,aAAL,EAAoB;MAClB,MAAM,IAAIgC,KAAJ,CAAW,kDAAiD/G,OAAQ,OAAMuB,EAAE,CAACC,QAAH,EAAc,EAAxF,CAAN;IACD;;IACD,MAAMqE,WAAW,GAAG,MAAM,IAAAC,gCAAA,EAAehB,IAAf,EAAqBlC,cAArB,EAAqCmC,aAArC,EAAoD8B,SAApD,EAA+D,KAA/D,CAA1B;;IACA,IAAIhB,WAAW,CAACmB,GAAhB,EAAqB;MACnB,IAAInB,WAAW,CAACmB,GAAZ,YAA2BC,4BAA3B,IAA2C1C,OAA3C,aAA2CA,OAA3C,eAA2CA,OAAO,CAAE2C,gBAAxD,EAA0E;QACxE,IAAI,CAAA3C,OAAO,SAAP,IAAAA,OAAO,WAAP,YAAAA,OAAO,CAAE2C,gBAAT,MAA8B,QAAlC,EAA4C;UAC1C;UACA,OAAO;YACLxE,gBADK;YAELqD,kBAAkB,EAAEX,eAFf;YAGL7D,EAHK;YAILlC,YAAY,EAAE,IAJT;YAKLwG,WALK;YAMLlD,iBAAiB,EAAE;UANd,CAAP;QAQD;;QACD,IAAI,CAAA4B,OAAO,SAAP,IAAAA,OAAO,WAAP,YAAAA,OAAO,CAAE2C,gBAAT,MAA8B,MAAlC,EAA0C;UACxC,OAAO;YACLxE,gBADK;YAELnB,EAFK;YAGLlC,YAAY,EAAE,IAHT;YAILwG,WAJK;YAKLlD,iBAAiB,EAAE;UALd,CAAP;QAOD;;QACD,MAAM,IAAIoE,KAAJ,CACH,yBAAwBxC,OAAzB,aAAyBA,OAAzB,uBAAyBA,OAAO,CAAE2C,gBAAiB,kEAD/C,CAAN;MAGD;;MACD,OAAO1C,cAAc,CAClB,sBAAqB9B,gBAAgB,CAACnB,EAAjB,CAAoBC,QAApB,EAA+B,oBAAmBqE,WAAW,CAACmB,GAAZ,CAAgB/H,OAAQ,EAD7E,CAArB;IAGD;;IACD,IAAI,CAAC4G,WAAW,CAACsB,UAAZ,EAAL,EAA+B;MAC7B,IAAItB,WAAW,CAACuB,YAAZ,EAAJ,EAAgC;QAC9B;QACA,OAAO5C,cAAc,CAAE,aAAY9B,gBAAgB,CAACnB,EAAjB,CAAoBC,QAApB,EAA+B,6BAA7C,EAA2E,IAA3E,CAArB;MACD;;MACD,IAAIqE,WAAW,CAACwB,aAAZ,EAAJ,EAAiC;QAC/B;QACA,OAAO;UACL3E,gBADK;UAELqD,kBAAkB,EAAEX,eAFf;UAGL7D,EAHK;UAILlC,YAAY,EAAE,IAJT;UAKLwG;QALK,CAAP;MAOD,CAd4B,CAe7B;;;MACA,OAAOrB,cAAc,CAAE,aAAY9B,gBAAgB,CAACnB,EAAjB,CAAoBC,QAApB,EAA+B,oBAA7C,EAAkE,IAAlE,CAArB;IACD;;IACD,MAAM8F,QAAQ,GAAGzB,WAAW,CAAC0B,uBAA7B,CA9H+B,CA8H8B;;IAC7D,MAAMhB,aAAsB,GAAG,MAAM3D,cAAc,CAACyC,WAAf,CAA2BiC,QAAQ,CAAC9F,QAAT,EAA3B,EAAgDsD,IAAhD,CAArC;IACA,MAAM0C,cAAuB,GAAG,MAAM5E,cAAc,CAACyC,WAAf,CAA2BN,aAAa,CAACvD,QAAd,EAA3B,EAAqDsD,IAArD,CAAtC;IACA,MAAM2C,eAAe,GAAG,CAAA3F,SAAS,SAAT,IAAAA,SAAS,WAAT,YAAAA,SAAS,CAAE4F,QAAX,GAAsBlG,QAAtB,OAAoC,MAA5D;IACA,MAAMnC,YAAY,GAAG,MAAM,IAAAsI,wBAAA,EAAc;MACvCjJ,QADuC;MAEvC8I,cAFuC;MAGvCI,UAAU,EAAG,GAAE7C,aAAa,CAACvD,QAAd,EAAyB,KAAI8C,aAAc,GAHnB;MAIvC5B,gBAJuC;MAKvCmF,YAAY,EAAG,GAAEjC,SAAS,CAAC5F,OAAQ,KAAIyH,eAAgB,GALhB;MAMvClB;IANuC,CAAd,CAA3B;IAQA,OAAO;MAAE7D,gBAAF;MAAoBnB,EAApB;MAAwBlC,YAAxB;MAAsCwG;IAAtC,CAAP;EACD;;EAEyB,MAAZzC,YAAY,CAAC;IACzBV,gBADyB;IAEzBnB,EAFyB;IAGzBlC,YAHyB;IAIzBR,aAJyB;IAKzBwE,UALyB;IAMzBxB,MANyB;IAOzBC,SAPyB;IAQzBa;EARyB,CAAD,EAkBM;IAC9B,MAAMjE,QAAQ,GAAG,KAAKH,SAAL,CAAeG,QAAhC;IACA,IAAIoJ,WAAW,GAAG,EAAlB;IACA,MAAMC,iBAAoC,GAAG;MAC3C;MACAxG,EAAE,EAAE;QAAE4B,IAAI,EAAE5B,EAAE,CAAC4B,IAAX;QAAiBN,KAAK,EAAEtB,EAAE,CAACsB;MAA3B,CAFuC;MAG3CrD,IAAI,EAAE6D,UAHqC;MAI3C2E,MAAM,EAAEnG,MAAM,CAACgB,KAJ4B;MAIrB;MACtBoF,IAAI,EAAEpG,MAAM,CAACsB,IAL8B;MAKxB;MACnBtB;IAN2C,CAA7C;IAQAN,EAAE,GAAGmB,gBAAgB,GAAGA,gBAAgB,CAACnB,EAApB,GAAyBA,EAA9C;IAEA,MAAMqB,cAAc,GAAG,MAAMlE,QAAQ,CAACmE,KAAT,CAAeC,iBAAf,CAAiCvB,EAAjC,CAA7B;;IACA,MAAM2G,sBAAsB,GAAG,MAAM;MACnC,IAAI,CAACxF,gBAAL,EAAuB,MAAM,IAAIqE,KAAJ,CAAU,yDAAV,CAAN;MACvB,IAAI,CAACjF,SAAL,EAAgB,MAAM,IAAIiF,KAAJ,CAAU,kDAAV,CAAN;MAChB,MAAMvH,IAAI,GAAGoD,cAAc,CAACU,MAAf,CAAsBZ,gBAAgB,CAACnB,EAAjB,CAAoBvB,OAA1C,CAAb;MACA,IAAI,CAACR,IAAL,EAAW,MAAM,IAAIuH,KAAJ,CAAW,iDAAgDxF,EAAE,CAACC,QAAH,EAAc,EAAzE,CAAN;MACXuG,iBAAiB,CAAClG,MAAlB,GAA2BC,SAAS,CAAC4F,QAAV,EAA3B;MACAK,iBAAiB,CAACvI,IAAlB,GAAyBA,IAAzB;MACAuI,iBAAiB,CAACI,SAAlB,GAA8B,IAA9B;MACAzJ,QAAQ,CAACmE,KAAT,CAAegB,OAAf,CAAuBG,kBAAvB,CAA0CoE,QAA1C,CAAmDL,iBAAnD;MACA,OAAO;QAAExG,EAAF;QAAMuG;MAAN,CAAP;IACD,CAVD;;IAYA,MAAMO,uBAAuB,GAAG,MAAM;MACpC,IAAI,CAAC3F,gBAAL,EAAuB,MAAM,IAAIqE,KAAJ,CAAW,mDAAkDxF,EAAE,CAACC,QAAH,EAAc,EAA3E,CAAN;MACvBkB,gBAAgB,CAAC4F,KAAjB,CAAuBC,OAAvB,CAAgCC,IAAD,IAAU;QACvCV,WAAW,CAAC,IAAAW,6BAAA,EAAqBD,IAAI,CAACE,QAA1B,CAAD,CAAX,GAAmDC,0BAAA,CAAWC,SAA9D;MACD,CAFD;IAGD,CALD;;IAMA,IAAIvJ,YAAY,IAAIA,YAAY,CAAC6C,YAA7B,IAA6CrD,aAAa,KAAKgK,4BAAA,CAAaC,IAAhF,EAAsF;MACpFT,uBAAuB;MACvB3J,QAAQ,CAACmE,KAAT,CAAegB,OAAf,CAAuBG,kBAAvB,CAA0CoE,QAA1C,CAAmDL,iBAAnD;MACA,OAAO;QAAExG,EAAF;QAAMuG;MAAN,CAAP;IACD;;IACD,IAAInF,iBAAiB,IAAIA,iBAAiB,KAAK,MAA/C,EAAuD;MACrD0F,uBAAuB;MACvBvG,SAAS,SAAT,IAAAA,SAAS,WAAT,YAAAA,SAAS,CAAEiH,YAAX,CAAwB;QAAExH,EAAF;QAAM/B,IAAI,EAAE6D;MAAZ,CAAxB;MACA,OAAO6E,sBAAsB,EAA7B;IACD;;IACD,MAAMc,QAAQ,GAAGzH,EAAE,CAACmE,aAAH,CAAiBrC,UAAU,CAAC7B,QAAX,EAAjB,CAAjB;IACA,MAAMyH,QAAQ,GAAG,CAAC5J,YAAD,IAAiBR,aAAa,KAAKgK,4BAAA,CAAaK,MAAhD,GAAyDF,QAAzD,GAAoEzH,EAArF;IACA,MAAM4H,yBAAyB,GAAG,MAAMzK,QAAQ,CAAC0K,sCAAT,CAAgDH,QAAhD,CAAxC;IACA,MAAMX,KAAK,GAAGa,yBAAyB,CAAClH,SAA1B,CAAoCqG,KAAlD;IACAA,KAAK,CAACC,OAAN,CAAeC,IAAD,IAAU;MACtB;MACAV,WAAW,CAAC,IAAAW,6BAAA,EAAqBD,IAAI,CAACE,QAA1B,CAAD,CAAX,GAAmDC,0BAAA,CAAWU,OAA9D;IACD,CAHD;;IAKA,IAAIhK,YAAJ,EAAkB;MAChB;MACA,MAAM;QAAEyI,WAAW,EAAEwB,cAAf;QAA+BC;MAA/B,IAAiD,IAAAC,uCAAA,EAAqBlB,KAArB,EAA4BjJ,YAA5B,EAA0CR,aAA1C,CAAvD;MACAsK,yBAAyB,CAAClH,SAA1B,CAAoCqG,KAApC,GAA4CiB,aAA5C;MACAzB,WAAW,mCAAQA,WAAR,GAAwBwB,cAAxB,CAAX;IACD;;IAED,MAAMG,oBAAoB,GAAG,KAAIC,+BAAJ,EAAyB;MACpDhL,QADoD;MAEpDiL,0BAA0B,EAAE,CAACR,yBAAD,CAFwB;MAGpDS,kBAAkB,EAAE,KAHgC;MAIpDC,QAAQ,EAAE,IAJ0C;MAKpDC,WAAW,EAAE,KALuC;MAKhC;MACpBC,OAAO,EAAE,KAN2C;MAMpC;MAChBC,UAAU,EAAE,IAPwC;MAOlC;MAClBC,gBAAgB,EAAE;IARkC,CAAzB,CAA7B;IAUA,MAAMR,oBAAoB,CAACS,QAArB,EAAN,CApE8B,CAsE9B;IACA;;IACA,IAAI7K,YAAJ,EAAkB;MAChB,IAAIA,YAAY,CAAC6C,YAAb,IAA6BrD,aAAa,KAAKgK,4BAAA,CAAasB,MAAhE,EAAwE;QACtEpC,iBAAiB,CAACqC,aAAlB,GAAkC/K,YAAY,CAACkK,aAAb,CAA2B1I,MAA3B,CAAmCwJ,CAAD,IAAOA,CAAC,CAACC,QAA3C,EAAqDnJ,GAArD,CAA0DkJ,CAAD,IAAOA,CAAC,CAACE,QAAlE,CAAlC;MACD;;MACD7L,QAAQ,CAACmE,KAAT,CAAegB,OAAf,CAAuBG,kBAAvB,CAA0CoE,QAA1C,CAAmDL,iBAAnD;IACD,CALD,MAKO,IAAIjG,SAAJ,EAAe;MACpBA,SAAS,CAACiH,YAAV,CAAuB;QAAExH,EAAF;QAAM/B,IAAI,EAAE6D;MAAZ,CAAvB;;MACA,IAAIV,iBAAJ,EAAuB;QACrB;QACA,OAAOuF,sBAAsB,EAA7B;MACD;IACF,CANM,MAMA;MACL;MACAtF,cAAc,CAAC4H,OAAf,CAAuBnH,UAAvB,EAFK,CAGL;;MACAT,cAAc,CAAC6H,kBAAf,CAAkCpH,UAAU,CAAC7B,QAAX,EAAlC;MACA9C,QAAQ,CAACmE,KAAT,CAAegB,OAAf,CAAuBC,GAAvB,CAA2BlB,cAA3B;IACD;;IAED,OAAO;MAAErB,EAAF;MAAMuG;IAAN,CAAP;EACD;;EAEuB,MAAVpI,UAAU,CAACd,MAAD,EAAiD;IACvE,MAAMF,QAAQ,GAAG,KAAKH,SAAL,CAAeG,QAAhC;IACA,MAAMuB,GAAG,GAAG,MAAM,KAAKyK,iBAAL,CAAuB9L,MAAvB,CAAlB;IACA,MAAM+L,OAAO,GAAG,MAAM,KAAKlM,QAAL,CAAcA,QAAd,CAAuB;MAAEwB,GAAF;MAAO2K,KAAK,EAAE;IAAd,CAAvB,CAAtB;IACA3K,GAAG,CAACsI,OAAJ,CAAahH,EAAD,IAAQ7C,QAAQ,CAACmE,KAAT,CAAegB,OAAf,CAAuBG,kBAAvB,CAA0C6G,eAA1C,CAA0DtJ,EAAE,CAACuJ,QAA7D,CAApB;IACA,MAAMpM,QAAQ,CAACmE,KAAT,CAAegB,OAAf,CAAuBG,kBAAvB,CAA0CC,KAA1C,EAAN;IACA,OAAO;MAAE8G,iBAAiB,EAAEJ,OAAO,CAACvG;IAA7B,CAAP;EACD;;EAEyB,MAAZ3E,YAAY,CAACb,MAAD,EAAmByB,WAAnB,EAAwCnB,KAAxC,EAAsF;IAC9G,MAAMe,GAAG,GAAG,MAAM,KAAKyK,iBAAL,CAAuB9L,MAAvB,CAAlB,CAD8G,CAE9G;;IACA,MAAM;MAAEoM;IAAF,IAAwB,MAAM,KAAKxM,QAAL,CAAcyM,IAAd,CAAmB;MACrDC,YAAY,EAAEC,eAAA,CAAOC,SAAP,CAAiBnL,GAAG,CAACkB,GAAJ,CAASI,EAAD,IAAQA,EAAE,CAAC8J,OAAnB,CAAjB,CADuC;MAErDnM,KAFqD;MAGrDD,OAAO,EAAEoB;IAH4C,CAAnB,CAApC;IAKA,OAAO;MAAEiL,kBAAkB,EAAEN;IAAtB,CAAP;EACD;;EAEmC,MAAtBrK,sBAAsB,CAClCd,MADkC,EAElCgC,MAFkC,EAGlC0J,eAHkC,EAID;IACjC,MAAMC,GAAG,GAAG,KAAIC,mBAAJ,EAAQ,KAAK/M,QAAL,CAAcmE,KAAtB,CAAZ;;IACA,IAAI;MACF,MAAM6I,gBAAgB,GAAG,MAAMC,OAAO,CAACC,GAAR,CAC7B/L,MAAM,CAACsB,GAAP,CAAW,MAAO0K,KAAP,IAAiB;QAC1B,MAAMC,eAAe,GAAGjK,MAAM,CAACmB,SAAP,KAAqB6I,KAAK,CAAChJ,KAA3B,GAAmChB,MAAM,CAACgB,KAAlE;;QACA,MAAMkJ,YAAY,GAAG9I,gBAAA,CAAOC,IAAP,CAAYrB,MAAM,CAACsB,IAAnB,EAAyB2I,eAAzB,CAArB;;QACA,MAAMzI,UAAU,GAAG,MAAM,KAAK3E,QAAL,CAAcmE,KAAd,CAAoBgB,OAApB,CAA4BmI,WAA5B,CAAwC1I,MAAxC,CAA+CyI,YAA/C,EAA6DF,KAA7D,CAAzB;QACA,MAAMI,SAAS,GAAGF,YAAY,CAACvK,QAAb,EAAlB;QACA,IAAI,CAAC6B,UAAL,EACE,MAAM,KAAI1B,oBAAJ,EAAc,oCAAmCkK,KAAK,CAAChH,sBAAN,EAA+B,SAAQoH,SAAU,GAAlG,CAAN;QACF,OAAO,KAAK5H,uBAAL,CAA6BwH,KAAK,CAACnG,aAAN,CAAoBrC,UAAU,CAAC7B,QAAX,EAApB,CAA7B,EAAyE+J,eAAzE,EAA0FU,SAA1F,CAAP;MACD,CARD,CAD6B,CAA/B;MAWA,MAAMT,GAAG,CAACU,KAAJ,EAAN;MACA,OAAOR,gBAAP;IACD,CAdD,CAcE,OAAO1E,GAAP,EAAiB;MACjB,MAAMwE,GAAG,CAACU,KAAJ,EAAN;MACA,MAAMlF,GAAN;IACD;EACF;;EAEmC,MAAtB7C,sBAAsB,CAClCzF,QADkC,EAElC2B,WAFkC,EAGlCnB,KAHkC,EAI+D;IACjG,MAAM8E,kBAAkB,GAAGtF,QAAQ,CAACmE,KAAT,CAAegB,OAAf,CAAuBG,kBAAvB,CAA0CmI,aAA1C,EAA3B;;IACAC,iBAAA,CAAOC,KAAP,CAAc,8CAA6CrI,kBAAkB,CAAC/C,MAAnB,CAA0BO,QAA1B,EAAqC,aAAhG;;IACA,IAAI,CAACwC,kBAAkB,CAAC/C,MAAxB,EAAgC,OAAO,IAAP;;IAChC,MAAMhB,GAAG,GAAGkL,eAAA,CAAOC,SAAP,CAAiBpH,kBAAkB,CAAC7C,GAAnB,CAAwBmL,CAAD,IAAO,KAAI3M,cAAJ,EAAU2M,CAAC,CAAC/K,EAAZ,CAA9B,CAAjB,CAAZ;;IACA,OAAO,KAAK/C,QAAL,CAAcyM,IAAd,CAAmB;MACxBC,YAAY,EAAEjL,GADU;MAExBf,KAFwB;MAGxBD,OAAO,EAAEoB;IAHe,CAAnB,CAAP;EAKD;;EAE8B,MAAjBqK,iBAAiB,CAAC6B,MAAD,EAA4C;IACzE,IAAIA,MAAM,IAAIA,MAAM,CAACtL,MAArB,EAA6B;MAC3B,MAAMuL,YAAY,GAAG,MAAM,KAAKjO,SAAL,CAAekO,2BAAf,CAA2CF,MAA3C,CAA3B;MACAC,YAAY,CAACjE,OAAb,CAAsBhH,EAAD,IAAQ;QAC3B,MAAMmL,KAAK,GAAG,KAAKnO,SAAL,CAAeG,QAAf,CAAwBmE,KAAxB,CAA8BgB,OAA9B,CAAsCG,kBAAtC,CAAyDY,QAAzD,CAAkErD,EAAE,CAACuJ,QAArE,CAAd;;QACA,IAAI,CAAC4B,KAAL,EAAY;UACV,MAAM,KAAIC,uBAAJ,EAAkB,2BAA0BpL,EAAE,CAACC,QAAH,EAAc,kCAA1D,CAAN;QACD;MACF,CALD;MAMA,OAAOgL,YAAP;IACD;;IACD,MAAMI,oBAAoB,GAAG,KAAKrO,SAAL,CAAeG,QAAf,CAAwBmE,KAAxB,CAA8BgB,OAA9B,CAAsCG,kBAAtC,CAAyDmI,aAAzD,EAA7B;IACA,IAAI,CAACS,oBAAoB,CAAC3L,MAA1B,EAAkC,MAAM,KAAI0L,uBAAJ,EAAkB,oDAAlB,CAAN;IAClC,OAAOC,oBAAoB,CAACzL,GAArB,CAA0B0L,CAAD,IAAOC,0BAAA,CAAYC,UAAZ,CAAuB,KAAIpN,cAAJ,EAAUkN,CAAC,CAACtL,EAAZ,CAAvB,CAAhC,CAAP;EACD;;EAEOzB,oBAAoB,CAACpB,QAAD,EAAqBuB,GAArB,EAA6C;IACvE,IAAI,IAAA+M,sBAAA,EAAY/M,GAAZ,CAAJ,EAAsB;MACpB,MAAMgN,cAAc,GAAG,KAAIC,yBAAJ,EAAmBxO,QAAnB,CAAvB;MACA,OAAOuO,cAAc,CAACE,+BAAf,CAA+ClN,GAA/C,CAAP;IACD;;IACD,OAAOA,GAAG,CAACkB,GAAJ,CAASI,EAAD,IAAQ7C,QAAQ,CAAC0O,WAAT,CAAqB7L,EAArB,CAAhB,CAAP;EACD;;EAKoB,aAAR8L,QAAQ,CAAC,CAACC,GAAD,EAAM/O,SAAN,EAAiBC,QAAjB,EAA2BC,QAA3B,CAAD,EAAyF;IAC5G,MAAM8O,OAAO,GAAG,IAAIlP,WAAJ,CAAgBE,SAAhB,EAA2BC,QAA3B,EAAqCC,QAArC,CAAhB;IACA6O,GAAG,CAACE,QAAJ,CAAa,KAAIC,oBAAJ,EAAaF,OAAb,CAAb;IACA,OAAOA,OAAP;EACD;;AA1hBsB;;;gCAAZlP,W,WAmhBI,E;gCAnhBJA,W,kBAohBW,CAACqP,gBAAD,EAAYC,oBAAZ,EAA6BC,mBAA7B,EAA6CC,0BAA7C,C;gCAphBXxP,W,aAqhBMyP,kB;;AAQnBC,wBAAA,CAAcC,UAAd,CAAyB3P,WAAzB"}

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@teambit/merging",
-  "version": "0.0.151",
+  "version": "0.0.159",
   "homepage": "https://bit.dev/teambit/component/merging",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.component",
     "name": "merging",
-    "version": "0.0.151"
+    "version": "0.0.159"
   },
   "dependencies": {
     "chalk": "2.4.2",
@@ -16,11 +16,13 @@
     "@babel/runtime": "7.12.18",
     "core-js": "^3.0.0",
     "@teambit/harmony": "0.3.3",
-    "@teambit/bit-error": "0.0.399",
-    "@teambit/cli": "0.0.561",
-    "@teambit/lane-id": "0.0.80",
-    "@teambit/snapping": "0.0.151",
-    "@teambit/workspace": "0.0.836"
+    "@teambit/bit-error": "0.0.400",
+    "@teambit/cli": "0.0.563",
+    "@teambit/checkout": "0.0.13",
+    "@teambit/component-id": "0.0.417",
+    "@teambit/lane-id": "0.0.82",
+    "@teambit/snapping": "0.0.159",
+    "@teambit/workspace": "0.0.844"
   },
   "devDependencies": {
     "@types/lodash": "4.14.165",
@@ -32,7 +34,7 @@
     "@types/node": "12.20.4"
   },
   "peerDependencies": {
-    "@teambit/legacy": "1.0.342",
+    "@teambit/legacy": "1.0.344",
     "react-dom": "^16.8.0 || ^17.0.0",
     "react": "^16.8.0 || ^17.0.0"
   },