@teambit/merge-lanes 0.0.303 → 0.0.305

package/dist/merge-abort.cmd.d.ts

@@ -1,5 +1,8 @@
 import { Command, CommandOptions } from '@teambit/cli';
 import { MergeLanesMain } from './merge-lanes.main.runtime';
+export declare type MergeAbortOpts = {
+    silent?: boolean;
+};
 export declare class MergeAbortLaneCmd implements Command {
     private mergeLanes;
     name: string;
@@ -17,5 +20,4 @@ export declare class MergeAbortLaneCmd implements Command {
         verbose?: boolean;
         silent?: boolean;
     }): Promise<string>;
-    private prompt;
 }

package/dist/merge-abort.cmd.js

@@ -20,13 +20,6 @@ function _chalk() {
   };
   return data;
 }
-function _yesno() {
-  const data = _interopRequireDefault(require("yesno"));
-  _yesno = function () {
-    return data;
-  };
-  return data;
-}
 function _checkout() {
   const data = require("@teambit/checkout");
   _checkout = function () {
@@ -34,13 +27,6 @@ function _checkout() {
   };
   return data;
 }
-function _exceptions() {
-  const data = require("@teambit/legacy/dist/prompts/exceptions");
-  _exceptions = function () {
-    return data;
-  };
-  return data;
-}
 class MergeAbortLaneCmd {
   constructor(mergeLanes) {
     this.mergeLanes = mergeLanes;
@@ -60,20 +46,20 @@ also, checkout the workspace components according to the restored lane`);
     verbose = false,
     silent = false
   }) {
-    if (!silent) {
-      await this.prompt();
-    }
     const checkoutProps = {
       reset: true,
       all: true,
       verbose,
       skipNpmInstall: skipDependencyInstallation
     };
+    const mergeAbortOpts = {
+      silent
+    };
     const {
       checkoutResults,
       restoredItems,
       checkoutError
-    } = await this.mergeLanes.abortLaneMerge(checkoutProps);
+    } = await this.mergeLanes.abortLaneMerge(checkoutProps, mergeAbortOpts);
     const getCheckoutErrorStr = () => {
       if (!checkoutError) return '';
       const errMsg = `\n\nFailed changing the component files to the pre-merge due to an error:
@@ -86,18 +72,6 @@ please fix the error and then run "bit checkout reset --all" to revert the compo
     const restoredItemsOutput = restoredItems.map(item => `[√] ${item}`).join('\n');
     return `${checkoutOutputStr}\n\n${restoredItemsTitle}\n${restoredItemsOutput}${getCheckoutErrorStr()}`;
   }
-  async prompt() {
-    this.mergeLanes.logger.clearStatusLine();
-    const ok = await (0, _yesno().default)({
-      question: `Code changes that were done since the last lane-merge will be lost.
-The .bitmap and workspace.jsonc files will be restored to the state before the merge.
-This action is irreversible.
-${_chalk().default.bold('Do you want to continue? [yes(y)/no(n)]')}`
-    });
-    if (!ok) {
-      throw new (_exceptions().PromptCanceled)();
-    }
-  }
 }
 exports.MergeAbortLaneCmd = MergeAbortLaneCmd;
 

package/dist/merge-abort.cmd.js.map

@@ -1 +1 @@
-{"version":3,"names":["_chalk","data","_interopRequireDefault","require","_yesno","_checkout","_exceptions","MergeAbortLaneCmd","constructor","mergeLanes","_defineProperty2","default","report","_","skipDependencyInstallation","verbose","silent","prompt","checkoutProps","reset","all","skipNpmInstall","checkoutResults","restoredItems","checkoutError","abortLaneMerge","getCheckoutErrorStr","errMsg","message","chalk","red","checkoutOutputStr","checkoutOutput","restoredItemsTitle","green","restoredItemsOutput","map","item","join","logger","clearStatusLine","ok","yesno","question","bold","PromptCanceled","exports"],"sources":["merge-abort.cmd.ts"],"sourcesContent":["import chalk from 'chalk';\nimport yesno from 'yesno';\nimport { CheckoutProps, checkoutOutput } from '@teambit/checkout';\nimport { PromptCanceled } from '@teambit/legacy/dist/prompts/exceptions';\nimport { Command, CommandOptions } from '@teambit/cli';\nimport { MergeLanesMain } from './merge-lanes.main.runtime';\n\nexport class MergeAbortLaneCmd implements Command {\n  name = 'merge-abort';\n  description = `abort the recent lane-merge. revert the lane object and checkout accordingly`;\n  extendedDescription = `restore the lane-object same as it was before the last \"bit lane merge\" command.\nalso, checkout the workspace components according to the restored lane`;\n  alias = '';\n  options = [\n    ['', 'verbose', 'show details of components that were not merged legitimately'],\n    ['s', 'silent', 'skip confirmation'],\n    ['x', 'skip-dependency-installation', 'do not install packages of the imported components'],\n  ] as CommandOptions;\n  loader = true;\n  private = true;\n  migration = true;\n  remoteOp = true;\n\n  constructor(private mergeLanes: MergeLanesMain) {}\n\n  async report(\n    _,\n    {\n      skipDependencyInstallation = false,\n      verbose = false,\n      silent = false,\n    }: {\n      skipDependencyInstallation?: boolean;\n      verbose?: boolean;\n      silent?: boolean;\n    }\n  ): Promise<string> {\n    if (!silent) {\n      await this.prompt();\n    }\n    const checkoutProps: CheckoutProps = {\n      reset: true,\n      all: true,\n      verbose,\n      skipNpmInstall: skipDependencyInstallation,\n    };\n    const { checkoutResults, restoredItems, checkoutError } = await this.mergeLanes.abortLaneMerge(checkoutProps);\n\n    const getCheckoutErrorStr = () => {\n      if (!checkoutError) return '';\n      const errMsg = `\\n\\nFailed changing the component files to the pre-merge due to an error:\n${checkoutError.message}\nplease fix the error and then run \"bit checkout reset --all\" to revert the components to the pre-merge state`;\n      return chalk.red(errMsg);\n    };\n\n    const checkoutOutputStr = checkoutResults ? checkoutOutput(checkoutResults, checkoutProps) : '';\n    const restoredItemsTitle = chalk.green('The following have been restored successfully:');\n    const restoredItemsOutput = restoredItems.map((item) => `[√] ${item}`).join('\\n');\n\n    return `${checkoutOutputStr}\\n\\n${restoredItemsTitle}\\n${restoredItemsOutput}${getCheckoutErrorStr()}`;\n  }\n\n  private async prompt() {\n    this.mergeLanes.logger.clearStatusLine();\n    const ok = await yesno({\n      question: `Code changes that were done since the last lane-merge will be lost.\nThe .bitmap and workspace.jsonc files will be restored to the state before the merge.\nThis action is irreversible.\n${chalk.bold('Do you want to continue? [yes(y)/no(n)]')}`,\n    });\n    if (!ok) {\n      throw new PromptCanceled();\n    }\n  }\n}\n"],"mappings":"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"}
+{"version":3,"names":["_chalk","data","_interopRequireDefault","require","_checkout","MergeAbortLaneCmd","constructor","mergeLanes","_defineProperty2","default","report","_","skipDependencyInstallation","verbose","silent","checkoutProps","reset","all","skipNpmInstall","mergeAbortOpts","checkoutResults","restoredItems","checkoutError","abortLaneMerge","getCheckoutErrorStr","errMsg","message","chalk","red","checkoutOutputStr","checkoutOutput","restoredItemsTitle","green","restoredItemsOutput","map","item","join","exports"],"sources":["merge-abort.cmd.ts"],"sourcesContent":["import chalk from 'chalk';\nimport { CheckoutProps, checkoutOutput } from '@teambit/checkout';\nimport { Command, CommandOptions } from '@teambit/cli';\nimport { MergeLanesMain } from './merge-lanes.main.runtime';\n\nexport type MergeAbortOpts = {\n  silent?: boolean; // don't show prompt before aborting\n};\n\nexport class MergeAbortLaneCmd implements Command {\n  name = 'merge-abort';\n  description = `abort the recent lane-merge. revert the lane object and checkout accordingly`;\n  extendedDescription = `restore the lane-object same as it was before the last \"bit lane merge\" command.\nalso, checkout the workspace components according to the restored lane`;\n  alias = '';\n  options = [\n    ['', 'verbose', 'show details of components that were not merged legitimately'],\n    ['s', 'silent', 'skip confirmation'],\n    ['x', 'skip-dependency-installation', 'do not install packages of the imported components'],\n  ] as CommandOptions;\n  loader = true;\n  private = true;\n  migration = true;\n  remoteOp = true;\n\n  constructor(private mergeLanes: MergeLanesMain) {}\n\n  async report(\n    _,\n    {\n      skipDependencyInstallation = false,\n      verbose = false,\n      silent = false,\n    }: {\n      skipDependencyInstallation?: boolean;\n      verbose?: boolean;\n      silent?: boolean;\n    }\n  ): Promise<string> {\n    const checkoutProps: CheckoutProps = {\n      reset: true,\n      all: true,\n      verbose,\n      skipNpmInstall: skipDependencyInstallation,\n    };\n    const mergeAbortOpts = { silent };\n    const { checkoutResults, restoredItems, checkoutError } = await this.mergeLanes.abortLaneMerge(\n      checkoutProps,\n      mergeAbortOpts\n    );\n\n    const getCheckoutErrorStr = () => {\n      if (!checkoutError) return '';\n      const errMsg = `\\n\\nFailed changing the component files to the pre-merge due to an error:\n${checkoutError.message}\nplease fix the error and then run \"bit checkout reset --all\" to revert the components to the pre-merge state`;\n      return chalk.red(errMsg);\n    };\n\n    const checkoutOutputStr = checkoutResults ? checkoutOutput(checkoutResults, checkoutProps) : '';\n    const restoredItemsTitle = chalk.green('The following have been restored successfully:');\n    const restoredItemsOutput = restoredItems.map((item) => `[√] ${item}`).join('\\n');\n\n    return `${checkoutOutputStr}\\n\\n${restoredItemsTitle}\\n${restoredItemsOutput}${getCheckoutErrorStr()}`;\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,UAAA;EAAA,MAAAH,IAAA,GAAAE,OAAA;EAAAC,SAAA,YAAAA,CAAA;IAAA,OAAAH,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAQO,MAAMI,iBAAiB,CAAoB;EAgBhDC,WAAWA,CAASC,UAA0B,EAAE;IAAA,KAA5BA,UAA0B,GAA1BA,UAA0B;IAAA,IAAAC,gBAAA,GAAAC,OAAA,gBAfvC,aAAa;IAAA,IAAAD,gBAAA,GAAAC,OAAA,uBACL,8EAA6E;IAAA,IAAAD,gBAAA,GAAAC,OAAA,+BACrE;AACzB,uEAAuE;IAAA,IAAAD,gBAAA,GAAAC,OAAA,iBAC7D,EAAE;IAAA,IAAAD,gBAAA,GAAAC,OAAA,mBACA,CACR,CAAC,EAAE,EAAE,SAAS,EAAE,8DAA8D,CAAC,EAC/E,CAAC,GAAG,EAAE,QAAQ,EAAE,mBAAmB,CAAC,EACpC,CAAC,GAAG,EAAE,8BAA8B,EAAE,oDAAoD,CAAC,CAC5F;IAAA,IAAAD,gBAAA,GAAAC,OAAA,kBACQ,IAAI;IAAA,IAAAD,gBAAA,GAAAC,OAAA,mBACH,IAAI;IAAA,IAAAD,gBAAA,GAAAC,OAAA,qBACF,IAAI;IAAA,IAAAD,gBAAA,GAAAC,OAAA,oBACL,IAAI;EAEkC;EAEjD,MAAMC,MAAMA,CACVC,CAAC,EACD;IACEC,0BAA0B,GAAG,KAAK;IAClCC,OAAO,GAAG,KAAK;IACfC,MAAM,GAAG;EAKX,CAAC,EACgB;IACjB,MAAMC,aAA4B,GAAG;MACnCC,KAAK,EAAE,IAAI;MACXC,GAAG,EAAE,IAAI;MACTJ,OAAO;MACPK,cAAc,EAAEN;IAClB,CAAC;IACD,MAAMO,cAAc,GAAG;MAAEL;IAAO,CAAC;IACjC,MAAM;MAAEM,eAAe;MAAEC,aAAa;MAAEC;IAAc,CAAC,GAAG,MAAM,IAAI,CAACf,UAAU,CAACgB,cAAc,CAC5FR,aAAa,EACbI,cACF,CAAC;IAED,MAAMK,mBAAmB,GAAGA,CAAA,KAAM;MAChC,IAAI,CAACF,aAAa,EAAE,OAAO,EAAE;MAC7B,MAAMG,MAAM,GAAI;AACtB,EAAEH,aAAa,CAACI,OAAQ;AACxB,6GAA6G;MACvG,OAAOC,gBAAK,CAACC,GAAG,CAACH,MAAM,CAAC;IAC1B,CAAC;IAED,MAAMI,iBAAiB,GAAGT,eAAe,GAAG,IAAAU,0BAAc,EAACV,eAAe,EAAEL,aAAa,CAAC,GAAG,EAAE;IAC/F,MAAMgB,kBAAkB,GAAGJ,gBAAK,CAACK,KAAK,CAAC,gDAAgD,CAAC;IACxF,MAAMC,mBAAmB,GAAGZ,aAAa,CAACa,GAAG,CAAEC,IAAI,IAAM,OAAMA,IAAK,EAAC,CAAC,CAACC,IAAI,CAAC,IAAI,CAAC;IAEjF,OAAQ,GAAEP,iBAAkB,OAAME,kBAAmB,KAAIE,mBAAoB,GAAET,mBAAmB,CAAC,CAAE,EAAC;EACxG;AACF;AAACa,OAAA,CAAAhC,iBAAA,GAAAA,iBAAA"}

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

@@ -16,7 +16,7 @@ export declare class MergeLaneCmd implements Command {
     migration: boolean;
     remoteOp: boolean;
     constructor(mergeLanes: MergeLanesMain);
-    report([name, pattern]: [string, string], { ours, theirs, manual, build, workspace: existingOnWorkspaceOnly, squash, noSnap, tag, message: snapMessage, keepReadme, noSquash, skipDependencyInstallation, skipFetch, includeDeps, resolveUnrelated, ignoreConfigChanges, verbose, }: {
+    report([name, pattern]: [string, string], { ours, theirs, manual, build, workspace: existingOnWorkspaceOnly, squash, noSnap, tag, message: snapMessage, keepReadme, noSquash, skipDependencyInstallation, skipFetch, includeDeps, resolveUnrelated, ignoreConfigChanges, verbose, includeNonLaneComps, }: {
         ours: boolean;
         theirs: boolean;
         manual: boolean;
@@ -34,5 +34,6 @@ export declare class MergeLaneCmd implements Command {
         resolveUnrelated?: string | boolean;
         ignoreConfigChanges?: boolean;
         verbose?: boolean;
+        includeNonLaneComps?: boolean;
     }): Promise<string>;
 }

package/dist/merge-lane.cmd.js

@@ -76,7 +76,7 @@ it will snap-merge these components to complete the merge. use "no-snap" to opt-
       description: 'partially merge the lane with the specified component-pattern'
     }]);
     (0, _defineProperty2().default)(this, "alias", '');
-    (0, _defineProperty2().default)(this, "options", [['', 'ours', 'in case of a conflict, override the used version with the current modification'], ['', 'theirs', 'in case of a conflict, override the current modification with the specified version'], ['', 'manual', 'in case of a conflict, leave the files with a conflict state to resolve them manually later'], ['', 'workspace', 'merge only components in a lane that exist in the workspace'], ['', 'no-snap', 'do not auto snap in case the merge completed without conflicts'], ['', 'tag', 'tag all lane components after merging into main (also tag-merge in case of snap-merge)'], ['', 'build', 'in case of snap during the merge, run the build-pipeline (similar to bit snap --build)'], ['m', 'message <message>', 'override the default message for the auto snap'], ['', 'keep-readme', 'skip deleting the lane readme component after merging'], ['', 'no-squash', 'relevant for merging lanes into main, which by default squash'], ['', 'squash', 'EXPERIMENTAL. relevant for merging a lane into another lane, which by default does not squash'], ['', 'ignore-config-changes', 'allow merging when component are modified due to config changes (such as dependencies) only and not files'], ['', 'verbose', 'show details of components that were not merged legitimately'], ['x', 'skip-dependency-installation', 'do not install packages of the imported components'], ['', 'skip-fetch', 'use the current target-lane if exits locally without updating it from the remote'], ['', 'include-deps', 'relevant for "--pattern" and "--workspace". merge also dependencies of the given components'], ['', 'resolve-unrelated [merge-strategy]', 'relevant when a component on a lane and the component on main has nothing in common. merge-strategy can be "ours" (default) or "theirs"']]);
+    (0, _defineProperty2().default)(this, "options", [['', 'ours', 'in case of a conflict, override the used version with the current modification'], ['', 'theirs', 'in case of a conflict, override the current modification with the specified version'], ['', 'manual', 'in case of a conflict, leave the files with a conflict state to resolve them manually later'], ['', 'workspace', 'merge only components in a lane that exist in the workspace'], ['', 'no-snap', 'do not auto snap in case the merge completed without conflicts'], ['', 'tag', 'tag all lane components after merging into main (also tag-merge in case of snap-merge)'], ['', 'build', 'in case of snap during the merge, run the build-pipeline (similar to bit snap --build)'], ['m', 'message <message>', 'override the default message for the auto snap'], ['', 'keep-readme', 'skip deleting the lane readme component after merging'], ['', 'no-squash', 'relevant for merging lanes into main, which by default squash'], ['', 'squash', 'EXPERIMENTAL. relevant for merging a lane into another lane, which by default does not squash'], ['', 'ignore-config-changes', 'allow merging when component are modified due to config changes (such as dependencies) only and not files'], ['', 'verbose', 'show details of components that were not merged legitimately'], ['x', 'skip-dependency-installation', 'do not install packages of the imported components'], ['', 'skip-fetch', 'use the current target-lane if exits locally without updating it from the remote'], ['', 'include-deps', 'relevant for "--pattern" and "--workspace". merge also dependencies of the given components'], ['', 'resolve-unrelated [merge-strategy]', 'relevant when a component on a lane and the component on main has nothing in common. merge-strategy can be "ours" (default) or "theirs"'], ['', 'include-non-lane-comps', 'when merging main, include workspace components that are not on the lane (by default only lane components are merged)']]);
     (0, _defineProperty2().default)(this, "loader", true);
     (0, _defineProperty2().default)(this, "private", true);
     (0, _defineProperty2().default)(this, "migration", true);
@@ -99,7 +99,8 @@ it will snap-merge these components to complete the merge. use "no-snap" to opt-
     includeDeps = false,
     resolveUnrelated,
     ignoreConfigChanges,
-    verbose = false
+    verbose = false,
+    includeNonLaneComps = false
   }) {
     build = (0, _featureToggle().isFeatureEnabled)(_featureToggle().BUILD_ON_CI) ? Boolean(build) : true;
     const mergeStrategy = (0, _mergeVersion().getMergeStrategy)(ours, theirs, manual);
@@ -138,7 +139,8 @@ it will snap-merge these components to complete the merge. use "no-snap" to opt-
       skipFetch,
       resolveUnrelated: getResolveUnrelated(),
       ignoreConfigChanges,
-      includeDeps
+      includeDeps,
+      includeNonLaneComps
     });
     const mergeResult = (0, _merging().mergeReport)(_objectSpread(_objectSpread({}, mergeResults), {}, {
       configMergeResults,

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

@@ -1 +1 @@
-{"version":3,"names":["_chalk","data","_interopRequireDefault","require","_mergeVersion","_merging","_featureToggle","_bitError","_removeTemplate","ownKeys","object","enumerableOnly","keys","Object","getOwnPropertySymbols","symbols","filter","sym","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","target","i","arguments","length","source","forEach","key","_defineProperty2","default","getOwnPropertyDescriptors","defineProperties","defineProperty","MergeLaneCmd","constructor","mergeLanes","name","description","report","pattern","ours","theirs","manual","build","workspace","existingOnWorkspaceOnly","squash","noSnap","tag","message","snapMessage","keepReadme","noSquash","skipDependencyInstallation","skipFetch","includeDeps","resolveUnrelated","ignoreConfigChanges","verbose","isFeatureEnabled","BUILD_ON_CI","Boolean","mergeStrategy","getMergeStrategy","BitError","getResolveUnrelated","undefined","Error","mergeResults","deleteResults","configMergeResults","mergeLane","mergeResult","mergeReport","deleteResult","localResult","paintRemoved","remoteResult","map","item","readmeResult","chalk","yellow","exports"],"sources":["merge-lane.cmd.ts"],"sourcesContent":["import chalk from 'chalk';\nimport { Command, CommandOptions } from '@teambit/cli';\nimport { getMergeStrategy, MergeStrategy } from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport { mergeReport } from '@teambit/merging';\nimport { BUILD_ON_CI, isFeatureEnabled } from '@teambit/legacy/dist/api/consumer/lib/feature-toggle';\nimport { BitError } from '@teambit/bit-error';\nimport paintRemoved from '@teambit/legacy/dist/cli/templates/remove-template';\nimport { MergeLanesMain } from './merge-lanes.main.runtime';\n\nexport class MergeLaneCmd implements Command {\n  name = 'merge <lane> [pattern]';\n  description = `merge a local or a remote lane`;\n  extendedDescription = `by default, the provided lane will be fetched from the remote before merging.\nto merge the lane from the local scope without updating it first, use \"--skip-fetch\" flag.\n\nwhen the current and the other lanes are diverged in history and the files could be merged with no conflicts,\nit will snap-merge these components to complete the merge. use \"no-snap\" to opt-out, or \"tag\" to tag instead`;\n  arguments = [\n    {\n      name: 'lane',\n      description: 'lane-name or lane-id (if not exists locally) to merge to the current lane',\n    },\n    {\n      name: 'pattern',\n      description: 'partially merge the lane with the specified component-pattern',\n    },\n  ];\n  alias = '';\n  options = [\n    ['', 'ours', 'in case of a conflict, override the used version with the current modification'],\n    ['', 'theirs', 'in case of a conflict, override the current modification with the specified version'],\n    ['', 'manual', 'in case of a conflict, leave the files with a conflict state to resolve them manually later'],\n    ['', 'workspace', 'merge only components in a lane that exist in the workspace'],\n    ['', 'no-snap', 'do not auto snap in case the merge completed without conflicts'],\n    ['', 'tag', 'tag all lane components after merging into main (also tag-merge in case of snap-merge)'],\n    ['', 'build', 'in case of snap during the merge, run the build-pipeline (similar to bit snap --build)'],\n    ['m', 'message <message>', 'override the default message for the auto snap'],\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    ['', 'squash', 'EXPERIMENTAL. relevant for merging a lane into another lane, which by default does not squash'],\n    [\n      '',\n      'ignore-config-changes',\n      'allow merging when component are modified due to config changes (such as dependencies) only and not files',\n    ],\n    ['', 'verbose', 'show details of components that were not merged legitimately'],\n    ['x', 'skip-dependency-installation', 'do not install packages of the imported components'],\n    ['', 'skip-fetch', 'use the current target-lane if exits locally without updating it from the remote'],\n    ['', 'include-deps', 'relevant for \"--pattern\" and \"--workspace\". merge also dependencies of the given components'],\n    [\n      '',\n      'resolve-unrelated [merge-strategy]',\n      'relevant when a component on a lane and the component on main has nothing in common. merge-strategy can be \"ours\" (default) or \"theirs\"',\n    ],\n  ] as CommandOptions;\n  loader = true;\n  private = true;\n  migration = true;\n  remoteOp = true;\n\n  constructor(private mergeLanes: MergeLanesMain) {}\n\n  async report(\n    [name, pattern]: [string, string],\n    {\n      ours = false,\n      theirs = false,\n      manual = false,\n      build,\n      workspace: existingOnWorkspaceOnly = false,\n      squash = false,\n      noSnap = false,\n      tag = false,\n      message: snapMessage = '',\n      keepReadme = false,\n      noSquash = false,\n      skipDependencyInstallation = false,\n      skipFetch = false,\n      includeDeps = false,\n      resolveUnrelated,\n      ignoreConfigChanges,\n      verbose = false,\n    }: {\n      ours: boolean;\n      theirs: boolean;\n      manual: boolean;\n      workspace?: boolean;\n      build?: boolean;\n      noSnap: boolean;\n      tag: boolean;\n      message: string;\n      keepReadme?: boolean;\n      squash?: boolean;\n      noSquash: boolean;\n      skipDependencyInstallation?: boolean;\n      skipFetch: boolean;\n      includeDeps?: boolean;\n      resolveUnrelated?: string | boolean;\n      ignoreConfigChanges?: boolean;\n      verbose?: boolean;\n    }\n  ): Promise<string> {\n    build = isFeatureEnabled(BUILD_ON_CI) ? Boolean(build) : true;\n    const mergeStrategy = getMergeStrategy(ours, theirs, manual);\n    if (noSnap && snapMessage) throw new BitError('unable to use \"noSnap\" and \"message\" flags together');\n    if (includeDeps && !pattern && !existingOnWorkspaceOnly) {\n      throw new BitError(`\"--include-deps\" flag is relevant only for --workspace and --pattern flags`);\n    }\n    const getResolveUnrelated = (): MergeStrategy | undefined => {\n      if (!resolveUnrelated) return undefined;\n      if (typeof resolveUnrelated === 'boolean') return 'ours';\n      if (resolveUnrelated !== 'ours' && resolveUnrelated !== 'theirs' && resolveUnrelated !== 'manual') {\n        throw new Error('--resolve-unrelated must be one of the following: [ours, theirs, manual]');\n      }\n      return resolveUnrelated;\n    };\n    if (resolveUnrelated && typeof resolveUnrelated === 'boolean') {\n      resolveUnrelated = 'ours';\n    }\n    const { mergeResults, deleteResults, configMergeResults } = await this.mergeLanes.mergeLane(name, {\n      build,\n      // @ts-ignore\n      mergeStrategy,\n      existingOnWorkspaceOnly,\n      noSnap,\n      snapMessage,\n      keepReadme,\n      squash,\n      noSquash,\n      tag,\n      pattern,\n      skipDependencyInstallation,\n      skipFetch,\n      resolveUnrelated: getResolveUnrelated(),\n      ignoreConfigChanges,\n      includeDeps,\n    });\n\n    const mergeResult = mergeReport({ ...mergeResults, configMergeResults, verbose });\n    const deleteResult = `${deleteResults.localResult ? paintRemoved(deleteResults.localResult, false) : ''}${(\n      deleteResults.remoteResult || []\n    ).map((item) => paintRemoved(item, true))}${\n      (deleteResults.readmeResult && chalk.yellow(deleteResults.readmeResult)) || ''\n    }\\n`;\n    return mergeResult + deleteResult;\n  }\n}\n"],"mappings":"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"}
+{"version":3,"names":["_chalk","data","_interopRequireDefault","require","_mergeVersion","_merging","_featureToggle","_bitError","_removeTemplate","ownKeys","object","enumerableOnly","keys","Object","getOwnPropertySymbols","symbols","filter","sym","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","target","i","arguments","length","source","forEach","key","_defineProperty2","default","getOwnPropertyDescriptors","defineProperties","defineProperty","MergeLaneCmd","constructor","mergeLanes","name","description","report","pattern","ours","theirs","manual","build","workspace","existingOnWorkspaceOnly","squash","noSnap","tag","message","snapMessage","keepReadme","noSquash","skipDependencyInstallation","skipFetch","includeDeps","resolveUnrelated","ignoreConfigChanges","verbose","includeNonLaneComps","isFeatureEnabled","BUILD_ON_CI","Boolean","mergeStrategy","getMergeStrategy","BitError","getResolveUnrelated","undefined","Error","mergeResults","deleteResults","configMergeResults","mergeLane","mergeResult","mergeReport","deleteResult","localResult","paintRemoved","remoteResult","map","item","readmeResult","chalk","yellow","exports"],"sources":["merge-lane.cmd.ts"],"sourcesContent":["import chalk from 'chalk';\nimport { Command, CommandOptions } from '@teambit/cli';\nimport { getMergeStrategy, MergeStrategy } from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport { mergeReport } from '@teambit/merging';\nimport { BUILD_ON_CI, isFeatureEnabled } from '@teambit/legacy/dist/api/consumer/lib/feature-toggle';\nimport { BitError } from '@teambit/bit-error';\nimport paintRemoved from '@teambit/legacy/dist/cli/templates/remove-template';\nimport { MergeLanesMain } from './merge-lanes.main.runtime';\n\nexport class MergeLaneCmd implements Command {\n  name = 'merge <lane> [pattern]';\n  description = `merge a local or a remote lane`;\n  extendedDescription = `by default, the provided lane will be fetched from the remote before merging.\nto merge the lane from the local scope without updating it first, use \"--skip-fetch\" flag.\n\nwhen the current and the other lanes are diverged in history and the files could be merged with no conflicts,\nit will snap-merge these components to complete the merge. use \"no-snap\" to opt-out, or \"tag\" to tag instead`;\n  arguments = [\n    {\n      name: 'lane',\n      description: 'lane-name or lane-id (if not exists locally) to merge to the current lane',\n    },\n    {\n      name: 'pattern',\n      description: 'partially merge the lane with the specified component-pattern',\n    },\n  ];\n  alias = '';\n  options = [\n    ['', 'ours', 'in case of a conflict, override the used version with the current modification'],\n    ['', 'theirs', 'in case of a conflict, override the current modification with the specified version'],\n    ['', 'manual', 'in case of a conflict, leave the files with a conflict state to resolve them manually later'],\n    ['', 'workspace', 'merge only components in a lane that exist in the workspace'],\n    ['', 'no-snap', 'do not auto snap in case the merge completed without conflicts'],\n    ['', 'tag', 'tag all lane components after merging into main (also tag-merge in case of snap-merge)'],\n    ['', 'build', 'in case of snap during the merge, run the build-pipeline (similar to bit snap --build)'],\n    ['m', 'message <message>', 'override the default message for the auto snap'],\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    ['', 'squash', 'EXPERIMENTAL. relevant for merging a lane into another lane, which by default does not squash'],\n    [\n      '',\n      'ignore-config-changes',\n      'allow merging when component are modified due to config changes (such as dependencies) only and not files',\n    ],\n    ['', 'verbose', 'show details of components that were not merged legitimately'],\n    ['x', 'skip-dependency-installation', 'do not install packages of the imported components'],\n    ['', 'skip-fetch', 'use the current target-lane if exits locally without updating it from the remote'],\n    ['', 'include-deps', 'relevant for \"--pattern\" and \"--workspace\". merge also dependencies of the given components'],\n    [\n      '',\n      'resolve-unrelated [merge-strategy]',\n      'relevant when a component on a lane and the component on main has nothing in common. merge-strategy can be \"ours\" (default) or \"theirs\"',\n    ],\n    [\n      '',\n      'include-non-lane-comps',\n      'when merging main, include workspace components that are not on the lane (by default only lane components are merged)',\n    ],\n  ] as CommandOptions;\n  loader = true;\n  private = true;\n  migration = true;\n  remoteOp = true;\n\n  constructor(private mergeLanes: MergeLanesMain) {}\n\n  async report(\n    [name, pattern]: [string, string],\n    {\n      ours = false,\n      theirs = false,\n      manual = false,\n      build,\n      workspace: existingOnWorkspaceOnly = false,\n      squash = false,\n      noSnap = false,\n      tag = false,\n      message: snapMessage = '',\n      keepReadme = false,\n      noSquash = false,\n      skipDependencyInstallation = false,\n      skipFetch = false,\n      includeDeps = false,\n      resolveUnrelated,\n      ignoreConfigChanges,\n      verbose = false,\n      includeNonLaneComps = false,\n    }: {\n      ours: boolean;\n      theirs: boolean;\n      manual: boolean;\n      workspace?: boolean;\n      build?: boolean;\n      noSnap: boolean;\n      tag: boolean;\n      message: string;\n      keepReadme?: boolean;\n      squash?: boolean;\n      noSquash: boolean;\n      skipDependencyInstallation?: boolean;\n      skipFetch: boolean;\n      includeDeps?: boolean;\n      resolveUnrelated?: string | boolean;\n      ignoreConfigChanges?: boolean;\n      verbose?: boolean;\n      includeNonLaneComps?: boolean;\n    }\n  ): Promise<string> {\n    build = isFeatureEnabled(BUILD_ON_CI) ? Boolean(build) : true;\n    const mergeStrategy = getMergeStrategy(ours, theirs, manual);\n    if (noSnap && snapMessage) throw new BitError('unable to use \"noSnap\" and \"message\" flags together');\n    if (includeDeps && !pattern && !existingOnWorkspaceOnly) {\n      throw new BitError(`\"--include-deps\" flag is relevant only for --workspace and --pattern flags`);\n    }\n    const getResolveUnrelated = (): MergeStrategy | undefined => {\n      if (!resolveUnrelated) return undefined;\n      if (typeof resolveUnrelated === 'boolean') return 'ours';\n      if (resolveUnrelated !== 'ours' && resolveUnrelated !== 'theirs' && resolveUnrelated !== 'manual') {\n        throw new Error('--resolve-unrelated must be one of the following: [ours, theirs, manual]');\n      }\n      return resolveUnrelated;\n    };\n    if (resolveUnrelated && typeof resolveUnrelated === 'boolean') {\n      resolveUnrelated = 'ours';\n    }\n    const { mergeResults, deleteResults, configMergeResults } = await this.mergeLanes.mergeLane(name, {\n      build,\n      // @ts-ignore\n      mergeStrategy,\n      existingOnWorkspaceOnly,\n      noSnap,\n      snapMessage,\n      keepReadme,\n      squash,\n      noSquash,\n      tag,\n      pattern,\n      skipDependencyInstallation,\n      skipFetch,\n      resolveUnrelated: getResolveUnrelated(),\n      ignoreConfigChanges,\n      includeDeps,\n      includeNonLaneComps,\n    });\n\n    const mergeResult = mergeReport({ ...mergeResults, configMergeResults, verbose });\n    const deleteResult = `${deleteResults.localResult ? paintRemoved(deleteResults.localResult, false) : ''}${(\n      deleteResults.remoteResult || []\n    ).map((item) => paintRemoved(item, true))}${\n      (deleteResults.readmeResult && chalk.yellow(deleteResults.readmeResult)) || ''\n    }\\n`;\n    return mergeResult + deleteResult;\n  }\n}\n"],"mappings":"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"}

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

@@ -9,6 +9,7 @@ import { Logger, LoggerMain } from '@teambit/logger';
 import { CheckoutMain, CheckoutProps } from '@teambit/checkout';
 import { RemoveMain } from '@teambit/remove';
 import { ExportMain } from '@teambit/export';
+import { MergeAbortOpts } from './merge-abort.cmd';
 export declare type MergeLaneOptions = {
     mergeStrategy: MergeStrategy;
     noSnap: boolean;
@@ -25,6 +26,7 @@ export declare type MergeLaneOptions = {
     resolveUnrelated?: MergeStrategy;
     ignoreConfigChanges?: boolean;
     skipFetch?: boolean;
+    includeNonLaneComps?: boolean;
 };
 export declare class MergeLanesMain {
     private workspace;
@@ -42,11 +44,12 @@ export declare class MergeLanesMain {
         deleteResults: any;
         configMergeResults: ConfigMergeResult[];
     }>;
-    abortLaneMerge(checkoutProps: CheckoutProps): Promise<{
+    abortLaneMerge(checkoutProps: CheckoutProps, mergeAbortOpts: MergeAbortOpts): Promise<{
         checkoutResults: ApplyVersionResults | undefined;
         restoredItems: string[];
         checkoutError: Error | undefined;
     }>;
+    private mergeAbortPrompt;
     private getLastMergedLaneContentIfExists;
     private getLastMergedBitmapFilename;
     private getLastMergedWorkspaceFilename;

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

@@ -30,6 +30,20 @@ function _fsExtra() {
   };
   return data;
 }
+function _yesno() {
+  const data = _interopRequireDefault(require("yesno"));
+  _yesno = function () {
+    return data;
+  };
+  return data;
+}
+function _exceptions() {
+  const data = require("@teambit/legacy/dist/prompts/exceptions");
+  _exceptions = function () {
+    return data;
+  };
+  return data;
+}
 function _tempy() {
   const data = _interopRequireDefault(require("tempy"));
   _tempy = function () {
@@ -177,6 +191,13 @@ function _getDivergeData() {
   };
   return data;
 }
+function _bitMap() {
+  const data = _interopRequireDefault(require("@teambit/legacy/dist/consumer/bit-map"));
+  _bitMap = function () {
+    return data;
+  };
+  return data;
+}
 function _mergeLanes() {
   const data = require("./merge-lanes.aspect");
   _mergeLanes = function () {
@@ -230,6 +251,8 @@ class MergeLanesMain {
     this.importer = importer;
     this.checkout = checkout;
   }
+
+  // eslint-disable-next-line complexity
   async mergeLane(laneName, options) {
     if (!this.workspace) {
       throw new (_bitError().BitError)(`unable to merge a lane outside of Bit workspace`);
@@ -250,7 +273,8 @@ class MergeLanesMain {
       skipDependencyInstallation,
       resolveUnrelated,
       ignoreConfigChanges,
-      skipFetch
+      skipFetch,
+      includeNonLaneComps
     } = options;
     const currentLaneId = consumer.getCurrentLaneId();
     if (tag && !currentLaneId.isDefault()) {
@@ -265,6 +289,7 @@ class MergeLanesMain {
     }
     const currentLane = currentLaneId.isDefault() ? null : await consumer.scope.loadLane(currentLaneId);
     const isDefaultLane = otherLaneId.isDefault();
+    let laneToFetchArtifactsFrom;
     const getOtherLane = async () => {
       if (isDefaultLane) {
         if (!skipFetch) {
@@ -277,7 +302,7 @@ class MergeLanesMain {
       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);
-        await this.importer.importHeadArtifactsFromLane(otherLane, true);
+        laneToFetchArtifactsFrom = otherLane;
         lane = await consumer.scope.loadLane(otherLaneId);
       }
       return lane;
@@ -286,7 +311,7 @@ class MergeLanesMain {
     const getBitIds = async () => {
       if (isDefaultLane) {
         if (!currentLane) throw new Error(`unable to merge ${_laneId().DEFAULT_LANE}, the current lane was not found`);
-        return this.getMainIdsToMerge(currentLane);
+        return this.getMainIdsToMerge(currentLane, includeNonLaneComps);
       }
       if (!otherLane) throw new Error(`lane must be defined for non-default`);
       return otherLane.toBitIds();
@@ -330,6 +355,10 @@ class MergeLanesMain {
     if (shouldSquash) {
       await squashSnaps(allComponentsStatus, otherLaneId, consumer);
     }
+    if (laneToFetchArtifactsFrom) {
+      const idsToMerge = allComponentsStatus.map(c => c.id);
+      await this.importer.importHeadArtifactsFromLane(laneToFetchArtifactsFrom, idsToMerge, true);
+    }
     const copyOfCurrentLane = currentLane ? currentLane.clone() : undefined;
     const copyOfBitmap = _tempy().default.file();
     const copyOfWorkspaceJsonc = _tempy().default.file();
@@ -380,7 +409,7 @@ class MergeLanesMain {
       }
     }
   }
-  async abortLaneMerge(checkoutProps) {
+  async abortLaneMerge(checkoutProps, mergeAbortOpts) {
     if (!this.workspace) throw new (_workspace().OutsideWorkspaceError)();
     if (!_fsExtra().default.pathExistsSync(this.scope.getLastMergedPath())) {
       throw new (_bitError().BitError)(`unable to abort the last lane-merge because "bit export" was running since then`);
@@ -400,6 +429,15 @@ class MergeLanesMain {
       const laneFromBackup = await _objects().BitObject.parseObject(lastLane, LAST_MERGED_LANE_FILENAME);
       await this.workspace.scope.legacyScope.objects.writeObjectsToTheFS([laneFromBackup]);
     }
+    const previousBitmapBuffer = await _fsExtra().default.readFile(this.getLastMergedBitmapFilename());
+    const previousBitmap = _bitMap().default.loadFromContentWithoutLoadingFiles(previousBitmapBuffer, '', '');
+    const currentRootDirs = this.workspace.consumer.bitMap.getAllTrackDirs();
+    const previousRootDirs = previousBitmap.getAllTrackDirs();
+    const compDirsToRemove = Object.keys(currentRootDirs).filter(dir => !previousRootDirs[dir]);
+    if (!mergeAbortOpts.silent) {
+      await this.mergeAbortPrompt(compDirsToRemove);
+    }
+    await Promise.all(compDirsToRemove.map(dir => _fsExtra().default.remove(dir))); // it doesn't throw if not-exist, so we're good here.
     await _fsExtra().default.copyFile(this.getLastMergedBitmapFilename(), this.workspace.consumer.bitMap.mapPath);
     await _fsExtra().default.copyFile(this.getLastMergedWorkspaceFilename(), this.workspace.consumer.config.path);
     await _fsExtra().default.remove(this.scope.getLastMergedPath());
@@ -419,6 +457,9 @@ class MergeLanesMain {
       checkoutError = err;
     }
     const restoredItems = [`${_path().default.basename(this.workspace.consumer.bitMap.mapPath)} file`, `${_path().default.basename(this.workspace.consumer.config.path)} file`];
+    if (compDirsToRemove.length) {
+      restoredItems.push(`deleted components directories: ${compDirsToRemove.join(', ')}`);
+    }
     if (currentLane) {
       restoredItems.push(`${currentLane.id()} lane object`);
     }
@@ -428,6 +469,19 @@ class MergeLanesMain {
       checkoutError
     };
   }
+  async mergeAbortPrompt(dirsToRemove) {
+    this.logger.clearStatusLine();
+    const dirsToRemoveStr = dirsToRemove.length ? `\nThe following directories introduced by the merge will be deleted: ${dirsToRemove.join(', ')}` : '';
+    const ok = await (0, _yesno().default)({
+      question: `Code changes that were done since the last lane-merge will be lost.${dirsToRemoveStr}
+The .bitmap and workspace.jsonc files will be restored to the state before the merge.
+This action is irreversible.
+${_chalk().default.bold('Do you want to continue? [yes(y)/no(n)]')}`
+    });
+    if (!ok) {
+      throw new (_exceptions().PromptCanceled)();
+    }
+  }
   async getLastMergedLaneContentIfExists() {
     const filename = this.getLastMergedLaneFilename();
     try {
@@ -446,14 +500,17 @@ class MergeLanesMain {
   getLastMergedLaneFilename() {
     return _path().default.join(this.scope.getLastMergedPath(), LAST_MERGED_LANE_FILENAME);
   }
-  async getMainIdsToMerge(lane) {
+  async getMainIdsToMerge(lane, includeNonLaneComps = false) {
     const laneIds = lane.toBitIds();
-    if (!this.workspace) {
-      throw new (_bitError().BitError)(`getMainIdsToMerge needs workspace`);
+    const ids = laneIds.filter(id => id.hasScope());
+    if (includeNonLaneComps) {
+      if (!this.workspace) {
+        throw new (_bitError().BitError)(`getMainIdsToMerge needs workspace`);
+      }
+      const workspaceIds = (await this.workspace.listIds()).map(id => id._legacy);
+      const mainNotOnLane = workspaceIds.filter(id => !laneIds.find(laneId => laneId.isEqualWithoutVersion(id)) && id.hasScope());
+      ids.push(...mainNotOnLane);
     }
-    const workspaceIds = (await this.workspace.listIds()).map(id => id._legacy);
-    const mainNotOnLane = workspaceIds.filter(id => !laneIds.find(laneId => laneId.isEqualWithoutVersion(id)));
-    const ids = [...laneIds, ...mainNotOnLane].filter(id => id.hasScope());
     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
@@ -491,7 +548,7 @@ class MergeLanesMain {
       ignoreMissingHead: true,
       includeVersionHistory: true
     });
-    await this.importer.importHeadArtifactsFromLane(fromLaneObj, true);
+    await this.importer.importHeadArtifactsFromLane(fromLaneObj, undefined, true);
     await this.throwIfNotUpToDate(fromLaneId, toLaneId);
     const repo = this.scope.legacyScope.objects;
     // loop through all components, make sure they're all ahead of main (it might not be on main yet).

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

@@ -1 +1 @@
-{"version":3,"names":["_bitError","data","require","_fsExtra","_interopRequireDefault","_tempy","_path","_cli","_importer","_lanes","_merging","_workspace","_interopRequireWildcard","_chalk","_snapping","_pMapSeries","_bitId","_scope","_scopeComponentsImporter","_laneId","_logger","_checkout","_remove","_lodash","_export","_objects","_getDivergeData","_mergeLanes","_mergeLane","_mergeLaneFromScope","_missingCompsToMerge","_mergeAbort","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","obj","__esModule","default","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","ownKeys","object","enumerableOnly","keys","getOwnPropertySymbols","symbols","filter","sym","enumerable","push","apply","_objectSpread","target","i","arguments","length","source","forEach","_defineProperty2","getOwnPropertyDescriptors","defineProperties","LAST_MERGED_LANE_FILENAME","LAST_MERGED_BITMAP_FILENAME","MergeLanesMain","constructor","workspace","merging","lanes","logger","remove","scope","exporter","importer","checkout","mergeLane","laneName","options","BitError","consumer","mergeStrategy","noSnap","tag","snapMessage","existingOnWorkspaceOnly","build","keepReadme","squash","noSquash","pattern","includeDeps","skipDependencyInstallation","resolveUnrelated","ignoreConfigChanges","skipFetch","currentLaneId","getCurrentLaneId","isDefault","toString","otherLaneId","getParsedLaneId","isEqual","currentLane","loadLane","isDefaultLane","getOtherLane","importObjectsFromMainIfExist","toBitIds","toVersionLatest","undefined","lane","shouldFetch","isNew","otherLane","fetchLaneWithItsComponents","importHeadArtifactsFromLane","getBitIds","Error","DEFAULT_LANE","getMainIdsToMerge","bitIds","debug","allComponentsStatus","getMergeStatus","shouldSquash","componentIds","resolveMultipleComponentIds","compIdsFromPattern","filterIdsFromPoolIdsByPattern","filterComponentsStatus","bitId","find","c","id","isEqualWithoutVersion","unmergedLegitimately","unmergedMessage","workspaceIds","listIds","_legacy","throwForFailures","squashSnaps","copyOfCurrentLane","clone","copyOfBitmap","tempy","file","copyOfWorkspaceJsonc","fs","copyFile","bitMap","mapPath","config","path","mergeResults","mergeSnaps","laneId","localLane","getLastMergedPath","ensureDir","getLastMergedBitmapFilename","getLastMergedWorkspaceFilename","compressed","compress","outputFile","getLastMergedLaneFilename","mergedSuccessfully","failedComponents","every","failedComponent","unchangedLegitimately","deleteResults","readmeComponent","_otherLane$readmeComp","_otherLane$readmeComp2","readmeComponentId","changeVersion","head","hash","removeLocallyByIds","readmeResult","name","configMergeResults","map","configMergeResult","onDestroy","compact","failureMsgs","chalk","bold","red","join","abortLaneMerge","checkoutProps","OutsideWorkspaceError","pathExistsSync","lastLane","getLastMergedLaneContentIfExists","getCurrentLane","laneFromBackup","BitObject","parseObject","legacyScope","objects","writeObjectsToTheFS","_reloadConsumer","unmergedComponents","removeAllComponents","write","configMergeFile","getConflictMergeFile","delete","checkoutResults","checkoutError","ids","restoreMissingComponents","err","error","restoredItems","basename","filename","readFile","code","laneIds","mainNotOnLane","hasScope","modelComponents","Promise","all","getModelComponent","toBitId","mergeFromScope","fromLane","toLane","fromLaneId","LaneId","parse","fromLaneObj","importLaneObject","toLaneId","getDefaultLaneId","toLaneObj","fromLaneBitIds","getIdsToMerge","laneCompIds","BitIds","fromArray","idsToMerge","scopeComponentsImporter","ScopeComponentsImporter","getInstance","importWithoutDeps","ignoreMissingHead","includeVersionHistory","throwIfNotUpToDate","repo","mergedPreviously","mergedNow","log","getLogForSquash","bitObjectsPerComp","pMapSeries","_toLaneObj$getCompone","modelComponent","fromVersionObj","loadVersion","version","isRemoved","fromLaneHead","getRef","toLaneHead","getComponent","divergeData","getDivergeData","sourceHead","targetHead","throwForNoCommonSnap","modifiedVersion","squashOneComp","addComponent","setHead","bitObjects","b","bitObjectsFlat","flat","exportedIds","exported","exportMany","idsWithFutureScope","laneObject","allVersions","exportHeadsOnly","ignoreMissingExternalArtifacts","exportOrigin","status","diffStatus","skipChanges","compsNotUpToDate","componentsStatus","s","upToDate","componentId","provider","cli","loggerMain","_lanesCommand$command","_lanesCommand$command2","createLogger","MergeLanesAspect","lanesCommand","getCommand","mergeLanesMain","commands","MergeLaneCmd","MergeAbortLaneCmd","register","MergeLaneFromScopeCmd","exports","LanesAspect","CLIAspect","WorkspaceAspect","MergingAspect","LoggerAspect","RemoveAspect","ScopeAspect","ExportAspect","ImporterAspect","CheckoutAspect","MainRuntime","compIdsToKeep","allBitIds","bitIdsFromPattern","bitIdsNotFromPattern","hasWithoutVersion","filteredComponentStatus","depsToAdd","missingDepsFromHead","missingDepsFromHistory","compId","fromStatus","targetVersions","snapsOnTargetOnly","_otherLane$getCompone","headOnTarget","remoteVersion","versionObj","flattenedDeps","getAllFlattenedDependencies","depsNotIncludeInPattern","depsOnLane","dep","isOnLane","isIdOnLane","_otherLane$getCompone2","depsOnLaneStr","toStringWithoutVersion","MissingCompsToMerge","uniq","depsWithoutVersion","d","depsUniqWithoutVersion","uniqFromArray","basicLog","getBasicLog","message","currentLaneName","succeededComponents","componentFromModel","modifiedComp","add","versionHistory","updateRebasedVersionHistory","messageTitle","isDiverged","isSourceAhead","isTargetAhead","remoteSnaps","getAllMessages","scopeImporter","importManyObjects","versionObjects","load","v","getFinalMessage","allMessage","allMessageStr","m","currentParents","parents","doSquash","commonSnapBeforeDiverge","addAsOnlyParent","getModelComponentIfExist","ref","removeParent","finalMessage","setSquashed","previousParents","addRuntime","_default"],"sources":["merge-lanes.main.runtime.ts"],"sourcesContent":["import { BitError } from '@teambit/bit-error';\nimport fs from 'fs-extra';\nimport tempy from 'tempy';\nimport path from 'path';\nimport { CLIAspect, CLIMain, MainRuntime } from '@teambit/cli';\nimport ImporterAspect, { ImporterMain } from '@teambit/importer';\nimport { LanesAspect, LanesMain } from '@teambit/lanes';\nimport MergingAspect, {\n  MergingMain,\n  ComponentMergeStatus,\n  ConfigMergeResult,\n  ApplyVersionResults,\n} from '@teambit/merging';\nimport WorkspaceAspect, { OutsideWorkspaceError, Workspace } from '@teambit/workspace';\nimport chalk from 'chalk';\nimport { getBasicLog } from '@teambit/snapping';\nimport { BitId } from '@teambit/legacy-bit-id';\nimport { Log } from '@teambit/legacy/dist/scope/models/version';\nimport pMapSeries from 'p-map-series';\nimport { Scope as LegacyScope } from '@teambit/legacy/dist/scope';\nimport { Consumer } from '@teambit/legacy/dist/consumer';\nimport { MergeStrategy } from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport { BitIds } from '@teambit/legacy/dist/bit-id';\nimport { ScopeAspect, ScopeMain } from '@teambit/scope';\nimport ScopeComponentsImporter from '@teambit/legacy/dist/scope/component-ops/scope-components-importer';\nimport { ComponentID } from '@teambit/component-id';\nimport { DEFAULT_LANE, LaneId } from '@teambit/lane-id';\nimport { Lane, Version } from '@teambit/legacy/dist/scope/models';\nimport { Logger, LoggerAspect, LoggerMain } from '@teambit/logger';\nimport CheckoutAspect, { CheckoutMain, CheckoutProps } from '@teambit/checkout';\nimport { SnapsDistance } from '@teambit/legacy/dist/scope/component-ops/snaps-distance';\nimport { RemoveAspect, RemoveMain } from '@teambit/remove';\nimport { compact, uniq } from 'lodash';\nimport { ExportAspect, ExportMain } from '@teambit/export';\nimport { BitObject } from '@teambit/legacy/dist/scope/objects';\nimport { getDivergeData } from '@teambit/legacy/dist/scope/component-ops/get-diverge-data';\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 } from './merge-abort.cmd';\n\nexport type MergeLaneOptions = {\n  mergeStrategy: MergeStrategy;\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};\n\nconst LAST_MERGED_LANE_FILENAME = 'lane';\nconst LAST_MERGED_BITMAP_FILENAME = 'bitmap';\n\nexport class MergeLanesMain {\n  constructor(\n    private workspace: Workspace | undefined,\n    private merging: MergingMain,\n    private 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 mergeLane(\n    laneName: string,\n    options: MergeLaneOptions\n  ): Promise<{ mergeResults: ApplyVersionResults; deleteResults: any; configMergeResults: ConfigMergeResult[] }> {\n    if (!this.workspace) {\n      throw new BitError(`unable to merge a lane outside of Bit workspace`);\n    }\n    const consumer = this.workspace.consumer;\n\n    const {\n      mergeStrategy,\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    } = options;\n\n    const currentLaneId = consumer.getCurrentLaneId();\n    if (tag && !currentLaneId.isDefault()) {\n      throw new BitError(`--tag only possible when on main. currently checked out to ${currentLaneId.toString()}`);\n    }\n    const otherLaneId = await consumer.getParsedLaneId(laneName);\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    const currentLane = currentLaneId.isDefault() ? null : await consumer.scope.loadLane(currentLaneId);\n    const isDefaultLane = otherLaneId.isDefault();\n    const getOtherLane = async () => {\n      if (isDefaultLane) {\n        if (!skipFetch) {\n          await this.importer.importObjectsFromMainIfExist(currentLane?.toBitIds().toVersionLatest() || []);\n        }\n        return undefined;\n      }\n      let lane = await consumer.scope.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);\n\n        await this.importer.importHeadArtifactsFromLane(otherLane, true);\n\n        lane = await consumer.scope.loadLane(otherLaneId);\n      }\n      return lane;\n    };\n    const otherLane = await getOtherLane();\n    const getBitIds = async () => {\n      if (isDefaultLane) {\n        if (!currentLane) throw new Error(`unable to merge ${DEFAULT_LANE}, the current lane was not found`);\n        return this.getMainIdsToMerge(currentLane);\n      }\n      if (!otherLane) throw new Error(`lane must be defined for non-default`);\n      return otherLane.toBitIds();\n    };\n    const bitIds = await getBitIds();\n    this.logger.debug(`merging the following bitIds: ${bitIds.toString()}`);\n\n    let allComponentsStatus = await this.merging.getMergeStatus(bitIds, currentLane, otherLane, {\n      resolveUnrelated,\n      ignoreConfigChanges,\n    });\n    const shouldSquash = squash || (currentLaneId.isDefault() && !noSquash);\n\n    if (pattern) {\n      const componentIds = await this.workspace.resolveMultipleComponentIds(bitIds);\n      const compIdsFromPattern = this.workspace.scope.filterIdsFromPoolIdsByPattern(pattern, componentIds);\n      allComponentsStatus = await filterComponentsStatus(\n        allComponentsStatus,\n        compIdsFromPattern,\n        bitIds,\n        this.workspace,\n        includeDeps,\n        otherLane || undefined,\n        shouldSquash\n      );\n      bitIds.forEach((bitId) => {\n        if (!allComponentsStatus.find((c) => c.id.isEqualWithoutVersion(bitId))) {\n          allComponentsStatus.push({ id: bitId, unmergedLegitimately: true, unmergedMessage: `excluded by pattern` });\n        }\n      });\n    }\n    if (existingOnWorkspaceOnly) {\n      const workspaceIds = await this.workspace.listIds();\n      const compIdsFromPattern = workspaceIds.filter((id) =>\n        allComponentsStatus.find((c) => c.id.isEqualWithoutVersion(id._legacy))\n      );\n      allComponentsStatus = await filterComponentsStatus(\n        allComponentsStatus,\n        compIdsFromPattern,\n        bitIds,\n        this.workspace,\n        includeDeps,\n        otherLane || undefined,\n        shouldSquash\n      );\n      bitIds.forEach((bitId) => {\n        if (!allComponentsStatus.find((c) => c.id.isEqualWithoutVersion(bitId))) {\n          allComponentsStatus.push({ id: bitId, unmergedLegitimately: true, unmergedMessage: `not in the workspace` });\n        }\n      });\n    }\n\n    throwForFailures();\n\n    if (shouldSquash) {\n      await squashSnaps(allComponentsStatus, otherLaneId, consumer);\n    }\n\n    const copyOfCurrentLane = currentLane ? currentLane.clone() : undefined;\n    const copyOfBitmap = tempy.file();\n    const copyOfWorkspaceJsonc = tempy.file();\n    await fs.copyFile(consumer.bitMap.mapPath, copyOfBitmap);\n    await fs.copyFile(consumer.config.path, copyOfWorkspaceJsonc);\n\n    const mergeResults = await this.merging.mergeSnaps({\n      mergeStrategy,\n      allComponentsStatus,\n      laneId: otherLaneId,\n      localLane: currentLane,\n      noSnap,\n      tag,\n      snapMessage,\n      build,\n      skipDependencyInstallation,\n    });\n\n    await fs.remove(this.scope.getLastMergedPath());\n    await fs.ensureDir(this.scope.getLastMergedPath());\n    await fs.copyFile(copyOfBitmap, this.getLastMergedBitmapFilename());\n    await fs.copyFile(copyOfWorkspaceJsonc, this.getLastMergedWorkspaceFilename());\n    if (copyOfCurrentLane) {\n      const compressed = await copyOfCurrentLane.compress();\n      await fs.outputFile(this.getLastMergedLaneFilename(), compressed);\n    }\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]);\n    } else if (otherLane && !otherLane.readmeComponent) {\n      deleteResults = { readmeResult: `\\nlane ${otherLane.name} doesn't have a readme component` };\n    }\n    const configMergeResults = allComponentsStatus.map((c) => c.configMergeResult);\n\n    await this.workspace.consumer.onDestroy();\n\n    return { mergeResults, deleteResults, configMergeResults: compact(configMergeResults) };\n\n    function throwForFailures() {\n      const failedComponents = allComponentsStatus.filter((c) => c.unmergedMessage && !c.unmergedLegitimately);\n      if (failedComponents.length) {\n        const failureMsgs = failedComponents\n          .map(\n            (failedComponent) =>\n              `${chalk.bold(failedComponent.id.toString())} - ${chalk.red(failedComponent.unmergedMessage as string)}`\n          )\n          .join('\\n');\n        throw new BitError(`unable to merge due to the following failures:\\n${failureMsgs}`);\n      }\n    }\n  }\n\n  async abortLaneMerge(checkoutProps: CheckoutProps) {\n    if (!this.workspace) throw new OutsideWorkspaceError();\n    if (!fs.pathExistsSync(this.scope.getLastMergedPath())) {\n      throw new BitError(`unable to abort the last lane-merge because \"bit export\" was running since then`);\n    }\n    const lastLane = await this.getLastMergedLaneContentIfExists();\n\n    const currentLane = await this.lanes.getCurrentLane();\n\n    if (!fs.pathExistsSync(this.getLastMergedBitmapFilename())) {\n      throw new BitError(\n        `unable to abort the last lane-merge because the ${LAST_MERGED_BITMAP_FILENAME} is missing from ${this.scope.getLastMergedPath()}`\n      );\n    }\n    if (!fs.pathExistsSync(this.getLastMergedWorkspaceFilename())) {\n      throw new BitError(\n        `unable to abort the last lane-merge because the workspace.jsonc is missing from ${this.scope.getLastMergedPath()}`\n      );\n    }\n    if (currentLane) {\n      if (!lastLane) {\n        throw new BitError(\n          `unable to abort the last lane-merge because the ${LAST_MERGED_LANE_FILENAME} is missing from ${this.scope.getLastMergedPath()}`\n        );\n      }\n      const laneFromBackup = await BitObject.parseObject(lastLane, LAST_MERGED_LANE_FILENAME);\n      await this.workspace.scope.legacyScope.objects.writeObjectsToTheFS([laneFromBackup]);\n    }\n    await fs.copyFile(this.getLastMergedBitmapFilename(), this.workspace.consumer.bitMap.mapPath);\n    await fs.copyFile(this.getLastMergedWorkspaceFilename(), this.workspace.consumer.config.path);\n\n    await fs.remove(this.scope.getLastMergedPath());\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 = await 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 (currentLane) {\n      restoredItems.push(`${currentLane.id()} lane object`);\n    }\n\n    return { checkoutResults, restoredItems, checkoutError };\n  }\n\n  private async getLastMergedLaneContentIfExists(): Promise<Buffer | null> {\n    const filename = this.getLastMergedLaneFilename();\n    try {\n      return await fs.readFile(filename);\n    } catch (err: any) {\n      if (err.code === 'ENOENT') return null;\n      throw err;\n    }\n  }\n\n  private getLastMergedBitmapFilename() {\n    return path.join(this.scope.getLastMergedPath(), LAST_MERGED_BITMAP_FILENAME);\n  }\n  private getLastMergedWorkspaceFilename() {\n    return path.join(this.scope.getLastMergedPath(), 'workspace.jsonc');\n  }\n  private getLastMergedLaneFilename() {\n    return path.join(this.scope.getLastMergedPath(), LAST_MERGED_LANE_FILENAME);\n  }\n  private async getMainIdsToMerge(lane: Lane) {\n    const laneIds = lane.toBitIds();\n    if (!this.workspace) {\n      throw new BitError(`getMainIdsToMerge needs workspace`);\n    }\n    const workspaceIds = (await this.workspace.listIds()).map((id) => id._legacy);\n    const mainNotOnLane = workspaceIds.filter((id) => !laneIds.find((laneId) => laneId.isEqualWithoutVersion(id)));\n    const ids = [...laneIds, ...mainNotOnLane].filter((id) => id.hasScope());\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.toBitId().changeVersion(c.head.toString());\n      })\n    );\n  }\n\n  async mergeFromScope(\n    fromLane: string,\n    toLane: string,\n    options: Partial<MergeLaneOptions> & { push?: boolean }\n  ): Promise<{\n    mergedPreviously: string[];\n    mergedNow: string[];\n    exportedIds: string[];\n  }> {\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 = LaneId.parse(fromLane);\n    const fromLaneObj = await this.lanes.importLaneObject(fromLaneId);\n    const toLaneId = toLane === DEFAULT_LANE ? this.lanes.getDefaultLaneId() : LaneId.parse(toLane);\n    const toLaneObj = toLaneId.isDefault() ? undefined : await this.lanes.importLaneObject(toLaneId);\n    const fromLaneBitIds = fromLaneObj.toBitIds();\n    const getIdsToMerge = async (): Promise<BitIds> => {\n      if (!options.pattern) return fromLaneBitIds;\n      const laneCompIds = await this.scope.resolveMultipleComponentIds(fromLaneBitIds);\n      const ids = this.scope.filterIdsFromPoolIdsByPattern(options.pattern, laneCompIds);\n      return BitIds.fromArray(ids.map((id) => id._legacy));\n    };\n    const idsToMerge = await getIdsToMerge();\n    const scopeComponentsImporter = ScopeComponentsImporter.getInstance(this.scope.legacyScope);\n    await scopeComponentsImporter.importWithoutDeps(idsToMerge.toVersionLatest(), {\n      cache: false,\n      lane: fromLaneObj,\n      ignoreMissingHead: true,\n      includeVersionHistory: true,\n    });\n\n    // get their main/to-lane as well\n    await scopeComponentsImporter.importWithoutDeps(idsToMerge.toVersionLatest(), {\n      cache: false,\n      lane: toLaneObj,\n      ignoreMissingHead: true,\n      includeVersionHistory: true,\n    });\n    await this.importer.importHeadArtifactsFromLane(fromLaneObj, true);\n    await this.throwIfNotUpToDate(fromLaneId, toLaneId);\n    const repo = this.scope.legacyScope.objects;\n    // loop through all components, make sure they're all ahead of main (it might not be on main yet).\n    // then, change the version object to include an extra parent to point to the main.\n    // then, change the component object head to point to this changed version\n    const mergedPreviously: BitId[] = [];\n    const mergedNow: BitId[] = [];\n    const shouldSquash = !toLaneObj && !options.noSquash; // only when merging to main we squash.\n    const log = await getLogForSquash(fromLaneId);\n    const bitObjectsPerComp = await pMapSeries(idsToMerge, async (id) => {\n      const modelComponent = await this.scope.legacyScope.getModelComponent(id);\n      const fromVersionObj = await modelComponent.loadVersion(id.version as string, repo);\n      if (fromVersionObj.isRemoved()) return undefined;\n      const fromLaneHead = modelComponent.getRef(id.version as string);\n      if (!fromLaneHead) throw new Error(`lane head must be defined for ${id.toString()}`);\n      const toLaneHead = toLaneObj ? toLaneObj.getComponent(id)?.head : modelComponent.head || null;\n      if (toLaneHead?.isEqual(fromLaneHead)) {\n        mergedPreviously.push(id);\n        return undefined;\n      }\n\n      const divergeData = await getDivergeData({\n        repo,\n        modelComponent,\n        sourceHead: toLaneHead,\n        targetHead: fromLaneHead,\n        throwForNoCommonSnap: true,\n      });\n      const modifiedVersion = shouldSquash\n        ? await squashOneComp(\n            DEFAULT_LANE,\n            fromLaneId,\n            id,\n            divergeData,\n            log,\n            this.scope.legacyScope,\n            fromVersionObj,\n            options.snapMessage\n          )\n        : undefined;\n      const objects: BitObject[] = [];\n      if (modifiedVersion) objects.push(modifiedVersion);\n      if (toLaneObj) {\n        toLaneObj.addComponent({ id: id.changeVersion(undefined), head: fromLaneHead });\n      } else {\n        modelComponent.setHead(fromLaneHead);\n        objects.push(modelComponent);\n      }\n      mergedNow.push(id);\n      return { id, objects };\n    });\n    const bitObjects = compact(bitObjectsPerComp).map((b) => b.objects);\n    const bitObjectsFlat = bitObjects.flat();\n    if (toLaneObj) bitObjectsFlat.push(toLaneObj);\n    await repo.writeObjectsToTheFS(bitObjectsFlat);\n    let exportedIds: string[] = [];\n    if (options.push) {\n      const ids = compact(bitObjectsPerComp).map((b) => b.id);\n      const bitIds = BitIds.fromArray(ids);\n      const { exported } = await this.exporter.exportMany({\n        scope: this.scope.legacyScope,\n        ids: shouldSquash ? bitIds : new BitIds(),\n        idsWithFutureScope: shouldSquash ? bitIds : new BitIds(),\n        laneObject: toLaneObj,\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        exportHeadsOnly: shouldSquash,\n        // all artifacts must be pushed. they're all considered \"external\" in this case, because it's running from a\n        // bare-scope, but we don't want to ignore them, otherwise, they'll be missing from the component-scopes.\n        ignoreMissingExternalArtifacts: false,\n        exportOrigin: 'lane-merge',\n      });\n      exportedIds = exported.map((id) => id.toString());\n    }\n\n    return {\n      mergedPreviously: mergedPreviously.map((id) => id.toString()),\n      mergedNow: mergedNow.map((id) => id.toString()),\n      exportedIds,\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  ];\n  static runtime = MainRuntime;\n\n  static async provider([lanes, cli, workspace, merging, loggerMain, remove, scope, exporter, importer, checkout]: [\n    LanesMain,\n    CLIMain,\n    Workspace,\n    MergingMain,\n    LoggerMain,\n    RemoveMain,\n    ScopeMain,\n    ExportMain,\n    ImporterMain,\n    CheckoutMain\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));\n    lanesCommand?.commands?.push(new MergeAbortLaneCmd(mergeLanesMain));\n    cli.register(new MergeLaneFromScopeCmd(mergeLanesMain));\n    return mergeLanesMain;\n  }\n}\n\nasync function filterComponentsStatus(\n  allComponentsStatus: ComponentMergeStatus[],\n  compIdsToKeep: ComponentID[],\n  allBitIds: BitId[],\n  workspace: Workspace,\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 = BitIds.fromArray(compIdsToKeep.map((c) => c._legacy));\n  const bitIdsNotFromPattern = allBitIds.filter((bitId) => !bitIdsFromPattern.hasWithoutVersion(bitId));\n  const filteredComponentStatus: ComponentMergeStatus[] = [];\n  const depsToAdd: BitId[] = [];\n  const missingDepsFromHead = {};\n  const missingDepsFromHistory: string[] = [];\n  await pMapSeries(compIdsToKeep, async (compId) => {\n    const fromStatus = allComponentsStatus.find((c) => c.id.isEqualWithoutVersion(compId._legacy));\n    if (!fromStatus) {\n      throw new Error(`filterComponentsStatus: unable to find ${compId.toString()} in component-status`);\n    }\n    filteredComponentStatus.push(fromStatus);\n    if (fromStatus.unmergedMessage) {\n      return;\n    }\n    if (!otherLane) {\n      // if merging main, no need to check whether the deps are included in the pattern.\n      return;\n    }\n    const { divergeData } = fromStatus;\n    if (!divergeData) {\n      throw new Error(`filterComponentsStatus: unable to find divergeData for ${compId.toString()}`);\n    }\n    let targetVersions = divergeData.snapsOnTargetOnly;\n    if (!targetVersions.length) {\n      return;\n    }\n    const modelComponent = await workspace.consumer.scope.getModelComponent(compId._legacy);\n    if (shouldSquash) {\n      // no need to check all versions, we merge only the head\n      const headOnTarget = otherLane ? otherLane.getComponent(compId._legacy)?.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    await pMapSeries(targetVersions, async (remoteVersion) => {\n      const versionObj = await modelComponent.loadVersion(remoteVersion.toString(), workspace.consumer.scope.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: BitId[] = [];\n      await Promise.all(\n        depsNotIncludeInPattern.map(async (dep) => {\n          const isOnLane = await workspace.consumer.scope.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._legacy)?.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 = BitIds.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(allComponentsStatus: ComponentMergeStatus[], otherLaneId: LaneId, consumer: Consumer) {\n  const currentLaneName = consumer.getCurrentLaneId().name;\n  const succeededComponents = allComponentsStatus.filter((c) => !c.unmergedMessage);\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        consumer.scope,\n        componentFromModel\n      );\n      if (modifiedComp) {\n        consumer.scope.objects.add(modifiedComp);\n        const modelComponent = await consumer.scope.getModelComponent(id);\n        const versionHistory = await modelComponent.updateRebasedVersionHistory(consumer.scope.objects, [modifiedComp]);\n        if (versionHistory) consumer.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: BitId,\n  divergeData: SnapsDistance,\n  log: Log,\n  scope: LegacyScope,\n  componentFromModel?: Version,\n  messageTitle?: string\n): Promise<Version | undefined> {\n  if (divergeData.isDiverged()) {\n    throw new BitError(`unable to squash because ${id.toString()} is diverged in history.\nconsider switching to \"${\n      otherLaneId.name\n    }\" first, merging \"${currentLaneName}\", then switching back to \"${currentLaneName}\" and merging \"${\n      otherLaneId.name\n    }\"\nalternatively, 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 undefined;\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 undefined;\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  // no need to check this case. even if it has only one snap ahead, we want to do the \"squash\", and run \"addAsOnlyParent\"\n  // to make sure it doesn't not have two parents.\n  // if (remoteSnaps.length === 1) {\n  //   // nothing to squash. it has only one commit.\n  //   return;\n  // }\n  if (!componentFromModel) {\n    throw new Error('unable to squash, the componentFromModel is missing');\n  }\n\n  const currentParents = componentFromModel.parents;\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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"}
+{"version":3,"names":["_bitError","data","require","_fsExtra","_interopRequireDefault","_yesno","_exceptions","_tempy","_path","_cli","_importer","_lanes","_merging","_workspace","_interopRequireWildcard","_chalk","_snapping","_pMapSeries","_bitId","_scope","_scopeComponentsImporter","_laneId","_logger","_checkout","_remove","_lodash","_export","_objects","_getDivergeData","_bitMap","_mergeLanes","_mergeLane","_mergeLaneFromScope","_missingCompsToMerge","_mergeAbort","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","obj","__esModule","default","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","ownKeys","object","enumerableOnly","keys","getOwnPropertySymbols","symbols","filter","sym","enumerable","push","apply","_objectSpread","target","i","arguments","length","source","forEach","_defineProperty2","getOwnPropertyDescriptors","defineProperties","LAST_MERGED_LANE_FILENAME","LAST_MERGED_BITMAP_FILENAME","MergeLanesMain","constructor","workspace","merging","lanes","logger","remove","scope","exporter","importer","checkout","mergeLane","laneName","options","BitError","consumer","mergeStrategy","noSnap","tag","snapMessage","existingOnWorkspaceOnly","build","keepReadme","squash","noSquash","pattern","includeDeps","skipDependencyInstallation","resolveUnrelated","ignoreConfigChanges","skipFetch","includeNonLaneComps","currentLaneId","getCurrentLaneId","isDefault","toString","otherLaneId","getParsedLaneId","isEqual","currentLane","loadLane","isDefaultLane","laneToFetchArtifactsFrom","getOtherLane","importObjectsFromMainIfExist","toBitIds","toVersionLatest","undefined","lane","shouldFetch","isNew","otherLane","fetchLaneWithItsComponents","getBitIds","Error","DEFAULT_LANE","getMainIdsToMerge","bitIds","debug","allComponentsStatus","getMergeStatus","shouldSquash","componentIds","resolveMultipleComponentIds","compIdsFromPattern","filterIdsFromPoolIdsByPattern","filterComponentsStatus","bitId","find","c","id","isEqualWithoutVersion","unmergedLegitimately","unmergedMessage","workspaceIds","listIds","_legacy","throwForFailures","squashSnaps","idsToMerge","map","importHeadArtifactsFromLane","copyOfCurrentLane","clone","copyOfBitmap","tempy","file","copyOfWorkspaceJsonc","fs","copyFile","bitMap","mapPath","config","path","mergeResults","mergeSnaps","laneId","localLane","getLastMergedPath","ensureDir","getLastMergedBitmapFilename","getLastMergedWorkspaceFilename","compressed","compress","outputFile","getLastMergedLaneFilename","mergedSuccessfully","failedComponents","every","failedComponent","unchangedLegitimately","deleteResults","readmeComponent","_otherLane$readmeComp","_otherLane$readmeComp2","readmeComponentId","changeVersion","head","hash","removeLocallyByIds","readmeResult","name","configMergeResults","configMergeResult","onDestroy","compact","failureMsgs","chalk","bold","red","join","abortLaneMerge","checkoutProps","mergeAbortOpts","OutsideWorkspaceError","pathExistsSync","lastLane","getLastMergedLaneContentIfExists","getCurrentLane","laneFromBackup","BitObject","parseObject","legacyScope","objects","writeObjectsToTheFS","previousBitmapBuffer","readFile","previousBitmap","BitMap","loadFromContentWithoutLoadingFiles","currentRootDirs","getAllTrackDirs","previousRootDirs","compDirsToRemove","dir","silent","mergeAbortPrompt","Promise","all","_reloadConsumer","unmergedComponents","removeAllComponents","write","configMergeFile","getConflictMergeFile","delete","checkoutResults","checkoutError","ids","restoreMissingComponents","err","error","restoredItems","basename","dirsToRemove","clearStatusLine","dirsToRemoveStr","ok","yesno","question","PromptCanceled","filename","code","laneIds","hasScope","mainNotOnLane","modelComponents","getModelComponent","toBitId","mergeFromScope","fromLane","toLane","fromLaneId","LaneId","parse","fromLaneObj","importLaneObject","toLaneId","getDefaultLaneId","toLaneObj","fromLaneBitIds","getIdsToMerge","laneCompIds","BitIds","fromArray","scopeComponentsImporter","ScopeComponentsImporter","getInstance","importWithoutDeps","ignoreMissingHead","includeVersionHistory","throwIfNotUpToDate","repo","mergedPreviously","mergedNow","log","getLogForSquash","bitObjectsPerComp","pMapSeries","_toLaneObj$getCompone","modelComponent","fromVersionObj","loadVersion","version","isRemoved","fromLaneHead","getRef","toLaneHead","getComponent","divergeData","getDivergeData","sourceHead","targetHead","throwForNoCommonSnap","modifiedVersion","squashOneComp","addComponent","setHead","bitObjects","b","bitObjectsFlat","flat","exportedIds","exported","exportMany","idsWithFutureScope","laneObject","allVersions","exportHeadsOnly","ignoreMissingExternalArtifacts","exportOrigin","status","diffStatus","skipChanges","compsNotUpToDate","componentsStatus","s","upToDate","componentId","provider","cli","loggerMain","_lanesCommand$command","_lanesCommand$command2","createLogger","MergeLanesAspect","lanesCommand","getCommand","mergeLanesMain","commands","MergeLaneCmd","MergeAbortLaneCmd","register","MergeLaneFromScopeCmd","exports","LanesAspect","CLIAspect","WorkspaceAspect","MergingAspect","LoggerAspect","RemoveAspect","ScopeAspect","ExportAspect","ImporterAspect","CheckoutAspect","MainRuntime","compIdsToKeep","allBitIds","bitIdsFromPattern","bitIdsNotFromPattern","hasWithoutVersion","filteredComponentStatus","depsToAdd","missingDepsFromHead","missingDepsFromHistory","compId","fromStatus","targetVersions","snapsOnTargetOnly","_otherLane$getCompone","headOnTarget","remoteVersion","versionObj","flattenedDeps","getAllFlattenedDependencies","depsNotIncludeInPattern","depsOnLane","dep","isOnLane","isIdOnLane","_otherLane$getCompone2","depsOnLaneStr","toStringWithoutVersion","MissingCompsToMerge","uniq","depsWithoutVersion","d","depsUniqWithoutVersion","uniqFromArray","basicLog","getBasicLog","message","currentLaneName","succeededComponents","componentFromModel","modifiedComp","add","versionHistory","updateRebasedVersionHistory","messageTitle","isDiverged","isSourceAhead","isTargetAhead","remoteSnaps","getAllMessages","scopeImporter","importManyObjects","versionObjects","load","v","getFinalMessage","allMessage","allMessageStr","m","currentParents","parents","doSquash","commonSnapBeforeDiverge","addAsOnlyParent","getModelComponentIfExist","ref","removeParent","finalMessage","setSquashed","previousParents","addRuntime","_default"],"sources":["merge-lanes.main.runtime.ts"],"sourcesContent":["import { BitError } from '@teambit/bit-error';\nimport fs from 'fs-extra';\nimport yesno from 'yesno';\nimport { PromptCanceled } from '@teambit/legacy/dist/prompts/exceptions';\nimport tempy from 'tempy';\nimport path from 'path';\nimport { CLIAspect, CLIMain, MainRuntime } from '@teambit/cli';\nimport ImporterAspect, { ImporterMain } from '@teambit/importer';\nimport { LanesAspect, LanesMain } from '@teambit/lanes';\nimport MergingAspect, {\n  MergingMain,\n  ComponentMergeStatus,\n  ConfigMergeResult,\n  ApplyVersionResults,\n} from '@teambit/merging';\nimport WorkspaceAspect, { OutsideWorkspaceError, Workspace } from '@teambit/workspace';\nimport chalk from 'chalk';\nimport { getBasicLog } from '@teambit/snapping';\nimport { BitId } from '@teambit/legacy-bit-id';\nimport { Log } from '@teambit/legacy/dist/scope/models/version';\nimport pMapSeries from 'p-map-series';\nimport { Scope as LegacyScope } from '@teambit/legacy/dist/scope';\nimport { Consumer } from '@teambit/legacy/dist/consumer';\nimport { MergeStrategy } from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport { BitIds } from '@teambit/legacy/dist/bit-id';\nimport { ScopeAspect, ScopeMain } from '@teambit/scope';\nimport ScopeComponentsImporter from '@teambit/legacy/dist/scope/component-ops/scope-components-importer';\nimport { ComponentID } from '@teambit/component-id';\nimport { DEFAULT_LANE, LaneId } from '@teambit/lane-id';\nimport { Lane, Version } from '@teambit/legacy/dist/scope/models';\nimport { Logger, LoggerAspect, LoggerMain } from '@teambit/logger';\nimport CheckoutAspect, { CheckoutMain, CheckoutProps } from '@teambit/checkout';\nimport { SnapsDistance } from '@teambit/legacy/dist/scope/component-ops/snaps-distance';\nimport { RemoveAspect, RemoveMain } from '@teambit/remove';\nimport { compact, uniq } from 'lodash';\nimport { ExportAspect, ExportMain } from '@teambit/export';\nimport { BitObject } from '@teambit/legacy/dist/scope/objects';\nimport { getDivergeData } from '@teambit/legacy/dist/scope/component-ops/get-diverge-data';\nimport BitMap from '@teambit/legacy/dist/consumer/bit-map';\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';\n\nexport type MergeLaneOptions = {\n  mergeStrategy: MergeStrategy;\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  includeNonLaneComps?: boolean;\n};\n\nconst LAST_MERGED_LANE_FILENAME = 'lane';\nconst LAST_MERGED_BITMAP_FILENAME = 'bitmap';\n\nexport class MergeLanesMain {\n  constructor(\n    private workspace: Workspace | undefined,\n    private merging: MergingMain,\n    private 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  // eslint-disable-next-line complexity\n  async mergeLane(\n    laneName: string,\n    options: MergeLaneOptions\n  ): Promise<{ mergeResults: ApplyVersionResults; deleteResults: any; configMergeResults: ConfigMergeResult[] }> {\n    if (!this.workspace) {\n      throw new BitError(`unable to merge a lane outside of Bit workspace`);\n    }\n    const consumer = this.workspace.consumer;\n\n    const {\n      mergeStrategy,\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      includeNonLaneComps,\n    } = options;\n\n    const currentLaneId = consumer.getCurrentLaneId();\n    if (tag && !currentLaneId.isDefault()) {\n      throw new BitError(`--tag only possible when on main. currently checked out to ${currentLaneId.toString()}`);\n    }\n    const otherLaneId = await consumer.getParsedLaneId(laneName);\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    const currentLane = currentLaneId.isDefault() ? null : await consumer.scope.loadLane(currentLaneId);\n    const isDefaultLane = otherLaneId.isDefault();\n    let laneToFetchArtifactsFrom: Lane | undefined;\n    const getOtherLane = async () => {\n      if (isDefaultLane) {\n        if (!skipFetch) {\n          await this.importer.importObjectsFromMainIfExist(currentLane?.toBitIds().toVersionLatest() || []);\n        }\n        return undefined;\n      }\n      let lane = await consumer.scope.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);\n        laneToFetchArtifactsFrom = otherLane;\n        lane = await consumer.scope.loadLane(otherLaneId);\n      }\n      return lane;\n    };\n    const otherLane = await getOtherLane();\n    const getBitIds = async () => {\n      if (isDefaultLane) {\n        if (!currentLane) throw new Error(`unable to merge ${DEFAULT_LANE}, the current lane was not found`);\n        return this.getMainIdsToMerge(currentLane, includeNonLaneComps);\n      }\n      if (!otherLane) throw new Error(`lane must be defined for non-default`);\n      return otherLane.toBitIds();\n    };\n    const bitIds = await getBitIds();\n    this.logger.debug(`merging the following bitIds: ${bitIds.toString()}`);\n\n    let allComponentsStatus = await this.merging.getMergeStatus(bitIds, currentLane, otherLane, {\n      resolveUnrelated,\n      ignoreConfigChanges,\n    });\n    const shouldSquash = squash || (currentLaneId.isDefault() && !noSquash);\n\n    if (pattern) {\n      const componentIds = await this.workspace.resolveMultipleComponentIds(bitIds);\n      const compIdsFromPattern = this.workspace.scope.filterIdsFromPoolIdsByPattern(pattern, componentIds);\n      allComponentsStatus = await filterComponentsStatus(\n        allComponentsStatus,\n        compIdsFromPattern,\n        bitIds,\n        this.workspace,\n        includeDeps,\n        otherLane || undefined,\n        shouldSquash\n      );\n      bitIds.forEach((bitId) => {\n        if (!allComponentsStatus.find((c) => c.id.isEqualWithoutVersion(bitId))) {\n          allComponentsStatus.push({ id: bitId, unmergedLegitimately: true, unmergedMessage: `excluded by pattern` });\n        }\n      });\n    }\n    if (existingOnWorkspaceOnly) {\n      const workspaceIds = await this.workspace.listIds();\n      const compIdsFromPattern = workspaceIds.filter((id) =>\n        allComponentsStatus.find((c) => c.id.isEqualWithoutVersion(id._legacy))\n      );\n      allComponentsStatus = await filterComponentsStatus(\n        allComponentsStatus,\n        compIdsFromPattern,\n        bitIds,\n        this.workspace,\n        includeDeps,\n        otherLane || undefined,\n        shouldSquash\n      );\n      bitIds.forEach((bitId) => {\n        if (!allComponentsStatus.find((c) => c.id.isEqualWithoutVersion(bitId))) {\n          allComponentsStatus.push({ id: bitId, unmergedLegitimately: true, unmergedMessage: `not in the workspace` });\n        }\n      });\n    }\n\n    throwForFailures();\n\n    if (shouldSquash) {\n      await squashSnaps(allComponentsStatus, otherLaneId, consumer);\n    }\n\n    if (laneToFetchArtifactsFrom) {\n      const idsToMerge = allComponentsStatus.map((c) => c.id);\n      await this.importer.importHeadArtifactsFromLane(laneToFetchArtifactsFrom, idsToMerge, true);\n    }\n\n    const copyOfCurrentLane = currentLane ? currentLane.clone() : undefined;\n    const copyOfBitmap = tempy.file();\n    const copyOfWorkspaceJsonc = tempy.file();\n    await fs.copyFile(consumer.bitMap.mapPath, copyOfBitmap);\n    await fs.copyFile(consumer.config.path, copyOfWorkspaceJsonc);\n\n    const mergeResults = await this.merging.mergeSnaps({\n      mergeStrategy,\n      allComponentsStatus,\n      laneId: otherLaneId,\n      localLane: currentLane,\n      noSnap,\n      tag,\n      snapMessage,\n      build,\n      skipDependencyInstallation,\n    });\n\n    await fs.remove(this.scope.getLastMergedPath());\n    await fs.ensureDir(this.scope.getLastMergedPath());\n    await fs.copyFile(copyOfBitmap, this.getLastMergedBitmapFilename());\n    await fs.copyFile(copyOfWorkspaceJsonc, this.getLastMergedWorkspaceFilename());\n    if (copyOfCurrentLane) {\n      const compressed = await copyOfCurrentLane.compress();\n      await fs.outputFile(this.getLastMergedLaneFilename(), compressed);\n    }\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]);\n    } else if (otherLane && !otherLane.readmeComponent) {\n      deleteResults = { readmeResult: `\\nlane ${otherLane.name} doesn't have a readme component` };\n    }\n    const configMergeResults = allComponentsStatus.map((c) => c.configMergeResult);\n\n    await this.workspace.consumer.onDestroy();\n\n    return { mergeResults, deleteResults, configMergeResults: compact(configMergeResults) };\n\n    function throwForFailures() {\n      const failedComponents = allComponentsStatus.filter((c) => c.unmergedMessage && !c.unmergedLegitimately);\n      if (failedComponents.length) {\n        const failureMsgs = failedComponents\n          .map(\n            (failedComponent) =>\n              `${chalk.bold(failedComponent.id.toString())} - ${chalk.red(failedComponent.unmergedMessage as string)}`\n          )\n          .join('\\n');\n        throw new BitError(`unable to merge due to the following failures:\\n${failureMsgs}`);\n      }\n    }\n  }\n\n  async abortLaneMerge(checkoutProps: CheckoutProps, mergeAbortOpts: MergeAbortOpts) {\n    if (!this.workspace) throw new OutsideWorkspaceError();\n    if (!fs.pathExistsSync(this.scope.getLastMergedPath())) {\n      throw new BitError(`unable to abort the last lane-merge because \"bit export\" was running since then`);\n    }\n    const lastLane = await this.getLastMergedLaneContentIfExists();\n\n    const currentLane = await this.lanes.getCurrentLane();\n\n    if (!fs.pathExistsSync(this.getLastMergedBitmapFilename())) {\n      throw new BitError(\n        `unable to abort the last lane-merge because the ${LAST_MERGED_BITMAP_FILENAME} is missing from ${this.scope.getLastMergedPath()}`\n      );\n    }\n    if (!fs.pathExistsSync(this.getLastMergedWorkspaceFilename())) {\n      throw new BitError(\n        `unable to abort the last lane-merge because the workspace.jsonc is missing from ${this.scope.getLastMergedPath()}`\n      );\n    }\n    if (currentLane) {\n      if (!lastLane) {\n        throw new BitError(\n          `unable to abort the last lane-merge because the ${LAST_MERGED_LANE_FILENAME} is missing from ${this.scope.getLastMergedPath()}`\n        );\n      }\n      const laneFromBackup = await BitObject.parseObject(lastLane, LAST_MERGED_LANE_FILENAME);\n      await this.workspace.scope.legacyScope.objects.writeObjectsToTheFS([laneFromBackup]);\n    }\n    const previousBitmapBuffer = await fs.readFile(this.getLastMergedBitmapFilename());\n    const previousBitmap = BitMap.loadFromContentWithoutLoadingFiles(previousBitmapBuffer, '', '');\n    const currentRootDirs = this.workspace.consumer.bitMap.getAllTrackDirs();\n    const previousRootDirs = previousBitmap.getAllTrackDirs();\n    const compDirsToRemove = Object.keys(currentRootDirs).filter((dir) => !previousRootDirs[dir]);\n\n    if (!mergeAbortOpts.silent) {\n      await this.mergeAbortPrompt(compDirsToRemove);\n    }\n    await Promise.all(compDirsToRemove.map((dir) => fs.remove(dir))); // it doesn't throw if not-exist, so we're good here.\n    await fs.copyFile(this.getLastMergedBitmapFilename(), this.workspace.consumer.bitMap.mapPath);\n    await fs.copyFile(this.getLastMergedWorkspaceFilename(), this.workspace.consumer.config.path);\n\n    await fs.remove(this.scope.getLastMergedPath());\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 = await 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 mergeAbortPrompt(dirsToRemove: string[]) {\n    this.logger.clearStatusLine();\n    const dirsToRemoveStr = dirsToRemove.length\n      ? `\\nThe following directories introduced by the merge will be deleted: ${dirsToRemove.join(', ')}`\n      : '';\n    const ok = await yesno({\n      question: `Code changes that were done since the last lane-merge will be lost.${dirsToRemoveStr}\nThe .bitmap and workspace.jsonc files will be restored to the state before the merge.\nThis action is irreversible.\n${chalk.bold('Do you want to continue? [yes(y)/no(n)]')}`,\n    });\n    if (!ok) {\n      throw new PromptCanceled();\n    }\n  }\n\n  private async getLastMergedLaneContentIfExists(): Promise<Buffer | null> {\n    const filename = this.getLastMergedLaneFilename();\n    try {\n      return await fs.readFile(filename);\n    } catch (err: any) {\n      if (err.code === 'ENOENT') return null;\n      throw err;\n    }\n  }\n\n  private getLastMergedBitmapFilename() {\n    return path.join(this.scope.getLastMergedPath(), LAST_MERGED_BITMAP_FILENAME);\n  }\n  private getLastMergedWorkspaceFilename() {\n    return path.join(this.scope.getLastMergedPath(), 'workspace.jsonc');\n  }\n  private getLastMergedLaneFilename() {\n    return path.join(this.scope.getLastMergedPath(), LAST_MERGED_LANE_FILENAME);\n  }\n  private async getMainIdsToMerge(lane: Lane, includeNonLaneComps = false) {\n    const laneIds = lane.toBitIds();\n    const ids = laneIds.filter((id) => id.hasScope());\n    if (includeNonLaneComps) {\n      if (!this.workspace) {\n        throw new BitError(`getMainIdsToMerge needs workspace`);\n      }\n      const workspaceIds = (await this.workspace.listIds()).map((id) => id._legacy);\n      const mainNotOnLane = workspaceIds.filter(\n        (id) => !laneIds.find((laneId) => laneId.isEqualWithoutVersion(id)) && id.hasScope()\n      );\n      ids.push(...mainNotOnLane);\n    }\n\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.toBitId().changeVersion(c.head.toString());\n      })\n    );\n  }\n\n  async mergeFromScope(\n    fromLane: string,\n    toLane: string,\n    options: Partial<MergeLaneOptions> & { push?: boolean }\n  ): Promise<{\n    mergedPreviously: string[];\n    mergedNow: string[];\n    exportedIds: string[];\n  }> {\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 = LaneId.parse(fromLane);\n    const fromLaneObj = await this.lanes.importLaneObject(fromLaneId);\n    const toLaneId = toLane === DEFAULT_LANE ? this.lanes.getDefaultLaneId() : LaneId.parse(toLane);\n    const toLaneObj = toLaneId.isDefault() ? undefined : await this.lanes.importLaneObject(toLaneId);\n    const fromLaneBitIds = fromLaneObj.toBitIds();\n    const getIdsToMerge = async (): Promise<BitIds> => {\n      if (!options.pattern) return fromLaneBitIds;\n      const laneCompIds = await this.scope.resolveMultipleComponentIds(fromLaneBitIds);\n      const ids = this.scope.filterIdsFromPoolIdsByPattern(options.pattern, laneCompIds);\n      return BitIds.fromArray(ids.map((id) => id._legacy));\n    };\n    const idsToMerge = await getIdsToMerge();\n    const scopeComponentsImporter = ScopeComponentsImporter.getInstance(this.scope.legacyScope);\n    await scopeComponentsImporter.importWithoutDeps(idsToMerge.toVersionLatest(), {\n      cache: false,\n      lane: fromLaneObj,\n      ignoreMissingHead: true,\n      includeVersionHistory: true,\n    });\n\n    // get their main/to-lane as well\n    await scopeComponentsImporter.importWithoutDeps(idsToMerge.toVersionLatest(), {\n      cache: false,\n      lane: toLaneObj,\n      ignoreMissingHead: true,\n      includeVersionHistory: true,\n    });\n    await this.importer.importHeadArtifactsFromLane(fromLaneObj, undefined, true);\n    await this.throwIfNotUpToDate(fromLaneId, toLaneId);\n    const repo = this.scope.legacyScope.objects;\n    // loop through all components, make sure they're all ahead of main (it might not be on main yet).\n    // then, change the version object to include an extra parent to point to the main.\n    // then, change the component object head to point to this changed version\n    const mergedPreviously: BitId[] = [];\n    const mergedNow: BitId[] = [];\n    const shouldSquash = !toLaneObj && !options.noSquash; // only when merging to main we squash.\n    const log = await getLogForSquash(fromLaneId);\n    const bitObjectsPerComp = await pMapSeries(idsToMerge, async (id) => {\n      const modelComponent = await this.scope.legacyScope.getModelComponent(id);\n      const fromVersionObj = await modelComponent.loadVersion(id.version as string, repo);\n      if (fromVersionObj.isRemoved()) return undefined;\n      const fromLaneHead = modelComponent.getRef(id.version as string);\n      if (!fromLaneHead) throw new Error(`lane head must be defined for ${id.toString()}`);\n      const toLaneHead = toLaneObj ? toLaneObj.getComponent(id)?.head : modelComponent.head || null;\n      if (toLaneHead?.isEqual(fromLaneHead)) {\n        mergedPreviously.push(id);\n        return undefined;\n      }\n\n      const divergeData = await getDivergeData({\n        repo,\n        modelComponent,\n        sourceHead: toLaneHead,\n        targetHead: fromLaneHead,\n        throwForNoCommonSnap: true,\n      });\n      const modifiedVersion = shouldSquash\n        ? await squashOneComp(\n            DEFAULT_LANE,\n            fromLaneId,\n            id,\n            divergeData,\n            log,\n            this.scope.legacyScope,\n            fromVersionObj,\n            options.snapMessage\n          )\n        : undefined;\n      const objects: BitObject[] = [];\n      if (modifiedVersion) objects.push(modifiedVersion);\n      if (toLaneObj) {\n        toLaneObj.addComponent({ id: id.changeVersion(undefined), head: fromLaneHead });\n      } else {\n        modelComponent.setHead(fromLaneHead);\n        objects.push(modelComponent);\n      }\n      mergedNow.push(id);\n      return { id, objects };\n    });\n    const bitObjects = compact(bitObjectsPerComp).map((b) => b.objects);\n    const bitObjectsFlat = bitObjects.flat();\n    if (toLaneObj) bitObjectsFlat.push(toLaneObj);\n    await repo.writeObjectsToTheFS(bitObjectsFlat);\n    let exportedIds: string[] = [];\n    if (options.push) {\n      const ids = compact(bitObjectsPerComp).map((b) => b.id);\n      const bitIds = BitIds.fromArray(ids);\n      const { exported } = await this.exporter.exportMany({\n        scope: this.scope.legacyScope,\n        ids: shouldSquash ? bitIds : new BitIds(),\n        idsWithFutureScope: shouldSquash ? bitIds : new BitIds(),\n        laneObject: toLaneObj,\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        exportHeadsOnly: shouldSquash,\n        // all artifacts must be pushed. they're all considered \"external\" in this case, because it's running from a\n        // bare-scope, but we don't want to ignore them, otherwise, they'll be missing from the component-scopes.\n        ignoreMissingExternalArtifacts: false,\n        exportOrigin: 'lane-merge',\n      });\n      exportedIds = exported.map((id) => id.toString());\n    }\n\n    return {\n      mergedPreviously: mergedPreviously.map((id) => id.toString()),\n      mergedNow: mergedNow.map((id) => id.toString()),\n      exportedIds,\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  ];\n  static runtime = MainRuntime;\n\n  static async provider([lanes, cli, workspace, merging, loggerMain, remove, scope, exporter, importer, checkout]: [\n    LanesMain,\n    CLIMain,\n    Workspace,\n    MergingMain,\n    LoggerMain,\n    RemoveMain,\n    ScopeMain,\n    ExportMain,\n    ImporterMain,\n    CheckoutMain\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));\n    lanesCommand?.commands?.push(new MergeAbortLaneCmd(mergeLanesMain));\n    cli.register(new MergeLaneFromScopeCmd(mergeLanesMain));\n    return mergeLanesMain;\n  }\n}\n\nasync function filterComponentsStatus(\n  allComponentsStatus: ComponentMergeStatus[],\n  compIdsToKeep: ComponentID[],\n  allBitIds: BitId[],\n  workspace: Workspace,\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 = BitIds.fromArray(compIdsToKeep.map((c) => c._legacy));\n  const bitIdsNotFromPattern = allBitIds.filter((bitId) => !bitIdsFromPattern.hasWithoutVersion(bitId));\n  const filteredComponentStatus: ComponentMergeStatus[] = [];\n  const depsToAdd: BitId[] = [];\n  const missingDepsFromHead = {};\n  const missingDepsFromHistory: string[] = [];\n  await pMapSeries(compIdsToKeep, async (compId) => {\n    const fromStatus = allComponentsStatus.find((c) => c.id.isEqualWithoutVersion(compId._legacy));\n    if (!fromStatus) {\n      throw new Error(`filterComponentsStatus: unable to find ${compId.toString()} in component-status`);\n    }\n    filteredComponentStatus.push(fromStatus);\n    if (fromStatus.unmergedMessage) {\n      return;\n    }\n    if (!otherLane) {\n      // if merging main, no need to check whether the deps are included in the pattern.\n      return;\n    }\n    const { divergeData } = fromStatus;\n    if (!divergeData) {\n      throw new Error(`filterComponentsStatus: unable to find divergeData for ${compId.toString()}`);\n    }\n    let targetVersions = divergeData.snapsOnTargetOnly;\n    if (!targetVersions.length) {\n      return;\n    }\n    const modelComponent = await workspace.consumer.scope.getModelComponent(compId._legacy);\n    if (shouldSquash) {\n      // no need to check all versions, we merge only the head\n      const headOnTarget = otherLane ? otherLane.getComponent(compId._legacy)?.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    await pMapSeries(targetVersions, async (remoteVersion) => {\n      const versionObj = await modelComponent.loadVersion(remoteVersion.toString(), workspace.consumer.scope.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: BitId[] = [];\n      await Promise.all(\n        depsNotIncludeInPattern.map(async (dep) => {\n          const isOnLane = await workspace.consumer.scope.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._legacy)?.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 = BitIds.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(allComponentsStatus: ComponentMergeStatus[], otherLaneId: LaneId, consumer: Consumer) {\n  const currentLaneName = consumer.getCurrentLaneId().name;\n  const succeededComponents = allComponentsStatus.filter((c) => !c.unmergedMessage);\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        consumer.scope,\n        componentFromModel\n      );\n      if (modifiedComp) {\n        consumer.scope.objects.add(modifiedComp);\n        const modelComponent = await consumer.scope.getModelComponent(id);\n        const versionHistory = await modelComponent.updateRebasedVersionHistory(consumer.scope.objects, [modifiedComp]);\n        if (versionHistory) consumer.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: BitId,\n  divergeData: SnapsDistance,\n  log: Log,\n  scope: LegacyScope,\n  componentFromModel?: Version,\n  messageTitle?: string\n): Promise<Version | undefined> {\n  if (divergeData.isDiverged()) {\n    throw new BitError(`unable to squash because ${id.toString()} is diverged in history.\nconsider switching to \"${\n      otherLaneId.name\n    }\" first, merging \"${currentLaneName}\", then switching back to \"${currentLaneName}\" and merging \"${\n      otherLaneId.name\n    }\"\nalternatively, 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 undefined;\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 undefined;\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  // no need to check this case. even if it has only one snap ahead, we want to do the \"squash\", and run \"addAsOnlyParent\"\n  // to make sure it doesn't not have two parents.\n  // if (remoteSnaps.length === 1) {\n  //   // nothing to squash. it has only one commit.\n  //   return;\n  // }\n  if (!componentFromModel) {\n    throw new Error('unable to squash, the componentFromModel is missing');\n  }\n\n  const currentParents = componentFromModel.parents;\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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"}

package/package.json

@@ -1,38 +1,38 @@
 {
   "name": "@teambit/merge-lanes",
-  "version": "0.0.303",
+  "version": "0.0.305",
   "homepage": "https://bit.cloud/teambit/lanes/merge-lanes",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.lanes",
     "name": "merge-lanes",
-    "version": "0.0.303"
+    "version": "0.0.305"
   },
   "dependencies": {
     "chalk": "2.4.2",
-    "yesno": "0.4.0",
     "fs-extra": "10.0.0",
     "lodash": "4.17.21",
     "p-map-series": "2.1.0",
     "tempy": "1.0.1",
+    "yesno": "0.4.0",
     "core-js": "^3.0.0",
     "@babel/runtime": "7.20.0",
     "@teambit/harmony": "0.4.6",
     "@teambit/component-id": "0.0.427",
     "@teambit/legacy-bit-id": "0.0.423",
-    "@teambit/checkout": "0.0.295",
-    "@teambit/cli": "0.0.753",
+    "@teambit/checkout": "0.0.297",
+    "@teambit/cli": "0.0.754",
     "@teambit/bit-error": "0.0.402",
-    "@teambit/lane-id": "0.0.268",
-    "@teambit/merging": "0.0.441",
-    "@teambit/export": "0.0.1126",
-    "@teambit/importer": "0.0.555",
-    "@teambit/lanes": "0.0.698",
-    "@teambit/logger": "0.0.846",
-    "@teambit/remove": "0.0.303",
-    "@teambit/scope": "0.0.1126",
-    "@teambit/snapping": "0.0.441",
-    "@teambit/workspace": "0.0.1126"
+    "@teambit/lane-id": "0.0.269",
+    "@teambit/merging": "0.0.443",
+    "@teambit/export": "0.0.1128",
+    "@teambit/importer": "0.0.557",
+    "@teambit/lanes": "0.0.700",
+    "@teambit/logger": "0.0.847",
+    "@teambit/remove": "0.0.305",
+    "@teambit/scope": "0.0.1128",
+    "@teambit/snapping": "0.0.443",
+    "@teambit/workspace": "0.0.1128"
   },
   "devDependencies": {
     "@types/fs-extra": "9.0.7",
@@ -45,7 +45,7 @@
     "@types/testing-library__jest-dom": "5.9.5"
   },
   "peerDependencies": {
-    "@teambit/legacy": "1.0.535",
+    "@teambit/legacy": "1.0.536",
     "react": "^16.8.0 || ^17.0.0",
     "react-dom": "^16.8.0 || ^17.0.0"
   },