@teambit/merge-lanes 1.0.535 → 1.0.536

package/dist/lanes-check-conflicts.route.d.ts

@@ -0,0 +1,12 @@
+import { Route, Verb, Request, Response } from '@teambit/express';
+import { Logger } from '@teambit/logger';
+import { MergeLanesMain } from './merge-lanes.main.runtime';
+export declare class LanesCheckConflictsRoute implements Route {
+    private mergeLanes;
+    private logger;
+    constructor(mergeLanes: MergeLanesMain, logger: Logger);
+    method: string;
+    route: string;
+    verb: Verb;
+    middlewares: ((req: Request, res: Response) => Promise<import("express").Response<any, Record<string, any>>>)[];
+}

package/dist/lanes-check-conflicts.route.js

@@ -0,0 +1,59 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.LanesCheckConflictsRoute = void 0;
+function _express() {
+  const data = require("@teambit/express");
+  _express = function () {
+    return data;
+  };
+  return data;
+}
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+class LanesCheckConflictsRoute {
+  constructor(mergeLanes, logger) {
+    this.mergeLanes = mergeLanes;
+    this.logger = logger;
+    _defineProperty(this, "method", 'post');
+    _defineProperty(this, "route", '/lanes/check-conflicts');
+    _defineProperty(this, "verb", _express().Verb.WRITE);
+    _defineProperty(this, "middlewares", [async (req, res) => {
+      const {
+        body
+      } = req;
+      const sourceLane = body.sourceLane;
+      const targetLane = body.targetLane;
+      if (!sourceLane) {
+        return res.status(400).send('Missing sourceLane in body');
+      }
+      if (!targetLane) {
+        return res.status(400).send('Missing targetLane in body');
+      }
+      try {
+        const {
+          conflicts
+        } = await this.mergeLanes.checkLaneForConflicts(sourceLane, targetLane, {});
+        const conflictsOutput = conflicts.map(conflict => {
+          return _objectSpread(_objectSpread({}, conflict), {}, {
+            id: conflict.id.toString()
+          });
+        });
+        return res.json({
+          conflicts: conflictsOutput
+        });
+      } catch (e) {
+        this.logger.error(e.toString());
+        return res.status(500).send(e.toString());
+      }
+    }]);
+  }
+}
+exports.LanesCheckConflictsRoute = LanesCheckConflictsRoute;
+
+//# sourceMappingURL=lanes-check-conflicts.route.js.map

package/dist/lanes-check-conflicts.route.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["_express","data","require","ownKeys","e","r","t","Object","keys","getOwnPropertySymbols","o","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","defineProperty","_toPropertyKey","value","configurable","writable","i","_toPrimitive","Symbol","toPrimitive","call","TypeError","String","Number","LanesCheckConflictsRoute","constructor","mergeLanes","logger","Verb","WRITE","req","res","body","sourceLane","targetLane","status","send","conflicts","checkLaneForConflicts","conflictsOutput","map","conflict","id","toString","json","error","exports"],"sources":["lanes-check-conflicts.route.ts"],"sourcesContent":["import { Route, Verb, Request, Response } from '@teambit/express';\nimport { Logger } from '@teambit/logger';\nimport { MergeLanesMain } from './merge-lanes.main.runtime';\n\nexport class LanesCheckConflictsRoute implements Route {\n  constructor(\n    private mergeLanes: MergeLanesMain,\n    private logger: Logger\n  ) {}\n\n  method = 'post';\n  route = '/lanes/check-conflicts';\n  verb = Verb.WRITE;\n\n  middlewares = [\n    async (req: Request, res: Response) => {\n      const { body } = req;\n      const sourceLane = body.sourceLane;\n      const targetLane = body.targetLane;\n      if (!sourceLane) {\n        return res.status(400).send('Missing sourceLane in body');\n      }\n      if (!targetLane) {\n        return res.status(400).send('Missing targetLane in body');\n      }\n      try {\n        const { conflicts } = await this.mergeLanes.checkLaneForConflicts(sourceLane, targetLane, {});\n        const conflictsOutput = conflicts.map((conflict) => {\n          return {\n            ...conflict,\n            id: conflict.id.toString(),\n          };\n        });\n        return res.json({ conflicts: conflictsOutput });\n      } catch (e: any) {\n        this.logger.error(e.toString());\n        return res.status(500).send(e.toString());\n      }\n    },\n  ];\n}\n"],"mappings":";;;;;;AAAA,SAAAA,SAAA;EAAA,MAAAC,IAAA,GAAAC,OAAA;EAAAF,QAAA,YAAAA,CAAA;IAAA,OAAAC,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAAkE,SAAAE,QAAAC,CAAA,EAAAC,CAAA,QAAAC,CAAA,GAAAC,MAAA,CAAAC,IAAA,CAAAJ,CAAA,OAAAG,MAAA,CAAAE,qBAAA,QAAAC,CAAA,GAAAH,MAAA,CAAAE,qBAAA,CAAAL,CAAA,GAAAC,CAAA,KAAAK,CAAA,GAAAA,CAAA,CAAAC,MAAA,WAAAN,CAAA,WAAAE,MAAA,CAAAK,wBAAA,CAAAR,CAAA,EAAAC,CAAA,EAAAQ,UAAA,OAAAP,CAAA,CAAAQ,IAAA,CAAAC,KAAA,CAAAT,CAAA,EAAAI,CAAA,YAAAJ,CAAA;AAAA,SAAAU,cAAAZ,CAAA,aAAAC,CAAA,MAAAA,CAAA,GAAAY,SAAA,CAAAC,MAAA,EAAAb,CAAA,UAAAC,CAAA,WAAAW,SAAA,CAAAZ,CAAA,IAAAY,SAAA,CAAAZ,CAAA,QAAAA,CAAA,OAAAF,OAAA,CAAAI,MAAA,CAAAD,CAAA,OAAAa,OAAA,WAAAd,CAAA,IAAAe,eAAA,CAAAhB,CAAA,EAAAC,CAAA,EAAAC,CAAA,CAAAD,CAAA,SAAAE,MAAA,CAAAc,yBAAA,GAAAd,MAAA,CAAAe,gBAAA,CAAAlB,CAAA,EAAAG,MAAA,CAAAc,yBAAA,CAAAf,CAAA,KAAAH,OAAA,CAAAI,MAAA,CAAAD,CAAA,GAAAa,OAAA,WAAAd,CAAA,IAAAE,MAAA,CAAAgB,cAAA,CAAAnB,CAAA,EAAAC,CAAA,EAAAE,MAAA,CAAAK,wBAAA,CAAAN,CAAA,EAAAD,CAAA,iBAAAD,CAAA;AAAA,SAAAgB,gBAAAhB,CAAA,EAAAC,CAAA,EAAAC,CAAA,YAAAD,CAAA,GAAAmB,cAAA,CAAAnB,CAAA,MAAAD,CAAA,GAAAG,MAAA,CAAAgB,cAAA,CAAAnB,CAAA,EAAAC,CAAA,IAAAoB,KAAA,EAAAnB,CAAA,EAAAO,UAAA,MAAAa,YAAA,MAAAC,QAAA,UAAAvB,CAAA,CAAAC,CAAA,IAAAC,CAAA,EAAAF,CAAA;AAAA,SAAAoB,eAAAlB,CAAA,QAAAsB,CAAA,GAAAC,YAAA,CAAAvB,CAAA,uCAAAsB,CAAA,GAAAA,CAAA,GAAAA,CAAA;AAAA,SAAAC,aAAAvB,CAAA,EAAAD,CAAA,2BAAAC,CAAA,KAAAA,CAAA,SAAAA,CAAA,MAAAF,CAAA,GAAAE,CAAA,CAAAwB,MAAA,CAAAC,WAAA,kBAAA3B,CAAA,QAAAwB,CAAA,GAAAxB,CAAA,CAAA4B,IAAA,CAAA1B,CAAA,EAAAD,CAAA,uCAAAuB,CAAA,SAAAA,CAAA,YAAAK,SAAA,yEAAA5B,CAAA,GAAA6B,MAAA,GAAAC,MAAA,EAAA7B,CAAA;AAI3D,MAAM8B,wBAAwB,CAAkB;EACrDC,WAAWA,CACDC,UAA0B,EAC1BC,MAAc,EACtB;IAAA,KAFQD,UAA0B,GAA1BA,UAA0B;IAAA,KAC1BC,MAAc,GAAdA,MAAc;IAAAnB,eAAA,iBAGf,MAAM;IAAAA,eAAA,gBACP,wBAAwB;IAAAA,eAAA,eACzBoB,eAAI,CAACC,KAAK;IAAArB,eAAA,sBAEH,CACZ,OAAOsB,GAAY,EAAEC,GAAa,KAAK;MACrC,MAAM;QAAEC;MAAK,CAAC,GAAGF,GAAG;MACpB,MAAMG,UAAU,GAAGD,IAAI,CAACC,UAAU;MAClC,MAAMC,UAAU,GAAGF,IAAI,CAACE,UAAU;MAClC,IAAI,CAACD,UAAU,EAAE;QACf,OAAOF,GAAG,CAACI,MAAM,CAAC,GAAG,CAAC,CAACC,IAAI,CAAC,4BAA4B,CAAC;MAC3D;MACA,IAAI,CAACF,UAAU,EAAE;QACf,OAAOH,GAAG,CAACI,MAAM,CAAC,GAAG,CAAC,CAACC,IAAI,CAAC,4BAA4B,CAAC;MAC3D;MACA,IAAI;QACF,MAAM;UAAEC;QAAU,CAAC,GAAG,MAAM,IAAI,CAACX,UAAU,CAACY,qBAAqB,CAACL,UAAU,EAAEC,UAAU,EAAE,CAAC,CAAC,CAAC;QAC7F,MAAMK,eAAe,GAAGF,SAAS,CAACG,GAAG,CAAEC,QAAQ,IAAK;UAClD,OAAArC,aAAA,CAAAA,aAAA,KACKqC,QAAQ;YACXC,EAAE,EAAED,QAAQ,CAACC,EAAE,CAACC,QAAQ,CAAC;UAAC;QAE9B,CAAC,CAAC;QACF,OAAOZ,GAAG,CAACa,IAAI,CAAC;UAAEP,SAAS,EAAEE;QAAgB,CAAC,CAAC;MACjD,CAAC,CAAC,OAAO/C,CAAM,EAAE;QACf,IAAI,CAACmC,MAAM,CAACkB,KAAK,CAACrD,CAAC,CAACmD,QAAQ,CAAC,CAAC,CAAC;QAC/B,OAAOZ,GAAG,CAACI,MAAM,CAAC,GAAG,CAAC,CAACC,IAAI,CAAC5C,CAAC,CAACmD,QAAQ,CAAC,CAAC,CAAC;MAC3C;IACF,CAAC,CACF;EA/BE;AAgCL;AAACG,OAAA,CAAAtB,wBAAA,GAAAA,wBAAA","ignoreList":[]}

package/dist/merge-lane-from-scope.cmd.d.ts

