@teambit/merge-lanes 0.0.123 → 0.0.125

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

@@ -1,5 +1,12 @@
 import { Command, CommandOptions } from '@teambit/cli';
 import { MergeLanesMain } from './merge-lanes.main.runtime';
+declare type Flags = {
+    pattern?: string;
+    push?: boolean;
+    keepReadme?: boolean;
+    noSquash: boolean;
+    includeDeps?: boolean;
+};
 /**
  * private command. the underscore prefix is intended.
  */
@@ -19,18 +26,8 @@ export declare class MergeLaneFromScopeCmd implements Command {
     migration: boolean;
     remoteOp: boolean;
     constructor(mergeLanes: MergeLanesMain);
-    report([name, pattern]: [string, string], { push, keepReadme, noSquash, includeDeps, }: {
-        push?: boolean;
-        keepReadme?: boolean;
-        noSquash: boolean;
-        includeDeps?: boolean;
-    }): Promise<string>;
-    json([name, pattern]: [string, string], { push, keepReadme, noSquash, includeDeps, }: {
-        push?: boolean;
-        keepReadme?: boolean;
-        noSquash: boolean;
-        includeDeps?: boolean;
-    }): Promise<{
+    report([fromLane, toLane]: [string, string], { pattern, push, keepReadme, noSquash, includeDeps }: Flags): Promise<string>;
+    json([fromLane, toLane]: [string, string], { pattern, push, keepReadme, noSquash, includeDeps }: Flags): Promise<{
         code: number;
         data: any;
         error?: undefined;
@@ -40,3 +37,4 @@ export declare class MergeLaneFromScopeCmd implements Command {
         data?: undefined;
     }>;
 }
+export {};

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

@@ -21,6 +21,13 @@ function _chalk() {
   };
   return data;
 }
+function _laneId() {
+  const data = require("@teambit/lane-id");
+  _laneId = function () {
+    return data;
+  };
+  return data;
+}
 function _bitError() {
   const data = require("@teambit/bit-error");
   _bitError = function () {
@@ -34,26 +41,27 @@ function _bitError() {
 class MergeLaneFromScopeCmd {
   constructor(mergeLanes) {
     this.mergeLanes = mergeLanes;
-    (0, _defineProperty2().default)(this, "name", '_merge-lane <lane> [pattern]');
-    (0, _defineProperty2().default)(this, "description", `merge a remote lane into main via a bare-scope (not workspace)`);
+    (0, _defineProperty2().default)(this, "name", '_merge-lane <from-lane> [to-lane]');
+    (0, _defineProperty2().default)(this, "description", `merge a remote lane into another lane or main via a bare-scope (not workspace)`);
     (0, _defineProperty2().default)(this, "extendedDescription", `to merge from a workspace, use "bit lane merge" command.
-this is intended to use from the UI, which will have a button to merge an existing lane into main.
-the lane must be up-to-date with main, otherwise, conflicts might occur which are not handled in this command`);
+this is intended to use from the UI, which will have a button to merge an existing lane.
+the lane must be up-to-date with the other lane, otherwise, conflicts might occur which are not handled in this command`);
     (0, _defineProperty2().default)(this, "arguments", [{
-      name: 'lane',
-      description: 'lane-id to merge to main'
+      name: 'from-lane',
+      description: 'lane-id to merge from'
     }, {
-      name: 'pattern',
-      description: 'EXPERIMENTAL. partially merge the lane with the specified component-pattern'
+      name: 'to-lane',
+      description: `lane-id to merge to. default is "${_laneId().DEFAULT_LANE}"`
     }]);
     (0, _defineProperty2().default)(this, "alias", '');
-    (0, _defineProperty2().default)(this, "options", [['', 'push', 'export the updated objects to the original scopes once done'], ['', 'keep-readme', 'skip deleting the lane readme component after merging'], ['', 'no-squash', 'EXPERIMENTAL. relevant for merging lanes into main, which by default squash.'], ['', 'include-deps', 'EXPERIMENTAL. relevant for "--pattern". merge also dependencies of the given components'], ['j', 'json', 'output as json format']]);
+    (0, _defineProperty2().default)(this, "options", [['', 'pattern <string>', 'partially merge the lane with the specified component-pattern'], ['', 'push', 'export the updated objects to the original scopes once done'], ['', 'keep-readme', 'skip deleting the lane readme component after merging'], ['', 'no-squash', 'EXPERIMENTAL. relevant for merging lanes into main, which by default squash.'], ['', 'include-deps', 'EXPERIMENTAL. relevant for "--pattern". merge also dependencies of the given components'], ['j', 'json', 'output as json format']]);
     (0, _defineProperty2().default)(this, "loader", true);
     (0, _defineProperty2().default)(this, "private", true);
     (0, _defineProperty2().default)(this, "migration", true);
     (0, _defineProperty2().default)(this, "remoteOp", true);
   }
-  async report([name, pattern], {
+  async report([fromLane, toLane], {
+    pattern,
     push = false,
     keepReadme = false,
     noSquash = false,
@@ -66,14 +74,14 @@ the lane must be up-to-date with main, otherwise, conflicts might occur which ar
       mergedNow,
       mergedPreviously,
       exportedIds
-    } = await this.mergeLanes.mergeFromScope(name, {
+    } = await this.mergeLanes.mergeFromScope(fromLane, toLane || _laneId().DEFAULT_LANE, {
       push,
       keepReadme,
       noSquash,
       pattern,
       includeDeps
     });
-    const mergedTitle = _chalk().default.green(`successfully merged ${mergedNow.length} components from ${name} to main`);
+    const mergedTitle = _chalk().default.green(`successfully merged ${mergedNow.length} components from ${fromLane} to ${toLane || _laneId().DEFAULT_LANE}`);
     const mergedOutput = mergedNow.length ? `${mergedTitle}\n${mergedNow.join('\n')}` : '';
     const nonMergedTitle = _chalk().default.bold(`the following ${mergedPreviously.length} components were already merged before, they were left intact`);
     const nonMergedOutput = mergedPreviously.length ? `\n${nonMergedTitle}\n${mergedPreviously.join('\n')}` : '';
@@ -81,7 +89,8 @@ the lane must be up-to-date with main, otherwise, conflicts might occur which ar
     const exportedOutput = exportedIds.length ? `\n${exportedTitle}\n${exportedIds.join('\n')}` : '';
     return mergedOutput + nonMergedOutput + exportedOutput;
   }
-  async json([name, pattern], {
+  async json([fromLane, toLane], {
+    pattern,
     push = false,
     keepReadme = false,
     noSquash = false,
@@ -92,7 +101,7 @@ the lane must be up-to-date with main, otherwise, conflicts might occur which ar
     }
     let results;
     try {
-      results = await this.mergeLanes.mergeFromScope(name, {
+      results = await this.mergeLanes.mergeFromScope(fromLane, toLane || _laneId().DEFAULT_LANE, {
         push,
         keepReadme,
         noSquash,

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

@@ -1 +1 @@
-{"version":3,"names":["MergeLaneFromScopeCmd","constructor","mergeLanes","name","description","report","pattern","push","keepReadme","noSquash","includeDeps","BitError","mergedNow","mergedPreviously","exportedIds","mergeFromScope","mergedTitle","chalk","green","length","mergedOutput","join","nonMergedTitle","bold","nonMergedOutput","exportedTitle","exportedOutput","json","results","code","data","err","error","message"],"sources":["merge-lane-from-scope.cmd.ts"],"sourcesContent":["import chalk from 'chalk';\nimport { Command, CommandOptions } from '@teambit/cli';\nimport { BitError } from '@teambit/bit-error';\nimport { MergeLanesMain } from './merge-lanes.main.runtime';\n\n/**\n * private command. the underscore prefix is intended.\n */\nexport class MergeLaneFromScopeCmd implements Command {\n  name = '_merge-lane <lane> [pattern]';\n  description = `merge a remote lane into main via a bare-scope (not workspace)`;\n  extendedDescription = `to merge from a workspace, use \"bit lane merge\" command.\nthis is intended to use from the UI, which will have a button to merge an existing lane into main.\nthe lane must be up-to-date with main, otherwise, conflicts might occur which are not handled in this command`;\n  arguments = [\n    {\n      name: 'lane',\n      description: 'lane-id to merge to main',\n    },\n    {\n      name: 'pattern',\n      description: 'EXPERIMENTAL. partially merge the lane with the specified component-pattern',\n    },\n  ];\n  alias = '';\n  options = [\n    ['', 'push', 'export the updated objects to the original scopes once done'],\n    ['', 'keep-readme', 'skip deleting the lane readme component after merging'],\n    ['', 'no-squash', 'EXPERIMENTAL. relevant for merging lanes into main, which by default squash.'],\n    ['', 'include-deps', 'EXPERIMENTAL. relevant for \"--pattern\". merge also dependencies of the given components'],\n    ['j', 'json', 'output as json format'],\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      push = false,\n      keepReadme = false,\n      noSquash = false,\n      includeDeps = false,\n    }: {\n      push?: boolean;\n      keepReadme?: boolean;\n      noSquash: boolean;\n      includeDeps?: boolean;\n    }\n  ): Promise<string> {\n    if (includeDeps && !pattern) {\n      throw new BitError(`\"--include-deps\" flag is relevant only for --pattern flag`);\n    }\n    const { mergedNow, mergedPreviously, exportedIds } = await this.mergeLanes.mergeFromScope(name, {\n      push,\n      keepReadme,\n      noSquash,\n      pattern,\n      includeDeps,\n    });\n\n    const mergedTitle = chalk.green(`successfully merged ${mergedNow.length} components from ${name} to main`);\n    const mergedOutput = mergedNow.length ? `${mergedTitle}\\n${mergedNow.join('\\n')}` : '';\n\n    const nonMergedTitle = chalk.bold(\n      `the following ${mergedPreviously.length} components were already merged before, they were left intact`\n    );\n    const nonMergedOutput = mergedPreviously.length ? `\\n${nonMergedTitle}\\n${mergedPreviously.join('\\n')}` : '';\n\n    const exportedTitle = chalk.green(`successfully exported ${exportedIds.length} components`);\n    const exportedOutput = exportedIds.length ? `\\n${exportedTitle}\\n${exportedIds.join('\\n')}` : '';\n\n    return mergedOutput + nonMergedOutput + exportedOutput;\n  }\n  async json(\n    [name, pattern]: [string, string],\n    {\n      push = false,\n      keepReadme = false,\n      noSquash = false,\n      includeDeps = false,\n    }: {\n      push?: boolean;\n      keepReadme?: boolean;\n      noSquash: boolean;\n      includeDeps?: boolean;\n    }\n  ) {\n    if (includeDeps && !pattern) {\n      throw new BitError(`\"--include-deps\" flag is relevant only for --pattern flag`);\n    }\n    let results: any;\n    try {\n      results = await this.mergeLanes.mergeFromScope(name, {\n        push,\n        keepReadme,\n        noSquash,\n        pattern,\n        includeDeps,\n      });\n      return {\n        code: 0,\n        data: results,\n      };\n    } catch (err: any) {\n      return {\n        code: 1,\n        error: err.message,\n      };\n    }\n  }\n}\n"],"mappings":"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"}
+{"version":3,"names":["MergeLaneFromScopeCmd","constructor","mergeLanes","name","description","DEFAULT_LANE","report","fromLane","toLane","pattern","push","keepReadme","noSquash","includeDeps","BitError","mergedNow","mergedPreviously","exportedIds","mergeFromScope","mergedTitle","chalk","green","length","mergedOutput","join","nonMergedTitle","bold","nonMergedOutput","exportedTitle","exportedOutput","json","results","code","data","err","error","message"],"sources":["merge-lane-from-scope.cmd.ts"],"sourcesContent":["import chalk from 'chalk';\nimport { DEFAULT_LANE } from '@teambit/lane-id';\nimport { Command, CommandOptions } from '@teambit/cli';\nimport { BitError } from '@teambit/bit-error';\nimport { MergeLanesMain } from './merge-lanes.main.runtime';\n\ntype Flags = {\n  pattern?: string;\n  push?: boolean;\n  keepReadme?: boolean;\n  noSquash: boolean;\n  includeDeps?: boolean;\n};\n\n/**\n * private command. the underscore prefix is intended.\n */\nexport class MergeLaneFromScopeCmd implements Command {\n  name = '_merge-lane <from-lane> [to-lane]';\n  description = `merge a remote lane into another lane or main via a bare-scope (not workspace)`;\n  extendedDescription = `to merge from a workspace, use \"bit lane merge\" command.\nthis is intended to use from the UI, which will have a button to merge an existing lane.\nthe lane must be up-to-date with the other lane, otherwise, conflicts might occur which are not handled in this command`;\n  arguments = [\n    {\n      name: 'from-lane',\n      description: 'lane-id to merge from',\n    },\n    {\n      name: 'to-lane',\n      description: `lane-id to merge to. default is \"${DEFAULT_LANE}\"`,\n    },\n  ];\n  alias = '';\n  options = [\n    ['', 'pattern <string>', 'partially merge the lane with the specified component-pattern'],\n    ['', 'push', 'export the updated objects to the original scopes once done'],\n    ['', 'keep-readme', 'skip deleting the lane readme component after merging'],\n    ['', 'no-squash', 'EXPERIMENTAL. relevant for merging lanes into main, which by default squash.'],\n    ['', 'include-deps', 'EXPERIMENTAL. relevant for \"--pattern\". merge also dependencies of the given components'],\n    ['j', 'json', 'output as json format'],\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    [fromLane, toLane]: [string, string],\n    { pattern, push = false, keepReadme = false, noSquash = false, includeDeps = false }: Flags\n  ): Promise<string> {\n    if (includeDeps && !pattern) {\n      throw new BitError(`\"--include-deps\" flag is relevant only for --pattern flag`);\n    }\n\n    const { mergedNow, mergedPreviously, exportedIds } = await this.mergeLanes.mergeFromScope(\n      fromLane,\n      toLane || DEFAULT_LANE,\n      {\n        push,\n        keepReadme,\n        noSquash,\n        pattern,\n        includeDeps,\n      }\n    );\n\n    const mergedTitle = chalk.green(\n      `successfully merged ${mergedNow.length} components from ${fromLane} to ${toLane || DEFAULT_LANE}`\n    );\n    const mergedOutput = mergedNow.length ? `${mergedTitle}\\n${mergedNow.join('\\n')}` : '';\n\n    const nonMergedTitle = chalk.bold(\n      `the following ${mergedPreviously.length} components were already merged before, they were left intact`\n    );\n    const nonMergedOutput = mergedPreviously.length ? `\\n${nonMergedTitle}\\n${mergedPreviously.join('\\n')}` : '';\n\n    const exportedTitle = chalk.green(`successfully exported ${exportedIds.length} components`);\n    const exportedOutput = exportedIds.length ? `\\n${exportedTitle}\\n${exportedIds.join('\\n')}` : '';\n\n    return mergedOutput + nonMergedOutput + exportedOutput;\n  }\n  async json(\n    [fromLane, toLane]: [string, string],\n    { pattern, push = false, keepReadme = false, noSquash = false, includeDeps = false }: Flags\n  ) {\n    if (includeDeps && !pattern) {\n      throw new BitError(`\"--include-deps\" flag is relevant only for --pattern flag`);\n    }\n    let results: any;\n    try {\n      results = await this.mergeLanes.mergeFromScope(fromLane, toLane || DEFAULT_LANE, {\n        push,\n        keepReadme,\n        noSquash,\n        pattern,\n        includeDeps,\n      });\n      return {\n        code: 0,\n        data: results,\n      };\n    } catch (err: any) {\n      return {\n        code: 1,\n        error: err.message,\n      };\n    }\n  }\n}\n"],"mappings":"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"}

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

@@ -37,13 +37,15 @@ export declare class MergeLanesMain {
         deleteResults: any;
         configMergeResults: ConfigMergeResult[];
     }>;
-    mergeFromScope(laneName: string, options: Partial<MergeLaneOptions> & {
+    private getMainIdsToMerge;
+    mergeFromScope(fromLane: string, toLane: string, options: Partial<MergeLaneOptions> & {
         push?: boolean;
     }): Promise<{
         mergedPreviously: string[];
         mergedNow: string[];
         exportedIds: string[];
     }>;
+    private throwIfNotUpToDate;
     static slots: never[];
     static dependencies: import("@teambit/harmony").Aspect[];
     static runtime: import("@teambit/harmony").RuntimeDefinition;

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

@@ -204,7 +204,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 consumer.scope.getDefaultLaneIdsFromLane(currentLane);
+        return this.getMainIdsToMerge(currentLane);
       }
       if (!otherLane) throw new Error(`lane must be defined for non-default`);
       return otherLane.toBitIds();
@@ -292,14 +292,32 @@ class MergeLanesMain {
       }
     }
   }
-  async mergeFromScope(laneName, options) {
-    if (this.workspace) throw new (_bitError().BitError)(`unable to run this command from a workspace, please create a new bare-scope and run it from there`);
-    const laneId = _laneId().LaneId.parse(laneName);
-    const lane = await this.lanes.importLaneObject(laneId);
+  async getMainIdsToMerge(lane) {
     const laneIds = lane.toBitIds();
+    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)));
+    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
+      return c.toBitId().changeVersion(c.head.toString());
+    }));
+  }
+  async mergeFromScope(fromLane, toLane, options) {
+    if (this.workspace) {
+      throw new (_bitError().BitError)(`unable to run this command from a workspace, please create a new bare-scope and run it from there`);
+    }
+    const fromLaneId = _laneId().LaneId.parse(fromLane);
+    const fromLaneObj = await this.lanes.importLaneObject(fromLaneId);
+    const toLaneId = toLane === _laneId().DEFAULT_LANE ? this.lanes.getDefaultLaneId() : _laneId().LaneId.parse(toLane);
+    const toLaneObj = toLaneId.isDefault() ? undefined : await this.lanes.importLaneObject(toLaneId);
+    const fromLaneBitIds = fromLaneObj.toBitIds();
     const getIdsToMerge = async () => {
-      if (!options.pattern) return laneIds;
-      const laneCompIds = await this.scope.resolveMultipleComponentIds(laneIds);
+      if (!options.pattern) return fromLaneBitIds;
+      const laneCompIds = await this.scope.resolveMultipleComponentIds(fromLaneBitIds);
       const ids = this.scope.filterIdsFromPoolIdsByPattern(options.pattern, laneCompIds);
       return _bitId().BitIds.fromArray(ids.map(id => id._legacy));
     };
@@ -308,40 +326,56 @@ class MergeLanesMain {
     await scopeComponentsImporter.importManyDeltaWithoutDeps({
       ids: idsToMerge,
       fromHead: true,
-      lane,
+      lane: fromLaneObj,
       ignoreMissingHead: true
     });
-    // get their main as well
+    // get their main/to-lane as well
     await scopeComponentsImporter.importManyDeltaWithoutDeps({
       ids: idsToMerge.toVersionLatest(),
       fromHead: true,
-      ignoreMissingHead: true
+      ignoreMissingHead: true,
+      lane: toLaneObj
     });
+    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).
     // then, change the version object to include an extra parent to point to the main.
     // then, change the component object head to point to this changed version
     const mergedPreviously = [];
     const mergedNow = [];
+    const shouldSquash = !toLaneObj && !options.noSquash; // only when merging to main we squash.
     const bitObjectsPerComp = await (0, _pMapSeries().default)(idsToMerge, async id => {
+      var _toLaneObj$getCompone;
       const modelComponent = await this.scope.legacyScope.getModelComponent(id);
-      const versionObj = await modelComponent.loadVersion(id.version, repo);
-      const laneHead = modelComponent.getRef(id.version);
-      if (!laneHead) throw new Error(`lane head must be defined for ${id.toString()}`);
-      const mainHead = modelComponent.head || null;
-      if (mainHead !== null && mainHead !== void 0 && mainHead.isEqual(laneHead)) {
+      const fromVersionObj = await modelComponent.loadVersion(id.version, repo);
+      const fromLaneHead = modelComponent.getRef(id.version);
+      if (!fromLaneHead) throw new Error(`lane head must be defined for ${id.toString()}`);
+      const toLaneHead = toLaneObj ? (_toLaneObj$getCompone = toLaneObj.getComponent(id)) === null || _toLaneObj$getCompone === void 0 ? void 0 : _toLaneObj$getCompone.head : modelComponent.head || null;
+      if (toLaneHead !== null && toLaneHead !== void 0 && toLaneHead.isEqual(fromLaneHead)) {
         mergedPreviously.push(id);
         return undefined;
       }
+      // this might be confusing, we pass the toLaneHead as the sourceHead and the fromLaneHead as the targetHead.
+      // this is because normally, in the workspace, we merge another lane (target) into the current lane (source).
+      // so effectively, in the workspace, we merge fromLane=target into toLane=source.
       const divergeData = await (0, _getDivergeData().getDivergeData)({
         repo,
         modelComponent,
-        sourceHead: mainHead,
-        targetHead: laneHead
+        sourceHead: toLaneHead,
+        targetHead: fromLaneHead
       });
-      const modifiedVersion = squashOneComp(_laneId().DEFAULT_LANE, laneId, id, divergeData, versionObj);
-      modelComponent.setHead(laneHead);
-      const objects = [modelComponent, modifiedVersion];
+      const modifiedVersion = shouldSquash ? squashOneComp(_laneId().DEFAULT_LANE, fromLaneId, id, divergeData, fromVersionObj) : undefined;
+      const objects = [];
+      if (modifiedVersion) objects.push(modifiedVersion);
+      if (toLaneObj) {
+        toLaneObj.addComponent({
+          id: id.changeVersion(undefined),
+          head: fromLaneHead
+        });
+      } else {
+        modelComponent.setHead(fromLaneHead);
+        objects.push(modelComponent);
+      }
       mergedNow.push(id);
       return {
         id,
@@ -349,7 +383,9 @@ class MergeLanesMain {
       };
     });
     const bitObjects = (0, _lodash().compact)(bitObjectsPerComp).map(b => b.objects);
-    await repo.writeObjectsToTheFS(bitObjects.flat());
+    const bitObjectsFlat = bitObjects.flat();
+    if (toLaneObj) bitObjectsFlat.push(toLaneObj);
+    await repo.writeObjectsToTheFS(bitObjectsFlat);
     let exportedIds = [];
     if (options.push) {
       const ids = (0, _lodash().compact)(bitObjectsPerComp).map(b => b.id);
@@ -358,12 +394,13 @@ class MergeLanesMain {
         exported
       } = await this.exporter.exportMany({
         scope: this.scope.legacyScope,
-        ids: bitIds,
-        idsWithFutureScope: bitIds,
+        ids: shouldSquash ? bitIds : new (_bitId().BitIds)(),
+        idsWithFutureScope: shouldSquash ? bitIds : new (_bitId().BitIds)(),
+        laneObject: toLaneObj,
         allVersions: false,
         // no need to export anything else other than the head. the normal calculation of what to export won't apply here
         // as it is done from the scope.
-        exportHeadsOnly: true
+        exportHeadsOnly: shouldSquash
       });
       exportedIds = exported.map(id => id.toString());
     }
@@ -373,6 +410,16 @@ class MergeLanesMain {
       exportedIds
     };
   }
+  async throwIfNotUpToDate(fromLaneId, toLaneId) {
+    const status = await this.lanes.diffStatus(fromLaneId, toLaneId, {
+      skipChanges: true
+    });
+    const compsNotUpToDate = status.componentsStatus.filter(s => !s.upToDate);
+    if (compsNotUpToDate.length) {
+      throw new Error(`unable to merge, the following components are not up-to-date:
+${compsNotUpToDate.map(s => s.componentId.toString()).join('\n')}`);
+    }
+  }
   static async provider([lanes, cli, workspace, merging, loggerMain, remove, scope, exporter]) {
     var _lanesCommand$command;
     const logger = loggerMain.createLogger(_mergeLanes().MergeLanesAspect.id);

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

@@ -1 +1 @@
-{"version":3,"names":["MergeLanesMain","constructor","workspace","merging","lanes","logger","remove","scope","exporter","mergeLane","laneName","options","BitError","consumer","mergeStrategy","noSnap","tag","snapMessage","existingOnWorkspaceOnly","build","keepReadme","noSquash","pattern","includeDeps","skipDependencyInstallation","resolveUnrelated","ignoreConfigChanges","remote","currentLaneId","getCurrentLaneId","isDefault","toString","otherLaneId","getParsedLaneId","isEqual","currentLane","loadLane","isDefaultLane","getOtherLane","undefined","lane","fetchLaneWithItsComponents","otherLane","getBitIds","Error","DEFAULT_LANE","getDefaultLaneIdsFromLane","toBitIds","bitIds","debug","allComponentsStatus","getMergeStatus","shouldSquash","componentIds","resolveMultipleComponentIds","compIdsFromPattern","filterIdsFromPoolIdsByPattern","filterComponentsStatus","forEach","bitId","find","c","id","isEqualWithoutVersion","push","unmergedLegitimately","unmergedMessage","workspaceIds","listIds","filter","_legacy","throwForFailures","squashSnaps","mergeResults","mergeSnaps","laneId","localLane","mergedSuccessfully","failedComponents","length","every","failedComponent","unchangedLegitimately","deleteResults","readmeComponent","readmeComponentId","changeVersion","head","hash","componentsPattern","force","track","deleteFiles","fromLane","readmeResult","name","configMergeResults","map","configMergeResult","onDestroy","compact","failureMsgs","chalk","bold","red","join","mergeFromScope","LaneId","parse","importLaneObject","laneIds","getIdsToMerge","laneCompIds","ids","BitIds","fromArray","idsToMerge","scopeComponentsImporter","ScopeComponentsImporter","getInstance","legacyScope","importManyDeltaWithoutDeps","fromHead","ignoreMissingHead","toVersionLatest","repo","objects","mergedPreviously","mergedNow","bitObjectsPerComp","pMapSeries","modelComponent","getModelComponent","versionObj","loadVersion","version","laneHead","getRef","mainHead","divergeData","getDivergeData","sourceHead","targetHead","modifiedVersion","squashOneComp","setHead","bitObjects","b","writeObjectsToTheFS","flat","exportedIds","exported","exportMany","idsWithFutureScope","allVersions","exportHeadsOnly","provider","cli","loggerMain","createLogger","MergeLanesAspect","lanesCommand","getCommand","mergeLanesMain","commands","MergeLaneCmd","register","MergeLaneFromScopeCmd","LanesAspect","CLIAspect","WorkspaceAspect","MergingAspect","LoggerAspect","RemoveAspect","ScopeAspect","ExportAspect","MainRuntime","compIdsToKeep","allBitIds","bitIdsFromPattern","bitIdsNotFromPattern","hasWithoutVersion","filteredComponentStatus","depsToAdd","compId","fromStatus","targetVersions","snapsOnTargetOnly","headOnTarget","getComponent","remoteVersion","flattenedDeps","getAllFlattenedDependencies","depsNotIncludeInPattern","depsOnLane","Promise","all","dep","isOnLane","isIdOnLane","d","depsUniq","uniqFromArray","currentLaneName","succeededComponents","componentFromModel","modifiedComp","add","versionHistory","updateRebasedVersionHistory","isDiverged","isSourceAhead","isTargetAhead","remoteSnaps","currentParents","parents","commonSnapBeforeDiverge","addAsOnlyParent","ref","removeParent","setSquashed","previousParents","addRuntime"],"sources":["merge-lanes.main.runtime.ts"],"sourcesContent":["import { BitError } from '@teambit/bit-error';\nimport { CLIAspect, CLIMain, MainRuntime } from '@teambit/cli';\nimport { LanesAspect, LanesMain } from '@teambit/lanes';\nimport MergingAspect, { MergingMain, ComponentMergeStatus, ConfigMergeResult } from '@teambit/merging';\nimport WorkspaceAspect, { Workspace } from '@teambit/workspace';\nimport chalk from 'chalk';\nimport { BitId } from '@teambit/legacy-bit-id';\nimport pMapSeries from 'p-map-series';\nimport { Consumer } from '@teambit/legacy/dist/consumer';\nimport { MergeStrategy, ApplyVersionResults } 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 { SnapsDistance } from '@teambit/legacy/dist/scope/component-ops/snaps-distance';\nimport { RemoveAspect, RemoveMain } from '@teambit/remove';\nimport { compact } 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';\n\nexport type MergeLaneOptions = {\n  mergeStrategy: MergeStrategy;\n  noSnap: boolean;\n  snapMessage: string;\n  existingOnWorkspaceOnly: boolean;\n  build: boolean;\n  keepReadme: boolean;\n  noSquash: boolean;\n  tag?: boolean;\n  pattern?: string;\n  includeDeps?: boolean;\n  skipDependencyInstallation?: boolean;\n  resolveUnrelated?: MergeStrategy;\n  ignoreConfigChanges?: boolean;\n  remote?: boolean;\n};\n\nexport class MergeLanesMain {\n  constructor(\n    private workspace: Workspace | undefined,\n    private merging: MergingMain,\n    private lanes: LanesMain,\n    private logger: Logger,\n    private remove: RemoveMain,\n    private scope: ScopeMain,\n    private exporter: ExportMain\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      noSquash,\n      pattern,\n      includeDeps,\n      skipDependencyInstallation,\n      resolveUnrelated,\n      ignoreConfigChanges,\n      remote,\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    const currentLane = currentLaneId.isDefault() ? null : await consumer.scope.loadLane(currentLaneId);\n    const isDefaultLane = otherLaneId.isDefault();\n    const getOtherLane = async () => {\n      if (isDefaultLane) {\n        return undefined;\n      }\n      const lane = await consumer.scope.loadLane(otherLaneId);\n      if (remote || !lane) {\n        return this.lanes.fetchLaneWithItsComponents(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 consumer.scope.getDefaultLaneIdsFromLane(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 = 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 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    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\n        .changeVersion(otherLane.readmeComponent?.head?.hash)\n        .toString();\n\n      deleteResults = await this.remove.remove({\n        componentsPattern: readmeComponentId,\n        force: false,\n        remote: false,\n        track: false,\n        deleteFiles: true,\n        fromLane: false,\n      });\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 mergeFromScope(\n    laneName: 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    const laneId = LaneId.parse(laneName);\n    const lane = await this.lanes.importLaneObject(laneId);\n    const laneIds = lane.toBitIds();\n    const getIdsToMerge = async (): Promise<BitIds> => {\n      if (!options.pattern) return laneIds;\n      const laneCompIds = await this.scope.resolveMultipleComponentIds(laneIds);\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.importManyDeltaWithoutDeps({\n      ids: idsToMerge,\n      fromHead: true,\n      lane,\n      ignoreMissingHead: true,\n    });\n    // get their main as well\n    await scopeComponentsImporter.importManyDeltaWithoutDeps({\n      ids: idsToMerge.toVersionLatest(),\n      fromHead: true,\n      ignoreMissingHead: true,\n    });\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 bitObjectsPerComp = await pMapSeries(idsToMerge, async (id) => {\n      const modelComponent = await this.scope.legacyScope.getModelComponent(id);\n      const versionObj = await modelComponent.loadVersion(id.version as string, repo);\n      const laneHead = modelComponent.getRef(id.version as string);\n      if (!laneHead) throw new Error(`lane head must be defined for ${id.toString()}`);\n      const mainHead = modelComponent.head || null;\n      if (mainHead?.isEqual(laneHead)) {\n        mergedPreviously.push(id);\n        return undefined;\n      }\n      const divergeData = await getDivergeData({\n        repo,\n        modelComponent,\n        sourceHead: mainHead,\n        targetHead: laneHead,\n      });\n      const modifiedVersion = squashOneComp(DEFAULT_LANE, laneId, id, divergeData, versionObj);\n      modelComponent.setHead(laneHead);\n      const objects = [modelComponent, modifiedVersion];\n      mergedNow.push(id);\n      return { id, objects };\n    });\n    const bitObjects = compact(bitObjectsPerComp).map((b) => b.objects);\n    await repo.writeObjectsToTheFS(bitObjects.flat() as BitObject[]);\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: bitIds,\n        idsWithFutureScope: bitIds,\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: true,\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\n  static slots = [];\n  static dependencies = [\n    LanesAspect,\n    CLIAspect,\n    WorkspaceAspect,\n    MergingAspect,\n    LoggerAspect,\n    RemoveAspect,\n    ScopeAspect,\n    ExportAspect,\n  ];\n  static runtime = MainRuntime;\n\n  static async provider([lanes, cli, workspace, merging, loggerMain, remove, scope, exporter]: [\n    LanesMain,\n    CLIMain,\n    Workspace,\n    MergingMain,\n    LoggerMain,\n    RemoveMain,\n    ScopeMain,\n    ExportMain\n  ]) {\n    const logger = loggerMain.createLogger(MergeLanesAspect.id);\n    const lanesCommand = cli.getCommand('lane');\n    const mergeLanesMain = new MergeLanesMain(workspace, merging, lanes, logger, remove, scope, exporter);\n    lanesCommand?.commands?.push(new MergeLaneCmd(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  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        throw new BitError(`unable to merge ${compId.toString()}.\nit has (in version ${remoteVersion.toString()}) the following dependencies which were not included in the pattern. consider adding \"--include-deps\" flag\n${depsOnLane.map((d) => d.toString()).join('\\n')}`);\n      }\n      depsToAdd.push(...depsOnLane);\n    });\n  });\n  if (depsToAdd.length) {\n    const depsUniq = BitIds.uniqFromArray(depsToAdd);\n    depsUniq.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 squashSnaps(allComponentsStatus: ComponentMergeStatus[], otherLaneId: LaneId, consumer: Consumer) {\n  const currentLaneName = consumer.getCurrentLaneId().name;\n  const succeededComponents = allComponentsStatus.filter((c) => !c.unmergedMessage);\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      const modifiedComp = squashOneComp(currentLaneName, otherLaneId, id, divergeData, componentFromModel);\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 */\nfunction squashOneComp(\n  currentLaneName: string,\n  otherLaneId: LaneId,\n  id: BitId,\n  divergeData: SnapsDistance,\n  componentFromModel?: Version\n): 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  // 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  // do the squash.\n  if (divergeData.commonSnapBeforeDiverge) {\n    componentFromModel.addAsOnlyParent(divergeData.commonSnapBeforeDiverge);\n  } else {\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  componentFromModel.setSquashed({ previousParents: currentParents, laneId: otherLaneId });\n  return componentFromModel;\n}\n\nMergeLanesAspect.addRuntime(MergeLanesMain);\n\nexport default MergeLanesMain;\n"],"mappings":"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"}
+{"version":3,"names":["MergeLanesMain","constructor","workspace","merging","lanes","logger","remove","scope","exporter","mergeLane","laneName","options","BitError","consumer","mergeStrategy","noSnap","tag","snapMessage","existingOnWorkspaceOnly","build","keepReadme","noSquash","pattern","includeDeps","skipDependencyInstallation","resolveUnrelated","ignoreConfigChanges","remote","currentLaneId","getCurrentLaneId","isDefault","toString","otherLaneId","getParsedLaneId","isEqual","currentLane","loadLane","isDefaultLane","getOtherLane","undefined","lane","fetchLaneWithItsComponents","otherLane","getBitIds","Error","DEFAULT_LANE","getMainIdsToMerge","toBitIds","bitIds","debug","allComponentsStatus","getMergeStatus","shouldSquash","componentIds","resolveMultipleComponentIds","compIdsFromPattern","filterIdsFromPoolIdsByPattern","filterComponentsStatus","forEach","bitId","find","c","id","isEqualWithoutVersion","push","unmergedLegitimately","unmergedMessage","workspaceIds","listIds","filter","_legacy","throwForFailures","squashSnaps","mergeResults","mergeSnaps","laneId","localLane","mergedSuccessfully","failedComponents","length","every","failedComponent","unchangedLegitimately","deleteResults","readmeComponent","readmeComponentId","changeVersion","head","hash","componentsPattern","force","track","deleteFiles","fromLane","readmeResult","name","configMergeResults","map","configMergeResult","onDestroy","compact","failureMsgs","chalk","bold","red","join","laneIds","mainNotOnLane","ids","hasScope","modelComponents","Promise","all","legacyScope","getModelComponent","toBitId","mergeFromScope","toLane","fromLaneId","LaneId","parse","fromLaneObj","importLaneObject","toLaneId","getDefaultLaneId","toLaneObj","fromLaneBitIds","getIdsToMerge","laneCompIds","BitIds","fromArray","idsToMerge","scopeComponentsImporter","ScopeComponentsImporter","getInstance","importManyDeltaWithoutDeps","fromHead","ignoreMissingHead","toVersionLatest","throwIfNotUpToDate","repo","objects","mergedPreviously","mergedNow","bitObjectsPerComp","pMapSeries","modelComponent","fromVersionObj","loadVersion","version","fromLaneHead","getRef","toLaneHead","getComponent","divergeData","getDivergeData","sourceHead","targetHead","modifiedVersion","squashOneComp","addComponent","setHead","bitObjects","b","bitObjectsFlat","flat","writeObjectsToTheFS","exportedIds","exported","exportMany","idsWithFutureScope","laneObject","allVersions","exportHeadsOnly","status","diffStatus","skipChanges","compsNotUpToDate","componentsStatus","s","upToDate","componentId","provider","cli","loggerMain","createLogger","MergeLanesAspect","lanesCommand","getCommand","mergeLanesMain","commands","MergeLaneCmd","register","MergeLaneFromScopeCmd","LanesAspect","CLIAspect","WorkspaceAspect","MergingAspect","LoggerAspect","RemoveAspect","ScopeAspect","ExportAspect","MainRuntime","compIdsToKeep","allBitIds","bitIdsFromPattern","bitIdsNotFromPattern","hasWithoutVersion","filteredComponentStatus","depsToAdd","compId","fromStatus","targetVersions","snapsOnTargetOnly","headOnTarget","remoteVersion","versionObj","flattenedDeps","getAllFlattenedDependencies","depsNotIncludeInPattern","depsOnLane","dep","isOnLane","isIdOnLane","d","depsUniq","uniqFromArray","currentLaneName","succeededComponents","componentFromModel","modifiedComp","add","versionHistory","updateRebasedVersionHistory","isDiverged","isSourceAhead","isTargetAhead","remoteSnaps","currentParents","parents","commonSnapBeforeDiverge","addAsOnlyParent","ref","removeParent","setSquashed","previousParents","addRuntime"],"sources":["merge-lanes.main.runtime.ts"],"sourcesContent":["import { BitError } from '@teambit/bit-error';\nimport { CLIAspect, CLIMain, MainRuntime } from '@teambit/cli';\nimport { LanesAspect, LanesMain } from '@teambit/lanes';\nimport MergingAspect, { MergingMain, ComponentMergeStatus, ConfigMergeResult } from '@teambit/merging';\nimport WorkspaceAspect, { Workspace } from '@teambit/workspace';\nimport chalk from 'chalk';\nimport { BitId } from '@teambit/legacy-bit-id';\nimport pMapSeries from 'p-map-series';\nimport { Consumer } from '@teambit/legacy/dist/consumer';\nimport { MergeStrategy, ApplyVersionResults } 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 { SnapsDistance } from '@teambit/legacy/dist/scope/component-ops/snaps-distance';\nimport { RemoveAspect, RemoveMain } from '@teambit/remove';\nimport { compact } 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';\n\nexport type MergeLaneOptions = {\n  mergeStrategy: MergeStrategy;\n  noSnap: boolean;\n  snapMessage: string;\n  existingOnWorkspaceOnly: boolean;\n  build: boolean;\n  keepReadme: boolean;\n  noSquash: boolean;\n  tag?: boolean;\n  pattern?: string;\n  includeDeps?: boolean;\n  skipDependencyInstallation?: boolean;\n  resolveUnrelated?: MergeStrategy;\n  ignoreConfigChanges?: boolean;\n  remote?: boolean;\n};\n\nexport class MergeLanesMain {\n  constructor(\n    private workspace: Workspace | undefined,\n    private merging: MergingMain,\n    private lanes: LanesMain,\n    private logger: Logger,\n    private remove: RemoveMain,\n    private scope: ScopeMain,\n    private exporter: ExportMain\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      noSquash,\n      pattern,\n      includeDeps,\n      skipDependencyInstallation,\n      resolveUnrelated,\n      ignoreConfigChanges,\n      remote,\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    const currentLane = currentLaneId.isDefault() ? null : await consumer.scope.loadLane(currentLaneId);\n    const isDefaultLane = otherLaneId.isDefault();\n    const getOtherLane = async () => {\n      if (isDefaultLane) {\n        return undefined;\n      }\n      const lane = await consumer.scope.loadLane(otherLaneId);\n      if (remote || !lane) {\n        return this.lanes.fetchLaneWithItsComponents(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 = 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 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    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\n        .changeVersion(otherLane.readmeComponent?.head?.hash)\n        .toString();\n\n      deleteResults = await this.remove.remove({\n        componentsPattern: readmeComponentId,\n        force: false,\n        remote: false,\n        track: false,\n        deleteFiles: true,\n        fromLane: false,\n      });\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  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.importManyDeltaWithoutDeps({\n      ids: idsToMerge,\n      fromHead: true,\n      lane: fromLaneObj,\n      ignoreMissingHead: true,\n    });\n    // get their main/to-lane as well\n    await scopeComponentsImporter.importManyDeltaWithoutDeps({\n      ids: idsToMerge.toVersionLatest(),\n      fromHead: true,\n      ignoreMissingHead: true,\n      lane: toLaneObj,\n    });\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 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      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      // this might be confusing, we pass the toLaneHead as the sourceHead and the fromLaneHead as the targetHead.\n      // this is because normally, in the workspace, we merge another lane (target) into the current lane (source).\n      // so effectively, in the workspace, we merge fromLane=target into toLane=source.\n      const divergeData = await getDivergeData({\n        repo,\n        modelComponent,\n        sourceHead: toLaneHead,\n        targetHead: fromLaneHead,\n      });\n      const modifiedVersion = shouldSquash\n        ? squashOneComp(DEFAULT_LANE, fromLaneId, id, divergeData, fromVersionObj)\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      });\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  ];\n  static runtime = MainRuntime;\n\n  static async provider([lanes, cli, workspace, merging, loggerMain, remove, scope, exporter]: [\n    LanesMain,\n    CLIMain,\n    Workspace,\n    MergingMain,\n    LoggerMain,\n    RemoveMain,\n    ScopeMain,\n    ExportMain\n  ]) {\n    const logger = loggerMain.createLogger(MergeLanesAspect.id);\n    const lanesCommand = cli.getCommand('lane');\n    const mergeLanesMain = new MergeLanesMain(workspace, merging, lanes, logger, remove, scope, exporter);\n    lanesCommand?.commands?.push(new MergeLaneCmd(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  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        throw new BitError(`unable to merge ${compId.toString()}.\nit has (in version ${remoteVersion.toString()}) the following dependencies which were not included in the pattern. consider adding \"--include-deps\" flag\n${depsOnLane.map((d) => d.toString()).join('\\n')}`);\n      }\n      depsToAdd.push(...depsOnLane);\n    });\n  });\n  if (depsToAdd.length) {\n    const depsUniq = BitIds.uniqFromArray(depsToAdd);\n    depsUniq.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 squashSnaps(allComponentsStatus: ComponentMergeStatus[], otherLaneId: LaneId, consumer: Consumer) {\n  const currentLaneName = consumer.getCurrentLaneId().name;\n  const succeededComponents = allComponentsStatus.filter((c) => !c.unmergedMessage);\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      const modifiedComp = squashOneComp(currentLaneName, otherLaneId, id, divergeData, componentFromModel);\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 */\nfunction squashOneComp(\n  currentLaneName: string,\n  otherLaneId: LaneId,\n  id: BitId,\n  divergeData: SnapsDistance,\n  componentFromModel?: Version\n): 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  // 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  // do the squash.\n  if (divergeData.commonSnapBeforeDiverge) {\n    componentFromModel.addAsOnlyParent(divergeData.commonSnapBeforeDiverge);\n  } else {\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  componentFromModel.setSquashed({ previousParents: currentParents, laneId: otherLaneId });\n  return componentFromModel;\n}\n\nMergeLanesAspect.addRuntime(MergeLanesMain);\n\nexport default MergeLanesMain;\n"],"mappings":"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"}

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@teambit/merge-lanes",
-  "version": "0.0.123",
+  "version": "0.0.125",
   "homepage": "https://bit.dev/teambit/lanes/merge-lanes",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.lanes",
     "name": "merge-lanes",
-    "version": "0.0.123"
+    "version": "0.0.125"
   },
   "dependencies": {
     "chalk": "2.4.2",
@@ -16,17 +16,17 @@
     "@babel/runtime": "7.20.0",
     "@teambit/harmony": "0.4.6",
     "@teambit/bit-error": "0.0.402",
-    "@teambit/cli": "0.0.633",
-    "@teambit/merging": "0.0.261",
+    "@teambit/cli": "0.0.635",
+    "@teambit/lane-id": "0.0.153",
+    "@teambit/merging": "0.0.263",
     "@teambit/component-id": "0.0.425",
-    "@teambit/export": "0.0.946",
-    "@teambit/lane-id": "0.0.151",
-    "@teambit/lanes": "0.0.518",
+    "@teambit/export": "0.0.948",
+    "@teambit/lanes": "0.0.520",
     "@teambit/legacy-bit-id": "0.0.421",
-    "@teambit/logger": "0.0.726",
-    "@teambit/remove": "0.0.123",
-    "@teambit/scope": "0.0.946",
-    "@teambit/workspace": "0.0.946"
+    "@teambit/logger": "0.0.728",
+    "@teambit/remove": "0.0.125",
+    "@teambit/scope": "0.0.948",
+    "@teambit/workspace": "0.0.948"
   },
   "devDependencies": {
     "@types/lodash": "4.14.165",
@@ -38,7 +38,7 @@
     "@types/testing-library__jest-dom": "5.9.5"
   },
   "peerDependencies": {
-    "@teambit/legacy": "1.0.414",
+    "@teambit/legacy": "1.0.416",
     "react": "^16.8.0 || ^17.0.0",
     "react-dom": "^16.8.0 || ^17.0.0"
   },