@@ -3,6 +3,7 @@ import { MergeLanesMain } from './merge-lanes.main.runtime';
 type Flags = {
     pattern?: string;
     push?: boolean;
+    build?: boolean;
     keepReadme?: boolean;
     noSquash: boolean;
     includeDeps?: boolean;
@@ -28,7 +29,7 @@ export declare class MergeLaneFromScopeCmd implements Command {
     private: boolean;
     remoteOp: boolean;
     constructor(mergeLanes: MergeLanesMain);
-    report([fromLane, toLane]: [string, string], { pattern, push, keepReadme, noSquash, includeDeps, title, titleBase64, reMerge, }: Flags): Promise<string>;
+    report([fromLane, toLane]: [string, string], { pattern, push, build, keepReadme, noSquash, includeDeps, title, titleBase64, reMerge, }: Flags): Promise<string>;
     json([fromLane, toLane]: [string, string], { pattern, push, keepReadme, noSquash, includeDeps, reMerge }: Flags): Promise<{
         code: number;
         data: {

package/dist/merge-lane-from-scope.cmd.js

@@ -67,7 +67,7 @@ the lane must be up-to-date with the other lane, otherwise, conflicts might occu
       description: `lane-id to merge to. default is "${_laneId().DEFAULT_LANE}"`
     }]);
     _defineProperty(this, "alias", '');
-    _defineProperty(this, "options", [['', 'pattern <string>', 'partially merge the lane with the specified component-pattern'], ['', 'title <string>', 'if provided, it replaces the original message with this title and append squashed snaps messages'], ['', 'title-base64 <string>', 'same as --title flag but the title is base64 encoded'], ['', 'push', 'export the updated objects to the original scopes once done'], ['', 'keep-readme', 'skip deleting the lane readme component after merging'], ['', 'no-squash', 'relevant for merging lanes into main, which by default squash.'], ['', 'include-deps', 'relevant for "--pattern". merge also dependencies of the given components'], ['', 're-merge', 'helpful when last merge failed during export. do not skip components that seemed to be merged'], ['j', 'json', 'output as json format']]);
+    _defineProperty(this, "options", [['', 'pattern <string>', 'partially merge the lane with the specified component-pattern'], ['', 'title <string>', 'if provided, it replaces the original message with this title and append squashed snaps messages'], ['', 'title-base64 <string>', 'same as --title flag but the title is base64 encoded'], ['', 'push', 'export the updated objects to the original scopes once done'], ['', 'build', 'in case of snap during the merge, run the build-pipeline (similar to bit snap --build)'], ['', 'keep-readme', 'skip deleting the lane readme component after merging'], ['', 'no-squash', 'relevant for merging lanes into main, which by default squash.'], ['', 'include-deps', 'relevant for "--pattern". merge also dependencies of the given components'], ['', 're-merge', 'helpful when last merge failed during export. do not skip components that seemed to be merged'], ['j', 'json', 'output as json format']]);
     _defineProperty(this, "loader", true);
     _defineProperty(this, "private", true);
     _defineProperty(this, "remoteOp", true);
@@ -75,6 +75,7 @@ the lane must be up-to-date with the other lane, otherwise, conflicts might occu
   async report([fromLane, toLane], {
     pattern,
     push = false,
+    build,
     keepReadme = false,
     noSquash = false,
     includeDeps = false,
@@ -97,6 +98,7 @@ the lane must be up-to-date with the other lane, otherwise, conflicts might occu
       mergeSnapError
     } = await this.mergeLanes.mergeFromScope(fromLane, toLane || _laneId().DEFAULT_LANE, {
       push,
+      build,
       keepReadme,
       noSquash,
       pattern,

package/dist/merge-lane-from-scope.cmd.js.map

@@ -1 +1 @@
-{"version":3,"names":["_chalk","data","_interopRequireDefault","require","_laneId","_lodash","_legacy","_bitError","_excluded","e","__esModule","default","_objectWithoutProperties","t","o","r","i","_objectWithoutPropertiesLoose","Object","getOwnPropertySymbols","n","length","indexOf","propertyIsEnumerable","call","hasOwnProperty","ownKeys","keys","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","defineProperty","_toPropertyKey","value","configurable","writable","_toPrimitive","Symbol","toPrimitive","TypeError","String","Number","MergeLaneFromScopeCmd","constructor","mergeLanes","name","description","DEFAULT_LANE","report","fromLane","toLane","pattern","keepReadme","noSquash","includeDeps","title","titleBase64","reMerge","BitError","titleBase64Decoded","fromBase64","undefined","mergedNow","unmerged","exportedIds","conflicts","mergeSnapError","mergeFromScope","snapMessage","mergedTitle","chalk","green","mergedOutput","join","nonMergedTitle","bold","nonMergedOutput","map","u","id","reason","conflictsTitle","conflictsOutput","files","config","mergeSnapErrorTitle","mergeSnapErrorOutput","red","message","exportedTitle","exportedOutput","compact","json","results","code","toString","mergedPreviously","_ref","rest","snappedIds","stack","err","logger","error","exports"],"sources":["merge-lane-from-scope.cmd.ts"],"sourcesContent":["import chalk from 'chalk';\nimport { DEFAULT_LANE } from '@teambit/lane-id';\nimport { Command, CommandOptions } from '@teambit/cli';\nimport { compact } from 'lodash';\nimport { fromBase64 } from '@teambit/legacy.utils';\nimport { BitError } from '@teambit/bit-error';\nimport { MergeFromScopeResult, MergeLanesMain } from './merge-lanes.main.runtime';\n\ntype Flags = {\n  pattern?: string;\n  push?: boolean;\n  keepReadme?: boolean;\n  noSquash: boolean;\n  includeDeps?: boolean;\n  title?: string;\n  titleBase64?: string;\n  reMerge?: boolean;\n};\n\n/**\n * private command. the underscore prefix is intended.\n */\nexport class MergeLaneFromScopeCmd implements Command {\n  name = '_merge-lane <from-lane> [to-lane]';\n  description = `merge a remote lane into another lane or main via a bare-scope (not workspace)`;\n  extendedDescription = `to merge from a workspace, use \"bit lane merge\" command.\nthis is intended to use from the UI, which will have a button to merge an existing lane.\nthe lane must be up-to-date with the other lane, otherwise, conflicts might occur which are not handled in this command`;\n  arguments = [\n    {\n      name: 'from-lane',\n      description: `lane-id to merge from or \"${DEFAULT_LANE}\"`,\n    },\n    {\n      name: 'to-lane',\n      description: `lane-id to merge to. default is \"${DEFAULT_LANE}\"`,\n    },\n  ];\n  alias = '';\n  options = [\n    ['', 'pattern <string>', 'partially merge the lane with the specified component-pattern'],\n    [\n      '',\n      'title <string>',\n      'if provided, it replaces the original message with this title and append squashed snaps messages',\n    ],\n    ['', 'title-base64 <string>', 'same as --title flag but the title is base64 encoded'],\n    ['', 'push', 'export the updated objects to the original scopes once done'],\n    ['', 'keep-readme', 'skip deleting the lane readme component after merging'],\n    ['', 'no-squash', 'relevant for merging lanes into main, which by default squash.'],\n    ['', 'include-deps', 'relevant for \"--pattern\". merge also dependencies of the given components'],\n    ['', 're-merge', 'helpful when last merge failed during export. do not skip components that seemed to be merged'],\n    ['j', 'json', 'output as json format'],\n  ] as CommandOptions;\n  loader = true;\n  private = true;\n  remoteOp = true;\n\n  constructor(private mergeLanes: MergeLanesMain) {}\n\n  async report(\n    [fromLane, toLane]: [string, string],\n    {\n      pattern,\n      push = false,\n      keepReadme = false,\n      noSquash = false,\n      includeDeps = false,\n      title,\n      titleBase64,\n      reMerge,\n    }: Flags\n  ): Promise<string> {\n    if (includeDeps && !pattern) {\n      throw new BitError(`\"--include-deps\" flag is relevant only for --pattern flag`);\n    }\n    if (fromLane === DEFAULT_LANE && !toLane) {\n      throw new BitError('to merge from the main lane, specify the target lane');\n    }\n\n    const titleBase64Decoded = titleBase64 ? fromBase64(titleBase64) : undefined;\n\n    const { mergedNow, unmerged, exportedIds, conflicts, mergeSnapError } = await this.mergeLanes.mergeFromScope(\n      fromLane,\n      toLane || DEFAULT_LANE,\n      {\n        push,\n        keepReadme,\n        noSquash,\n        pattern,\n        includeDeps,\n        snapMessage: titleBase64Decoded || title,\n        reMerge,\n      }\n    );\n\n    const mergedTitle = chalk.green(\n      `successfully merged ${mergedNow.length} components from ${fromLane} to ${toLane || DEFAULT_LANE}`\n    );\n    const mergedOutput = mergedNow.length ? `${mergedTitle}\\n${mergedNow.join('\\n')}` : '';\n\n    const nonMergedTitle = chalk.bold(`the following ${unmerged.length} components were not merged`);\n    const nonMergedOutput = unmerged.length\n      ? `${nonMergedTitle}\\n${unmerged.map((u) => `${u.id} (${u.reason})`).join('\\n')}`\n      : '';\n\n    const conflictsTitle = chalk.bold(\n      `the following ${conflicts?.length} components have conflicts, the merge was not completed`\n    );\n    const conflictsOutput = conflicts?.length\n      ? `${conflictsTitle}\\n${conflicts\n          .map((u) => `${u.id} (files: ${u.files.join(', ') || 'N/A'}) (config: ${u.config})`)\n          .join('\\n')}`\n      : '';\n\n    const mergeSnapErrorTitle = chalk.bold(`the following error was thrown while snapping the components:`);\n    const mergeSnapErrorOutput = mergeSnapError ? `${mergeSnapErrorTitle}\\n${chalk.red(mergeSnapError.message)}` : '';\n\n    const exportedTitle = chalk.bold(`successfully exported ${exportedIds.length} components`);\n    const exportedOutput = exportedIds.length ? `${exportedTitle}\\n${exportedIds.join('\\n')}` : '';\n\n    return compact([mergedOutput, nonMergedOutput, conflictsOutput, mergeSnapErrorOutput, exportedOutput]).join('\\n\\n');\n  }\n  async json(\n    [fromLane, toLane]: [string, string],\n    { pattern, push = false, keepReadme = false, noSquash = false, includeDeps = false, reMerge }: Flags\n  ) {\n    if (includeDeps && !pattern) {\n      throw new BitError(`\"--include-deps\" flag is relevant only for --pattern flag`);\n    }\n    let results: MergeFromScopeResult;\n    try {\n      results = await this.mergeLanes.mergeFromScope(fromLane, toLane || DEFAULT_LANE, {\n        push,\n        keepReadme,\n        noSquash,\n        pattern,\n        includeDeps,\n        reMerge,\n      });\n      return {\n        code: 0,\n        data: {\n          ...results,\n          mergedNow: results.mergedNow.map((id) => id.toString()),\n          mergedPreviously: results.mergedPreviously.map((id) => id.toString()),\n          exportedIds: results.exportedIds.map((id) => id.toString()),\n          unmerged: results.unmerged.map(({ id, reason }) => ({ id: id.toString(), reason })),\n          conflicts: results.conflicts?.map(({ id, ...rest }) => ({ id: id.toString(), ...rest })),\n          snappedIds: results.snappedIds?.map((id) => id.toString()),\n          mergeSnapError: results.mergeSnapError\n            ? { message: results.mergeSnapError.message, stack: results.mergeSnapError.stack }\n            : undefined,\n        },\n      };\n    } catch (err: any) {\n      this.mergeLanes.logger.error('merge-lane-from-scope.json, error: ', err);\n      return {\n        code: 1,\n        error: err.message,\n      };\n    }\n  }\n}\n"],"mappings":";;;;;;AAAA,SAAAA,OAAA;EAAA,MAAAC,IAAA,GAAAC,sBAAA,CAAAC,OAAA;EAAAH,MAAA,YAAAA,CAAA;IAAA,OAAAC,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAG,QAAA;EAAA,MAAAH,IAAA,GAAAE,OAAA;EAAAC,OAAA,YAAAA,CAAA;IAAA,OAAAH,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAEA,SAAAI,QAAA;EAAA,MAAAJ,IAAA,GAAAE,OAAA;EAAAE,OAAA,YAAAA,CAAA;IAAA,OAAAJ,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAK,QAAA;EAAA,MAAAL,IAAA,GAAAE,OAAA;EAAAG,OAAA,YAAAA,CAAA;IAAA,OAAAL,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAM,UAAA;EAAA,MAAAN,IAAA,GAAAE,OAAA;EAAAI,SAAA,YAAAA,CAAA;IAAA,OAAAN,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAA8C,MAAAO,SAAA;AAAA,SAAAN,uBAAAO,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAAA,SAAAG,yBAAAH,CAAA,EAAAI,CAAA,gBAAAJ,CAAA,iBAAAK,CAAA,EAAAC,CAAA,EAAAC,CAAA,GAAAC,6BAAA,CAAAR,CAAA,EAAAI,CAAA,OAAAK,MAAA,CAAAC,qBAAA,QAAAC,CAAA,GAAAF,MAAA,CAAAC,qBAAA,CAAAV,CAAA,QAAAM,CAAA,MAAAA,CAAA,GAAAK,CAAA,CAAAC,MAAA,EAAAN,CAAA,IAAAD,CAAA,GAAAM,CAAA,CAAAL,CAAA,UAAAF,CAAA,CAAAS,OAAA,CAAAR,CAAA,QAAAS,oBAAA,CAAAC,IAAA,CAAAf,CAAA,EAAAK,CAAA,MAAAE,CAAA,CAAAF,CAAA,IAAAL,CAAA,CAAAK,CAAA,aAAAE,CAAA;AAAA,SAAAC,8BAAAF,CAAA,EAAAN,CAAA,gBAAAM,CAAA,iBAAAF,CAAA,gBAAAO,CAAA,IAAAL,CAAA,SAAAU,cAAA,CAAAD,IAAA,CAAAT,CAAA,EAAAK,CAAA,gBAAAX,CAAA,CAAAa,OAAA,CAAAF,CAAA,aAAAP,CAAA,CAAAO,CAAA,IAAAL,CAAA,CAAAK,CAAA,YAAAP,CAAA;AAAA,SAAAa,QAAAjB,CAAA,EAAAM,CAAA,QAAAF,CAAA,GAAAK,MAAA,CAAAS,IAAA,CAAAlB,CAAA,OAAAS,MAAA,CAAAC,qBAAA,QAAAL,CAAA,GAAAI,MAAA,CAAAC,qBAAA,CAAAV,CAAA,GAAAM,CAAA,KAAAD,CAAA,GAAAA,CAAA,CAAAc,MAAA,WAAAb,CAAA,WAAAG,MAAA,CAAAW,wBAAA,CAAApB,CAAA,EAAAM,CAAA,EAAAe,UAAA,OAAAjB,CAAA,CAAAkB,IAAA,CAAAC,KAAA,CAAAnB,CAAA,EAAAC,CAAA,YAAAD,CAAA;AAAA,SAAAoB,cAAAxB,CAAA,aAAAM,CAAA,MAAAA,CAAA,GAAAmB,SAAA,CAAAb,MAAA,EAAAN,CAAA,UAAAF,CAAA,WAAAqB,SAAA,CAAAnB,CAAA,IAAAmB,SAAA,CAAAnB,CAAA,QAAAA,CAAA,OAAAW,OAAA,CAAAR,MAAA,CAAAL,CAAA,OAAAsB,OAAA,WAAApB,CAAA,IAAAqB,eAAA,CAAA3B,CAAA,EAAAM,CAAA,EAAAF,CAAA,CAAAE,CAAA,SAAAG,MAAA,CAAAmB,yBAAA,GAAAnB,MAAA,CAAAoB,gBAAA,CAAA7B,CAAA,EAAAS,MAAA,CAAAmB,yBAAA,CAAAxB,CAAA,KAAAa,OAAA,CAAAR,MAAA,CAAAL,CAAA,GAAAsB,OAAA,WAAApB,CAAA,IAAAG,MAAA,CAAAqB,cAAA,CAAA9B,CAAA,EAAAM,CAAA,EAAAG,MAAA,CAAAW,wBAAA,CAAAhB,CAAA,EAAAE,CAAA,iBAAAN,CAAA;AAAA,SAAA2B,gBAAA3B,CAAA,EAAAM,CAAA,EAAAF,CAAA,YAAAE,CAAA,GAAAyB,cAAA,CAAAzB,CAAA,MAAAN,CAAA,GAAAS,MAAA,CAAAqB,cAAA,CAAA9B,CAAA,EAAAM,CAAA,IAAA0B,KAAA,EAAA5B,CAAA,EAAAiB,UAAA,MAAAY,YAAA,MAAAC,QAAA,UAAAlC,CAAA,CAAAM,CAAA,IAAAF,CAAA,EAAAJ,CAAA;AAAA,SAAA+B,eAAA3B,CAAA,QAAAG,CAAA,GAAA4B,YAAA,CAAA/B,CAAA,uCAAAG,CAAA,GAAAA,CAAA,GAAAA,CAAA;AAAA,SAAA4B,aAAA/B,CAAA,EAAAE,CAAA,2BAAAF,CAAA,KAAAA,CAAA,SAAAA,CAAA,MAAAJ,CAAA,GAAAI,CAAA,CAAAgC,MAAA,CAAAC,WAAA,kBAAArC,CAAA,QAAAO,CAAA,GAAAP,CAAA,CAAAe,IAAA,CAAAX,CAAA,EAAAE,CAAA,uCAAAC,CAAA,SAAAA,CAAA,YAAA+B,SAAA,yEAAAhC,CAAA,GAAAiC,MAAA,GAAAC,MAAA,EAAApC,CAAA;AAc9C;AACA;AACA;AACO,MAAMqC,qBAAqB,CAAoB;EAoCpDC,WAAWA,CAASC,UAA0B,EAAE;IAAA,KAA5BA,UAA0B,GAA1BA,UAA0B;IAAAhB,eAAA,eAnCvC,mCAAmC;IAAAA,eAAA,sBAC5B,gFAAgF;IAAAA,eAAA,8BACxE;AACxB;AACA,wHAAwH;IAAAA,eAAA,oBAC1G,CACV;MACEiB,IAAI,EAAE,WAAW;MACjBC,WAAW,EAAE,6BAA6BC,sBAAY;IACxD,CAAC,EACD;MACEF,IAAI,EAAE,SAAS;MACfC,WAAW,EAAE,oCAAoCC,sBAAY;IAC/D,CAAC,CACF;IAAAnB,eAAA,gBACO,EAAE;IAAAA,eAAA,kBACA,CACR,CAAC,EAAE,EAAE,kBAAkB,EAAE,+DAA+D,CAAC,EACzF,CACE,EAAE,EACF,gBAAgB,EAChB,kGAAkG,CACnG,EACD,CAAC,EAAE,EAAE,uBAAuB,EAAE,sDAAsD,CAAC,EACrF,CAAC,EAAE,EAAE,MAAM,EAAE,6DAA6D,CAAC,EAC3E,CAAC,EAAE,EAAE,aAAa,EAAE,uDAAuD,CAAC,EAC5E,CAAC,EAAE,EAAE,WAAW,EAAE,gEAAgE,CAAC,EACnF,CAAC,EAAE,EAAE,cAAc,EAAE,2EAA2E,CAAC,EACjG,CAAC,EAAE,EAAE,UAAU,EAAE,+FAA+F,CAAC,EACjH,CAAC,GAAG,EAAE,MAAM,EAAE,uBAAuB,CAAC,CACvC;IAAAA,eAAA,iBACQ,IAAI;IAAAA,eAAA,kBACH,IAAI;IAAAA,eAAA,mBACH,IAAI;EAEkC;EAEjD,MAAMoB,MAAMA,CACV,CAACC,QAAQ,EAAEC,MAAM,CAAmB,EACpC;IACEC,OAAO;IACP5B,IAAI,GAAG,KAAK;IACZ6B,UAAU,GAAG,KAAK;IAClBC,QAAQ,GAAG,KAAK;IAChBC,WAAW,GAAG,KAAK;IACnBC,KAAK;IACLC,WAAW;IACXC;EACK,CAAC,EACS;IACjB,IAAIH,WAAW,IAAI,CAACH,OAAO,EAAE;MAC3B,MAAM,KAAIO,oBAAQ,EAAC,2DAA2D,CAAC;IACjF;IACA,IAAIT,QAAQ,KAAKF,sBAAY,IAAI,CAACG,MAAM,EAAE;MACxC,MAAM,KAAIQ,oBAAQ,EAAC,sDAAsD,CAAC;IAC5E;IAEA,MAAMC,kBAAkB,GAAGH,WAAW,GAAG,IAAAI,oBAAU,EAACJ,WAAW,CAAC,GAAGK,SAAS;IAE5E,MAAM;MAAEC,SAAS;MAAEC,QAAQ;MAAEC,WAAW;MAAEC,SAAS;MAAEC;IAAe,CAAC,GAAG,MAAM,IAAI,CAACtB,UAAU,CAACuB,cAAc,CAC1GlB,QAAQ,EACRC,MAAM,IAAIH,sBAAY,EACtB;MACExB,IAAI;MACJ6B,UAAU;MACVC,QAAQ;MACRF,OAAO;MACPG,WAAW;MACXc,WAAW,EAAET,kBAAkB,IAAIJ,KAAK;MACxCE;IACF,CACF,CAAC;IAED,MAAMY,WAAW,GAAGC,gBAAK,CAACC,KAAK,CAC7B,uBAAuBT,SAAS,CAACjD,MAAM,oBAAoBoC,QAAQ,OAAOC,MAAM,IAAIH,sBAAY,EAClG,CAAC;IACD,MAAMyB,YAAY,GAAGV,SAAS,CAACjD,MAAM,GAAG,GAAGwD,WAAW,KAAKP,SAAS,CAACW,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE;IAEtF,MAAMC,cAAc,GAAGJ,gBAAK,CAACK,IAAI,CAAC,iBAAiBZ,QAAQ,CAAClD,MAAM,6BAA6B,CAAC;IAChG,MAAM+D,eAAe,GAAGb,QAAQ,CAAClD,MAAM,GACnC,GAAG6D,cAAc,KAAKX,QAAQ,CAACc,GAAG,CAAEC,CAAC,IAAK,GAAGA,CAAC,CAACC,EAAE,KAAKD,CAAC,CAACE,MAAM,GAAG,CAAC,CAACP,IAAI,CAAC,IAAI,CAAC,EAAE,GAC/E,EAAE;IAEN,MAAMQ,cAAc,GAAGX,gBAAK,CAACK,IAAI,CAC/B,iBAAiBV,SAAS,EAAEpD,MAAM,yDACpC,CAAC;IACD,MAAMqE,eAAe,GAAGjB,SAAS,EAAEpD,MAAM,GACrC,GAAGoE,cAAc,KAAKhB,SAAS,CAC5BY,GAAG,CAAEC,CAAC,IAAK,GAAGA,CAAC,CAACC,EAAE,YAAYD,CAAC,CAACK,KAAK,CAACV,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,cAAcK,CAAC,CAACM,MAAM,GAAG,CAAC,CACnFX,IAAI,CAAC,IAAI,CAAC,EAAE,GACf,EAAE;IAEN,MAAMY,mBAAmB,GAAGf,gBAAK,CAACK,IAAI,CAAC,+DAA+D,CAAC;IACvG,MAAMW,oBAAoB,GAAGpB,cAAc,GAAG,GAAGmB,mBAAmB,KAAKf,gBAAK,CAACiB,GAAG,CAACrB,cAAc,CAACsB,OAAO,CAAC,EAAE,GAAG,EAAE;IAEjH,MAAMC,aAAa,GAAGnB,gBAAK,CAACK,IAAI,CAAC,yBAAyBX,WAAW,CAACnD,MAAM,aAAa,CAAC;IAC1F,MAAM6E,cAAc,GAAG1B,WAAW,CAACnD,MAAM,GAAG,GAAG4E,aAAa,KAAKzB,WAAW,CAACS,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE;IAE9F,OAAO,IAAAkB,iBAAO,EAAC,CAACnB,YAAY,EAAEI,eAAe,EAAEM,eAAe,EAAEI,oBAAoB,EAAEI,cAAc,CAAC,CAAC,CAACjB,IAAI,CAAC,MAAM,CAAC;EACrH;EACA,MAAMmB,IAAIA,CACR,CAAC3C,QAAQ,EAAEC,MAAM,CAAmB,EACpC;IAAEC,OAAO;IAAE5B,IAAI,GAAG,KAAK;IAAE6B,UAAU,GAAG,KAAK;IAAEC,QAAQ,GAAG,KAAK;IAAEC,WAAW,GAAG,KAAK;IAAEG;EAAe,CAAC,EACpG;IACA,IAAIH,WAAW,IAAI,CAACH,OAAO,EAAE;MAC3B,MAAM,KAAIO,oBAAQ,EAAC,2DAA2D,CAAC;IACjF;IACA,IAAImC,OAA6B;IACjC,IAAI;MACFA,OAAO,GAAG,MAAM,IAAI,CAACjD,UAAU,CAACuB,cAAc,CAAClB,QAAQ,EAAEC,MAAM,IAAIH,sBAAY,EAAE;QAC/ExB,IAAI;QACJ6B,UAAU;QACVC,QAAQ;QACRF,OAAO;QACPG,WAAW;QACXG;MACF,CAAC,CAAC;MACF,OAAO;QACLqC,IAAI,EAAE,CAAC;QACPrG,IAAI,EAAAgC,aAAA,CAAAA,aAAA,KACCoE,OAAO;UACV/B,SAAS,EAAE+B,OAAO,CAAC/B,SAAS,CAACe,GAAG,CAAEE,EAAE,IAAKA,EAAE,CAACgB,QAAQ,CAAC,CAAC,CAAC;UACvDC,gBAAgB,EAAEH,OAAO,CAACG,gBAAgB,CAACnB,GAAG,CAAEE,EAAE,IAAKA,EAAE,CAACgB,QAAQ,CAAC,CAAC,CAAC;UACrE/B,WAAW,EAAE6B,OAAO,CAAC7B,WAAW,CAACa,GAAG,CAAEE,EAAE,IAAKA,EAAE,CAACgB,QAAQ,CAAC,CAAC,CAAC;UAC3DhC,QAAQ,EAAE8B,OAAO,CAAC9B,QAAQ,CAACc,GAAG,CAAC,CAAC;YAAEE,EAAE;YAAEC;UAAO,CAAC,MAAM;YAAED,EAAE,EAAEA,EAAE,CAACgB,QAAQ,CAAC,CAAC;YAAEf;UAAO,CAAC,CAAC,CAAC;UACnFf,SAAS,EAAE4B,OAAO,CAAC5B,SAAS,EAAEY,GAAG,CAACoB,IAAA;YAAA,IAAC;gBAAElB;cAAY,CAAC,GAAAkB,IAAA;cAANC,IAAI,GAAA9F,wBAAA,CAAA6F,IAAA,EAAAjG,SAAA;YAAA,OAAAyB,aAAA;cAAUsD,EAAE,EAAEA,EAAE,CAACgB,QAAQ,CAAC;YAAC,GAAKG,IAAI;UAAA,CAAG,CAAC;UACxFC,UAAU,EAAEN,OAAO,CAACM,UAAU,EAAEtB,GAAG,CAAEE,EAAE,IAAKA,EAAE,CAACgB,QAAQ,CAAC,CAAC,CAAC;UAC1D7B,cAAc,EAAE2B,OAAO,CAAC3B,cAAc,GAClC;YAAEsB,OAAO,EAAEK,OAAO,CAAC3B,cAAc,CAACsB,OAAO;YAAEY,KAAK,EAAEP,OAAO,CAAC3B,cAAc,CAACkC;UAAM,CAAC,GAChFvC;QAAS;MAEjB,CAAC;IACH,CAAC,CAAC,OAAOwC,GAAQ,EAAE;MACjB,IAAI,CAACzD,UAAU,CAAC0D,MAAM,CAACC,KAAK,CAAC,qCAAqC,EAAEF,GAAG,CAAC;MACxE,OAAO;QACLP,IAAI,EAAE,CAAC;QACPS,KAAK,EAAEF,GAAG,CAACb;MACb,CAAC;IACH;EACF;AACF;AAACgB,OAAA,CAAA9D,qBAAA,GAAAA,qBAAA","ignoreList":[]}
+{"version":3,"names":["_chalk","data","_interopRequireDefault","require","_laneId","_lodash","_legacy","_bitError","_excluded","e","__esModule","default","_objectWithoutProperties","t","o","r","i","_objectWithoutPropertiesLoose","Object","getOwnPropertySymbols","n","length","indexOf","propertyIsEnumerable","call","hasOwnProperty","ownKeys","keys","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","defineProperty","_toPropertyKey","value","configurable","writable","_toPrimitive","Symbol","toPrimitive","TypeError","String","Number","MergeLaneFromScopeCmd","constructor","mergeLanes","name","description","DEFAULT_LANE","report","fromLane","toLane","pattern","build","keepReadme","noSquash","includeDeps","title","titleBase64","reMerge","BitError","titleBase64Decoded","fromBase64","undefined","mergedNow","unmerged","exportedIds","conflicts","mergeSnapError","mergeFromScope","snapMessage","mergedTitle","chalk","green","mergedOutput","join","nonMergedTitle","bold","nonMergedOutput","map","u","id","reason","conflictsTitle","conflictsOutput","files","config","mergeSnapErrorTitle","mergeSnapErrorOutput","red","message","exportedTitle","exportedOutput","compact","json","results","code","toString","mergedPreviously","_ref","rest","snappedIds","stack","err","logger","error","exports"],"sources":["merge-lane-from-scope.cmd.ts"],"sourcesContent":["import chalk from 'chalk';\nimport { DEFAULT_LANE } from '@teambit/lane-id';\nimport { Command, CommandOptions } from '@teambit/cli';\nimport { compact } from 'lodash';\nimport { fromBase64 } from '@teambit/legacy.utils';\nimport { BitError } from '@teambit/bit-error';\nimport { MergeFromScopeResult, MergeLanesMain } from './merge-lanes.main.runtime';\n\ntype Flags = {\n  pattern?: string;\n  push?: boolean;\n  build?: boolean;\n  keepReadme?: boolean;\n  noSquash: boolean;\n  includeDeps?: boolean;\n  title?: string;\n  titleBase64?: string;\n  reMerge?: boolean;\n};\n\n/**\n * private command. the underscore prefix is intended.\n */\nexport class MergeLaneFromScopeCmd implements Command {\n  name = '_merge-lane <from-lane> [to-lane]';\n  description = `merge a remote lane into another lane or main via a bare-scope (not workspace)`;\n  extendedDescription = `to merge from a workspace, use \"bit lane merge\" command.\nthis is intended to use from the UI, which will have a button to merge an existing lane.\nthe lane must be up-to-date with the other lane, otherwise, conflicts might occur which are not handled in this command`;\n  arguments = [\n    {\n      name: 'from-lane',\n      description: `lane-id to merge from or \"${DEFAULT_LANE}\"`,\n    },\n    {\n      name: 'to-lane',\n      description: `lane-id to merge to. default is \"${DEFAULT_LANE}\"`,\n    },\n  ];\n  alias = '';\n  options = [\n    ['', 'pattern <string>', 'partially merge the lane with the specified component-pattern'],\n    [\n      '',\n      'title <string>',\n      'if provided, it replaces the original message with this title and append squashed snaps messages',\n    ],\n    ['', 'title-base64 <string>', 'same as --title flag but the title is base64 encoded'],\n    ['', 'push', 'export the updated objects to the original scopes once done'],\n    ['', 'build', 'in case of snap during the merge, run the build-pipeline (similar to bit snap --build)'],\n    ['', 'keep-readme', 'skip deleting the lane readme component after merging'],\n    ['', 'no-squash', 'relevant for merging lanes into main, which by default squash.'],\n    ['', 'include-deps', 'relevant for \"--pattern\". merge also dependencies of the given components'],\n    ['', 're-merge', 'helpful when last merge failed during export. do not skip components that seemed to be merged'],\n    ['j', 'json', 'output as json format'],\n  ] as CommandOptions;\n  loader = true;\n  private = true;\n  remoteOp = true;\n\n  constructor(private mergeLanes: MergeLanesMain) {}\n\n  async report(\n    [fromLane, toLane]: [string, string],\n    {\n      pattern,\n      push = false,\n      build,\n      keepReadme = false,\n      noSquash = false,\n      includeDeps = false,\n      title,\n      titleBase64,\n      reMerge,\n    }: Flags\n  ): Promise<string> {\n    if (includeDeps && !pattern) {\n      throw new BitError(`\"--include-deps\" flag is relevant only for --pattern flag`);\n    }\n    if (fromLane === DEFAULT_LANE && !toLane) {\n      throw new BitError('to merge from the main lane, specify the target lane');\n    }\n\n    const titleBase64Decoded = titleBase64 ? fromBase64(titleBase64) : undefined;\n\n    const { mergedNow, unmerged, exportedIds, conflicts, mergeSnapError } = await this.mergeLanes.mergeFromScope(\n      fromLane,\n      toLane || DEFAULT_LANE,\n      {\n        push,\n        build,\n        keepReadme,\n        noSquash,\n        pattern,\n        includeDeps,\n        snapMessage: titleBase64Decoded || title,\n        reMerge,\n      }\n    );\n\n    const mergedTitle = chalk.green(\n      `successfully merged ${mergedNow.length} components from ${fromLane} to ${toLane || DEFAULT_LANE}`\n    );\n    const mergedOutput = mergedNow.length ? `${mergedTitle}\\n${mergedNow.join('\\n')}` : '';\n\n    const nonMergedTitle = chalk.bold(`the following ${unmerged.length} components were not merged`);\n    const nonMergedOutput = unmerged.length\n      ? `${nonMergedTitle}\\n${unmerged.map((u) => `${u.id} (${u.reason})`).join('\\n')}`\n      : '';\n\n    const conflictsTitle = chalk.bold(\n      `the following ${conflicts?.length} components have conflicts, the merge was not completed`\n    );\n    const conflictsOutput = conflicts?.length\n      ? `${conflictsTitle}\\n${conflicts\n          .map((u) => `${u.id} (files: ${u.files.join(', ') || 'N/A'}) (config: ${u.config})`)\n          .join('\\n')}`\n      : '';\n\n    const mergeSnapErrorTitle = chalk.bold(`the following error was thrown while snapping the components:`);\n    const mergeSnapErrorOutput = mergeSnapError ? `${mergeSnapErrorTitle}\\n${chalk.red(mergeSnapError.message)}` : '';\n\n    const exportedTitle = chalk.bold(`successfully exported ${exportedIds.length} components`);\n    const exportedOutput = exportedIds.length ? `${exportedTitle}\\n${exportedIds.join('\\n')}` : '';\n\n    return compact([mergedOutput, nonMergedOutput, conflictsOutput, mergeSnapErrorOutput, exportedOutput]).join('\\n\\n');\n  }\n  async json(\n    [fromLane, toLane]: [string, string],\n    { pattern, push = false, keepReadme = false, noSquash = false, includeDeps = false, reMerge }: Flags\n  ) {\n    if (includeDeps && !pattern) {\n      throw new BitError(`\"--include-deps\" flag is relevant only for --pattern flag`);\n    }\n    let results: MergeFromScopeResult;\n    try {\n      results = await this.mergeLanes.mergeFromScope(fromLane, toLane || DEFAULT_LANE, {\n        push,\n        keepReadme,\n        noSquash,\n        pattern,\n        includeDeps,\n        reMerge,\n      });\n      return {\n        code: 0,\n        data: {\n          ...results,\n          mergedNow: results.mergedNow.map((id) => id.toString()),\n          mergedPreviously: results.mergedPreviously.map((id) => id.toString()),\n          exportedIds: results.exportedIds.map((id) => id.toString()),\n          unmerged: results.unmerged.map(({ id, reason }) => ({ id: id.toString(), reason })),\n          conflicts: results.conflicts?.map(({ id, ...rest }) => ({ id: id.toString(), ...rest })),\n          snappedIds: results.snappedIds?.map((id) => id.toString()),\n          mergeSnapError: results.mergeSnapError\n            ? { message: results.mergeSnapError.message, stack: results.mergeSnapError.stack }\n            : undefined,\n        },\n      };\n    } catch (err: any) {\n      this.mergeLanes.logger.error('merge-lane-from-scope.json, error: ', err);\n      return {\n        code: 1,\n        error: err.message,\n      };\n    }\n  }\n}\n"],"mappings":";;;;;;AAAA,SAAAA,OAAA;EAAA,MAAAC,IAAA,GAAAC,sBAAA,CAAAC,OAAA;EAAAH,MAAA,YAAAA,CAAA;IAAA,OAAAC,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAG,QAAA;EAAA,MAAAH,IAAA,GAAAE,OAAA;EAAAC,OAAA,YAAAA,CAAA;IAAA,OAAAH,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAEA,SAAAI,QAAA;EAAA,MAAAJ,IAAA,GAAAE,OAAA;EAAAE,OAAA,YAAAA,CAAA;IAAA,OAAAJ,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAK,QAAA;EAAA,MAAAL,IAAA,GAAAE,OAAA;EAAAG,OAAA,YAAAA,CAAA;IAAA,OAAAL,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAM,UAAA;EAAA,MAAAN,IAAA,GAAAE,OAAA;EAAAI,SAAA,YAAAA,CAAA;IAAA,OAAAN,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAA8C,MAAAO,SAAA;AAAA,SAAAN,uBAAAO,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAAA,SAAAG,yBAAAH,CAAA,EAAAI,CAAA,gBAAAJ,CAAA,iBAAAK,CAAA,EAAAC,CAAA,EAAAC,CAAA,GAAAC,6BAAA,CAAAR,CAAA,EAAAI,CAAA,OAAAK,MAAA,CAAAC,qBAAA,QAAAC,CAAA,GAAAF,MAAA,CAAAC,qBAAA,CAAAV,CAAA,QAAAM,CAAA,MAAAA,CAAA,GAAAK,CAAA,CAAAC,MAAA,EAAAN,CAAA,IAAAD,CAAA,GAAAM,CAAA,CAAAL,CAAA,UAAAF,CAAA,CAAAS,OAAA,CAAAR,CAAA,QAAAS,oBAAA,CAAAC,IAAA,CAAAf,CAAA,EAAAK,CAAA,MAAAE,CAAA,CAAAF,CAAA,IAAAL,CAAA,CAAAK,CAAA,aAAAE,CAAA;AAAA,SAAAC,8BAAAF,CAAA,EAAAN,CAAA,gBAAAM,CAAA,iBAAAF,CAAA,gBAAAO,CAAA,IAAAL,CAAA,SAAAU,cAAA,CAAAD,IAAA,CAAAT,CAAA,EAAAK,CAAA,gBAAAX,CAAA,CAAAa,OAAA,CAAAF,CAAA,aAAAP,CAAA,CAAAO,CAAA,IAAAL,CAAA,CAAAK,CAAA,YAAAP,CAAA;AAAA,SAAAa,QAAAjB,CAAA,EAAAM,CAAA,QAAAF,CAAA,GAAAK,MAAA,CAAAS,IAAA,CAAAlB,CAAA,OAAAS,MAAA,CAAAC,qBAAA,QAAAL,CAAA,GAAAI,MAAA,CAAAC,qBAAA,CAAAV,CAAA,GAAAM,CAAA,KAAAD,CAAA,GAAAA,CAAA,CAAAc,MAAA,WAAAb,CAAA,WAAAG,MAAA,CAAAW,wBAAA,CAAApB,CAAA,EAAAM,CAAA,EAAAe,UAAA,OAAAjB,CAAA,CAAAkB,IAAA,CAAAC,KAAA,CAAAnB,CAAA,EAAAC,CAAA,YAAAD,CAAA;AAAA,SAAAoB,cAAAxB,CAAA,aAAAM,CAAA,MAAAA,CAAA,GAAAmB,SAAA,CAAAb,MAAA,EAAAN,CAAA,UAAAF,CAAA,WAAAqB,SAAA,CAAAnB,CAAA,IAAAmB,SAAA,CAAAnB,CAAA,QAAAA,CAAA,OAAAW,OAAA,CAAAR,MAAA,CAAAL,CAAA,OAAAsB,OAAA,WAAApB,CAAA,IAAAqB,eAAA,CAAA3B,CAAA,EAAAM,CAAA,EAAAF,CAAA,CAAAE,CAAA,SAAAG,MAAA,CAAAmB,yBAAA,GAAAnB,MAAA,CAAAoB,gBAAA,CAAA7B,CAAA,EAAAS,MAAA,CAAAmB,yBAAA,CAAAxB,CAAA,KAAAa,OAAA,CAAAR,MAAA,CAAAL,CAAA,GAAAsB,OAAA,WAAApB,CAAA,IAAAG,MAAA,CAAAqB,cAAA,CAAA9B,CAAA,EAAAM,CAAA,EAAAG,MAAA,CAAAW,wBAAA,CAAAhB,CAAA,EAAAE,CAAA,iBAAAN,CAAA;AAAA,SAAA2B,gBAAA3B,CAAA,EAAAM,CAAA,EAAAF,CAAA,YAAAE,CAAA,GAAAyB,cAAA,CAAAzB,CAAA,MAAAN,CAAA,GAAAS,MAAA,CAAAqB,cAAA,CAAA9B,CAAA,EAAAM,CAAA,IAAA0B,KAAA,EAAA5B,CAAA,EAAAiB,UAAA,MAAAY,YAAA,MAAAC,QAAA,UAAAlC,CAAA,CAAAM,CAAA,IAAAF,CAAA,EAAAJ,CAAA;AAAA,SAAA+B,eAAA3B,CAAA,QAAAG,CAAA,GAAA4B,YAAA,CAAA/B,CAAA,uCAAAG,CAAA,GAAAA,CAAA,GAAAA,CAAA;AAAA,SAAA4B,aAAA/B,CAAA,EAAAE,CAAA,2BAAAF,CAAA,KAAAA,CAAA,SAAAA,CAAA,MAAAJ,CAAA,GAAAI,CAAA,CAAAgC,MAAA,CAAAC,WAAA,kBAAArC,CAAA,QAAAO,CAAA,GAAAP,CAAA,CAAAe,IAAA,CAAAX,CAAA,EAAAE,CAAA,uCAAAC,CAAA,SAAAA,CAAA,YAAA+B,SAAA,yEAAAhC,CAAA,GAAAiC,MAAA,GAAAC,MAAA,EAAApC,CAAA;AAe9C;AACA;AACA;AACO,MAAMqC,qBAAqB,CAAoB;EAqCpDC,WAAWA,CAASC,UAA0B,EAAE;IAAA,KAA5BA,UAA0B,GAA1BA,UAA0B;IAAAhB,eAAA,eApCvC,mCAAmC;IAAAA,eAAA,sBAC5B,gFAAgF;IAAAA,eAAA,8BACxE;AACxB;AACA,wHAAwH;IAAAA,eAAA,oBAC1G,CACV;MACEiB,IAAI,EAAE,WAAW;MACjBC,WAAW,EAAE,6BAA6BC,sBAAY;IACxD,CAAC,EACD;MACEF,IAAI,EAAE,SAAS;MACfC,WAAW,EAAE,oCAAoCC,sBAAY;IAC/D,CAAC,CACF;IAAAnB,eAAA,gBACO,EAAE;IAAAA,eAAA,kBACA,CACR,CAAC,EAAE,EAAE,kBAAkB,EAAE,+DAA+D,CAAC,EACzF,CACE,EAAE,EACF,gBAAgB,EAChB,kGAAkG,CACnG,EACD,CAAC,EAAE,EAAE,uBAAuB,EAAE,sDAAsD,CAAC,EACrF,CAAC,EAAE,EAAE,MAAM,EAAE,6DAA6D,CAAC,EAC3E,CAAC,EAAE,EAAE,OAAO,EAAE,wFAAwF,CAAC,EACvG,CAAC,EAAE,EAAE,aAAa,EAAE,uDAAuD,CAAC,EAC5E,CAAC,EAAE,EAAE,WAAW,EAAE,gEAAgE,CAAC,EACnF,CAAC,EAAE,EAAE,cAAc,EAAE,2EAA2E,CAAC,EACjG,CAAC,EAAE,EAAE,UAAU,EAAE,+FAA+F,CAAC,EACjH,CAAC,GAAG,EAAE,MAAM,EAAE,uBAAuB,CAAC,CACvC;IAAAA,eAAA,iBACQ,IAAI;IAAAA,eAAA,kBACH,IAAI;IAAAA,eAAA,mBACH,IAAI;EAEkC;EAEjD,MAAMoB,MAAMA,CACV,CAACC,QAAQ,EAAEC,MAAM,CAAmB,EACpC;IACEC,OAAO;IACP5B,IAAI,GAAG,KAAK;IACZ6B,KAAK;IACLC,UAAU,GAAG,KAAK;IAClBC,QAAQ,GAAG,KAAK;IAChBC,WAAW,GAAG,KAAK;IACnBC,KAAK;IACLC,WAAW;IACXC;EACK,CAAC,EACS;IACjB,IAAIH,WAAW,IAAI,CAACJ,OAAO,EAAE;MAC3B,MAAM,KAAIQ,oBAAQ,EAAC,2DAA2D,CAAC;IACjF;IACA,IAAIV,QAAQ,KAAKF,sBAAY,IAAI,CAACG,MAAM,EAAE;MACxC,MAAM,KAAIS,oBAAQ,EAAC,sDAAsD,CAAC;IAC5E;IAEA,MAAMC,kBAAkB,GAAGH,WAAW,GAAG,IAAAI,oBAAU,EAACJ,WAAW,CAAC,GAAGK,SAAS;IAE5E,MAAM;MAAEC,SAAS;MAAEC,QAAQ;MAAEC,WAAW;MAAEC,SAAS;MAAEC;IAAe,CAAC,GAAG,MAAM,IAAI,CAACvB,UAAU,CAACwB,cAAc,CAC1GnB,QAAQ,EACRC,MAAM,IAAIH,sBAAY,EACtB;MACExB,IAAI;MACJ6B,KAAK;MACLC,UAAU;MACVC,QAAQ;MACRH,OAAO;MACPI,WAAW;MACXc,WAAW,EAAET,kBAAkB,IAAIJ,KAAK;MACxCE;IACF,CACF,CAAC;IAED,MAAMY,WAAW,GAAGC,gBAAK,CAACC,KAAK,CAC7B,uBAAuBT,SAAS,CAAClD,MAAM,oBAAoBoC,QAAQ,OAAOC,MAAM,IAAIH,sBAAY,EAClG,CAAC;IACD,MAAM0B,YAAY,GAAGV,SAAS,CAAClD,MAAM,GAAG,GAAGyD,WAAW,KAAKP,SAAS,CAACW,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE;IAEtF,MAAMC,cAAc,GAAGJ,gBAAK,CAACK,IAAI,CAAC,iBAAiBZ,QAAQ,CAACnD,MAAM,6BAA6B,CAAC;IAChG,MAAMgE,eAAe,GAAGb,QAAQ,CAACnD,MAAM,GACnC,GAAG8D,cAAc,KAAKX,QAAQ,CAACc,GAAG,CAAEC,CAAC,IAAK,GAAGA,CAAC,CAACC,EAAE,KAAKD,CAAC,CAACE,MAAM,GAAG,CAAC,CAACP,IAAI,CAAC,IAAI,CAAC,EAAE,GAC/E,EAAE;IAEN,MAAMQ,cAAc,GAAGX,gBAAK,CAACK,IAAI,CAC/B,iBAAiBV,SAAS,EAAErD,MAAM,yDACpC,CAAC;IACD,MAAMsE,eAAe,GAAGjB,SAAS,EAAErD,MAAM,GACrC,GAAGqE,cAAc,KAAKhB,SAAS,CAC5BY,GAAG,CAAEC,CAAC,IAAK,GAAGA,CAAC,CAACC,EAAE,YAAYD,CAAC,CAACK,KAAK,CAACV,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,cAAcK,CAAC,CAACM,MAAM,GAAG,CAAC,CACnFX,IAAI,CAAC,IAAI,CAAC,EAAE,GACf,EAAE;IAEN,MAAMY,mBAAmB,GAAGf,gBAAK,CAACK,IAAI,CAAC,+DAA+D,CAAC;IACvG,MAAMW,oBAAoB,GAAGpB,cAAc,GAAG,GAAGmB,mBAAmB,KAAKf,gBAAK,CAACiB,GAAG,CAACrB,cAAc,CAACsB,OAAO,CAAC,EAAE,GAAG,EAAE;IAEjH,MAAMC,aAAa,GAAGnB,gBAAK,CAACK,IAAI,CAAC,yBAAyBX,WAAW,CAACpD,MAAM,aAAa,CAAC;IAC1F,MAAM8E,cAAc,GAAG1B,WAAW,CAACpD,MAAM,GAAG,GAAG6E,aAAa,KAAKzB,WAAW,CAACS,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE;IAE9F,OAAO,IAAAkB,iBAAO,EAAC,CAACnB,YAAY,EAAEI,eAAe,EAAEM,eAAe,EAAEI,oBAAoB,EAAEI,cAAc,CAAC,CAAC,CAACjB,IAAI,CAAC,MAAM,CAAC;EACrH;EACA,MAAMmB,IAAIA,CACR,CAAC5C,QAAQ,EAAEC,MAAM,CAAmB,EACpC;IAAEC,OAAO;IAAE5B,IAAI,GAAG,KAAK;IAAE8B,UAAU,GAAG,KAAK;IAAEC,QAAQ,GAAG,KAAK;IAAEC,WAAW,GAAG,KAAK;IAAEG;EAAe,CAAC,EACpG;IACA,IAAIH,WAAW,IAAI,CAACJ,OAAO,EAAE;MAC3B,MAAM,KAAIQ,oBAAQ,EAAC,2DAA2D,CAAC;IACjF;IACA,IAAImC,OAA6B;IACjC,IAAI;MACFA,OAAO,GAAG,MAAM,IAAI,CAAClD,UAAU,CAACwB,cAAc,CAACnB,QAAQ,EAAEC,MAAM,IAAIH,sBAAY,EAAE;QAC/ExB,IAAI;QACJ8B,UAAU;QACVC,QAAQ;QACRH,OAAO;QACPI,WAAW;QACXG;MACF,CAAC,CAAC;MACF,OAAO;QACLqC,IAAI,EAAE,CAAC;QACPtG,IAAI,EAAAgC,aAAA,CAAAA,aAAA,KACCqE,OAAO;UACV/B,SAAS,EAAE+B,OAAO,CAAC/B,SAAS,CAACe,GAAG,CAAEE,EAAE,IAAKA,EAAE,CAACgB,QAAQ,CAAC,CAAC,CAAC;UACvDC,gBAAgB,EAAEH,OAAO,CAACG,gBAAgB,CAACnB,GAAG,CAAEE,EAAE,IAAKA,EAAE,CAACgB,QAAQ,CAAC,CAAC,CAAC;UACrE/B,WAAW,EAAE6B,OAAO,CAAC7B,WAAW,CAACa,GAAG,CAAEE,EAAE,IAAKA,EAAE,CAACgB,QAAQ,CAAC,CAAC,CAAC;UAC3DhC,QAAQ,EAAE8B,OAAO,CAAC9B,QAAQ,CAACc,GAAG,CAAC,CAAC;YAAEE,EAAE;YAAEC;UAAO,CAAC,MAAM;YAAED,EAAE,EAAEA,EAAE,CAACgB,QAAQ,CAAC,CAAC;YAAEf;UAAO,CAAC,CAAC,CAAC;UACnFf,SAAS,EAAE4B,OAAO,CAAC5B,SAAS,EAAEY,GAAG,CAACoB,IAAA;YAAA,IAAC;gBAAElB;cAAY,CAAC,GAAAkB,IAAA;cAANC,IAAI,GAAA/F,wBAAA,CAAA8F,IAAA,EAAAlG,SAAA;YAAA,OAAAyB,aAAA;cAAUuD,EAAE,EAAEA,EAAE,CAACgB,QAAQ,CAAC;YAAC,GAAKG,IAAI;UAAA,CAAG,CAAC;UACxFC,UAAU,EAAEN,OAAO,CAACM,UAAU,EAAEtB,GAAG,CAAEE,EAAE,IAAKA,EAAE,CAACgB,QAAQ,CAAC,CAAC,CAAC;UAC1D7B,cAAc,EAAE2B,OAAO,CAAC3B,cAAc,GAClC;YAAEsB,OAAO,EAAEK,OAAO,CAAC3B,cAAc,CAACsB,OAAO;YAAEY,KAAK,EAAEP,OAAO,CAAC3B,cAAc,CAACkC;UAAM,CAAC,GAChFvC;QAAS;MAEjB,CAAC;IACH,CAAC,CAAC,OAAOwC,GAAQ,EAAE;MACjB,IAAI,CAAC1D,UAAU,CAAC2D,MAAM,CAACC,KAAK,CAAC,qCAAqC,EAAEF,GAAG,CAAC;MACxE,OAAO;QACLP,IAAI,EAAE,CAAC;QACPS,KAAK,EAAEF,GAAG,CAACb;MACb,CAAC;IACH;EACF;AACF;AAACgB,OAAA,CAAA/D,qBAAA,GAAAA,qBAAA","ignoreList":[]}

package/dist/merge-lanes.main.runtime.d.ts

@@ -13,6 +13,7 @@ import { RemoveMain } from '@teambit/remove';
 import { ExportMain } from '@teambit/export';
 import { GlobalConfigMain } from '@teambit/global-config';
 import { MergeAbortOpts } from './merge-abort.cmd';
+import { ExpressMain } from '@teambit/express';
 export type MergeLaneOptions = {
     mergeStrategy: MergeStrategy;
     ours?: boolean;
@@ -73,6 +74,9 @@ export declare class MergeLanesMain {
         mergedSuccessfullyIds: ComponentID[];
         conflicts: ConflictPerId[];
     }>;
+    /**
+     * merge otherLaneId into currentLaneId
+     */
     mergeLane(otherLaneId: LaneId, currentLaneId: LaneId, options: MergeLaneOptions): Promise<{
         mergeResults: ApplyVersionResults;
         deleteResults: any;
@@ -80,6 +84,14 @@ export declare class MergeLanesMain {
         mergedSuccessfullyIds: ComponentID[];
         conflicts: ConflictPerId[];
     }>;
+    private validateMergeFlags;
+    private resolveMergeContext;
+    /**
+     * check conflicts in case of merging sourceLaneId into targetLaneId
+     */
+    checkLaneForConflicts(sourceLaneIdStr: string, targetLaneIdStr: string, options: Partial<MergeLaneOptions>): Promise<{
+        conflicts: ConflictPerId[];
+    }>;
     mergeMove(newLaneName: string, options: {
         scope?: string;
     }): Promise<import("@teambit/lanes").CreateLaneResult>;
@@ -97,7 +109,7 @@ export declare class MergeLanesMain {
     static slots: never[];
     static dependencies: import("@teambit/harmony").Aspect[];
     static runtime: import("@teambit/harmony").RuntimeDefinition;
-    static provider([lanes, cli, workspace, merging, loggerMain, remove, scope, exporter, importer, checkout, globalConfig,]: [
+    static provider([lanes, cli, workspace, merging, loggerMain, remove, scope, exporter, importer, checkout, globalConfig, express,]: [
         LanesMain,
         CLIMain,
         Workspace,
@@ -108,7 +120,8 @@ export declare class MergeLanesMain {
         ExportMain,
         ImporterMain,
         CheckoutMain,
-        GlobalConfigMain
+        GlobalConfigMain,
+        ExpressMain
     ]): Promise<MergeLanesMain>;
 }
 export default MergeLanesMain;

package/dist/merge-lanes.main.runtime.js

@@ -186,6 +186,20 @@ function _harmonyModules2() {
   };
   return data;
 }
+function _express() {
+  const data = require("@teambit/express");
+  _express = function () {
+    return data;
+  };
+  return data;
+}
+function _lanesCheckConflicts() {
+  const data = require("./lanes-check-conflicts.route");
+  _lanesCheckConflicts = function () {
+    return data;
+  };
+  return data;
+}
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -213,9 +227,17 @@ class MergeLanesMain {
     return this.mergeLane(otherLaneId, currentLaneId, options);
   }
 
-  // eslint-disable-next-line complexity
+  /**
+   * merge otherLaneId into currentLaneId
+   */
   async mergeLane(otherLaneId, currentLaneId, options) {
-    const consumer = this.workspace?.consumer;
+    this.validateMergeFlags(otherLaneId, currentLaneId, options);
+    const {
+      currentLane,
+      otherLane,
+      laneToFetchArtifactsFrom,
+      idsToMerge
+    } = await this.resolveMergeContext(otherLaneId, currentLaneId, options);
     const {
       mergeStrategy,
       noAutoSnap,
@@ -232,73 +254,11 @@ class MergeLanesMain {
       skipDependencyInstallation,
       resolveUnrelated,
       ignoreConfigChanges,
-      skipFetch,
-      excludeNonLaneComps,
-      shouldIncludeUpdateDependents,
       throwIfNotUpToDate,
-      fetchCurrent,
       detachHead
     } = options;
     const legacyScope = this.scope.legacyScope;
-    if (tag && !currentLaneId.isDefault()) {
-      throw new (_bitError().BitError)(`--tag only possible when on main. currently checked out to ${currentLaneId.toString()}`);
-    }
-    if (otherLaneId.isEqual(currentLaneId)) {
-      throw new (_bitError().BitError)(`unable to merge lane "${otherLaneId.toString()}", you're already at this lane. to get updates, simply run "bit checkout head"`);
-    }
-    if (resolveUnrelated && currentLaneId.isDefault()) {
-      throw new (_bitError().BitError)(`unable to resolve unrelated when on main. switch to ${otherLaneId.toString()} and run "bit lane merge main --resolve-unrelated"`);
-    }
-    if (detachHead && !(0, _harmonyModules2().isFeatureEnabled)(_harmonyModules2().DETACH_HEAD)) {
-      throw new (_bitError().BitError)(`unable to detach head. the feature is not enabled`);
-    }
-    if (detachHead && !currentLaneId.isDefault()) {
-      throw new (_bitError().BitError)(`unable to detach head. the current lane is not main`);
-    }
-    if (fetchCurrent && !currentLaneId.isDefault()) {
-      // if current is default, it'll be fetch later on
-      await this.lanes.fetchLaneWithItsComponents(currentLaneId);
-    }
-    const currentLane = currentLaneId.isDefault() ? undefined : await legacyScope.loadLane(currentLaneId);
-    const isDefaultLane = otherLaneId.isDefault();
-    if (isDefaultLane) {
-      if (!skipFetch) {
-        const ids = await this.getMainIdsToMerge(currentLane, !excludeNonLaneComps);
-        const compIdList = _componentId().ComponentIdList.fromArray(ids).toVersionLatest();
-        await this.importer.importObjectsFromMainIfExist(compIdList);
-      }
-    }
-    let laneToFetchArtifactsFrom;
-    const getOtherLane = async () => {
-      let lane = await legacyScope.loadLane(otherLaneId);
-      const shouldFetch = !lane || !skipFetch && !lane.isNew;
-      if (shouldFetch) {
-        // don't assign `lane` to the result of this command. otherwise, if you have local snaps, it'll ignore them and use the remote-lane.
-        const otherLane = await this.lanes.fetchLaneWithItsComponents(otherLaneId, shouldIncludeUpdateDependents);
-        laneToFetchArtifactsFrom = otherLane;
-        lane = await legacyScope.loadLane(otherLaneId);
-      }
-      return lane;
-    };
-    const otherLane = isDefaultLane ? undefined : await getOtherLane();
-    if (fetchCurrent && otherLane && currentLaneId.isDefault()) {
-      const ids = await this.getMainIdsToMerge(otherLane, false, shouldIncludeUpdateDependents);
-      const compIdList = _componentId().ComponentIdList.fromArray(ids).toVersionLatest();
-      await this.importer.importObjectsFromMainIfExist(compIdList);
-    }
-    const getBitIds = async () => {
-      if (isDefaultLane) {
-        const ids = await this.getMainIdsToMerge(currentLane, !excludeNonLaneComps, shouldIncludeUpdateDependents);
-        const modelComponents = await Promise.all(ids.map(id => this.scope.legacyScope.getModelComponent(id)));
-        return (0, _lodash().compact)(modelComponents.map(c => {
-          if (!c.head) return null; // probably the component was never merged to main
-          return c.toComponentId().changeVersion(c.head.toString());
-        }));
-      }
-      if (!otherLane) throw new Error(`lane must be defined for non-default`);
-      return shouldIncludeUpdateDependents ? otherLane.toComponentIdsIncludeUpdateDependents() : otherLane.toComponentIds();
-    };
-    const idsToMerge = await getBitIds();
+    const consumer = this.workspace?.consumer;
     if (throwIfNotUpToDate) await this.throwIfNotUpToDate(otherLaneId, currentLaneId);
     this.logger.debug(`merging the following ids: ${idsToMerge.toString()}`);
     const shouldSquash = squash || currentLaneId.isDefault() && !noSquash;
@@ -406,6 +366,123 @@ class MergeLanesMain {
       conflicts
     };
   }
+  validateMergeFlags(otherLaneId, currentLaneId, options) {
+    const {
+      tag,
+      resolveUnrelated,
+      detachHead
+    } = options;
+    if (tag && !currentLaneId.isDefault()) {
+      throw new (_bitError().BitError)(`--tag only possible when on main. currently checked out to ${currentLaneId.toString()}`);
+    }
+    if (otherLaneId.isEqual(currentLaneId)) {
+      throw new (_bitError().BitError)(`unable to merge lane "${otherLaneId.toString()}", you're already at this lane. to get updates, simply run "bit checkout head"`);
+    }
+    if (resolveUnrelated && currentLaneId.isDefault()) {
+      throw new (_bitError().BitError)(`unable to resolve unrelated when on main. switch to ${otherLaneId.toString()} and run "bit lane merge main --resolve-unrelated"`);
+    }
+    if (detachHead && !(0, _harmonyModules2().isFeatureEnabled)(_harmonyModules2().DETACH_HEAD)) {
+      throw new (_bitError().BitError)(`unable to detach head. the feature is not enabled`);
+    }
+    if (detachHead && !currentLaneId.isDefault()) {
+      throw new (_bitError().BitError)(`unable to detach head. the current lane is not main`);
+    }
+  }
+  async resolveMergeContext(otherLaneId, currentLaneId, options) {
+    const {
+      skipFetch,
+      excludeNonLaneComps,
+      shouldIncludeUpdateDependents,
+      fetchCurrent
+    } = options;
+    const legacyScope = this.scope.legacyScope;
+    if (fetchCurrent && !currentLaneId.isDefault()) {
+      // if current is default, it'll be fetch later on
+      await this.lanes.fetchLaneWithItsComponents(currentLaneId);
+    }
+    const currentLane = currentLaneId.isDefault() ? undefined : await legacyScope.loadLane(currentLaneId);
+    const isDefaultLane = otherLaneId.isDefault();
+    if (isDefaultLane) {
+      if (!skipFetch) {
+        const ids = await this.getMainIdsToMerge(currentLane, !excludeNonLaneComps);
+        const compIdList = _componentId().ComponentIdList.fromArray(ids).toVersionLatest();
+        await this.importer.importObjectsFromMainIfExist(compIdList);
+      }
+    }
+    let laneToFetchArtifactsFrom;
+    const getOtherLane = async () => {
+      let lane = await legacyScope.loadLane(otherLaneId);
+      const shouldFetch = !lane || !skipFetch && !lane.isNew;
+      if (shouldFetch) {
+        // don't assign `lane` to the result of this command. otherwise, if you have local snaps, it'll ignore them and use the remote-lane.
+        const otherLane = await this.lanes.fetchLaneWithItsComponents(otherLaneId, shouldIncludeUpdateDependents);
+        laneToFetchArtifactsFrom = otherLane;
+        lane = await legacyScope.loadLane(otherLaneId);
+      }
+      return lane;
+    };
+    const otherLane = isDefaultLane ? undefined : await getOtherLane();
+    if (fetchCurrent && otherLane && currentLaneId.isDefault()) {
+      const ids = await this.getMainIdsToMerge(otherLane, false, shouldIncludeUpdateDependents);
+      const compIdList = _componentId().ComponentIdList.fromArray(ids).toVersionLatest();
+      await this.importer.importObjectsFromMainIfExist(compIdList);
+    }
+    const getBitIds = async () => {
+      if (isDefaultLane) {
+        const ids = await this.getMainIdsToMerge(currentLane, !excludeNonLaneComps, shouldIncludeUpdateDependents);
+        const modelComponents = await Promise.all(ids.map(id => this.scope.legacyScope.getModelComponent(id)));
+        return (0, _lodash().compact)(modelComponents.map(c => {
+          if (!c.head) return null; // probably the component was never merged to main
+          return c.toComponentId().changeVersion(c.head.toString());
+        }));
+      }
+      if (!otherLane) throw new Error(`lane must be defined for non-default`);
+      return shouldIncludeUpdateDependents ? otherLane.toComponentIdsIncludeUpdateDependents() : otherLane.toComponentIds();
+    };
+    const idsToMerge = await getBitIds();
+    return {
+      currentLane,
+      otherLane,
+      laneToFetchArtifactsFrom,
+      idsToMerge
+    };
+  }
+
+  /**
+   * check conflicts in case of merging sourceLaneId into targetLaneId
+   */
+  async checkLaneForConflicts(sourceLaneIdStr, targetLaneIdStr, options) {
+    const legacyScope = this.scope.legacyScope;
+    const otherLaneId = await legacyScope.lanes.parseLaneIdFromString(sourceLaneIdStr);
+    const currentLaneId = await legacyScope.lanes.parseLaneIdFromString(targetLaneIdStr);
+    options.excludeNonLaneComps = true;
+    const {
+      currentLane,
+      otherLane,
+      idsToMerge
+    } = await this.resolveMergeContext(otherLaneId, currentLaneId, options);
+    const allComponentsStatus = await this.merging.getMergeStatus(idsToMerge, {
+      mergeStrategy: 'manual'
+    }, currentLane, otherLane);
+    (0, _checkout().throwForFailures)(allComponentsStatus);
+    const configMergeResults = (0, _lodash().compact)(allComponentsStatus.map(c => c.configMergeResult));
+    const componentsWithConfigConflicts = configMergeResults.filter(c => c.hasConflicts()).map(c => c.compIdStr);
+    const conflicts = [];
+    allComponentsStatus.forEach(c => {
+      const files = c.mergeResults?.modifiedFiles.filter(f => f.conflict || f.isBinaryConflict) || [];
+      const config = componentsWithConfigConflicts.includes(c.id.toStringWithoutVersion());
+      if (files.length || config) {
+        conflicts.push({
+          id: c.id,
+          files: files.map(f => f.filePath),
+          config
+        });
+      }
+    });
+    return {
+      conflicts
+    };
+  }
   async mergeMove(newLaneName, options) {
     if (!this.workspace) throw new (_workspace().OutsideWorkspaceError)();
     const lastMerge = new (_lastMerged().LastMerged)(this.scope, this.workspace.consumer, this.logger);
@@ -555,7 +632,7 @@ class MergeLanesMain {
 ${compsNotUpToDate.map(s => s.componentId.toString()).join('\n')}`);
     }
   }
-  static async provider([lanes, cli, workspace, merging, loggerMain, remove, scope, exporter, importer, checkout, globalConfig]) {
+  static async provider([lanes, cli, workspace, merging, loggerMain, remove, scope, exporter, importer, checkout, globalConfig, express]) {
     const logger = loggerMain.createLogger(_mergeLanes().MergeLanesAspect.id);
     const lanesCommand = cli.getCommand('lane');
     const mergeLanesMain = new MergeLanesMain(workspace, merging, lanes, logger, remove, scope, exporter, importer, checkout);
@@ -563,12 +640,13 @@ ${compsNotUpToDate.map(s => s.componentId.toString()).join('\n')}`);
     lanesCommand?.commands?.push(new (_mergeAbort().MergeAbortLaneCmd)(mergeLanesMain));
     lanesCommand?.commands?.push(new (_mergeMove().MergeMoveLaneCmd)(mergeLanesMain));
     cli.register(new (_mergeLaneFromScope().MergeLaneFromScopeCmd)(mergeLanesMain));
+    express.register([new (_lanesCheckConflicts().LanesCheckConflictsRoute)(mergeLanesMain, logger)]);
     return mergeLanesMain;
   }
 }
 exports.MergeLanesMain = MergeLanesMain;
 _defineProperty(MergeLanesMain, "slots", []);
-_defineProperty(MergeLanesMain, "dependencies", [_lanes().LanesAspect, _cli().CLIAspect, _workspace().WorkspaceAspect, _merging().MergingAspect, _logger().LoggerAspect, _remove().RemoveAspect, _scope().ScopeAspect, _export().ExportAspect, _importer().ImporterAspect, _checkout().CheckoutAspect, _globalConfig().GlobalConfigAspect]);
+_defineProperty(MergeLanesMain, "dependencies", [_lanes().LanesAspect, _cli().CLIAspect, _workspace().WorkspaceAspect, _merging().MergingAspect, _logger().LoggerAspect, _remove().RemoveAspect, _scope().ScopeAspect, _export().ExportAspect, _importer().ImporterAspect, _checkout().CheckoutAspect, _globalConfig().GlobalConfigAspect, _express().ExpressAspect]);
 _defineProperty(MergeLanesMain, "runtime", _cli().MainRuntime);
 async function filterComponentsStatus(allComponentsStatus, compIdsToKeep, allBitIds, legacyScope, includeDeps = false, otherLane,
 // lane that gets merged into the current lane. if not provided, it's main that gets merged into the current lane

package/dist/merge-lanes.main.runtime.js.map

@@ -1 +1 @@
-{"version":3,"names":["_bitError","data","require","_path","_interopRequireDefault","_cli","_importer","_lanes","_merging","_workspace","_harmonyModules","_componentId","_pMapSeries","_scope","_laneId","_logger","_checkout","_remove","_lodash","_export","_globalConfig","_mergeLanes","_mergeLane","_mergeLaneFromScope","_missingCompsToMerge","_mergeAbort","_lastMerged","_mergeMove","_harmonyModules2","e","__esModule","default","ownKeys","r","t","Object","keys","getOwnPropertySymbols","o","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","defineProperty","_toPropertyKey","value","configurable","writable","i","_toPrimitive","Symbol","toPrimitive","call","TypeError","String","Number","MergeLanesMain","constructor","workspace","merging","lanes","logger","remove","scope","exporter","importer","checkout","mergeLaneByCLI","laneName","options","BitError","currentLaneId","consumer","getCurrentLaneId","otherLaneId","getParsedLaneId","mergeLane","mergeStrategy","noAutoSnap","noSnap","tag","snapMessage","existingOnWorkspaceOnly","build","keepReadme","squash","noSquash","pattern","includeDeps","skipDependencyInstallation","resolveUnrelated","ignoreConfigChanges","skipFetch","excludeNonLaneComps","shouldIncludeUpdateDependents","throwIfNotUpToDate","fetchCurrent","detachHead","legacyScope","isDefault","toString","isEqual","isFeatureEnabled","DETACH_HEAD","fetchLaneWithItsComponents","currentLane","undefined","loadLane","isDefaultLane","ids","getMainIdsToMerge","compIdList","ComponentIdList","fromArray","toVersionLatest","importObjectsFromMainIfExist","laneToFetchArtifactsFrom","getOtherLane","lane","shouldFetch","isNew","otherLane","getBitIds","modelComponents","Promise","all","map","id","getModelComponent","compact","c","head","toComponentId","changeVersion","Error","toComponentIdsIncludeUpdateDependents","toComponentIds","idsToMerge","debug","shouldSquash","allComponentsStatus","getMergeStatus","handleTargetAheadAsDiverged","componentIds","compIdsFromPattern","filterIdsFromPoolIdsByPattern","filterComponentsStatus","bitId","find","isEqualWithoutVersion","unchangedLegitimately","unchangedMessage","workspaceIds","listIds","throwForFailures","succeededComponents","squashSnaps","messageTitle","importHeadArtifactsFromLane","lastMerged","LastMerged","snapshot","takeSnapshot","mergeResults","mergeSnaps","persistSnapshot","mergedSuccessfully","failedComponents","every","failedComponent","deleteResults","readmeComponent","readmeComponentId","hash","removeLocallyByIds","reasonForRemoval","readmeResult","configMergeResults","configMergeResult","mergedSnapIds","mergeSnapResults","snappedComponents","componentsWithConfigConflicts","hasConflicts","compIdStr","conflicts","mergedSuccessfullyIds","components","files","filesStatus","f","FileStatus","manual","binaryConflict","config","includes","toStringWithoutVersion","snappedId","searchWithoutVersion","onDestroy","name","mergeMove","newLaneName","OutsideWorkspaceError","lastMerge","restoreLaneObjectFromLastMerged","newLaneResult","createLane","abortLaneMerge","checkoutProps","mergeAbortOpts","getCurrentLane","compDirsToRemove","restoreFromLastMerged","_reloadConsumer","objects","unmergedComponents","removeAllComponents","write","configMergeFile","getConflictMergeFile","delete","checkoutResults","checkoutError","restoreMissingComponents","err","error","restoredItems","path","basename","bitMap","mapPath","join","includeNonLaneComps","includeUpdateDependents","DEFAULT_LANE","laneIds","isExported","mainNotOnLane","laneId","mergeFromScope","fromLane","toLane","fromLaneId","parseLaneId","toLaneId","getDefaultLaneId","LaneId","parse","exportIfNeeded","idsToExport","laneToExport","compIdsList","exported","exportMany","laneObject","allVersions","exportHeadsOnly","filterOutExistingVersions","throwForMissingArtifacts","exportOrigin","setCurrentLaneId","mergeSnapError","generateMergeConflictFile","snappedIds","exportedIds","mergedNow","mergedPreviously","compIsAlreadyMergedMsg","unmerged","reason","status","diffStatus","skipChanges","compsNotUpToDate","componentsStatus","s","upToDate","componentId","provider","cli","loggerMain","globalConfig","createLogger","MergeLanesAspect","lanesCommand","getCommand","mergeLanesMain","commands","MergeLaneCmd","MergeAbortLaneCmd","MergeMoveLaneCmd","register","MergeLaneFromScopeCmd","exports","LanesAspect","CLIAspect","WorkspaceAspect","MergingAspect","LoggerAspect","RemoveAspect","ScopeAspect","ExportAspect","ImporterAspect","CheckoutAspect","GlobalConfigAspect","MainRuntime","compIdsToKeep","allBitIds","bitIdsFromPattern","bitIdsNotFromPattern","hasWithoutVersion","filteredComponentStatus","depsToAdd","missingDepsFromHead","missingDepsFromHistory","versionsToCheckPerId","pMapSeries","compId","fromStatus","divergeData","targetVersions","snapsOnTargetOnly","modelComponent","headOnTarget","getComponent","toImport","v","flat","scopeImporter","importWithoutDeps","cache","includeVersionHistory","remoteVersion","versionObj","loadVersion","flattenedDeps","getAllFlattenedDependencies","depsNotIncludeInPattern","depsOnLane","dep","isOnLane","isIdOnLane","depsOnLaneStr","MissingCompsToMerge","uniq","depsWithoutVersion","d","depsUniqWithoutVersion","uniqFromArray","getLogForSquash","basicLog","getBasicLog","log","message","opts","currentLaneName","componentFromModel","modifiedComp","squashOneComp","add","versionHistory","updateRebasedVersionHistory","isDiverged","isSourceAhead","isTargetAhead","remoteSnaps","getAllMessages","importManyObjects","versionObjects","load","getFinalMessage","allMessage","allMessageStr","m","currentParents","parents","commonSnapBeforeDiverge","doSquash","addAsOnlyParent","getModelComponentIfExist","ref","removeParent","finalMessage","setSquashed","previousParents","addRuntime","_default"],"sources":["merge-lanes.main.runtime.ts"],"sourcesContent":["import { BitError } from '@teambit/bit-error';\nimport path from 'path';\nimport { CLIAspect, CLIMain, MainRuntime } from '@teambit/cli';\nimport { ImporterAspect, ImporterMain } from '@teambit/importer';\nimport { LanesAspect, LanesMain } from '@teambit/lanes';\nimport {\n  MergingAspect,\n  MergingMain,\n  ComponentMergeStatus,\n  ApplyVersionResults,\n  compIsAlreadyMergedMsg,\n  FileStatus,\n  MergeStrategy,\n} from '@teambit/merging';\nimport { WorkspaceAspect, OutsideWorkspaceError, Workspace } from '@teambit/workspace';\nimport { getBasicLog } from '@teambit/harmony.modules.get-basic-log';\nimport { ComponentID, ComponentIdList } from '@teambit/component-id';\nimport { Ref, Lane, Version, Log } from '@teambit/objects';\nimport pMapSeries from 'p-map-series';\nimport { Scope as LegacyScope } from '@teambit/legacy.scope';\nimport { ScopeAspect, ScopeMain } from '@teambit/scope';\nimport { DEFAULT_LANE, LaneId } from '@teambit/lane-id';\nimport { ConfigMergeResult } from '@teambit/config-merger';\nimport { Logger, LoggerAspect, LoggerMain } from '@teambit/logger';\nimport { CheckoutAspect, CheckoutMain, CheckoutProps, throwForFailures } from '@teambit/checkout';\nimport { SnapsDistance } from '@teambit/component.snap-distance';\nimport { RemoveAspect, RemoveMain } from '@teambit/remove';\nimport { compact, uniq } from 'lodash';\nimport { ExportAspect, ExportMain } from '@teambit/export';\nimport { GlobalConfigAspect, GlobalConfigMain } from '@teambit/global-config';\nimport { MergeLanesAspect } from './merge-lanes.aspect';\nimport { MergeLaneCmd } from './merge-lane.cmd';\nimport { MergeLaneFromScopeCmd } from './merge-lane-from-scope.cmd';\nimport { MissingCompsToMerge } from './exceptions/missing-comps-to-merge';\nimport { MergeAbortLaneCmd, MergeAbortOpts } from './merge-abort.cmd';\nimport { LastMerged } from './last-merged';\nimport { MergeMoveLaneCmd } from './merge-move.cmd';\nimport { DETACH_HEAD, isFeatureEnabled } from '@teambit/harmony.modules.feature-toggle';\n\nexport type MergeLaneOptions = {\n  mergeStrategy: MergeStrategy;\n  ours?: boolean;\n  theirs?: boolean;\n  noAutoSnap?: boolean;\n  noSnap?: boolean;\n  snapMessage?: string;\n  existingOnWorkspaceOnly?: boolean;\n  build?: boolean;\n  keepReadme?: boolean;\n  squash?: boolean;\n  noSquash?: boolean;\n  tag?: boolean;\n  pattern?: string;\n  includeDeps?: boolean;\n  skipDependencyInstallation?: boolean;\n  resolveUnrelated?: MergeStrategy;\n  ignoreConfigChanges?: boolean;\n  skipFetch?: boolean;\n  excludeNonLaneComps?: boolean;\n  shouldIncludeUpdateDependents?: boolean;\n  throwIfNotUpToDate?: boolean; // relevant when merging from a scope\n  fetchCurrent?: boolean; // needed when merging from a bare-scope (because it's empty)\n  detachHead?: boolean;\n};\nexport type ConflictPerId = { id: ComponentID; files: string[]; config?: boolean };\nexport type MergeFromScopeResult = {\n  mergedNow: ComponentID[];\n  exportedIds: ComponentID[];\n  unmerged: { id: ComponentID; reason: string }[]; // reasons currently are: ahead / already-merge / removed\n  conflicts?: ConflictPerId[]; // relevant in case of diverge (currently possible only when merging from main to a lane)\n  snappedIds?: ComponentID[]; // relevant in case of diverge (currently possible only when merging from main to a lane)\n  mergedPreviously: ComponentID[];\n  mergeSnapError?: Error;\n};\n\nexport class MergeLanesMain {\n  constructor(\n    private workspace: Workspace | undefined,\n    private merging: MergingMain,\n    readonly lanes: LanesMain,\n    readonly logger: Logger,\n    private remove: RemoveMain,\n    private scope: ScopeMain,\n    private exporter: ExportMain,\n    private importer: ImporterMain,\n    private checkout: CheckoutMain\n  ) {}\n\n  async mergeLaneByCLI(laneName: string, options: MergeLaneOptions) {\n    if (!this.workspace) {\n      throw new BitError(`unable to merge a lane outside of Bit workspace`);\n    }\n    const currentLaneId = this.workspace.consumer.getCurrentLaneId();\n    const otherLaneId = await this.workspace.consumer.getParsedLaneId(laneName);\n    return this.mergeLane(otherLaneId, currentLaneId, options);\n  }\n\n  // eslint-disable-next-line complexity\n  async mergeLane(\n    otherLaneId: LaneId,\n    currentLaneId: LaneId,\n    options: MergeLaneOptions\n  ): Promise<{\n    mergeResults: ApplyVersionResults;\n    deleteResults: any;\n    configMergeResults: ConfigMergeResult[];\n    mergedSuccessfullyIds: ComponentID[];\n    conflicts: ConflictPerId[];\n  }> {\n    const consumer = this.workspace?.consumer;\n\n    const {\n      mergeStrategy,\n      noAutoSnap,\n      noSnap,\n      tag,\n      snapMessage,\n      existingOnWorkspaceOnly,\n      build,\n      keepReadme,\n      squash,\n      noSquash,\n      pattern,\n      includeDeps,\n      skipDependencyInstallation,\n      resolveUnrelated,\n      ignoreConfigChanges,\n      skipFetch,\n      excludeNonLaneComps,\n      shouldIncludeUpdateDependents,\n      throwIfNotUpToDate,\n      fetchCurrent,\n      detachHead,\n    } = options;\n    const legacyScope = this.scope.legacyScope;\n    if (tag && !currentLaneId.isDefault()) {\n      throw new BitError(`--tag only possible when on main. currently checked out to ${currentLaneId.toString()}`);\n    }\n    if (otherLaneId.isEqual(currentLaneId)) {\n      throw new BitError(\n        `unable to merge lane \"${otherLaneId.toString()}\", you're already at this lane. to get updates, simply run \"bit checkout head\"`\n      );\n    }\n    if (resolveUnrelated && currentLaneId.isDefault()) {\n      throw new BitError(\n        `unable to resolve unrelated when on main. switch to ${otherLaneId.toString()} and run \"bit lane merge main --resolve-unrelated\"`\n      );\n    }\n    if (detachHead && !isFeatureEnabled(DETACH_HEAD)) {\n      throw new BitError(`unable to detach head. the feature is not enabled`);\n    }\n    if (detachHead && !currentLaneId.isDefault()) {\n      throw new BitError(`unable to detach head. the current lane is not main`);\n    }\n    if (fetchCurrent && !currentLaneId.isDefault()) {\n      // if current is default, it'll be fetch later on\n      await this.lanes.fetchLaneWithItsComponents(currentLaneId);\n    }\n    const currentLane = currentLaneId.isDefault() ? undefined : await legacyScope.loadLane(currentLaneId);\n    const isDefaultLane = otherLaneId.isDefault();\n    if (isDefaultLane) {\n      if (!skipFetch) {\n        const ids = await this.getMainIdsToMerge(currentLane, !excludeNonLaneComps);\n        const compIdList = ComponentIdList.fromArray(ids).toVersionLatest();\n        await this.importer.importObjectsFromMainIfExist(compIdList);\n      }\n    }\n    let laneToFetchArtifactsFrom: Lane | undefined;\n    const getOtherLane = async () => {\n      let lane = await legacyScope.loadLane(otherLaneId);\n      const shouldFetch = !lane || (!skipFetch && !lane.isNew);\n      if (shouldFetch) {\n        // don't assign `lane` to the result of this command. otherwise, if you have local snaps, it'll ignore them and use the remote-lane.\n        const otherLane = await this.lanes.fetchLaneWithItsComponents(otherLaneId, shouldIncludeUpdateDependents);\n        laneToFetchArtifactsFrom = otherLane;\n        lane = await legacyScope.loadLane(otherLaneId);\n      }\n      return lane;\n    };\n    const otherLane = isDefaultLane ? undefined : await getOtherLane();\n    if (fetchCurrent && otherLane && currentLaneId.isDefault()) {\n      const ids = await this.getMainIdsToMerge(otherLane, false, shouldIncludeUpdateDependents);\n      const compIdList = ComponentIdList.fromArray(ids).toVersionLatest();\n      await this.importer.importObjectsFromMainIfExist(compIdList);\n    }\n    const getBitIds = async () => {\n      if (isDefaultLane) {\n        const ids = await this.getMainIdsToMerge(currentLane, !excludeNonLaneComps, shouldIncludeUpdateDependents);\n        const modelComponents = await Promise.all(ids.map((id) => this.scope.legacyScope.getModelComponent(id)));\n        return compact(\n          modelComponents.map((c) => {\n            if (!c.head) return null; // probably the component was never merged to main\n            return c.toComponentId().changeVersion(c.head.toString());\n          })\n        );\n      }\n      if (!otherLane) throw new Error(`lane must be defined for non-default`);\n      return shouldIncludeUpdateDependents\n        ? otherLane.toComponentIdsIncludeUpdateDependents()\n        : otherLane.toComponentIds();\n    };\n    const idsToMerge = await getBitIds();\n\n    if (throwIfNotUpToDate) await this.throwIfNotUpToDate(otherLaneId, currentLaneId);\n\n    this.logger.debug(`merging the following ids: ${idsToMerge.toString()}`);\n\n    const shouldSquash = squash || (currentLaneId.isDefault() && !noSquash);\n    let allComponentsStatus = await this.merging.getMergeStatus(\n      idsToMerge,\n      {\n        resolveUnrelated,\n        ignoreConfigChanges,\n        shouldSquash,\n        mergeStrategy,\n        handleTargetAheadAsDiverged: noSnap,\n        detachHead,\n      },\n      currentLane,\n      otherLane\n    );\n\n    if (pattern) {\n      const componentIds = idsToMerge;\n      const compIdsFromPattern = await (this.workspace || this.scope).filterIdsFromPoolIdsByPattern(\n        pattern,\n        componentIds\n      );\n      allComponentsStatus = await filterComponentsStatus(\n        allComponentsStatus,\n        compIdsFromPattern,\n        idsToMerge,\n        legacyScope,\n        includeDeps,\n        otherLane,\n        shouldSquash\n      );\n      idsToMerge.forEach((bitId) => {\n        if (!allComponentsStatus.find((c) => c.id.isEqualWithoutVersion(bitId))) {\n          allComponentsStatus.push({ id: bitId, unchangedLegitimately: true, unchangedMessage: `excluded by pattern` });\n        }\n      });\n    }\n    if (existingOnWorkspaceOnly && this.workspace) {\n      const workspaceIds = this.workspace.listIds();\n      const compIdsFromPattern = workspaceIds.filter((id) =>\n        allComponentsStatus.find((c) => c.id.isEqualWithoutVersion(id))\n      );\n      allComponentsStatus = await filterComponentsStatus(\n        allComponentsStatus,\n        compIdsFromPattern,\n        idsToMerge,\n        legacyScope,\n        includeDeps,\n        otherLane,\n        shouldSquash\n      );\n      idsToMerge.forEach((bitId) => {\n        if (!allComponentsStatus.find((c) => c.id.isEqualWithoutVersion(bitId))) {\n          allComponentsStatus.push({\n            id: bitId,\n            unchangedLegitimately: true,\n            unchangedMessage: `not in the workspace`,\n          });\n        }\n      });\n    }\n\n    throwForFailures(allComponentsStatus);\n\n    const succeededComponents = allComponentsStatus.filter((c) => !c.unchangedMessage);\n    if (shouldSquash) {\n      await squashSnaps(succeededComponents, currentLaneId, otherLaneId, legacyScope, {\n        messageTitle: options.snapMessage,\n        detachHead,\n      });\n    }\n\n    if (laneToFetchArtifactsFrom) {\n      const ids = allComponentsStatus.map((c) => c.id);\n      await this.importer.importHeadArtifactsFromLane(laneToFetchArtifactsFrom, ids, true);\n    }\n\n    const lastMerged = consumer ? new LastMerged(this.scope, consumer, this.logger) : undefined;\n    const snapshot = await lastMerged?.takeSnapshot(currentLane);\n\n    const mergeResults = await this.merging.mergeSnaps({\n      mergeStrategy,\n      allComponentsStatus,\n      otherLaneId,\n      currentLane,\n      noAutoSnap,\n      noSnap,\n      tag,\n      snapMessage,\n      build,\n      skipDependencyInstallation,\n      detachHead,\n    });\n\n    if (snapshot) await lastMerged?.persistSnapshot(snapshot);\n\n    const mergedSuccessfully =\n      !mergeResults.failedComponents ||\n      mergeResults.failedComponents.length === 0 ||\n      mergeResults.failedComponents.every((failedComponent) => failedComponent.unchangedLegitimately);\n\n    let deleteResults = {};\n\n    if (!keepReadme && otherLane && otherLane.readmeComponent && mergedSuccessfully) {\n      const readmeComponentId = otherLane.readmeComponent.id.changeVersion(otherLane.readmeComponent?.head?.hash);\n      deleteResults = await this.remove.removeLocallyByIds([readmeComponentId], { reasonForRemoval: 'lane-merge' });\n    } else if (otherLane && !otherLane.readmeComponent) {\n      deleteResults = { readmeResult: '' };\n    }\n    const configMergeResults = compact(allComponentsStatus.map((c) => c.configMergeResult));\n\n    const mergedSnapIds = ComponentIdList.fromArray(\n      mergeResults.mergeSnapResults?.snappedComponents.map((c) => c.id) || []\n    );\n    const componentsWithConfigConflicts = configMergeResults.filter((c) => c.hasConflicts()).map((c) => c.compIdStr);\n    const conflicts: ConflictPerId[] = [];\n    const mergedSuccessfullyIds: ComponentID[] = [];\n    mergeResults.components?.forEach((c) => {\n      const files = Object.keys(c.filesStatus).filter(\n        (f) => c.filesStatus[f] === FileStatus.manual || c.filesStatus[f] === FileStatus.binaryConflict\n      );\n      const config = componentsWithConfigConflicts.includes(c.id.toStringWithoutVersion());\n      if (files.length || config) {\n        conflicts.push({ id: c.id, files, config });\n      } else {\n        const snappedId = mergedSnapIds.searchWithoutVersion(c.id);\n        mergedSuccessfullyIds.push(snappedId || c.id);\n      }\n    });\n\n    await this.workspace?.consumer.onDestroy(`lane-merge (${otherLaneId.name})`);\n\n    return { mergeResults, deleteResults, configMergeResults, mergedSuccessfullyIds, conflicts };\n  }\n\n  async mergeMove(newLaneName: string, options: { scope?: string }) {\n    if (!this.workspace) throw new OutsideWorkspaceError();\n    const lastMerge = new LastMerged(this.scope, this.workspace.consumer, this.logger);\n    await lastMerge.restoreLaneObjectFromLastMerged();\n    const newLaneResult = await this.lanes.createLane(newLaneName, { scope: options.scope });\n    return newLaneResult;\n  }\n\n  async abortLaneMerge(checkoutProps: CheckoutProps, mergeAbortOpts: MergeAbortOpts) {\n    if (!this.workspace) throw new OutsideWorkspaceError();\n    const lastMerge = new LastMerged(this.scope, this.workspace.consumer, this.logger);\n    const currentLane = await this.lanes.getCurrentLane();\n    const { compDirsToRemove } = await lastMerge.restoreFromLastMerged(mergeAbortOpts, currentLane);\n\n    await this.workspace._reloadConsumer();\n\n    this.workspace.consumer.scope.objects.unmergedComponents.removeAllComponents();\n    await this.workspace.consumer.scope.objects.unmergedComponents.write();\n\n    const configMergeFile = this.workspace.getConflictMergeFile();\n    await configMergeFile.delete();\n\n    let checkoutResults: ApplyVersionResults | undefined;\n    let checkoutError: Error | undefined;\n    checkoutProps.ids = this.workspace.listIds();\n    checkoutProps.restoreMissingComponents = true;\n    try {\n      checkoutResults = await this.checkout.checkout(checkoutProps);\n    } catch (err: any) {\n      this.logger.error(`merge-abort got an error during the checkout stage`, err);\n      checkoutError = err;\n    }\n\n    const restoredItems = [\n      `${path.basename(this.workspace.consumer.bitMap.mapPath)} file`,\n      `${path.basename(this.workspace.consumer.config.path)} file`,\n    ];\n    if (compDirsToRemove.length) {\n      restoredItems.push(`deleted components directories: ${compDirsToRemove.join(', ')}`);\n    }\n    if (currentLane) {\n      restoredItems.push(`${currentLane.id()} lane object`);\n    }\n\n    return { checkoutResults, restoredItems, checkoutError };\n  }\n\n  private async getMainIdsToMerge(lane?: Lane | null, includeNonLaneComps = true, includeUpdateDependents = false) {\n    if (!lane) throw new Error(`unable to merge ${DEFAULT_LANE}, the current lane was not found`);\n    const laneIds = includeUpdateDependents ? lane.toComponentIdsIncludeUpdateDependents() : lane.toComponentIds();\n    const ids = laneIds.filter((id) => this.scope.isExported(id));\n    if (includeNonLaneComps) {\n      if (!this.workspace) {\n        throw new BitError(`getMainIdsToMerge needs workspace`);\n      }\n      const workspaceIds = this.workspace.listIds();\n      const mainNotOnLane = workspaceIds.filter(\n        (id) => !laneIds.find((laneId) => laneId.isEqualWithoutVersion(id)) && this.scope.isExported(id)\n      );\n      ids.push(...mainNotOnLane);\n    }\n    return ids;\n  }\n\n  async mergeFromScope(\n    fromLane: string,\n    toLane: string,\n    options: Partial<MergeLaneOptions> & { push?: boolean; reMerge?: boolean }\n  ): Promise<MergeFromScopeResult> {\n    if (this.workspace) {\n      throw new BitError(\n        `unable to run this command from a workspace, please create a new bare-scope and run it from there`\n      );\n    }\n    const fromLaneId = await this.lanes.parseLaneId(fromLane);\n    const toLaneId = toLane === DEFAULT_LANE ? this.lanes.getDefaultLaneId() : LaneId.parse(toLane);\n    const shouldIncludeUpdateDependents = toLaneId.isDefault();\n\n    const exportIfNeeded = async (idsToExport: ComponentID[], laneToExport?: Lane): Promise<ComponentID[]> => {\n      if (!options.push) return [];\n      const shouldSquash = toLaneId.isDefault() && !options.noSquash; // only when merging to main we squash.\n      const compIdsList = ComponentIdList.fromArray(idsToExport);\n      const { exported } = await this.exporter.exportMany({\n        scope: this.scope.legacyScope,\n        ids: compIdsList,\n        laneObject: laneToExport,\n        allVersions: false,\n        // no need to export anything else other than the head. the normal calculation of what to export won't apply here\n        // as it is done from the scope.\n        // @todo: if we merge main to a lane, then no need to export all main history, it'll be fetched later by fetchMissingHistory.\n        // once a change is done in the exporter about this, uncomment the next line.\n        // exportHeadsOnly: shouldSquash || fromLaneId.isDefault(),\n        exportHeadsOnly: shouldSquash,\n        // when merging main into a lane, because `shouldSquash` is false, we don't export head only, but all the snaps\n        // in between. chances are that a) many of them are already exported, b) those that are not head, are not in\n        // the local bare-scope, so trying to export them result in VersionNotFoundOnFS error.\n        // it's best to filter them out before.\n        // there is no risk of leaving modified Version objects behind, because when merging main into a lane, we don't\n        // squash, so the Version objects are not modified.\n        filterOutExistingVersions: fromLaneId.isDefault(),\n        // all artifacts must be pushed. otherwise, they'll be missing from the component-scopes.\n        // unless this is a merge from main to a lane, in which case it's not necessary to export the artifacts as\n        // the user importing them will get them from main.\n        throwForMissingArtifacts: !fromLaneId.isDefault(),\n        exportOrigin: 'lane-merge',\n      });\n      return exported;\n    };\n\n    // current -> target (to)\n    // other -> source (from)\n    options.mergeStrategy = 'manual';\n    options.excludeNonLaneComps = true;\n    options.skipDependencyInstallation = true;\n    options.shouldIncludeUpdateDependents = shouldIncludeUpdateDependents;\n    options.throwIfNotUpToDate = !fromLaneId.isDefault();\n    options.fetchCurrent = true;\n    this.scope.legacyScope.setCurrentLaneId(toLaneId);\n\n    const { mergeResults, configMergeResults, conflicts, mergedSuccessfullyIds } = await this.mergeLane(\n      fromLaneId,\n      toLaneId,\n      options as MergeLaneOptions\n    );\n\n    const { mergeSnapResults, failedComponents, mergeSnapError } = mergeResults;\n\n    if (configMergeResults.length) {\n      this.logger.debug(\n        `found the following config conflicts: ${configMergeResults\n          .map((c) => `\\n${c.compIdStr}\\n${c.generateMergeConflictFile()}`)\n          .join('\\n')}`\n      );\n    }\n\n    const snappedIds = mergeSnapResults?.snappedComponents.map((c) => c.id) || [];\n\n    const laneToExport = toLaneId.isDefault() ? undefined : await this.lanes.loadLane(toLaneId); // needs to be loaded again after the merge as it changed\n    const exportedIds =\n      conflicts.length || mergeSnapError\n        ? []\n        : await exportIfNeeded(\n            mergedSuccessfullyIds.map((id) => id.changeVersion(undefined)),\n            laneToExport\n          );\n\n    return {\n      mergedNow: mergedSuccessfullyIds,\n      mergedPreviously:\n        failedComponents\n          ?.filter(({ unchangedMessage }) => unchangedMessage === compIsAlreadyMergedMsg)\n          .map((c) => c.id) || [],\n      exportedIds,\n      unmerged: failedComponents?.map((c) => ({ id: c.id, reason: c.unchangedMessage })) || [],\n      conflicts,\n      snappedIds,\n      mergeSnapError,\n    };\n  }\n  private async throwIfNotUpToDate(fromLaneId: LaneId, toLaneId: LaneId) {\n    const status = await this.lanes.diffStatus(fromLaneId, toLaneId, { skipChanges: true });\n    const compsNotUpToDate = status.componentsStatus.filter((s) => !s.upToDate);\n    if (compsNotUpToDate.length) {\n      throw new Error(`unable to merge, the following components are not up-to-date:\n${compsNotUpToDate.map((s) => s.componentId.toString()).join('\\n')}`);\n    }\n  }\n\n  static slots = [];\n  static dependencies = [\n    LanesAspect,\n    CLIAspect,\n    WorkspaceAspect,\n    MergingAspect,\n    LoggerAspect,\n    RemoveAspect,\n    ScopeAspect,\n    ExportAspect,\n    ImporterAspect,\n    CheckoutAspect,\n    GlobalConfigAspect,\n  ];\n  static runtime = MainRuntime;\n\n  static async provider([\n    lanes,\n    cli,\n    workspace,\n    merging,\n    loggerMain,\n    remove,\n    scope,\n    exporter,\n    importer,\n    checkout,\n    globalConfig,\n  ]: [\n    LanesMain,\n    CLIMain,\n    Workspace,\n    MergingMain,\n    LoggerMain,\n    RemoveMain,\n    ScopeMain,\n    ExportMain,\n    ImporterMain,\n    CheckoutMain,\n    GlobalConfigMain,\n  ]) {\n    const logger = loggerMain.createLogger(MergeLanesAspect.id);\n    const lanesCommand = cli.getCommand('lane');\n    const mergeLanesMain = new MergeLanesMain(\n      workspace,\n      merging,\n      lanes,\n      logger,\n      remove,\n      scope,\n      exporter,\n      importer,\n      checkout\n    );\n    lanesCommand?.commands?.push(new MergeLaneCmd(mergeLanesMain, globalConfig));\n    lanesCommand?.commands?.push(new MergeAbortLaneCmd(mergeLanesMain));\n    lanesCommand?.commands?.push(new MergeMoveLaneCmd(mergeLanesMain));\n    cli.register(new MergeLaneFromScopeCmd(mergeLanesMain));\n    return mergeLanesMain;\n  }\n}\n\nasync function filterComponentsStatus(\n  allComponentsStatus: ComponentMergeStatus[],\n  compIdsToKeep: ComponentID[],\n  allBitIds: ComponentID[],\n  legacyScope: LegacyScope,\n  includeDeps = false,\n  otherLane?: Lane, // lane that gets merged into the current lane. if not provided, it's main that gets merged into the current lane\n  shouldSquash?: boolean\n): Promise<ComponentMergeStatus[]> {\n  const bitIdsFromPattern = ComponentIdList.fromArray(compIdsToKeep);\n  const bitIdsNotFromPattern = allBitIds.filter((bitId) => !bitIdsFromPattern.hasWithoutVersion(bitId));\n  const filteredComponentStatus: ComponentMergeStatus[] = [];\n  const depsToAdd: ComponentID[] = [];\n  const missingDepsFromHead = {};\n  const missingDepsFromHistory: string[] = [];\n\n  const versionsToCheckPerId = await pMapSeries(compIdsToKeep, async (compId) => {\n    const fromStatus = allComponentsStatus.find((c) => c.id.isEqualWithoutVersion(compId));\n    if (!fromStatus) {\n      throw new Error(`filterComponentsStatus: unable to find ${compId.toString()} in component-status`);\n    }\n    filteredComponentStatus.push(fromStatus);\n    if (fromStatus.unchangedMessage) {\n      return undefined;\n    }\n    if (!otherLane) {\n      // if merging main, no need to check whether the deps are included in the pattern.\n      return undefined;\n    }\n    const { divergeData } = fromStatus;\n    if (!divergeData) {\n      throw new Error(`filterComponentsStatus: unable to find divergeData for ${compId.toString()}`);\n    }\n    let targetVersions: Ref[] = divergeData.snapsOnTargetOnly;\n    if (!targetVersions.length) {\n      return undefined;\n    }\n    const modelComponent = await legacyScope.getModelComponent(compId);\n    if (shouldSquash) {\n      // no need to check all versions, we merge only the head\n      const headOnTarget = otherLane ? otherLane.getComponent(compId)?.head : modelComponent.head;\n      if (!headOnTarget) {\n        throw new Error(`filterComponentsStatus: unable to find head for ${compId.toString()}`);\n      }\n      targetVersions = [headOnTarget];\n    }\n\n    return { compId, targetVersions, modelComponent };\n  });\n\n  // all these versions needs to be imported to load them later and check whether they have dependencies on the target lane\n  const toImport = compact(versionsToCheckPerId)\n    .map((c) => c.targetVersions.map((v) => c.compId.changeVersion(v.toString())))\n    .flat();\n  await legacyScope.scopeImporter.importWithoutDeps(ComponentIdList.fromArray(toImport), {\n    lane: otherLane,\n    cache: true,\n    includeVersionHistory: false,\n    reason: 'import all history of given patterns components to check whether they have dependencies on the lane',\n  });\n\n  await pMapSeries(compact(versionsToCheckPerId), async ({ compId, targetVersions, modelComponent }) => {\n    await pMapSeries(targetVersions, async (remoteVersion) => {\n      const versionObj = await modelComponent.loadVersion(remoteVersion.toString(), legacyScope.objects);\n      const flattenedDeps = versionObj.getAllFlattenedDependencies();\n      const depsNotIncludeInPattern = flattenedDeps.filter((id) =>\n        bitIdsNotFromPattern.find((bitId) => bitId.isEqualWithoutVersion(id))\n      );\n      if (!depsNotIncludeInPattern.length) {\n        return;\n      }\n      const depsOnLane: ComponentID[] = [];\n      await Promise.all(\n        depsNotIncludeInPattern.map(async (dep) => {\n          const isOnLane = await legacyScope.isIdOnLane(dep, otherLane);\n          if (isOnLane) {\n            depsOnLane.push(dep);\n          }\n        })\n      );\n      if (!depsOnLane.length) {\n        return;\n      }\n      if (includeDeps) {\n        depsToAdd.push(...depsOnLane);\n      } else {\n        const headOnTarget = otherLane ? otherLane.getComponent(compId)?.head : modelComponent.head;\n        const depsOnLaneStr = depsOnLane.map((dep) => dep.toStringWithoutVersion());\n        if (headOnTarget?.isEqual(remoteVersion)) {\n          depsOnLaneStr.forEach((dep) => {\n            (missingDepsFromHead[dep] ||= []).push(compId.toStringWithoutVersion());\n          });\n        } else {\n          missingDepsFromHistory.push(...depsOnLaneStr);\n        }\n      }\n    });\n  });\n  if (Object.keys(missingDepsFromHead).length || missingDepsFromHistory.length) {\n    throw new MissingCompsToMerge(missingDepsFromHead, uniq(missingDepsFromHistory));\n  }\n\n  if (depsToAdd.length) {\n    // remove the version, otherwise, the uniq gives duplicate components with different versions.\n    const depsWithoutVersion = depsToAdd.map((d) => d.changeVersion(undefined));\n    const depsUniqWithoutVersion = ComponentIdList.uniqFromArray(depsWithoutVersion);\n    depsUniqWithoutVersion.forEach((id) => {\n      const fromStatus = allComponentsStatus.find((c) => c.id.isEqualWithoutVersion(id));\n      if (!fromStatus) {\n        throw new Error(`filterComponentsStatus: unable to find ${id.toString()} in component-status`);\n      }\n      filteredComponentStatus.push(fromStatus);\n    });\n  }\n  return filteredComponentStatus;\n}\n\nasync function getLogForSquash(otherLaneId: LaneId) {\n  const basicLog = await getBasicLog();\n  const log = {\n    ...basicLog,\n    message: `squashed during merge from ${otherLaneId.toString()}`,\n  };\n  return log;\n}\n\nasync function squashSnaps(\n  succeededComponents: ComponentMergeStatus[],\n  currentLaneId: LaneId,\n  otherLaneId: LaneId,\n  scope: LegacyScope,\n  opts: { messageTitle?: string; detachHead?: boolean } = {}\n) {\n  const currentLaneName = currentLaneId.name;\n  const log = await getLogForSquash(otherLaneId);\n\n  await Promise.all(\n    succeededComponents.map(async ({ id, divergeData, componentFromModel }) => {\n      if (!divergeData) {\n        throw new Error(`unable to squash. divergeData is missing from ${id.toString()}`);\n      }\n\n      const modifiedComp = await squashOneComp(\n        currentLaneName,\n        otherLaneId,\n        id,\n        divergeData,\n        log,\n        scope,\n        componentFromModel,\n        opts\n      );\n      if (modifiedComp) {\n        scope.objects.add(modifiedComp);\n        const modelComponent = await scope.getModelComponent(id);\n        const versionHistory = await modelComponent.updateRebasedVersionHistory(scope.objects, [modifiedComp]);\n        if (versionHistory) scope.objects.add(versionHistory);\n      }\n    })\n  );\n}\n\n/**\n * returns Version object if it was modified. otherwise, returns undefined\n */\nasync function squashOneComp(\n  currentLaneName: string,\n  otherLaneId: LaneId,\n  id: ComponentID,\n  divergeData: SnapsDistance,\n  log: Log,\n  scope: LegacyScope,\n  componentFromModel?: Version,\n  opts: { messageTitle?: string; detachHead?: boolean } = {}\n): Promise<Version | undefined> {\n  const { messageTitle, detachHead } = opts;\n  const shouldSquash = () => {\n    if (divergeData.isDiverged()) {\n      if (detachHead) {\n        // for detach head, it's ok to have it as diverged. as long as the target is ahead, we want to squash.\n        return true;\n      }\n      throw new BitError(`unable to squash because ${id.toString()} is diverged in history.\n  consider switching to \"${\n    otherLaneId.name\n  }\" first, merging \"${currentLaneName}\", then switching back to \"${currentLaneName}\" and merging \"${otherLaneId.name}\"\n  alternatively, use \"--no-squash\" flag to keep the entire history of \"${otherLaneId.name}\"`);\n    }\n    if (divergeData.isSourceAhead()) {\n      // nothing to do. current is ahead, nothing to merge. (it was probably filtered out already as a \"failedComponent\")\n      return false;\n    }\n    if (!divergeData.isTargetAhead()) {\n      // nothing to do. current and remote are the same, nothing to merge. (it was probably filtered out already as a \"failedComponent\")\n      return false;\n    }\n    return true;\n  };\n\n  if (!shouldSquash()) {\n    return undefined;\n  }\n\n  // remote is ahead and was not diverge.\n  const remoteSnaps = divergeData.snapsOnTargetOnly;\n  if (remoteSnaps.length === 0) {\n    throw new Error(`remote is ahead but it has no snaps. it's impossible`);\n  }\n  const getAllMessages = async () => {\n    if (!messageTitle) return [];\n    await scope.scopeImporter.importManyObjects({ [otherLaneId.scope]: remoteSnaps.map((s) => s.toString()) });\n    const versionObjects = (await Promise.all(remoteSnaps.map((s) => scope.objects.load(s)))) as Version[];\n    return compact(versionObjects).map((v) => v.log.message);\n  };\n  const getFinalMessage = async (): Promise<string | undefined> => {\n    if (!messageTitle) return undefined;\n    const allMessage = await getAllMessages();\n    const allMessageStr = compact(allMessage)\n      .map((m) => `[*] ${m}`)\n      .join('\\n');\n    return `${messageTitle}\\n${allMessageStr}`;\n  };\n  if (!componentFromModel) {\n    throw new Error('unable to squash, the componentFromModel is missing');\n  }\n  const currentParents = componentFromModel.parents;\n\n  // if the remote has only one snap, there is nothing to squash.\n  // other checks here is to make sure `componentFromModel.addAsOnlyParent` call is not needed.\n  if (remoteSnaps.length === 1 && divergeData.commonSnapBeforeDiverge && currentParents.length === 1) {\n    return undefined;\n  }\n\n  const doSquash = async () => {\n    if (divergeData.commonSnapBeforeDiverge) {\n      componentFromModel.addAsOnlyParent(divergeData.commonSnapBeforeDiverge);\n      return;\n    }\n    if (currentLaneName !== DEFAULT_LANE) {\n      // when squashing into lane, we have to take main into account\n      const modelComponent = await scope.getModelComponentIfExist(id);\n      if (!modelComponent) throw new Error(`missing ModelComponent for ${id.toString()}`);\n      if (modelComponent.head) {\n        componentFromModel.addAsOnlyParent(modelComponent.head);\n        return;\n      }\n    }\n    // there is no commonSnapBeforeDiverge. the local has no snaps, all are remote, no need for parents. keep only head.\n    componentFromModel.parents.forEach((ref) => componentFromModel.removeParent(ref));\n  };\n\n  await doSquash();\n\n  const finalMessage = await getFinalMessage();\n  componentFromModel.setSquashed({ previousParents: currentParents, laneId: otherLaneId }, log, finalMessage);\n  return componentFromModel;\n}\n\nMergeLanesAspect.addRuntime(MergeLanesMain);\n\nexport default MergeLanesMain;\n"],"mappings":";;;;;;AAAA,SAAAA,UAAA;EAAA,MAAAC,IAAA,GAAAC,OAAA;EAAAF,SAAA,YAAAA,CAAA;IAAA,OAAAC,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAE,MAAA;EAAA,MAAAF,IAAA,GAAAG,sBAAA,CAAAF,OAAA;EAAAC,KAAA,YAAAA,CAAA;IAAA,OAAAF,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAI,KAAA;EAAA,MAAAJ,IAAA,GAAAC,OAAA;EAAAG,IAAA,YAAAA,CAAA;IAAA,OAAAJ,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAK,UAAA;EAAA,MAAAL,IAAA,GAAAC,OAAA;EAAAI,SAAA,YAAAA,CAAA;IAAA,OAAAL,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAM,OAAA;EAAA,MAAAN,IAAA,GAAAC,OAAA;EAAAK,MAAA,YAAAA,CAAA;IAAA,OAAAN,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAO,SAAA;EAAA,MAAAP,IAAA,GAAAC,OAAA;EAAAM,QAAA,YAAAA,CAAA;IAAA,OAAAP,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AASA,SAAAQ,WAAA;EAAA,MAAAR,IAAA,GAAAC,OAAA;EAAAO,UAAA,YAAAA,CAAA;IAAA,OAAAR,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAS,gBAAA;EAAA,MAAAT,IAAA,GAAAC,OAAA;EAAAQ,eAAA,YAAAA,CAAA;IAAA,OAAAT,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAU,aAAA;EAAA,MAAAV,IAAA,GAAAC,OAAA;EAAAS,YAAA,YAAAA,CAAA;IAAA,OAAAV,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAEA,SAAAW,YAAA;EAAA,MAAAX,IAAA,GAAAG,sBAAA,CAAAF,OAAA;EAAAU,WAAA,YAAAA,CAAA;IAAA,OAAAX,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAEA,SAAAY,OAAA;EAAA,MAAAZ,IAAA,GAAAC,OAAA;EAAAW,MAAA,YAAAA,CAAA;IAAA,OAAAZ,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAa,QAAA;EAAA,MAAAb,IAAA,GAAAC,OAAA;EAAAY,OAAA,YAAAA,CAAA;IAAA,OAAAb,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAEA,SAAAc,QAAA;EAAA,MAAAd,IAAA,GAAAC,OAAA;EAAAa,OAAA,YAAAA,CAAA;IAAA,OAAAd,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAe,UAAA;EAAA,MAAAf,IAAA,GAAAC,OAAA;EAAAc,SAAA,YAAAA,CAAA;IAAA,OAAAf,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAEA,SAAAgB,QAAA;EAAA,MAAAhB,IAAA,GAAAC,OAAA;EAAAe,OAAA,YAAAA,CAAA;IAAA,OAAAhB,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAiB,QAAA;EAAA,MAAAjB,IAAA,GAAAC,OAAA;EAAAgB,OAAA,YAAAA,CAAA;IAAA,OAAAjB,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAkB,QAAA;EAAA,MAAAlB,IAAA,GAAAC,OAAA;EAAAiB,OAAA,YAAAA,CAAA;IAAA,OAAAlB,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAmB,cAAA;EAAA,MAAAnB,IAAA,GAAAC,OAAA;EAAAkB,aAAA,YAAAA,CAAA;IAAA,OAAAnB,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAoB,YAAA;EAAA,MAAApB,IAAA,GAAAC,OAAA;EAAAmB,WAAA,YAAAA,CAAA;IAAA,OAAApB,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAqB,WAAA;EAAA,MAAArB,IAAA,GAAAC,OAAA;EAAAoB,UAAA,YAAAA,CAAA;IAAA,OAAArB,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAsB,oBAAA;EAAA,MAAAtB,IAAA,GAAAC,OAAA;EAAAqB,mBAAA,YAAAA,CAAA;IAAA,OAAAtB,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAuB,qBAAA;EAAA,MAAAvB,IAAA,GAAAC,OAAA;EAAAsB,oBAAA,YAAAA,CAAA;IAAA,OAAAvB,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAwB,YAAA;EAAA,MAAAxB,IAAA,GAAAC,OAAA;EAAAuB,WAAA,YAAAA,CAAA;IAAA,OAAAxB,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAyB,YAAA;EAAA,MAAAzB,IAAA,GAAAC,OAAA;EAAAwB,WAAA,YAAAA,CAAA;IAAA,OAAAzB,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAA0B,WAAA;EAAA,MAAA1B,IAAA,GAAAC,OAAA;EAAAyB,UAAA,YAAAA,CAAA;IAAA,OAAA1B,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAA2B,iBAAA;EAAA,MAAA3B,IAAA,GAAAC,OAAA;EAAA0B,gBAAA,YAAAA,CAAA;IAAA,OAAA3B,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAAwF,SAAAG,uBAAAyB,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAAA,SAAAG,QAAAH,CAAA,EAAAI,CAAA,QAAAC,CAAA,GAAAC,MAAA,CAAAC,IAAA,CAAAP,CAAA,OAAAM,MAAA,CAAAE,qBAAA,QAAAC,CAAA,GAAAH,MAAA,CAAAE,qBAAA,CAAAR,CAAA,GAAAI,CAAA,KAAAK,CAAA,GAAAA,CAAA,CAAAC,MAAA,WAAAN,CAAA,WAAAE,MAAA,CAAAK,wBAAA,CAAAX,CAAA,EAAAI,CAAA,EAAAQ,UAAA,OAAAP,CAAA,CAAAQ,IAAA,CAAAC,KAAA,CAAAT,CAAA,EAAAI,CAAA,YAAAJ,CAAA;AAAA,SAAAU,cAAAf,CAAA,aAAAI,CAAA,MAAAA,CAAA,GAAAY,SAAA,CAAAC,MAAA,EAAAb,CAAA,UAAAC,CAAA,WAAAW,SAAA,CAAAZ,CAAA,IAAAY,SAAA,CAAAZ,CAAA,QAAAA,CAAA,OAAAD,OAAA,CAAAG,MAAA,CAAAD,CAAA,OAAAa,OAAA,WAAAd,CAAA,IAAAe,eAAA,CAAAnB,CAAA,EAAAI,CAAA,EAAAC,CAAA,CAAAD,CAAA,SAAAE,MAAA,CAAAc,yBAAA,GAAAd,MAAA,CAAAe,gBAAA,CAAArB,CAAA,EAAAM,MAAA,CAAAc,yBAAA,CAAAf,CAAA,KAAAF,OAAA,CAAAG,MAAA,CAAAD,CAAA,GAAAa,OAAA,WAAAd,CAAA,IAAAE,MAAA,CAAAgB,cAAA,CAAAtB,CAAA,EAAAI,CAAA,EAAAE,MAAA,CAAAK,wBAAA,CAAAN,CAAA,EAAAD,CAAA,iBAAAJ,CAAA;AAAA,SAAAmB,gBAAAnB,CAAA,EAAAI,CAAA,EAAAC,CAAA,YAAAD,CAAA,GAAAmB,cAAA,CAAAnB,CAAA,MAAAJ,CAAA,GAAAM,MAAA,CAAAgB,cAAA,CAAAtB,CAAA,EAAAI,CAAA,IAAAoB,KAAA,EAAAnB,CAAA,EAAAO,UAAA,MAAAa,YAAA,MAAAC,QAAA,UAAA1B,CAAA,CAAAI,CAAA,IAAAC,CAAA,EAAAL,CAAA;AAAA,SAAAuB,eAAAlB,CAAA,QAAAsB,CAAA,GAAAC,YAAA,CAAAvB,CAAA,uCAAAsB,CAAA,GAAAA,CAAA,GAAAA,CAAA;AAAA,SAAAC,aAAAvB,CAAA,EAAAD,CAAA,2BAAAC,CAAA,KAAAA,CAAA,SAAAA,CAAA,MAAAL,CAAA,GAAAK,CAAA,CAAAwB,MAAA,CAAAC,WAAA,kBAAA9B,CAAA,QAAA2B,CAAA,GAAA3B,CAAA,CAAA+B,IAAA,CAAA1B,CAAA,EAAAD,CAAA,uCAAAuB,CAAA,SAAAA,CAAA,YAAAK,SAAA,yEAAA5B,CAAA,GAAA6B,MAAA,GAAAC,MAAA,EAAA7B,CAAA;AAsCjF,MAAM8B,cAAc,CAAC;EAC1BC,WAAWA,CACDC,SAAgC,EAChCC,OAAoB,EACnBC,KAAgB,EAChBC,MAAc,EACfC,MAAkB,EAClBC,KAAgB,EAChBC,QAAoB,EACpBC,QAAsB,EACtBC,QAAsB,EAC9B;IAAA,KATQR,SAAgC,GAAhCA,SAAgC;IAAA,KAChCC,OAAoB,GAApBA,OAAoB;IAAA,KACnBC,KAAgB,GAAhBA,KAAgB;IAAA,KAChBC,MAAc,GAAdA,MAAc;IAAA,KACfC,MAAkB,GAAlBA,MAAkB;IAAA,KAClBC,KAAgB,GAAhBA,KAAgB;IAAA,KAChBC,QAAoB,GAApBA,QAAoB;IAAA,KACpBC,QAAsB,GAAtBA,QAAsB;IAAA,KACtBC,QAAsB,GAAtBA,QAAsB;EAC7B;EAEH,MAAMC,cAAcA,CAACC,QAAgB,EAAEC,OAAyB,EAAE;IAChE,IAAI,CAAC,IAAI,CAACX,SAAS,EAAE;MACnB,MAAM,KAAIY,oBAAQ,EAAC,iDAAiD,CAAC;IACvE;IACA,MAAMC,aAAa,GAAG,IAAI,CAACb,SAAS,CAACc,QAAQ,CAACC,gBAAgB,CAAC,CAAC;IAChE,MAAMC,WAAW,GAAG,MAAM,IAAI,CAAChB,SAAS,CAACc,QAAQ,CAACG,eAAe,CAACP,QAAQ,CAAC;IAC3E,OAAO,IAAI,CAACQ,SAAS,CAACF,WAAW,EAAEH,aAAa,EAAEF,OAAO,CAAC;EAC5D;;EAEA;EACA,MAAMO,SAASA,CACbF,WAAmB,EACnBH,aAAqB,EACrBF,OAAyB,EAOxB;IACD,MAAMG,QAAQ,GAAG,IAAI,CAACd,SAAS,EAAEc,QAAQ;IAEzC,MAAM;MACJK,aAAa;MACbC,UAAU;MACVC,MAAM;MACNC,GAAG;MACHC,WAAW;MACXC,uBAAuB;MACvBC,KAAK;MACLC,UAAU;MACVC,MAAM;MACNC,QAAQ;MACRC,OAAO;MACPC,WAAW;MACXC,0BAA0B;MAC1BC,gBAAgB;MAChBC,mBAAmB;MACnBC,SAAS;MACTC,mBAAmB;MACnBC,6BAA6B;MAC7BC,kBAAkB;MAClBC,YAAY;MACZC;IACF,CAAC,GAAG5B,OAAO;IACX,MAAM6B,WAAW,GAAG,IAAI,CAACnC,KAAK,CAACmC,WAAW;IAC1C,IAAIlB,GAAG,IAAI,CAACT,aAAa,CAAC4B,SAAS,CAAC,CAAC,EAAE;MACrC,MAAM,KAAI7B,oBAAQ,EAAC,8DAA8DC,aAAa,CAAC6B,QAAQ,CAAC,CAAC,EAAE,CAAC;IAC9G;IACA,IAAI1B,WAAW,CAAC2B,OAAO,CAAC9B,aAAa,CAAC,EAAE;MACtC,MAAM,KAAID,oBAAQ,EAChB,yBAAyBI,WAAW,CAAC0B,QAAQ,CAAC,CAAC,gFACjD,CAAC;IACH;IACA,IAAIV,gBAAgB,IAAInB,aAAa,CAAC4B,SAAS,CAAC,CAAC,EAAE;MACjD,MAAM,KAAI7B,oBAAQ,EAChB,uDAAuDI,WAAW,CAAC0B,QAAQ,CAAC,CAAC,oDAC/E,CAAC;IACH;IACA,IAAIH,UAAU,IAAI,CAAC,IAAAK,mCAAgB,EAACC,8BAAW,CAAC,EAAE;MAChD,MAAM,KAAIjC,oBAAQ,EAAC,mDAAmD,CAAC;IACzE;IACA,IAAI2B,UAAU,IAAI,CAAC1B,aAAa,CAAC4B,SAAS,CAAC,CAAC,EAAE;MAC5C,MAAM,KAAI7B,oBAAQ,EAAC,qDAAqD,CAAC;IAC3E;IACA,IAAI0B,YAAY,IAAI,CAACzB,aAAa,CAAC4B,SAAS,CAAC,CAAC,EAAE;MAC9C;MACA,MAAM,IAAI,CAACvC,KAAK,CAAC4C,0BAA0B,CAACjC,aAAa,CAAC;IAC5D;IACA,MAAMkC,WAAW,GAAGlC,aAAa,CAAC4B,SAAS,CAAC,CAAC,GAAGO,SAAS,GAAG,MAAMR,WAAW,CAACS,QAAQ,CAACpC,aAAa,CAAC;IACrG,MAAMqC,aAAa,GAAGlC,WAAW,CAACyB,SAAS,CAAC,CAAC;IAC7C,IAAIS,aAAa,EAAE;MACjB,IAAI,CAAChB,SAAS,EAAE;QACd,MAAMiB,GAAG,GAAG,MAAM,IAAI,CAACC,iBAAiB,CAACL,WAAW,EAAE,CAACZ,mBAAmB,CAAC;QAC3E,MAAMkB,UAAU,GAAGC,8BAAe,CAACC,SAAS,CAACJ,GAAG,CAAC,CAACK,eAAe,CAAC,CAAC;QACnE,MAAM,IAAI,CAACjD,QAAQ,CAACkD,4BAA4B,CAACJ,UAAU,CAAC;MAC9D;IACF;IACA,IAAIK,wBAA0C;IAC9C,MAAMC,YAAY,GAAG,MAAAA,CAAA,KAAY;MAC/B,IAAIC,IAAI,GAAG,MAAMpB,WAAW,CAACS,QAAQ,CAACjC,WAAW,CAAC;MAClD,MAAM6C,WAAW,GAAG,CAACD,IAAI,IAAK,CAAC1B,SAAS,IAAI,CAAC0B,IAAI,CAACE,KAAM;MACxD,IAAID,WAAW,EAAE;QACf;QACA,MAAME,SAAS,GAAG,MAAM,IAAI,CAAC7D,KAAK,CAAC4C,0BAA0B,CAAC9B,WAAW,EAAEoB,6BAA6B,CAAC;QACzGsB,wBAAwB,GAAGK,SAAS;QACpCH,IAAI,GAAG,MAAMpB,WAAW,CAACS,QAAQ,CAACjC,WAAW,CAAC;MAChD;MACA,OAAO4C,IAAI;IACb,CAAC;IACD,MAAMG,SAAS,GAAGb,aAAa,GAAGF,SAAS,GAAG,MAAMW,YAAY,CAAC,CAAC;IAClE,IAAIrB,YAAY,IAAIyB,SAAS,IAAIlD,aAAa,CAAC4B,SAAS,CAAC,CAAC,EAAE;MAC1D,MAAMU,GAAG,GAAG,MAAM,IAAI,CAACC,iBAAiB,CAACW,SAAS,EAAE,KAAK,EAAE3B,6BAA6B,CAAC;MACzF,MAAMiB,UAAU,GAAGC,8BAAe,CAACC,SAAS,CAACJ,GAAG,CAAC,CAACK,eAAe,CAAC,CAAC;MACnE,MAAM,IAAI,CAACjD,QAAQ,CAACkD,4BAA4B,CAACJ,UAAU,CAAC;IAC9D;IACA,MAAMW,SAAS,GAAG,MAAAA,CAAA,KAAY;MAC5B,IAAId,aAAa,EAAE;QACjB,MAAMC,GAAG,GAAG,MAAM,IAAI,CAACC,iBAAiB,CAACL,WAAW,EAAE,CAACZ,mBAAmB,EAAEC,6BAA6B,CAAC;QAC1G,MAAM6B,eAAe,GAAG,MAAMC,OAAO,CAACC,GAAG,CAAChB,GAAG,CAACiB,GAAG,CAAEC,EAAE,IAAK,IAAI,CAAChE,KAAK,CAACmC,WAAW,CAAC8B,iBAAiB,CAACD,EAAE,CAAC,CAAC,CAAC;QACxG,OAAO,IAAAE,iBAAO,EACZN,eAAe,CAACG,GAAG,CAAEI,CAAC,IAAK;UACzB,IAAI,CAACA,CAAC,CAACC,IAAI,EAAE,OAAO,IAAI,CAAC,CAAC;UAC1B,OAAOD,CAAC,CAACE,aAAa,CAAC,CAAC,CAACC,aAAa,CAACH,CAAC,CAACC,IAAI,CAAC/B,QAAQ,CAAC,CAAC,CAAC;QAC3D,CAAC,CACH,CAAC;MACH;MACA,IAAI,CAACqB,SAAS,EAAE,MAAM,IAAIa,KAAK,CAAC,sCAAsC,CAAC;MACvE,OAAOxC,6BAA6B,GAChC2B,SAAS,CAACc,qCAAqC,CAAC,CAAC,GACjDd,SAAS,CAACe,cAAc,CAAC,CAAC;IAChC,CAAC;IACD,MAAMC,UAAU,GAAG,MAAMf,SAAS,CAAC,CAAC;IAEpC,IAAI3B,kBAAkB,EAAE,MAAM,IAAI,CAACA,kBAAkB,CAACrB,WAAW,EAAEH,aAAa,CAAC;IAEjF,IAAI,CAACV,MAAM,CAAC6E,KAAK,CAAC,8BAA8BD,UAAU,CAACrC,QAAQ,CAAC,CAAC,EAAE,CAAC;IAExE,MAAMuC,YAAY,GAAGtD,MAAM,IAAKd,aAAa,CAAC4B,SAAS,CAAC,CAAC,IAAI,CAACb,QAAS;IACvE,IAAIsD,mBAAmB,GAAG,MAAM,IAAI,CAACjF,OAAO,CAACkF,cAAc,CACzDJ,UAAU,EACV;MACE/C,gBAAgB;MAChBC,mBAAmB;MACnBgD,YAAY;MACZ9D,aAAa;MACbiE,2BAA2B,EAAE/D,MAAM;MACnCkB;IACF,CAAC,EACDQ,WAAW,EACXgB,SACF,CAAC;IAED,IAAIlC,OAAO,EAAE;MACX,MAAMwD,YAAY,GAAGN,UAAU;MAC/B,MAAMO,kBAAkB,GAAG,MAAM,CAAC,IAAI,CAACtF,SAAS,IAAI,IAAI,CAACK,KAAK,EAAEkF,6BAA6B,CAC3F1D,OAAO,EACPwD,YACF,CAAC;MACDH,mBAAmB,GAAG,MAAMM,sBAAsB,CAChDN,mBAAmB,EACnBI,kBAAkB,EAClBP,UAAU,EACVvC,WAAW,EACXV,WAAW,EACXiC,SAAS,EACTkB,YACF,CAAC;MACDF,UAAU,CAAClG,OAAO,CAAE4G,KAAK,IAAK;QAC5B,IAAI,CAACP,mBAAmB,CAACQ,IAAI,CAAElB,CAAC,IAAKA,CAAC,CAACH,EAAE,CAACsB,qBAAqB,CAACF,KAAK,CAAC,CAAC,EAAE;UACvEP,mBAAmB,CAAC1G,IAAI,CAAC;YAAE6F,EAAE,EAAEoB,KAAK;YAAEG,qBAAqB,EAAE,IAAI;YAAEC,gBAAgB,EAAE;UAAsB,CAAC,CAAC;QAC/G;MACF,CAAC,CAAC;IACJ;IACA,IAAIrE,uBAAuB,IAAI,IAAI,CAACxB,SAAS,EAAE;MAC7C,MAAM8F,YAAY,GAAG,IAAI,CAAC9F,SAAS,CAAC+F,OAAO,CAAC,CAAC;MAC7C,MAAMT,kBAAkB,GAAGQ,YAAY,CAACzH,MAAM,CAAEgG,EAAE,IAChDa,mBAAmB,CAACQ,IAAI,CAAElB,CAAC,IAAKA,CAAC,CAACH,EAAE,CAACsB,qBAAqB,CAACtB,EAAE,CAAC,CAChE,CAAC;MACDa,mBAAmB,GAAG,MAAMM,sBAAsB,CAChDN,mBAAmB,EACnBI,kBAAkB,EAClBP,UAAU,EACVvC,WAAW,EACXV,WAAW,EACXiC,SAAS,EACTkB,YACF,CAAC;MACDF,UAAU,CAAClG,OAAO,CAAE4G,KAAK,IAAK;QAC5B,IAAI,CAACP,mBAAmB,CAACQ,IAAI,CAAElB,CAAC,IAAKA,CAAC,CAACH,EAAE,CAACsB,qBAAqB,CAACF,KAAK,CAAC,CAAC,EAAE;UACvEP,mBAAmB,CAAC1G,IAAI,CAAC;YACvB6F,EAAE,EAAEoB,KAAK;YACTG,qBAAqB,EAAE,IAAI;YAC3BC,gBAAgB,EAAE;UACpB,CAAC,CAAC;QACJ;MACF,CAAC,CAAC;IACJ;IAEA,IAAAG,4BAAgB,EAACd,mBAAmB,CAAC;IAErC,MAAMe,mBAAmB,GAAGf,mBAAmB,CAAC7G,MAAM,CAAEmG,CAAC,IAAK,CAACA,CAAC,CAACqB,gBAAgB,CAAC;IAClF,IAAIZ,YAAY,EAAE;MAChB,MAAMiB,WAAW,CAACD,mBAAmB,EAAEpF,aAAa,EAAEG,WAAW,EAAEwB,WAAW,EAAE;QAC9E2D,YAAY,EAAExF,OAAO,CAACY,WAAW;QACjCgB;MACF,CAAC,CAAC;IACJ;IAEA,IAAImB,wBAAwB,EAAE;MAC5B,MAAMP,GAAG,GAAG+B,mBAAmB,CAACd,GAAG,CAAEI,CAAC,IAAKA,CAAC,CAACH,EAAE,CAAC;MAChD,MAAM,IAAI,CAAC9D,QAAQ,CAAC6F,2BAA2B,CAAC1C,wBAAwB,EAAEP,GAAG,EAAE,IAAI,CAAC;IACtF;IAEA,MAAMkD,UAAU,GAAGvF,QAAQ,GAAG,KAAIwF,wBAAU,EAAC,IAAI,CAACjG,KAAK,EAAES,QAAQ,EAAE,IAAI,CAACX,MAAM,CAAC,GAAG6C,SAAS;IAC3F,MAAMuD,QAAQ,GAAG,MAAMF,UAAU,EAAEG,YAAY,CAACzD,WAAW,CAAC;IAE5D,MAAM0D,YAAY,GAAG,MAAM,IAAI,CAACxG,OAAO,CAACyG,UAAU,CAAC;MACjDvF,aAAa;MACb+D,mBAAmB;MACnBlE,WAAW;MACX+B,WAAW;MACX3B,UAAU;MACVC,MAAM;MACNC,GAAG;MACHC,WAAW;MACXE,KAAK;MACLM,0BAA0B;MAC1BQ;IACF,CAAC,CAAC;IAEF,IAAIgE,QAAQ,EAAE,MAAMF,UAAU,EAAEM,eAAe,CAACJ,QAAQ,CAAC;IAEzD,MAAMK,kBAAkB,GACtB,CAACH,YAAY,CAACI,gBAAgB,IAC9BJ,YAAY,CAACI,gBAAgB,CAACjI,MAAM,KAAK,CAAC,IAC1C6H,YAAY,CAACI,gBAAgB,CAACC,KAAK,CAAEC,eAAe,IAAKA,eAAe,CAACnB,qBAAqB,CAAC;IAEjG,IAAIoB,aAAa,GAAG,CAAC,CAAC;IAEtB,IAAI,CAACtF,UAAU,IAAIqC,SAAS,IAAIA,SAAS,CAACkD,eAAe,IAAIL,kBAAkB,EAAE;MAC/E,MAAMM,iBAAiB,GAAGnD,SAAS,CAACkD,eAAe,CAAC5C,EAAE,CAACM,aAAa,CAACZ,SAAS,CAACkD,eAAe,EAAExC,IAAI,EAAE0C,IAAI,CAAC;MAC3GH,aAAa,GAAG,MAAM,IAAI,CAAC5G,MAAM,CAACgH,kBAAkB,CAAC,CAACF,iBAAiB,CAAC,EAAE;QAAEG,gBAAgB,EAAE;MAAa,CAAC,CAAC;IAC/G,CAAC,MAAM,IAAItD,SAAS,IAAI,CAACA,SAAS,CAACkD,eAAe,EAAE;MAClDD,aAAa,GAAG;QAAEM,YAAY,EAAE;MAAG,CAAC;IACtC;IACA,MAAMC,kBAAkB,GAAG,IAAAhD,iBAAO,EAACW,mBAAmB,CAACd,GAAG,CAAEI,CAAC,IAAKA,CAAC,CAACgD,iBAAiB,CAAC,CAAC;IAEvF,MAAMC,aAAa,GAAGnE,8BAAe,CAACC,SAAS,CAC7CkD,YAAY,CAACiB,gBAAgB,EAAEC,iBAAiB,CAACvD,GAAG,CAAEI,CAAC,IAAKA,CAAC,CAACH,EAAE,CAAC,IAAI,EACvE,CAAC;IACD,MAAMuD,6BAA6B,GAAGL,kBAAkB,CAAClJ,MAAM,CAAEmG,CAAC,IAAKA,CAAC,CAACqD,YAAY,CAAC,CAAC,CAAC,CAACzD,GAAG,CAAEI,CAAC,IAAKA,CAAC,CAACsD,SAAS,CAAC;IAChH,MAAMC,SAA0B,GAAG,EAAE;IACrC,MAAMC,qBAAoC,GAAG,EAAE;IAC/CvB,YAAY,CAACwB,UAAU,EAAEpJ,OAAO,CAAE2F,CAAC,IAAK;MACtC,MAAM0D,KAAK,GAAGjK,MAAM,CAACC,IAAI,CAACsG,CAAC,CAAC2D,WAAW,CAAC,CAAC9J,MAAM,CAC5C+J,CAAC,IAAK5D,CAAC,CAAC2D,WAAW,CAACC,CAAC,CAAC,KAAKC,qBAAU,CAACC,MAAM,IAAI9D,CAAC,CAAC2D,WAAW,CAACC,CAAC,CAAC,KAAKC,qBAAU,CAACE,cACnF,CAAC;MACD,MAAMC,MAAM,GAAGZ,6BAA6B,CAACa,QAAQ,CAACjE,CAAC,CAACH,EAAE,CAACqE,sBAAsB,CAAC,CAAC,CAAC;MACpF,IAAIR,KAAK,CAACtJ,MAAM,IAAI4J,MAAM,EAAE;QAC1BT,SAAS,CAACvJ,IAAI,CAAC;UAAE6F,EAAE,EAAEG,CAAC,CAACH,EAAE;UAAE6D,KAAK;UAAEM;QAAO,CAAC,CAAC;MAC7C,CAAC,MAAM;QACL,MAAMG,SAAS,GAAGlB,aAAa,CAACmB,oBAAoB,CAACpE,CAAC,CAACH,EAAE,CAAC;QAC1D2D,qBAAqB,CAACxJ,IAAI,CAACmK,SAAS,IAAInE,CAAC,CAACH,EAAE,CAAC;MAC/C;IACF,CAAC,CAAC;IAEF,MAAM,IAAI,CAACrE,SAAS,EAAEc,QAAQ,CAAC+H,SAAS,CAAC,eAAe7H,WAAW,CAAC8H,IAAI,GAAG,CAAC;IAE5E,OAAO;MAAErC,YAAY;MAAEO,aAAa;MAAEO,kBAAkB;MAAES,qBAAqB;MAAED;IAAU,CAAC;EAC9F;EAEA,MAAMgB,SAASA,CAACC,WAAmB,EAAErI,OAA2B,EAAE;IAChE,IAAI,CAAC,IAAI,CAACX,SAAS,EAAE,MAAM,KAAIiJ,kCAAqB,EAAC,CAAC;IACtD,MAAMC,SAAS,GAAG,KAAI5C,wBAAU,EAAC,IAAI,CAACjG,KAAK,EAAE,IAAI,CAACL,SAAS,CAACc,QAAQ,EAAE,IAAI,CAACX,MAAM,CAAC;IAClF,MAAM+I,SAAS,CAACC,+BAA+B,CAAC,CAAC;IACjD,MAAMC,aAAa,GAAG,MAAM,IAAI,CAAClJ,KAAK,CAACmJ,UAAU,CAACL,WAAW,EAAE;MAAE3I,KAAK,EAAEM,OAAO,CAACN;IAAM,CAAC,CAAC;IACxF,OAAO+I,aAAa;EACtB;EAEA,MAAME,cAAcA,CAACC,aAA4B,EAAEC,cAA8B,EAAE;IACjF,IAAI,CAAC,IAAI,CAACxJ,SAAS,EAAE,MAAM,KAAIiJ,kCAAqB,EAAC,CAAC;IACtD,MAAMC,SAAS,GAAG,KAAI5C,wBAAU,EAAC,IAAI,CAACjG,KAAK,EAAE,IAAI,CAACL,SAAS,CAACc,QAAQ,EAAE,IAAI,CAACX,MAAM,CAAC;IAClF,MAAM4C,WAAW,GAAG,MAAM,IAAI,CAAC7C,KAAK,CAACuJ,cAAc,CAAC,CAAC;IACrD,MAAM;MAAEC;IAAiB,CAAC,GAAG,MAAMR,SAAS,CAACS,qBAAqB,CAACH,cAAc,EAAEzG,WAAW,CAAC;IAE/F,MAAM,IAAI,CAAC/C,SAAS,CAAC4J,eAAe,CAAC,CAAC;IAEtC,IAAI,CAAC5J,SAAS,CAACc,QAAQ,CAACT,KAAK,CAACwJ,OAAO,CAACC,kBAAkB,CAACC,mBAAmB,CAAC,CAAC;IAC9E,MAAM,IAAI,CAAC/J,SAAS,CAACc,QAAQ,CAACT,KAAK,CAACwJ,OAAO,CAACC,kBAAkB,CAACE,KAAK,CAAC,CAAC;IAEtE,MAAMC,eAAe,GAAG,IAAI,CAACjK,SAAS,CAACkK,oBAAoB,CAAC,CAAC;IAC7D,MAAMD,eAAe,CAACE,MAAM,CAAC,CAAC;IAE9B,IAAIC,eAAgD;IACpD,IAAIC,aAAgC;IACpCd,aAAa,CAACpG,GAAG,GAAG,IAAI,CAACnD,SAAS,CAAC+F,OAAO,CAAC,CAAC;IAC5CwD,aAAa,CAACe,wBAAwB,GAAG,IAAI;IAC7C,IAAI;MACFF,eAAe,GAAG,MAAM,IAAI,CAAC5J,QAAQ,CAACA,QAAQ,CAAC+I,aAAa,CAAC;IAC/D,CAAC,CAAC,OAAOgB,GAAQ,EAAE;MACjB,IAAI,CAACpK,MAAM,CAACqK,KAAK,CAAC,oDAAoD,EAAED,GAAG,CAAC;MAC5EF,aAAa,GAAGE,GAAG;IACrB;IAEA,MAAME,aAAa,GAAG,CACpB,GAAGC,eAAI,CAACC,QAAQ,CAAC,IAAI,CAAC3K,SAAS,CAACc,QAAQ,CAAC8J,MAAM,CAACC,OAAO,CAAC,OAAO,EAC/D,GAAGH,eAAI,CAACC,QAAQ,CAAC,IAAI,CAAC3K,SAAS,CAACc,QAAQ,CAAC0H,MAAM,CAACkC,IAAI,CAAC,OAAO,CAC7D;IACD,IAAIhB,gBAAgB,CAAC9K,MAAM,EAAE;MAC3B6L,aAAa,CAACjM,IAAI,CAAC,mCAAmCkL,gBAAgB,CAACoB,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;IACtF;IACA,IAAI/H,WAAW,EAAE;MACf0H,aAAa,CAACjM,IAAI,CAAC,GAAGuE,WAAW,CAACsB,EAAE,CAAC,CAAC,cAAc,CAAC;IACvD;IAEA,OAAO;MAAE+F,eAAe;MAAEK,aAAa;MAAEJ;IAAc,CAAC;EAC1D;EAEA,MAAcjH,iBAAiBA,CAACQ,IAAkB,EAAEmH,mBAAmB,GAAG,IAAI,EAAEC,uBAAuB,GAAG,KAAK,EAAE;IAC/G,IAAI,CAACpH,IAAI,EAAE,MAAM,IAAIgB,KAAK,CAAC,mBAAmBqG,sBAAY,kCAAkC,CAAC;IAC7F,MAAMC,OAAO,GAAGF,uBAAuB,GAAGpH,IAAI,CAACiB,qCAAqC,CAAC,CAAC,GAAGjB,IAAI,CAACkB,cAAc,CAAC,CAAC;IAC9G,MAAM3B,GAAG,GAAG+H,OAAO,CAAC7M,MAAM,CAAEgG,EAAE,IAAK,IAAI,CAAChE,KAAK,CAAC8K,UAAU,CAAC9G,EAAE,CAAC,CAAC;IAC7D,IAAI0G,mBAAmB,EAAE;MACvB,IAAI,CAAC,IAAI,CAAC/K,SAAS,EAAE;QACnB,MAAM,KAAIY,oBAAQ,EAAC,mCAAmC,CAAC;MACzD;MACA,MAAMkF,YAAY,GAAG,IAAI,CAAC9F,SAAS,CAAC+F,OAAO,CAAC,CAAC;MAC7C,MAAMqF,aAAa,GAAGtF,YAAY,CAACzH,MAAM,CACtCgG,EAAE,IAAK,CAAC6G,OAAO,CAACxF,IAAI,CAAE2F,MAAM,IAAKA,MAAM,CAAC1F,qBAAqB,CAACtB,EAAE,CAAC,CAAC,IAAI,IAAI,CAAChE,KAAK,CAAC8K,UAAU,CAAC9G,EAAE,CACjG,CAAC;MACDlB,GAAG,CAAC3E,IAAI,CAAC,GAAG4M,aAAa,CAAC;IAC5B;IACA,OAAOjI,GAAG;EACZ;EAEA,MAAMmI,cAAcA,CAClBC,QAAgB,EAChBC,MAAc,EACd7K,OAA0E,EAC3C;IAC/B,IAAI,IAAI,CAACX,SAAS,EAAE;MAClB,MAAM,KAAIY,oBAAQ,EAChB,mGACF,CAAC;IACH;IACA,MAAM6K,UAAU,GAAG,MAAM,IAAI,CAACvL,KAAK,CAACwL,WAAW,CAACH,QAAQ,CAAC;IACzD,MAAMI,QAAQ,GAAGH,MAAM,KAAKP,sBAAY,GAAG,IAAI,CAAC/K,KAAK,CAAC0L,gBAAgB,CAAC,CAAC,GAAGC,gBAAM,CAACC,KAAK,CAACN,MAAM,CAAC;IAC/F,MAAMpJ,6BAA6B,GAAGuJ,QAAQ,CAAClJ,SAAS,CAAC,CAAC;IAE1D,MAAMsJ,cAAc,GAAG,MAAAA,CAAOC,WAA0B,EAAEC,YAAmB,KAA6B;MACxG,IAAI,CAACtL,OAAO,CAACnC,IAAI,EAAE,OAAO,EAAE;MAC5B,MAAMyG,YAAY,GAAG0G,QAAQ,CAAClJ,SAAS,CAAC,CAAC,IAAI,CAAC9B,OAAO,CAACiB,QAAQ,CAAC,CAAC;MAChE,MAAMsK,WAAW,GAAG5I,8BAAe,CAACC,SAAS,CAACyI,WAAW,CAAC;MAC1D,MAAM;QAAEG;MAAS,CAAC,GAAG,MAAM,IAAI,CAAC7L,QAAQ,CAAC8L,UAAU,CAAC;QAClD/L,KAAK,EAAE,IAAI,CAACA,KAAK,CAACmC,WAAW;QAC7BW,GAAG,EAAE+I,WAAW;QAChBG,UAAU,EAAEJ,YAAY;QACxBK,WAAW,EAAE,KAAK;QAClB;QACA;QACA;QACA;QACA;QACAC,eAAe,EAAEtH,YAAY;QAC7B;QACA;QACA;QACA;QACA;QACA;QACAuH,yBAAyB,EAAEf,UAAU,CAAChJ,SAAS,CAAC,CAAC;QACjD;QACA;QACA;QACAgK,wBAAwB,EAAE,CAAChB,UAAU,CAAChJ,SAAS,CAAC,CAAC;QACjDiK,YAAY,EAAE;MAChB,CAAC,CAAC;MACF,OAAOP,QAAQ;IACjB,CAAC;;IAED;IACA;IACAxL,OAAO,CAACQ,aAAa,GAAG,QAAQ;IAChCR,OAAO,CAACwB,mBAAmB,GAAG,IAAI;IAClCxB,OAAO,CAACoB,0BAA0B,GAAG,IAAI;IACzCpB,OAAO,CAACyB,6BAA6B,GAAGA,6BAA6B;IACrEzB,OAAO,CAAC0B,kBAAkB,GAAG,CAACoJ,UAAU,CAAChJ,SAAS,CAAC,CAAC;IACpD9B,OAAO,CAAC2B,YAAY,GAAG,IAAI;IAC3B,IAAI,CAACjC,KAAK,CAACmC,WAAW,CAACmK,gBAAgB,CAAChB,QAAQ,CAAC;IAEjD,MAAM;MAAElF,YAAY;MAAEc,kBAAkB;MAAEQ,SAAS;MAAEC;IAAsB,CAAC,GAAG,MAAM,IAAI,CAAC9G,SAAS,CACjGuK,UAAU,EACVE,QAAQ,EACRhL,OACF,CAAC;IAED,MAAM;MAAE+G,gBAAgB;MAAEb,gBAAgB;MAAE+F;IAAe,CAAC,GAAGnG,YAAY;IAE3E,IAAIc,kBAAkB,CAAC3I,MAAM,EAAE;MAC7B,IAAI,CAACuB,MAAM,CAAC6E,KAAK,CACf,yCAAyCuC,kBAAkB,CACxDnD,GAAG,CAAEI,CAAC,IAAK,KAAKA,CAAC,CAACsD,SAAS,KAAKtD,CAAC,CAACqI,yBAAyB,CAAC,CAAC,EAAE,CAAC,CAChE/B,IAAI,CAAC,IAAI,CAAC,EACf,CAAC;IACH;IAEA,MAAMgC,UAAU,GAAGpF,gBAAgB,EAAEC,iBAAiB,CAACvD,GAAG,CAAEI,CAAC,IAAKA,CAAC,CAACH,EAAE,CAAC,IAAI,EAAE;IAE7E,MAAM4H,YAAY,GAAGN,QAAQ,CAAClJ,SAAS,CAAC,CAAC,GAAGO,SAAS,GAAG,MAAM,IAAI,CAAC9C,KAAK,CAAC+C,QAAQ,CAAC0I,QAAQ,CAAC,CAAC,CAAC;IAC7F,MAAMoB,WAAW,GACfhF,SAAS,CAACnJ,MAAM,IAAIgO,cAAc,GAC9B,EAAE,GACF,MAAMb,cAAc,CAClB/D,qBAAqB,CAAC5D,GAAG,CAAEC,EAAE,IAAKA,EAAE,CAACM,aAAa,CAAC3B,SAAS,CAAC,CAAC,EAC9DiJ,YACF,CAAC;IAEP,OAAO;MACLe,SAAS,EAAEhF,qBAAqB;MAChCiF,gBAAgB,EACdpG,gBAAgB,EACZxI,MAAM,CAAC,CAAC;QAAEwH;MAAiB,CAAC,KAAKA,gBAAgB,KAAKqH,iCAAsB,CAAC,CAC9E9I,GAAG,CAAEI,CAAC,IAAKA,CAAC,CAACH,EAAE,CAAC,IAAI,EAAE;MAC3B0I,WAAW;MACXI,QAAQ,EAAEtG,gBAAgB,EAAEzC,GAAG,CAAEI,CAAC,KAAM;QAAEH,EAAE,EAAEG,CAAC,CAACH,EAAE;QAAE+I,MAAM,EAAE5I,CAAC,CAACqB;MAAiB,CAAC,CAAC,CAAC,IAAI,EAAE;MACxFkC,SAAS;MACT+E,UAAU;MACVF;IACF,CAAC;EACH;EACA,MAAcvK,kBAAkBA,CAACoJ,UAAkB,EAAEE,QAAgB,EAAE;IACrE,MAAM0B,MAAM,GAAG,MAAM,IAAI,CAACnN,KAAK,CAACoN,UAAU,CAAC7B,UAAU,EAAEE,QAAQ,EAAE;MAAE4B,WAAW,EAAE;IAAK,CAAC,CAAC;IACvF,MAAMC,gBAAgB,GAAGH,MAAM,CAACI,gBAAgB,CAACpP,MAAM,CAAEqP,CAAC,IAAK,CAACA,CAAC,CAACC,QAAQ,CAAC;IAC3E,IAAIH,gBAAgB,CAAC5O,MAAM,EAAE;MAC3B,MAAM,IAAIgG,KAAK,CAAC;AACtB,EAAE4I,gBAAgB,CAACpJ,GAAG,CAAEsJ,CAAC,IAAKA,CAAC,CAACE,WAAW,CAAClL,QAAQ,CAAC,CAAC,CAAC,CAACoI,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;IACjE;EACF;EAkBA,aAAa+C,QAAQA,CAAC,CACpB3N,KAAK,EACL4N,GAAG,EACH9N,SAAS,EACTC,OAAO,EACP8N,UAAU,EACV3N,MAAM,EACNC,KAAK,EACLC,QAAQ,EACRC,QAAQ,EACRC,QAAQ,EACRwN,YAAY,CAab,EAAE;IACD,MAAM7N,MAAM,GAAG4N,UAAU,CAACE,YAAY,CAACC,8BAAgB,CAAC7J,EAAE,CAAC;IAC3D,MAAM8J,YAAY,GAAGL,GAAG,CAACM,UAAU,CAAC,MAAM,CAAC;IAC3C,MAAMC,cAAc,GAAG,IAAIvO,cAAc,CACvCE,SAAS,EACTC,OAAO,EACPC,KAAK,EACLC,MAAM,EACNC,MAAM,EACNC,KAAK,EACLC,QAAQ,EACRC,QAAQ,EACRC,QACF,CAAC;IACD2N,YAAY,EAAEG,QAAQ,EAAE9P,IAAI,CAAC,KAAI+P,yBAAY,EAACF,cAAc,EAAEL,YAAY,CAAC,CAAC;IAC5EG,YAAY,EAAEG,QAAQ,EAAE9P,IAAI,CAAC,KAAIgQ,+BAAiB,EAACH,cAAc,CAAC,CAAC;IACnEF,YAAY,EAAEG,QAAQ,EAAE9P,IAAI,CAAC,KAAIiQ,6BAAgB,EAACJ,cAAc,CAAC,CAAC;IAClEP,GAAG,CAACY,QAAQ,CAAC,KAAIC,2CAAqB,EAACN,cAAc,CAAC,CAAC;IACvD,OAAOA,cAAc;EACvB;AACF;AAACO,OAAA,CAAA9O,cAAA,GAAAA,cAAA;AAAAhB,eAAA,CA9eYgB,cAAc,WAkbV,EAAE;AAAAhB,eAAA,CAlbNgB,cAAc,kBAmbH,CACpB+O,oBAAW,EACXC,gBAAS,EACTC,4BAAe,EACfC,wBAAa,EACbC,sBAAY,EACZC,sBAAY,EACZC,oBAAW,EACXC,sBAAY,EACZC,0BAAc,EACdC,0BAAc,EACdC,kCAAkB,CACnB;AAAAzQ,eAAA,CA/bUgB,cAAc,aAgcR0P,kBAAW;AAgD9B,eAAehK,sBAAsBA,CACnCN,mBAA2C,EAC3CuK,aAA4B,EAC5BC,SAAwB,EACxBlN,WAAwB,EACxBV,WAAW,GAAG,KAAK,EACnBiC,SAAgB;AAAE;AAClBkB,YAAsB,EACW;EACjC,MAAM0K,iBAAiB,GAAGrM,8BAAe,CAACC,SAAS,CAACkM,aAAa,CAAC;EAClE,MAAMG,oBAAoB,GAAGF,SAAS,CAACrR,MAAM,CAAEoH,KAAK,IAAK,CAACkK,iBAAiB,CAACE,iBAAiB,CAACpK,KAAK,CAAC,CAAC;EACrG,MAAMqK,uBAA+C,GAAG,EAAE;EAC1D,MAAMC,SAAwB,GAAG,EAAE;EACnC,MAAMC,mBAAmB,GAAG,CAAC,CAAC;EAC9B,MAAMC,sBAAgC,GAAG,EAAE;EAE3C,MAAMC,oBAAoB,GAAG,MAAM,IAAAC,qBAAU,EAACV,aAAa,EAAE,MAAOW,MAAM,IAAK;IAC7E,MAAMC,UAAU,GAAGnL,mBAAmB,CAACQ,IAAI,CAAElB,CAAC,IAAKA,CAAC,CAACH,EAAE,CAACsB,qBAAqB,CAACyK,MAAM,CAAC,CAAC;IACtF,IAAI,CAACC,UAAU,EAAE;MACf,MAAM,IAAIzL,KAAK,CAAC,0CAA0CwL,MAAM,CAAC1N,QAAQ,CAAC,CAAC,sBAAsB,CAAC;IACpG;IACAoN,uBAAuB,CAACtR,IAAI,CAAC6R,UAAU,CAAC;IACxC,IAAIA,UAAU,CAACxK,gBAAgB,EAAE;MAC/B,OAAO7C,SAAS;IAClB;IACA,IAAI,CAACe,SAAS,EAAE;MACd;MACA,OAAOf,SAAS;IAClB;IACA,MAAM;MAAEsN;IAAY,CAAC,GAAGD,UAAU;IAClC,IAAI,CAACC,WAAW,EAAE;MAChB,MAAM,IAAI1L,KAAK,CAAC,0DAA0DwL,MAAM,CAAC1N,QAAQ,CAAC,CAAC,EAAE,CAAC;IAChG;IACA,IAAI6N,cAAqB,GAAGD,WAAW,CAACE,iBAAiB;IACzD,IAAI,CAACD,cAAc,CAAC3R,MAAM,EAAE;MAC1B,OAAOoE,SAAS;IAClB;IACA,MAAMyN,cAAc,GAAG,MAAMjO,WAAW,CAAC8B,iBAAiB,CAAC8L,MAAM,CAAC;IAClE,IAAInL,YAAY,EAAE;MAChB;MACA,MAAMyL,YAAY,GAAG3M,SAAS,GAAGA,SAAS,CAAC4M,YAAY,CAACP,MAAM,CAAC,EAAE3L,IAAI,GAAGgM,cAAc,CAAChM,IAAI;MAC3F,IAAI,CAACiM,YAAY,EAAE;QACjB,MAAM,IAAI9L,KAAK,CAAC,mDAAmDwL,MAAM,CAAC1N,QAAQ,CAAC,CAAC,EAAE,CAAC;MACzF;MACA6N,cAAc,GAAG,CAACG,YAAY,CAAC;IACjC;IAEA,OAAO;MAAEN,MAAM;MAAEG,cAAc;MAAEE;IAAe,CAAC;EACnD,CAAC,CAAC;;EAEF;EACA,MAAMG,QAAQ,GAAG,IAAArM,iBAAO,EAAC2L,oBAAoB,CAAC,CAC3C9L,GAAG,CAAEI,CAAC,IAAKA,CAAC,CAAC+L,cAAc,CAACnM,GAAG,CAAEyM,CAAC,IAAKrM,CAAC,CAAC4L,MAAM,CAACzL,aAAa,CAACkM,CAAC,CAACnO,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAC7EoO,IAAI,CAAC,CAAC;EACT,MAAMtO,WAAW,CAACuO,aAAa,CAACC,iBAAiB,CAAC1N,8BAAe,CAACC,SAAS,CAACqN,QAAQ,CAAC,EAAE;IACrFhN,IAAI,EAAEG,SAAS;IACfkN,KAAK,EAAE,IAAI;IACXC,qBAAqB,EAAE,KAAK;IAC5B9D,MAAM,EAAE;EACV,CAAC,CAAC;EAEF,MAAM,IAAA+C,qBAAU,EAAC,IAAA5L,iBAAO,EAAC2L,oBAAoB,CAAC,EAAE,OAAO;IAAEE,MAAM;IAAEG,cAAc;IAAEE;EAAe,CAAC,KAAK;IACpG,MAAM,IAAAN,qBAAU,EAACI,cAAc,EAAE,MAAOY,aAAa,IAAK;MACxD,MAAMC,UAAU,GAAG,MAAMX,cAAc,CAACY,WAAW,CAACF,aAAa,CAACzO,QAAQ,CAAC,CAAC,EAAEF,WAAW,CAACqH,OAAO,CAAC;MAClG,MAAMyH,aAAa,GAAGF,UAAU,CAACG,2BAA2B,CAAC,CAAC;MAC9D,MAAMC,uBAAuB,GAAGF,aAAa,CAACjT,MAAM,CAAEgG,EAAE,IACtDuL,oBAAoB,CAAClK,IAAI,CAAED,KAAK,IAAKA,KAAK,CAACE,qBAAqB,CAACtB,EAAE,CAAC,CACtE,CAAC;MACD,IAAI,CAACmN,uBAAuB,CAAC5S,MAAM,EAAE;QACnC;MACF;MACA,MAAM6S,UAAyB,GAAG,EAAE;MACpC,MAAMvN,OAAO,CAACC,GAAG,CACfqN,uBAAuB,CAACpN,GAAG,CAAC,MAAOsN,GAAG,IAAK;QACzC,MAAMC,QAAQ,GAAG,MAAMnP,WAAW,CAACoP,UAAU,CAACF,GAAG,EAAE3N,SAAS,CAAC;QAC7D,IAAI4N,QAAQ,EAAE;UACZF,UAAU,CAACjT,IAAI,CAACkT,GAAG,CAAC;QACtB;MACF,CAAC,CACH,CAAC;MACD,IAAI,CAACD,UAAU,CAAC7S,MAAM,EAAE;QACtB;MACF;MACA,IAAIkD,WAAW,EAAE;QACfiO,SAAS,CAACvR,IAAI,CAAC,GAAGiT,UAAU,CAAC;MAC/B,CAAC,MAAM;QACL,MAAMf,YAAY,GAAG3M,SAAS,GAAGA,SAAS,CAAC4M,YAAY,CAACP,MAAM,CAAC,EAAE3L,IAAI,GAAGgM,cAAc,CAAChM,IAAI;QAC3F,MAAMoN,aAAa,GAAGJ,UAAU,CAACrN,GAAG,CAAEsN,GAAG,IAAKA,GAAG,CAAChJ,sBAAsB,CAAC,CAAC,CAAC;QAC3E,IAAIgI,YAAY,EAAE/N,OAAO,CAACwO,aAAa,CAAC,EAAE;UACxCU,aAAa,CAAChT,OAAO,CAAE6S,GAAG,IAAK;YAC7B,CAAC1B,mBAAmB,CAAC0B,GAAG,CAAC,KAAK,EAAE,EAAElT,IAAI,CAAC4R,MAAM,CAAC1H,sBAAsB,CAAC,CAAC,CAAC;UACzE,CAAC,CAAC;QACJ,CAAC,MAAM;UACLuH,sBAAsB,CAACzR,IAAI,CAAC,GAAGqT,aAAa,CAAC;QAC/C;MACF;IACF,CAAC,CAAC;EACJ,CAAC,CAAC;EACF,IAAI5T,MAAM,CAACC,IAAI,CAAC8R,mBAAmB,CAAC,CAACpR,MAAM,IAAIqR,sBAAsB,CAACrR,MAAM,EAAE;IAC5E,MAAM,KAAIkT,0CAAmB,EAAC9B,mBAAmB,EAAE,IAAA+B,cAAI,EAAC9B,sBAAsB,CAAC,CAAC;EAClF;EAEA,IAAIF,SAAS,CAACnR,MAAM,EAAE;IACpB;IACA,MAAMoT,kBAAkB,GAAGjC,SAAS,CAAC3L,GAAG,CAAE6N,CAAC,IAAKA,CAAC,CAACtN,aAAa,CAAC3B,SAAS,CAAC,CAAC;IAC3E,MAAMkP,sBAAsB,GAAG5O,8BAAe,CAAC6O,aAAa,CAACH,kBAAkB,CAAC;IAChFE,sBAAsB,CAACrT,OAAO,CAAEwF,EAAE,IAAK;MACrC,MAAMgM,UAAU,GAAGnL,mBAAmB,CAACQ,IAAI,CAAElB,CAAC,IAAKA,CAAC,CAACH,EAAE,CAACsB,qBAAqB,CAACtB,EAAE,CAAC,CAAC;MAClF,IAAI,CAACgM,UAAU,EAAE;QACf,MAAM,IAAIzL,KAAK,CAAC,0CAA0CP,EAAE,CAAC3B,QAAQ,CAAC,CAAC,sBAAsB,CAAC;MAChG;MACAoN,uBAAuB,CAACtR,IAAI,CAAC6R,UAAU,CAAC;IAC1C,CAAC,CAAC;EACJ;EACA,OAAOP,uBAAuB;AAChC;AAEA,eAAesC,eAAeA,CAACpR,WAAmB,EAAE;EAClD,MAAMqR,QAAQ,GAAG,MAAM,IAAAC,6BAAW,EAAC,CAAC;EACpC,MAAMC,GAAG,GAAA7T,aAAA,CAAAA,aAAA,KACJ2T,QAAQ;IACXG,OAAO,EAAE,8BAA8BxR,WAAW,CAAC0B,QAAQ,CAAC,CAAC;EAAE,EAChE;EACD,OAAO6P,GAAG;AACZ;AAEA,eAAerM,WAAWA,CACxBD,mBAA2C,EAC3CpF,aAAqB,EACrBG,WAAmB,EACnBX,KAAkB,EAClBoS,IAAqD,GAAG,CAAC,CAAC,EAC1D;EACA,MAAMC,eAAe,GAAG7R,aAAa,CAACiI,IAAI;EAC1C,MAAMyJ,GAAG,GAAG,MAAMH,eAAe,CAACpR,WAAW,CAAC;EAE9C,MAAMkD,OAAO,CAACC,GAAG,CACf8B,mBAAmB,CAAC7B,GAAG,CAAC,OAAO;IAAEC,EAAE;IAAEiM,WAAW;IAAEqC;EAAmB,CAAC,KAAK;IACzE,IAAI,CAACrC,WAAW,EAAE;MAChB,MAAM,IAAI1L,KAAK,CAAC,iDAAiDP,EAAE,CAAC3B,QAAQ,CAAC,CAAC,EAAE,CAAC;IACnF;IAEA,MAAMkQ,YAAY,GAAG,MAAMC,aAAa,CACtCH,eAAe,EACf1R,WAAW,EACXqD,EAAE,EACFiM,WAAW,EACXiC,GAAG,EACHlS,KAAK,EACLsS,kBAAkB,EAClBF,IACF,CAAC;IACD,IAAIG,YAAY,EAAE;MAChBvS,KAAK,CAACwJ,OAAO,CAACiJ,GAAG,CAACF,YAAY,CAAC;MAC/B,MAAMnC,cAAc,GAAG,MAAMpQ,KAAK,CAACiE,iBAAiB,CAACD,EAAE,CAAC;MACxD,MAAM0O,cAAc,GAAG,MAAMtC,cAAc,CAACuC,2BAA2B,CAAC3S,KAAK,CAACwJ,OAAO,EAAE,CAAC+I,YAAY,CAAC,CAAC;MACtG,IAAIG,cAAc,EAAE1S,KAAK,CAACwJ,OAAO,CAACiJ,GAAG,CAACC,cAAc,CAAC;IACvD;EACF,CAAC,CACH,CAAC;AACH;;AAEA;AACA;AACA;AACA,eAAeF,aAAaA,CAC1BH,eAAuB,EACvB1R,WAAmB,EACnBqD,EAAe,EACfiM,WAA0B,EAC1BiC,GAAQ,EACRlS,KAAkB,EAClBsS,kBAA4B,EAC5BF,IAAqD,GAAG,CAAC,CAAC,EAC5B;EAC9B,MAAM;IAAEtM,YAAY;IAAE5D;EAAW,CAAC,GAAGkQ,IAAI;EACzC,MAAMxN,YAAY,GAAGA,CAAA,KAAM;IACzB,IAAIqL,WAAW,CAAC2C,UAAU,CAAC,CAAC,EAAE;MAC5B,IAAI1Q,UAAU,EAAE;QACd;QACA,OAAO,IAAI;MACb;MACA,MAAM,KAAI3B,oBAAQ,EAAC,4BAA4ByD,EAAE,CAAC3B,QAAQ,CAAC,CAAC;AAClE,2BACI1B,WAAW,CAAC8H,IAAI,qBACG4J,eAAe,8BAA8BA,eAAe,kBAAkB1R,WAAW,CAAC8H,IAAI;AACrH,yEAAyE9H,WAAW,CAAC8H,IAAI,GAAG,CAAC;IACzF;IACA,IAAIwH,WAAW,CAAC4C,aAAa,CAAC,CAAC,EAAE;MAC/B;MACA,OAAO,KAAK;IACd;IACA,IAAI,CAAC5C,WAAW,CAAC6C,aAAa,CAAC,CAAC,EAAE;MAChC;MACA,OAAO,KAAK;IACd;IACA,OAAO,IAAI;EACb,CAAC;EAED,IAAI,CAAClO,YAAY,CAAC,CAAC,EAAE;IACnB,OAAOjC,SAAS;EAClB;;EAEA;EACA,MAAMoQ,WAAW,GAAG9C,WAAW,CAACE,iBAAiB;EACjD,IAAI4C,WAAW,CAACxU,MAAM,KAAK,CAAC,EAAE;IAC5B,MAAM,IAAIgG,KAAK,CAAC,sDAAsD,CAAC;EACzE;EACA,MAAMyO,cAAc,GAAG,MAAAA,CAAA,KAAY;IACjC,IAAI,CAAClN,YAAY,EAAE,OAAO,EAAE;IAC5B,MAAM9F,KAAK,CAAC0Q,aAAa,CAACuC,iBAAiB,CAAC;MAAE,CAACtS,WAAW,CAACX,KAAK,GAAG+S,WAAW,CAAChP,GAAG,CAAEsJ,CAAC,IAAKA,CAAC,CAAChL,QAAQ,CAAC,CAAC;IAAE,CAAC,CAAC;IAC1G,MAAM6Q,cAAc,GAAI,MAAMrP,OAAO,CAACC,GAAG,CAACiP,WAAW,CAAChP,GAAG,CAAEsJ,CAAC,IAAKrN,KAAK,CAACwJ,OAAO,CAAC2J,IAAI,CAAC9F,CAAC,CAAC,CAAC,CAAe;IACtG,OAAO,IAAAnJ,iBAAO,EAACgP,cAAc,CAAC,CAACnP,GAAG,CAAEyM,CAAC,IAAKA,CAAC,CAAC0B,GAAG,CAACC,OAAO,CAAC;EAC1D,CAAC;EACD,MAAMiB,eAAe,GAAG,MAAAA,CAAA,KAAyC;IAC/D,IAAI,CAACtN,YAAY,EAAE,OAAOnD,SAAS;IACnC,MAAM0Q,UAAU,GAAG,MAAML,cAAc,CAAC,CAAC;IACzC,MAAMM,aAAa,GAAG,IAAApP,iBAAO,EAACmP,UAAU,CAAC,CACtCtP,GAAG,CAAEwP,CAAC,IAAK,OAAOA,CAAC,EAAE,CAAC,CACtB9I,IAAI,CAAC,IAAI,CAAC;IACb,OAAO,GAAG3E,YAAY,KAAKwN,aAAa,EAAE;EAC5C,CAAC;EACD,IAAI,CAAChB,kBAAkB,EAAE;IACvB,MAAM,IAAI/N,KAAK,CAAC,qDAAqD,CAAC;EACxE;EACA,MAAMiP,cAAc,GAAGlB,kBAAkB,CAACmB,OAAO;;EAEjD;EACA;EACA,IAAIV,WAAW,CAACxU,MAAM,KAAK,CAAC,IAAI0R,WAAW,CAACyD,uBAAuB,IAAIF,cAAc,CAACjV,MAAM,KAAK,CAAC,EAAE;IAClG,OAAOoE,SAAS;EAClB;EAEA,MAAMgR,QAAQ,GAAG,MAAAA,CAAA,KAAY;IAC3B,IAAI1D,WAAW,CAACyD,uBAAuB,EAAE;MACvCpB,kBAAkB,CAACsB,eAAe,CAAC3D,WAAW,CAACyD,uBAAuB,CAAC;MACvE;IACF;IACA,IAAIrB,eAAe,KAAKzH,sBAAY,EAAE;MACpC;MACA,MAAMwF,cAAc,GAAG,MAAMpQ,KAAK,CAAC6T,wBAAwB,CAAC7P,EAAE,CAAC;MAC/D,IAAI,CAACoM,cAAc,EAAE,MAAM,IAAI7L,KAAK,CAAC,8BAA8BP,EAAE,CAAC3B,QAAQ,CAAC,CAAC,EAAE,CAAC;MACnF,IAAI+N,cAAc,CAAChM,IAAI,EAAE;QACvBkO,kBAAkB,CAACsB,eAAe,CAACxD,cAAc,CAAChM,IAAI,CAAC;QACvD;MACF;IACF;IACA;IACAkO,kBAAkB,CAACmB,OAAO,CAACjV,OAAO,CAAEsV,GAAG,IAAKxB,kBAAkB,CAACyB,YAAY,CAACD,GAAG,CAAC,CAAC;EACnF,CAAC;EAED,MAAMH,QAAQ,CAAC,CAAC;EAEhB,MAAMK,YAAY,GAAG,MAAMZ,eAAe,CAAC,CAAC;EAC5Cd,kBAAkB,CAAC2B,WAAW,CAAC;IAAEC,eAAe,EAAEV,cAAc;IAAExI,MAAM,EAAErK;EAAY,CAAC,EAAEuR,GAAG,EAAE8B,YAAY,CAAC;EAC3G,OAAO1B,kBAAkB;AAC3B;AAEAzE,8BAAgB,CAACsG,UAAU,CAAC1U,cAAc,CAAC;AAAC,IAAA2U,QAAA,GAAA7F,OAAA,CAAA/Q,OAAA,GAE7BiC,cAAc","ignoreList":[]}
+{"version":3,"names":["_bitError","data","require","_path","_interopRequireDefault","_cli","_importer","_lanes","_merging","_workspace","_harmonyModules","_componentId","_pMapSeries","_scope","_laneId","_logger","_checkout","_remove","_lodash","_export","_globalConfig","_mergeLanes","_mergeLane","_mergeLaneFromScope","_missingCompsToMerge","_mergeAbort","_lastMerged","_mergeMove","_harmonyModules2","_express","_lanesCheckConflicts","e","__esModule","default","ownKeys","r","t","Object","keys","getOwnPropertySymbols","o","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","defineProperty","_toPropertyKey","value","configurable","writable","i","_toPrimitive","Symbol","toPrimitive","call","TypeError","String","Number","MergeLanesMain","constructor","workspace","merging","lanes","logger","remove","scope","exporter","importer","checkout","mergeLaneByCLI","laneName","options","BitError","currentLaneId","consumer","getCurrentLaneId","otherLaneId","getParsedLaneId","mergeLane","validateMergeFlags","currentLane","otherLane","laneToFetchArtifactsFrom","idsToMerge","resolveMergeContext","mergeStrategy","noAutoSnap","noSnap","tag","snapMessage","existingOnWorkspaceOnly","build","keepReadme","squash","noSquash","pattern","includeDeps","skipDependencyInstallation","resolveUnrelated","ignoreConfigChanges","throwIfNotUpToDate","detachHead","legacyScope","debug","toString","shouldSquash","isDefault","allComponentsStatus","getMergeStatus","handleTargetAheadAsDiverged","componentIds","compIdsFromPattern","filterIdsFromPoolIdsByPattern","filterComponentsStatus","bitId","find","c","id","isEqualWithoutVersion","unchangedLegitimately","unchangedMessage","workspaceIds","listIds","throwForFailures","succeededComponents","squashSnaps","messageTitle","ids","map","importHeadArtifactsFromLane","lastMerged","LastMerged","undefined","snapshot","takeSnapshot","mergeResults","mergeSnaps","persistSnapshot","mergedSuccessfully","failedComponents","every","failedComponent","deleteResults","readmeComponent","readmeComponentId","changeVersion","head","hash","removeLocallyByIds","reasonForRemoval","readmeResult","configMergeResults","compact","configMergeResult","mergedSnapIds","ComponentIdList","fromArray","mergeSnapResults","snappedComponents","componentsWithConfigConflicts","hasConflicts","compIdStr","conflicts","mergedSuccessfullyIds","components","files","filesStatus","f","FileStatus","manual","binaryConflict","config","includes","toStringWithoutVersion","snappedId","searchWithoutVersion","onDestroy","name","isEqual","isFeatureEnabled","DETACH_HEAD","skipFetch","excludeNonLaneComps","shouldIncludeUpdateDependents","fetchCurrent","fetchLaneWithItsComponents","loadLane","isDefaultLane","getMainIdsToMerge","compIdList","toVersionLatest","importObjectsFromMainIfExist","getOtherLane","lane","shouldFetch","isNew","getBitIds","modelComponents","Promise","all","getModelComponent","toComponentId","Error","toComponentIdsIncludeUpdateDependents","toComponentIds","checkLaneForConflicts","sourceLaneIdStr","targetLaneIdStr","parseLaneIdFromString","modifiedFiles","conflict","isBinaryConflict","filePath","mergeMove","newLaneName","OutsideWorkspaceError","lastMerge","restoreLaneObjectFromLastMerged","newLaneResult","createLane","abortLaneMerge","checkoutProps","mergeAbortOpts","getCurrentLane","compDirsToRemove","restoreFromLastMerged","_reloadConsumer","objects","unmergedComponents","removeAllComponents","write","configMergeFile","getConflictMergeFile","delete","checkoutResults","checkoutError","restoreMissingComponents","err","error","restoredItems","path","basename","bitMap","mapPath","join","includeNonLaneComps","includeUpdateDependents","DEFAULT_LANE","laneIds","isExported","mainNotOnLane","laneId","mergeFromScope","fromLane","toLane","fromLaneId","parseLaneId","toLaneId","getDefaultLaneId","LaneId","parse","exportIfNeeded","idsToExport","laneToExport","compIdsList","exported","exportMany","laneObject","allVersions","exportHeadsOnly","filterOutExistingVersions","throwForMissingArtifacts","exportOrigin","setCurrentLaneId","mergeSnapError","generateMergeConflictFile","snappedIds","exportedIds","mergedNow","mergedPreviously","compIsAlreadyMergedMsg","unmerged","reason","status","diffStatus","skipChanges","compsNotUpToDate","componentsStatus","s","upToDate","componentId","provider","cli","loggerMain","globalConfig","express","createLogger","MergeLanesAspect","lanesCommand","getCommand","mergeLanesMain","commands","MergeLaneCmd","MergeAbortLaneCmd","MergeMoveLaneCmd","register","MergeLaneFromScopeCmd","LanesCheckConflictsRoute","exports","LanesAspect","CLIAspect","WorkspaceAspect","MergingAspect","LoggerAspect","RemoveAspect","ScopeAspect","ExportAspect","ImporterAspect","CheckoutAspect","GlobalConfigAspect","ExpressAspect","MainRuntime","compIdsToKeep","allBitIds","bitIdsFromPattern","bitIdsNotFromPattern","hasWithoutVersion","filteredComponentStatus","depsToAdd","missingDepsFromHead","missingDepsFromHistory","versionsToCheckPerId","pMapSeries","compId","fromStatus","divergeData","targetVersions","snapsOnTargetOnly","modelComponent","headOnTarget","getComponent","toImport","v","flat","scopeImporter","importWithoutDeps","cache","includeVersionHistory","remoteVersion","versionObj","loadVersion","flattenedDeps","getAllFlattenedDependencies","depsNotIncludeInPattern","depsOnLane","dep","isOnLane","isIdOnLane","depsOnLaneStr","MissingCompsToMerge","uniq","depsWithoutVersion","d","depsUniqWithoutVersion","uniqFromArray","getLogForSquash","basicLog","getBasicLog","log","message","opts","currentLaneName","componentFromModel","modifiedComp","squashOneComp","add","versionHistory","updateRebasedVersionHistory","isDiverged","isSourceAhead","isTargetAhead","remoteSnaps","getAllMessages","importManyObjects","versionObjects","load","getFinalMessage","allMessage","allMessageStr","m","currentParents","parents","commonSnapBeforeDiverge","doSquash","addAsOnlyParent","getModelComponentIfExist","ref","removeParent","finalMessage","setSquashed","previousParents","addRuntime","_default"],"sources":["merge-lanes.main.runtime.ts"],"sourcesContent":["import { BitError } from '@teambit/bit-error';\nimport path from 'path';\nimport { CLIAspect, CLIMain, MainRuntime } from '@teambit/cli';\nimport { ImporterAspect, ImporterMain } from '@teambit/importer';\nimport { LanesAspect, LanesMain } from '@teambit/lanes';\nimport {\n  MergingAspect,\n  MergingMain,\n  ComponentMergeStatus,\n  ApplyVersionResults,\n  compIsAlreadyMergedMsg,\n  FileStatus,\n  MergeStrategy,\n} from '@teambit/merging';\nimport { WorkspaceAspect, OutsideWorkspaceError, Workspace } from '@teambit/workspace';\nimport { getBasicLog } from '@teambit/harmony.modules.get-basic-log';\nimport { ComponentID, ComponentIdList } from '@teambit/component-id';\nimport { Ref, Lane, Version, Log } from '@teambit/objects';\nimport pMapSeries from 'p-map-series';\nimport { Scope as LegacyScope } from '@teambit/legacy.scope';\nimport { ScopeAspect, ScopeMain } from '@teambit/scope';\nimport { DEFAULT_LANE, LaneId } from '@teambit/lane-id';\nimport { ConfigMergeResult } from '@teambit/config-merger';\nimport { Logger, LoggerAspect, LoggerMain } from '@teambit/logger';\nimport { CheckoutAspect, CheckoutMain, CheckoutProps, throwForFailures } from '@teambit/checkout';\nimport { SnapsDistance } from '@teambit/component.snap-distance';\nimport { RemoveAspect, RemoveMain } from '@teambit/remove';\nimport { compact, uniq } from 'lodash';\nimport { ExportAspect, ExportMain } from '@teambit/export';\nimport { GlobalConfigAspect, GlobalConfigMain } from '@teambit/global-config';\nimport { MergeLanesAspect } from './merge-lanes.aspect';\nimport { MergeLaneCmd } from './merge-lane.cmd';\nimport { MergeLaneFromScopeCmd } from './merge-lane-from-scope.cmd';\nimport { MissingCompsToMerge } from './exceptions/missing-comps-to-merge';\nimport { MergeAbortLaneCmd, MergeAbortOpts } from './merge-abort.cmd';\nimport { LastMerged } from './last-merged';\nimport { MergeMoveLaneCmd } from './merge-move.cmd';\nimport { DETACH_HEAD, isFeatureEnabled } from '@teambit/harmony.modules.feature-toggle';\nimport { ExpressAspect, ExpressMain } from '@teambit/express';\nimport { LanesCheckConflictsRoute } from './lanes-check-conflicts.route';\n\nexport type MergeLaneOptions = {\n  mergeStrategy: MergeStrategy;\n  ours?: boolean;\n  theirs?: boolean;\n  noAutoSnap?: boolean;\n  noSnap?: boolean;\n  snapMessage?: string;\n  existingOnWorkspaceOnly?: boolean;\n  build?: boolean;\n  keepReadme?: boolean;\n  squash?: boolean;\n  noSquash?: boolean;\n  tag?: boolean;\n  pattern?: string;\n  includeDeps?: boolean;\n  skipDependencyInstallation?: boolean;\n  resolveUnrelated?: MergeStrategy;\n  ignoreConfigChanges?: boolean;\n  skipFetch?: boolean;\n  excludeNonLaneComps?: boolean;\n  shouldIncludeUpdateDependents?: boolean;\n  throwIfNotUpToDate?: boolean; // relevant when merging from a scope\n  fetchCurrent?: boolean; // needed when merging from a bare-scope (because it's empty)\n  detachHead?: boolean;\n};\nexport type ConflictPerId = { id: ComponentID; files: string[]; config?: boolean };\nexport type MergeFromScopeResult = {\n  mergedNow: ComponentID[];\n  exportedIds: ComponentID[];\n  unmerged: { id: ComponentID; reason: string }[]; // reasons currently are: ahead / already-merge / removed\n  conflicts?: ConflictPerId[]; // relevant in case of diverge (currently possible only when merging from main to a lane)\n  snappedIds?: ComponentID[]; // relevant in case of diverge (currently possible only when merging from main to a lane)\n  mergedPreviously: ComponentID[];\n  mergeSnapError?: Error;\n};\n\nexport class MergeLanesMain {\n  constructor(\n    private workspace: Workspace | undefined,\n    private merging: MergingMain,\n    readonly lanes: LanesMain,\n    readonly logger: Logger,\n    private remove: RemoveMain,\n    private scope: ScopeMain,\n    private exporter: ExportMain,\n    private importer: ImporterMain,\n    private checkout: CheckoutMain\n  ) {}\n\n  async mergeLaneByCLI(laneName: string, options: MergeLaneOptions) {\n    if (!this.workspace) {\n      throw new BitError(`unable to merge a lane outside of Bit workspace`);\n    }\n    const currentLaneId = this.workspace.consumer.getCurrentLaneId();\n    const otherLaneId = await this.workspace.consumer.getParsedLaneId(laneName);\n    return this.mergeLane(otherLaneId, currentLaneId, options);\n  }\n\n  /**\n   * merge otherLaneId into currentLaneId\n   */\n  async mergeLane(\n    otherLaneId: LaneId,\n    currentLaneId: LaneId,\n    options: MergeLaneOptions\n  ): Promise<{\n    mergeResults: ApplyVersionResults;\n    deleteResults: any;\n    configMergeResults: ConfigMergeResult[];\n    mergedSuccessfullyIds: ComponentID[];\n    conflicts: ConflictPerId[];\n  }> {\n    this.validateMergeFlags(otherLaneId, currentLaneId, options);\n    const { currentLane, otherLane, laneToFetchArtifactsFrom, idsToMerge } = await this.resolveMergeContext(\n      otherLaneId,\n      currentLaneId,\n      options\n    );\n\n    const {\n      mergeStrategy,\n      noAutoSnap,\n      noSnap,\n      tag,\n      snapMessage,\n      existingOnWorkspaceOnly,\n      build,\n      keepReadme,\n      squash,\n      noSquash,\n      pattern,\n      includeDeps,\n      skipDependencyInstallation,\n      resolveUnrelated,\n      ignoreConfigChanges,\n      throwIfNotUpToDate,\n      detachHead,\n    } = options;\n    const legacyScope = this.scope.legacyScope;\n    const consumer = this.workspace?.consumer;\n\n    if (throwIfNotUpToDate) await this.throwIfNotUpToDate(otherLaneId, currentLaneId);\n\n    this.logger.debug(`merging the following ids: ${idsToMerge.toString()}`);\n\n    const shouldSquash = squash || (currentLaneId.isDefault() && !noSquash);\n    let allComponentsStatus = await this.merging.getMergeStatus(\n      idsToMerge,\n      {\n        resolveUnrelated,\n        ignoreConfigChanges,\n        shouldSquash,\n        mergeStrategy,\n        handleTargetAheadAsDiverged: noSnap,\n        detachHead,\n      },\n      currentLane,\n      otherLane\n    );\n\n    if (pattern) {\n      const componentIds = idsToMerge;\n      const compIdsFromPattern = await (this.workspace || this.scope).filterIdsFromPoolIdsByPattern(\n        pattern,\n        componentIds\n      );\n      allComponentsStatus = await filterComponentsStatus(\n        allComponentsStatus,\n        compIdsFromPattern,\n        idsToMerge,\n        legacyScope,\n        includeDeps,\n        otherLane,\n        shouldSquash\n      );\n      idsToMerge.forEach((bitId) => {\n        if (!allComponentsStatus.find((c) => c.id.isEqualWithoutVersion(bitId))) {\n          allComponentsStatus.push({ id: bitId, unchangedLegitimately: true, unchangedMessage: `excluded by pattern` });\n        }\n      });\n    }\n    if (existingOnWorkspaceOnly && this.workspace) {\n      const workspaceIds = this.workspace.listIds();\n      const compIdsFromPattern = workspaceIds.filter((id) =>\n        allComponentsStatus.find((c) => c.id.isEqualWithoutVersion(id))\n      );\n      allComponentsStatus = await filterComponentsStatus(\n        allComponentsStatus,\n        compIdsFromPattern,\n        idsToMerge,\n        legacyScope,\n        includeDeps,\n        otherLane,\n        shouldSquash\n      );\n      idsToMerge.forEach((bitId) => {\n        if (!allComponentsStatus.find((c) => c.id.isEqualWithoutVersion(bitId))) {\n          allComponentsStatus.push({\n            id: bitId,\n            unchangedLegitimately: true,\n            unchangedMessage: `not in the workspace`,\n          });\n        }\n      });\n    }\n\n    throwForFailures(allComponentsStatus);\n\n    const succeededComponents = allComponentsStatus.filter((c) => !c.unchangedMessage);\n    if (shouldSquash) {\n      await squashSnaps(succeededComponents, currentLaneId, otherLaneId, legacyScope, {\n        messageTitle: options.snapMessage,\n        detachHead,\n      });\n    }\n\n    if (laneToFetchArtifactsFrom) {\n      const ids = allComponentsStatus.map((c) => c.id);\n      await this.importer.importHeadArtifactsFromLane(laneToFetchArtifactsFrom, ids, true);\n    }\n\n    const lastMerged = consumer ? new LastMerged(this.scope, consumer, this.logger) : undefined;\n    const snapshot = await lastMerged?.takeSnapshot(currentLane);\n\n    const mergeResults = await this.merging.mergeSnaps({\n      mergeStrategy,\n      allComponentsStatus,\n      otherLaneId,\n      currentLane,\n      noAutoSnap,\n      noSnap,\n      tag,\n      snapMessage,\n      build,\n      skipDependencyInstallation,\n      detachHead,\n    });\n\n    if (snapshot) await lastMerged?.persistSnapshot(snapshot);\n\n    const mergedSuccessfully =\n      !mergeResults.failedComponents ||\n      mergeResults.failedComponents.length === 0 ||\n      mergeResults.failedComponents.every((failedComponent) => failedComponent.unchangedLegitimately);\n\n    let deleteResults = {};\n\n    if (!keepReadme && otherLane && otherLane.readmeComponent && mergedSuccessfully) {\n      const readmeComponentId = otherLane.readmeComponent.id.changeVersion(otherLane.readmeComponent?.head?.hash);\n      deleteResults = await this.remove.removeLocallyByIds([readmeComponentId], { reasonForRemoval: 'lane-merge' });\n    } else if (otherLane && !otherLane.readmeComponent) {\n      deleteResults = { readmeResult: '' };\n    }\n    const configMergeResults = compact(allComponentsStatus.map((c) => c.configMergeResult));\n\n    const mergedSnapIds = ComponentIdList.fromArray(\n      mergeResults.mergeSnapResults?.snappedComponents.map((c) => c.id) || []\n    );\n    const componentsWithConfigConflicts = configMergeResults.filter((c) => c.hasConflicts()).map((c) => c.compIdStr);\n    const conflicts: ConflictPerId[] = [];\n    const mergedSuccessfullyIds: ComponentID[] = [];\n    mergeResults.components?.forEach((c) => {\n      const files = Object.keys(c.filesStatus).filter(\n        (f) => c.filesStatus[f] === FileStatus.manual || c.filesStatus[f] === FileStatus.binaryConflict\n      );\n      const config = componentsWithConfigConflicts.includes(c.id.toStringWithoutVersion());\n      if (files.length || config) {\n        conflicts.push({ id: c.id, files, config });\n      } else {\n        const snappedId = mergedSnapIds.searchWithoutVersion(c.id);\n        mergedSuccessfullyIds.push(snappedId || c.id);\n      }\n    });\n\n    await this.workspace?.consumer.onDestroy(`lane-merge (${otherLaneId.name})`);\n\n    return { mergeResults, deleteResults, configMergeResults, mergedSuccessfullyIds, conflicts };\n  }\n\n  private validateMergeFlags(otherLaneId: LaneId,\n    currentLaneId: LaneId,\n    options: MergeLaneOptions\n  ) {\n    const {\n      tag,\n      resolveUnrelated,\n      detachHead,\n    } = options;\n\n    if (tag && !currentLaneId.isDefault()) {\n      throw new BitError(`--tag only possible when on main. currently checked out to ${currentLaneId.toString()}`);\n    }\n    if (otherLaneId.isEqual(currentLaneId)) {\n      throw new BitError(\n        `unable to merge lane \"${otherLaneId.toString()}\", you're already at this lane. to get updates, simply run \"bit checkout head\"`\n      );\n    }\n    if (resolveUnrelated && currentLaneId.isDefault()) {\n      throw new BitError(\n        `unable to resolve unrelated when on main. switch to ${otherLaneId.toString()} and run \"bit lane merge main --resolve-unrelated\"`\n      );\n    }\n    if (detachHead && !isFeatureEnabled(DETACH_HEAD)) {\n      throw new BitError(`unable to detach head. the feature is not enabled`);\n    }\n    if (detachHead && !currentLaneId.isDefault()) {\n      throw new BitError(`unable to detach head. the current lane is not main`);\n    }\n  }\n\n  private async resolveMergeContext(\n    otherLaneId: LaneId,\n    currentLaneId: LaneId,\n    options: Partial<MergeLaneOptions>\n  ) {\n    const {\n      skipFetch,\n      excludeNonLaneComps,\n      shouldIncludeUpdateDependents,\n      fetchCurrent,\n    } = options;\n    const legacyScope = this.scope.legacyScope;\n    if (fetchCurrent && !currentLaneId.isDefault()) {\n      // if current is default, it'll be fetch later on\n      await this.lanes.fetchLaneWithItsComponents(currentLaneId);\n    }\n    const currentLane = currentLaneId.isDefault() ? undefined : await legacyScope.loadLane(currentLaneId);\n    const isDefaultLane = otherLaneId.isDefault();\n    if (isDefaultLane) {\n      if (!skipFetch) {\n        const ids = await this.getMainIdsToMerge(currentLane, !excludeNonLaneComps);\n        const compIdList = ComponentIdList.fromArray(ids).toVersionLatest();\n        await this.importer.importObjectsFromMainIfExist(compIdList);\n      }\n    }\n    let laneToFetchArtifactsFrom: Lane | undefined;\n    const getOtherLane = async () => {\n      let lane = await legacyScope.loadLane(otherLaneId);\n      const shouldFetch = !lane || (!skipFetch && !lane.isNew);\n      if (shouldFetch) {\n        // don't assign `lane` to the result of this command. otherwise, if you have local snaps, it'll ignore them and use the remote-lane.\n        const otherLane = await this.lanes.fetchLaneWithItsComponents(otherLaneId, shouldIncludeUpdateDependents);\n        laneToFetchArtifactsFrom = otherLane;\n        lane = await legacyScope.loadLane(otherLaneId);\n      }\n      return lane;\n    };\n    const otherLane = isDefaultLane ? undefined : await getOtherLane();\n    if (fetchCurrent && otherLane && currentLaneId.isDefault()) {\n      const ids = await this.getMainIdsToMerge(otherLane, false, shouldIncludeUpdateDependents);\n      const compIdList = ComponentIdList.fromArray(ids).toVersionLatest();\n      await this.importer.importObjectsFromMainIfExist(compIdList);\n    }\n    const getBitIds = async () => {\n      if (isDefaultLane) {\n        const ids = await this.getMainIdsToMerge(currentLane, !excludeNonLaneComps, shouldIncludeUpdateDependents);\n        const modelComponents = await Promise.all(ids.map((id) => this.scope.legacyScope.getModelComponent(id)));\n        return compact(\n          modelComponents.map((c) => {\n            if (!c.head) return null; // probably the component was never merged to main\n            return c.toComponentId().changeVersion(c.head.toString());\n          })\n        );\n      }\n      if (!otherLane) throw new Error(`lane must be defined for non-default`);\n      return shouldIncludeUpdateDependents\n        ? otherLane.toComponentIdsIncludeUpdateDependents()\n        : otherLane.toComponentIds();\n    };\n    const idsToMerge = await getBitIds();\n\n    return {\n      currentLane,\n      otherLane,\n      laneToFetchArtifactsFrom,\n      idsToMerge,\n    }\n  }\n\n  /**\n   * check conflicts in case of merging sourceLaneId into targetLaneId\n   */\n  async checkLaneForConflicts(\n    sourceLaneIdStr: string,\n    targetLaneIdStr: string,\n    options: Partial<MergeLaneOptions>\n  ): Promise<{\n    conflicts: ConflictPerId[];\n  }> {\n    const legacyScope = this.scope.legacyScope;\n    const otherLaneId: LaneId = await legacyScope.lanes.parseLaneIdFromString(sourceLaneIdStr);\n    const currentLaneId: LaneId = await legacyScope.lanes.parseLaneIdFromString(targetLaneIdStr);\n    options.excludeNonLaneComps = true;\n    const { currentLane, otherLane, idsToMerge } = await this.resolveMergeContext(\n      otherLaneId,\n      currentLaneId,\n      options\n    );\n\n    const allComponentsStatus = await this.merging.getMergeStatus(\n      idsToMerge,\n      {\n        mergeStrategy: 'manual',\n      },\n      currentLane,\n      otherLane\n    );\n\n    throwForFailures(allComponentsStatus);\n\n    const configMergeResults = compact(allComponentsStatus.map((c) => c.configMergeResult));\n    const componentsWithConfigConflicts = configMergeResults.filter((c) => c.hasConflicts()).map((c) => c.compIdStr);\n    const conflicts: ConflictPerId[] = [];\n    allComponentsStatus.forEach((c) => {\n      const files = c.mergeResults?.modifiedFiles.filter((f) => f.conflict || f.isBinaryConflict) || [];\n      const config = componentsWithConfigConflicts.includes(c.id.toStringWithoutVersion());\n      if (files.length || config) {\n        conflicts.push({ id: c.id, files: files.map(f => f.filePath), config });\n      }\n    });\n\n    return { conflicts };\n  }\n\n  async mergeMove(newLaneName: string, options: { scope?: string }) {\n    if (!this.workspace) throw new OutsideWorkspaceError();\n    const lastMerge = new LastMerged(this.scope, this.workspace.consumer, this.logger);\n    await lastMerge.restoreLaneObjectFromLastMerged();\n    const newLaneResult = await this.lanes.createLane(newLaneName, { scope: options.scope });\n    return newLaneResult;\n  }\n\n  async abortLaneMerge(checkoutProps: CheckoutProps, mergeAbortOpts: MergeAbortOpts) {\n    if (!this.workspace) throw new OutsideWorkspaceError();\n    const lastMerge = new LastMerged(this.scope, this.workspace.consumer, this.logger);\n    const currentLane = await this.lanes.getCurrentLane();\n    const { compDirsToRemove } = await lastMerge.restoreFromLastMerged(mergeAbortOpts, currentLane);\n\n    await this.workspace._reloadConsumer();\n\n    this.workspace.consumer.scope.objects.unmergedComponents.removeAllComponents();\n    await this.workspace.consumer.scope.objects.unmergedComponents.write();\n\n    const configMergeFile = this.workspace.getConflictMergeFile();\n    await configMergeFile.delete();\n\n    let checkoutResults: ApplyVersionResults | undefined;\n    let checkoutError: Error | undefined;\n    checkoutProps.ids = this.workspace.listIds();\n    checkoutProps.restoreMissingComponents = true;\n    try {\n      checkoutResults = await this.checkout.checkout(checkoutProps);\n    } catch (err: any) {\n      this.logger.error(`merge-abort got an error during the checkout stage`, err);\n      checkoutError = err;\n    }\n\n    const restoredItems = [\n      `${path.basename(this.workspace.consumer.bitMap.mapPath)} file`,\n      `${path.basename(this.workspace.consumer.config.path)} file`,\n    ];\n    if (compDirsToRemove.length) {\n      restoredItems.push(`deleted components directories: ${compDirsToRemove.join(', ')}`);\n    }\n    if (currentLane) {\n      restoredItems.push(`${currentLane.id()} lane object`);\n    }\n\n    return { checkoutResults, restoredItems, checkoutError };\n  }\n\n  private async getMainIdsToMerge(lane?: Lane | null, includeNonLaneComps = true, includeUpdateDependents = false) {\n    if (!lane) throw new Error(`unable to merge ${DEFAULT_LANE}, the current lane was not found`);\n    const laneIds = includeUpdateDependents ? lane.toComponentIdsIncludeUpdateDependents() : lane.toComponentIds();\n    const ids = laneIds.filter((id) => this.scope.isExported(id));\n    if (includeNonLaneComps) {\n      if (!this.workspace) {\n        throw new BitError(`getMainIdsToMerge needs workspace`);\n      }\n      const workspaceIds = this.workspace.listIds();\n      const mainNotOnLane = workspaceIds.filter(\n        (id) => !laneIds.find((laneId) => laneId.isEqualWithoutVersion(id)) && this.scope.isExported(id)\n      );\n      ids.push(...mainNotOnLane);\n    }\n    return ids;\n  }\n\n  async mergeFromScope(\n    fromLane: string,\n    toLane: string,\n    options: Partial<MergeLaneOptions> & { push?: boolean; reMerge?: boolean }\n  ): Promise<MergeFromScopeResult> {\n    if (this.workspace) {\n      throw new BitError(\n        `unable to run this command from a workspace, please create a new bare-scope and run it from there`\n      );\n    }\n    const fromLaneId = await this.lanes.parseLaneId(fromLane);\n    const toLaneId = toLane === DEFAULT_LANE ? this.lanes.getDefaultLaneId() : LaneId.parse(toLane);\n    const shouldIncludeUpdateDependents = toLaneId.isDefault();\n\n    const exportIfNeeded = async (idsToExport: ComponentID[], laneToExport?: Lane): Promise<ComponentID[]> => {\n      if (!options.push) return [];\n      const shouldSquash = toLaneId.isDefault() && !options.noSquash; // only when merging to main we squash.\n      const compIdsList = ComponentIdList.fromArray(idsToExport);\n      const { exported } = await this.exporter.exportMany({\n        scope: this.scope.legacyScope,\n        ids: compIdsList,\n        laneObject: laneToExport,\n        allVersions: false,\n        // no need to export anything else other than the head. the normal calculation of what to export won't apply here\n        // as it is done from the scope.\n        // @todo: if we merge main to a lane, then no need to export all main history, it'll be fetched later by fetchMissingHistory.\n        // once a change is done in the exporter about this, uncomment the next line.\n        // exportHeadsOnly: shouldSquash || fromLaneId.isDefault(),\n        exportHeadsOnly: shouldSquash,\n        // when merging main into a lane, because `shouldSquash` is false, we don't export head only, but all the snaps\n        // in between. chances are that a) many of them are already exported, b) those that are not head, are not in\n        // the local bare-scope, so trying to export them result in VersionNotFoundOnFS error.\n        // it's best to filter them out before.\n        // there is no risk of leaving modified Version objects behind, because when merging main into a lane, we don't\n        // squash, so the Version objects are not modified.\n        filterOutExistingVersions: fromLaneId.isDefault(),\n        // all artifacts must be pushed. otherwise, they'll be missing from the component-scopes.\n        // unless this is a merge from main to a lane, in which case it's not necessary to export the artifacts as\n        // the user importing them will get them from main.\n        throwForMissingArtifacts: !fromLaneId.isDefault(),\n        exportOrigin: 'lane-merge',\n      });\n      return exported;\n    };\n\n    // current -> target (to)\n    // other -> source (from)\n    options.mergeStrategy = 'manual';\n    options.excludeNonLaneComps = true;\n    options.skipDependencyInstallation = true;\n    options.shouldIncludeUpdateDependents = shouldIncludeUpdateDependents;\n    options.throwIfNotUpToDate = !fromLaneId.isDefault();\n    options.fetchCurrent = true;\n    this.scope.legacyScope.setCurrentLaneId(toLaneId);\n\n    const { mergeResults, configMergeResults, conflicts, mergedSuccessfullyIds } = await this.mergeLane(\n      fromLaneId,\n      toLaneId,\n      options as MergeLaneOptions\n    );\n\n    const { mergeSnapResults, failedComponents, mergeSnapError } = mergeResults;\n\n    if (configMergeResults.length) {\n      this.logger.debug(\n        `found the following config conflicts: ${configMergeResults\n          .map((c) => `\\n${c.compIdStr}\\n${c.generateMergeConflictFile()}`)\n          .join('\\n')}`\n      );\n    }\n\n    const snappedIds = mergeSnapResults?.snappedComponents.map((c) => c.id) || [];\n\n    const laneToExport = toLaneId.isDefault() ? undefined : await this.lanes.loadLane(toLaneId); // needs to be loaded again after the merge as it changed\n    const exportedIds =\n      conflicts.length || mergeSnapError\n        ? []\n        : await exportIfNeeded(\n            mergedSuccessfullyIds.map((id) => id.changeVersion(undefined)),\n            laneToExport\n          );\n\n    return {\n      mergedNow: mergedSuccessfullyIds,\n      mergedPreviously:\n        failedComponents\n          ?.filter(({ unchangedMessage }) => unchangedMessage === compIsAlreadyMergedMsg)\n          .map((c) => c.id) || [],\n      exportedIds,\n      unmerged: failedComponents?.map((c) => ({ id: c.id, reason: c.unchangedMessage })) || [],\n      conflicts,\n      snappedIds,\n      mergeSnapError,\n    };\n  }\n  private async throwIfNotUpToDate(fromLaneId: LaneId, toLaneId: LaneId) {\n    const status = await this.lanes.diffStatus(fromLaneId, toLaneId, { skipChanges: true });\n    const compsNotUpToDate = status.componentsStatus.filter((s) => !s.upToDate);\n    if (compsNotUpToDate.length) {\n      throw new Error(`unable to merge, the following components are not up-to-date:\n${compsNotUpToDate.map((s) => s.componentId.toString()).join('\\n')}`);\n    }\n  }\n\n  static slots = [];\n  static dependencies = [\n    LanesAspect,\n    CLIAspect,\n    WorkspaceAspect,\n    MergingAspect,\n    LoggerAspect,\n    RemoveAspect,\n    ScopeAspect,\n    ExportAspect,\n    ImporterAspect,\n    CheckoutAspect,\n    GlobalConfigAspect,\n    ExpressAspect,\n  ];\n  static runtime = MainRuntime;\n\n  static async provider([\n    lanes,\n    cli,\n    workspace,\n    merging,\n    loggerMain,\n    remove,\n    scope,\n    exporter,\n    importer,\n    checkout,\n    globalConfig,\n    express,\n  ]: [\n    LanesMain,\n    CLIMain,\n    Workspace,\n    MergingMain,\n    LoggerMain,\n    RemoveMain,\n    ScopeMain,\n    ExportMain,\n    ImporterMain,\n    CheckoutMain,\n    GlobalConfigMain,\n    ExpressMain,\n  ]) {\n    const logger = loggerMain.createLogger(MergeLanesAspect.id);\n    const lanesCommand = cli.getCommand('lane');\n    const mergeLanesMain = new MergeLanesMain(\n      workspace,\n      merging,\n      lanes,\n      logger,\n      remove,\n      scope,\n      exporter,\n      importer,\n      checkout\n    );\n    lanesCommand?.commands?.push(new MergeLaneCmd(mergeLanesMain, globalConfig));\n    lanesCommand?.commands?.push(new MergeAbortLaneCmd(mergeLanesMain));\n    lanesCommand?.commands?.push(new MergeMoveLaneCmd(mergeLanesMain));\n    cli.register(new MergeLaneFromScopeCmd(mergeLanesMain));\n    express.register([new LanesCheckConflictsRoute(mergeLanesMain, logger)]);\n    return mergeLanesMain;\n  }\n}\n\nasync function filterComponentsStatus(\n  allComponentsStatus: ComponentMergeStatus[],\n  compIdsToKeep: ComponentID[],\n  allBitIds: ComponentID[],\n  legacyScope: LegacyScope,\n  includeDeps = false,\n  otherLane?: Lane, // lane that gets merged into the current lane. if not provided, it's main that gets merged into the current lane\n  shouldSquash?: boolean\n): Promise<ComponentMergeStatus[]> {\n  const bitIdsFromPattern = ComponentIdList.fromArray(compIdsToKeep);\n  const bitIdsNotFromPattern = allBitIds.filter((bitId) => !bitIdsFromPattern.hasWithoutVersion(bitId));\n  const filteredComponentStatus: ComponentMergeStatus[] = [];\n  const depsToAdd: ComponentID[] = [];\n  const missingDepsFromHead = {};\n  const missingDepsFromHistory: string[] = [];\n\n  const versionsToCheckPerId = await pMapSeries(compIdsToKeep, async (compId) => {\n    const fromStatus = allComponentsStatus.find((c) => c.id.isEqualWithoutVersion(compId));\n    if (!fromStatus) {\n      throw new Error(`filterComponentsStatus: unable to find ${compId.toString()} in component-status`);\n    }\n    filteredComponentStatus.push(fromStatus);\n    if (fromStatus.unchangedMessage) {\n      return undefined;\n    }\n    if (!otherLane) {\n      // if merging main, no need to check whether the deps are included in the pattern.\n      return undefined;\n    }\n    const { divergeData } = fromStatus;\n    if (!divergeData) {\n      throw new Error(`filterComponentsStatus: unable to find divergeData for ${compId.toString()}`);\n    }\n    let targetVersions: Ref[] = divergeData.snapsOnTargetOnly;\n    if (!targetVersions.length) {\n      return undefined;\n    }\n    const modelComponent = await legacyScope.getModelComponent(compId);\n    if (shouldSquash) {\n      // no need to check all versions, we merge only the head\n      const headOnTarget = otherLane ? otherLane.getComponent(compId)?.head : modelComponent.head;\n      if (!headOnTarget) {\n        throw new Error(`filterComponentsStatus: unable to find head for ${compId.toString()}`);\n      }\n      targetVersions = [headOnTarget];\n    }\n\n    return { compId, targetVersions, modelComponent };\n  });\n\n  // all these versions needs to be imported to load them later and check whether they have dependencies on the target lane\n  const toImport = compact(versionsToCheckPerId)\n    .map((c) => c.targetVersions.map((v) => c.compId.changeVersion(v.toString())))\n    .flat();\n  await legacyScope.scopeImporter.importWithoutDeps(ComponentIdList.fromArray(toImport), {\n    lane: otherLane,\n    cache: true,\n    includeVersionHistory: false,\n    reason: 'import all history of given patterns components to check whether they have dependencies on the lane',\n  });\n\n  await pMapSeries(compact(versionsToCheckPerId), async ({ compId, targetVersions, modelComponent }) => {\n    await pMapSeries(targetVersions, async (remoteVersion) => {\n      const versionObj = await modelComponent.loadVersion(remoteVersion.toString(), legacyScope.objects);\n      const flattenedDeps = versionObj.getAllFlattenedDependencies();\n      const depsNotIncludeInPattern = flattenedDeps.filter((id) =>\n        bitIdsNotFromPattern.find((bitId) => bitId.isEqualWithoutVersion(id))\n      );\n      if (!depsNotIncludeInPattern.length) {\n        return;\n      }\n      const depsOnLane: ComponentID[] = [];\n      await Promise.all(\n        depsNotIncludeInPattern.map(async (dep) => {\n          const isOnLane = await legacyScope.isIdOnLane(dep, otherLane);\n          if (isOnLane) {\n            depsOnLane.push(dep);\n          }\n        })\n      );\n      if (!depsOnLane.length) {\n        return;\n      }\n      if (includeDeps) {\n        depsToAdd.push(...depsOnLane);\n      } else {\n        const headOnTarget = otherLane ? otherLane.getComponent(compId)?.head : modelComponent.head;\n        const depsOnLaneStr = depsOnLane.map((dep) => dep.toStringWithoutVersion());\n        if (headOnTarget?.isEqual(remoteVersion)) {\n          depsOnLaneStr.forEach((dep) => {\n            (missingDepsFromHead[dep] ||= []).push(compId.toStringWithoutVersion());\n          });\n        } else {\n          missingDepsFromHistory.push(...depsOnLaneStr);\n        }\n      }\n    });\n  });\n  if (Object.keys(missingDepsFromHead).length || missingDepsFromHistory.length) {\n    throw new MissingCompsToMerge(missingDepsFromHead, uniq(missingDepsFromHistory));\n  }\n\n  if (depsToAdd.length) {\n    // remove the version, otherwise, the uniq gives duplicate components with different versions.\n    const depsWithoutVersion = depsToAdd.map((d) => d.changeVersion(undefined));\n    const depsUniqWithoutVersion = ComponentIdList.uniqFromArray(depsWithoutVersion);\n    depsUniqWithoutVersion.forEach((id) => {\n      const fromStatus = allComponentsStatus.find((c) => c.id.isEqualWithoutVersion(id));\n      if (!fromStatus) {\n        throw new Error(`filterComponentsStatus: unable to find ${id.toString()} in component-status`);\n      }\n      filteredComponentStatus.push(fromStatus);\n    });\n  }\n  return filteredComponentStatus;\n}\n\nasync function getLogForSquash(otherLaneId: LaneId) {\n  const basicLog = await getBasicLog();\n  const log = {\n    ...basicLog,\n    message: `squashed during merge from ${otherLaneId.toString()}`,\n  };\n  return log;\n}\n\nasync function squashSnaps(\n  succeededComponents: ComponentMergeStatus[],\n  currentLaneId: LaneId,\n  otherLaneId: LaneId,\n  scope: LegacyScope,\n  opts: { messageTitle?: string; detachHead?: boolean } = {}\n) {\n  const currentLaneName = currentLaneId.name;\n  const log = await getLogForSquash(otherLaneId);\n\n  await Promise.all(\n    succeededComponents.map(async ({ id, divergeData, componentFromModel }) => {\n      if (!divergeData) {\n        throw new Error(`unable to squash. divergeData is missing from ${id.toString()}`);\n      }\n\n      const modifiedComp = await squashOneComp(\n        currentLaneName,\n        otherLaneId,\n        id,\n        divergeData,\n        log,\n        scope,\n        componentFromModel,\n        opts\n      );\n      if (modifiedComp) {\n        scope.objects.add(modifiedComp);\n        const modelComponent = await scope.getModelComponent(id);\n        const versionHistory = await modelComponent.updateRebasedVersionHistory(scope.objects, [modifiedComp]);\n        if (versionHistory) scope.objects.add(versionHistory);\n      }\n    })\n  );\n}\n\n/**\n * returns Version object if it was modified. otherwise, returns undefined\n */\nasync function squashOneComp(\n  currentLaneName: string,\n  otherLaneId: LaneId,\n  id: ComponentID,\n  divergeData: SnapsDistance,\n  log: Log,\n  scope: LegacyScope,\n  componentFromModel?: Version,\n  opts: { messageTitle?: string; detachHead?: boolean } = {}\n): Promise<Version | undefined> {\n  const { messageTitle, detachHead } = opts;\n  const shouldSquash = () => {\n    if (divergeData.isDiverged()) {\n      if (detachHead) {\n        // for detach head, it's ok to have it as diverged. as long as the target is ahead, we want to squash.\n        return true;\n      }\n      throw new BitError(`unable to squash because ${id.toString()} is diverged in history.\n  consider switching to \"${\n    otherLaneId.name\n  }\" first, merging \"${currentLaneName}\", then switching back to \"${currentLaneName}\" and merging \"${otherLaneId.name}\"\n  alternatively, use \"--no-squash\" flag to keep the entire history of \"${otherLaneId.name}\"`);\n    }\n    if (divergeData.isSourceAhead()) {\n      // nothing to do. current is ahead, nothing to merge. (it was probably filtered out already as a \"failedComponent\")\n      return false;\n    }\n    if (!divergeData.isTargetAhead()) {\n      // nothing to do. current and remote are the same, nothing to merge. (it was probably filtered out already as a \"failedComponent\")\n      return false;\n    }\n    return true;\n  };\n\n  if (!shouldSquash()) {\n    return undefined;\n  }\n\n  // remote is ahead and was not diverge.\n  const remoteSnaps = divergeData.snapsOnTargetOnly;\n  if (remoteSnaps.length === 0) {\n    throw new Error(`remote is ahead but it has no snaps. it's impossible`);\n  }\n  const getAllMessages = async () => {\n    if (!messageTitle) return [];\n    await scope.scopeImporter.importManyObjects({ [otherLaneId.scope]: remoteSnaps.map((s) => s.toString()) });\n    const versionObjects = (await Promise.all(remoteSnaps.map((s) => scope.objects.load(s)))) as Version[];\n    return compact(versionObjects).map((v) => v.log.message);\n  };\n  const getFinalMessage = async (): Promise<string | undefined> => {\n    if (!messageTitle) return undefined;\n    const allMessage = await getAllMessages();\n    const allMessageStr = compact(allMessage)\n      .map((m) => `[*] ${m}`)\n      .join('\\n');\n    return `${messageTitle}\\n${allMessageStr}`;\n  };\n  if (!componentFromModel) {\n    throw new Error('unable to squash, the componentFromModel is missing');\n  }\n  const currentParents = componentFromModel.parents;\n\n  // if the remote has only one snap, there is nothing to squash.\n  // other checks here is to make sure `componentFromModel.addAsOnlyParent` call is not needed.\n  if (remoteSnaps.length === 1 && divergeData.commonSnapBeforeDiverge && currentParents.length === 1) {\n    return undefined;\n  }\n\n  const doSquash = async () => {\n    if (divergeData.commonSnapBeforeDiverge) {\n      componentFromModel.addAsOnlyParent(divergeData.commonSnapBeforeDiverge);\n      return;\n    }\n    if (currentLaneName !== DEFAULT_LANE) {\n      // when squashing into lane, we have to take main into account\n      const modelComponent = await scope.getModelComponentIfExist(id);\n      if (!modelComponent) throw new Error(`missing ModelComponent for ${id.toString()}`);\n      if (modelComponent.head) {\n        componentFromModel.addAsOnlyParent(modelComponent.head);\n        return;\n      }\n    }\n    // there is no commonSnapBeforeDiverge. the local has no snaps, all are remote, no need for parents. keep only head.\n    componentFromModel.parents.forEach((ref) => componentFromModel.removeParent(ref));\n  };\n\n  await doSquash();\n\n  const finalMessage = await getFinalMessage();\n  componentFromModel.setSquashed({ previousParents: currentParents, laneId: otherLaneId }, log, finalMessage);\n  return componentFromModel;\n}\n\nMergeLanesAspect.addRuntime(MergeLanesMain);\n\nexport default MergeLanesMain;\n"],"mappings":"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","ignoreList":[]}

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@teambit/merge-lanes",
-  "version": "1.0.535",
+  "version": "1.0.536",
   "homepage": "https://bit.cloud/teambit/lanes/merge-lanes",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.lanes",
     "name": "merge-lanes",
-    "version": "1.0.535"
+    "version": "1.0.536"
   },
   "dependencies": {
     "chalk": "2.4.2",
@@ -19,11 +19,12 @@
     "@teambit/lane-id": "0.0.312",
     "@teambit/harmony": "0.4.6",
     "@teambit/component-id": "1.2.2",
+    "@teambit/express": "0.0.1211",
+    "@teambit/logger": "0.0.1205",
     "@teambit/legacy.bit-map": "0.0.84",
     "@teambit/legacy.cli.prompts": "0.0.14",
     "@teambit/legacy.consumer": "0.0.27",
     "@teambit/legacy.scope": "0.0.27",
-    "@teambit/logger": "0.0.1205",
     "@teambit/objects": "0.0.42",
     "@teambit/scope": "1.0.535",
     "@teambit/checkout": "1.0.535",
@@ -39,7 +40,7 @@
     "@teambit/harmony.modules.feature-toggle": "0.0.17",
     "@teambit/harmony.modules.get-basic-log": "0.0.28",
     "@teambit/importer": "1.0.535",
-    "@teambit/lanes": "1.0.535",
+    "@teambit/lanes": "1.0.536",
     "@teambit/workspace": "1.0.535"
   },
   "devDependencies": {