@teambit/merge-lanes 0.0.38 → 0.0.40

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

@@ -0,0 +1,28 @@
+import { Command, CommandOptions } from '@teambit/cli';
+import { MergeLanesMain } from './merge-lanes.main.runtime';
+/**
+ * private command. the underscore prefix is intended.
+ */
+export declare class MergeLaneFromScopeCmd implements Command {
+    private mergeLanes;
+    name: string;
+    description: string;
+    extendedDescription: string;
+    arguments: {
+        name: string;
+        description: string;
+    }[];
+    alias: string;
+    options: CommandOptions;
+    loader: boolean;
+    private: boolean;
+    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>;
+}

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

@@ -0,0 +1,111 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+require("core-js/modules/es.array.iterator.js");
+
+require("core-js/modules/es.promise.js");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.MergeLaneFromScopeCmd = void 0;
+
+function _defineProperty2() {
+  const data = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
+  _defineProperty2 = function () {
+    return data;
+  };
+
+  return data;
+}
+
+function _chalk() {
+  const data = _interopRequireDefault(require("chalk"));
+
+  _chalk = function () {
+    return data;
+  };
+
+  return data;
+}
+
+function _bitError() {
+  const data = require("@teambit/bit-error");
+
+  _bitError = function () {
+    return data;
+  };
+
+  return data;
+}
+
+/**
+ * private command. the underscore prefix is intended.
+ */
+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, "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`);
+    (0, _defineProperty2().default)(this, "arguments", [{
+      name: 'lane',
+      description: 'lane-id to merge to main'
+    }, {
+      name: 'pattern',
+      description: 'EXPERIMENTAL. partially merge the lane with the specified component-pattern'
+    }]);
+    (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.'], // ['', 'verbose', 'show details of components that were not merged legitimately'],
+    ['', 'include-deps', 'EXPERIMENTAL. relevant for "--pattern". merge also dependencies of the given components']]);
+    (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], {
+    push = false,
+    keepReadme = false,
+    noSquash = false,
+    includeDeps = false
+  }) {
+    if (includeDeps && !pattern) {
+      throw new (_bitError().BitError)(`"--include-deps" flag is relevant only for --pattern flag`);
+    }
+
+    const {
+      mergedNow,
+      mergedPreviously,
+      exportedIds
+    } = await this.mergeLanes.mergeFromScope(name, {
+      push,
+      keepReadme,
+      noSquash,
+      pattern,
+      includeDeps
+    });
+
+    const mergedTitle = _chalk().default.green(`successfully merged ${mergedNow.length} components from ${name} to main`);
+
+    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')}` : '';
+
+    const exportedTitle = _chalk().default.green(`successfully exported ${exportedIds.length} components`);
+
+    const exportedOutput = exportedIds.length ? `\n${exportedTitle}\n${exportedIds.join('\n')}` : '';
+    return mergedOutput + nonMergedOutput + exportedOutput;
+  }
+
+}
+
+exports.MergeLaneFromScopeCmd = MergeLaneFromScopeCmd;
+
+//# sourceMappingURL=merge-lane-from-scope.cmd.js.map

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

@@ -0,0 +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"],"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    // ['', 'verbose', 'show details of components that were not merged legitimately'],\n    ['', 'include-deps', 'EXPERIMENTAL. relevant for \"--pattern\". merge also dependencies of the given 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    [name, pattern]: [string, string],\n    {\n      push = false,\n      keepReadme = false,\n      noSquash = false,\n      includeDeps = false,\n    }: // verbose = false,\n    {\n      push?: boolean;\n      keepReadme?: boolean;\n      noSquash: boolean;\n      includeDeps?: boolean;\n      // verbose?: 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}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AAAA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AAEA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AAGA;AACA;AACA;AACO,MAAMA,qBAAN,CAA+C;EA6BpDC,WAAW,CAASC,UAAT,EAAqC;IAAA,KAA5BA,UAA4B,GAA5BA,UAA4B;IAAA,8CA5BzC,8BA4ByC;IAAA,qDA3BjC,gEA2BiC;IAAA,6DA1BzB;AACzB;AACA,8GAwBkD;IAAA,mDAvBpC,CACV;MACEC,IAAI,EAAE,MADR;MAEEC,WAAW,EAAE;IAFf,CADU,EAKV;MACED,IAAI,EAAE,SADR;MAEEC,WAAW,EAAE;IAFf,CALU,CAuBoC;IAAA,+CAbxC,EAawC;IAAA,iDAZtC,CACR,CAAC,EAAD,EAAK,MAAL,EAAa,6DAAb,CADQ,EAER,CAAC,EAAD,EAAK,aAAL,EAAoB,uDAApB,CAFQ,EAGR,CAAC,EAAD,EAAK,WAAL,EAAkB,8EAAlB,CAHQ,EAIR;IACA,CAAC,EAAD,EAAK,cAAL,EAAqB,yFAArB,CALQ,CAYsC;IAAA,gDALvC,IAKuC;IAAA,iDAJtC,IAIsC;IAAA,mDAHpC,IAGoC;IAAA,kDAFrC,IAEqC;EAAE;;EAEtC,MAANC,MAAM,CACV,CAACF,IAAD,EAAOG,OAAP,CADU,EAEV;IACEC,IAAI,GAAG,KADT;IAEEC,UAAU,GAAG,KAFf;IAGEC,QAAQ,GAAG,KAHb;IAIEC,WAAW,GAAG;EAJhB,CAFU,EAeO;IACjB,IAAIA,WAAW,IAAI,CAACJ,OAApB,EAA6B;MAC3B,MAAM,KAAIK,oBAAJ,EAAc,2DAAd,CAAN;IACD;;IACD,MAAM;MAAEC,SAAF;MAAaC,gBAAb;MAA+BC;IAA/B,IAA+C,MAAM,KAAKZ,UAAL,CAAgBa,cAAhB,CAA+BZ,IAA/B,EAAqC;MAC9FI,IAD8F;MAE9FC,UAF8F;MAG9FC,QAH8F;MAI9FH,OAJ8F;MAK9FI;IAL8F,CAArC,CAA3D;;IAQA,MAAMM,WAAW,GAAGC,gBAAA,CAAMC,KAAN,CAAa,uBAAsBN,SAAS,CAACO,MAAO,oBAAmBhB,IAAK,UAA5E,CAApB;;IACA,MAAMiB,YAAY,GAAGR,SAAS,CAACO,MAAV,GAAoB,GAAEH,WAAY,KAAIJ,SAAS,CAACS,IAAV,CAAe,IAAf,CAAqB,EAA3D,GAA+D,EAApF;;IAEA,MAAMC,cAAc,GAAGL,gBAAA,CAAMM,IAAN,CACpB,iBAAgBV,gBAAgB,CAACM,MAAO,+DADpB,CAAvB;;IAGA,MAAMK,eAAe,GAAGX,gBAAgB,CAACM,MAAjB,GAA2B,KAAIG,cAAe,KAAIT,gBAAgB,CAACQ,IAAjB,CAAsB,IAAtB,CAA4B,EAA9E,GAAkF,EAA1G;;IAEA,MAAMI,aAAa,GAAGR,gBAAA,CAAMC,KAAN,CAAa,yBAAwBJ,WAAW,CAACK,MAAO,aAAxD,CAAtB;;IACA,MAAMO,cAAc,GAAGZ,WAAW,CAACK,MAAZ,GAAsB,KAAIM,aAAc,KAAIX,WAAW,CAACO,IAAZ,CAAiB,IAAjB,CAAuB,EAAnE,GAAuE,EAA9F;IAEA,OAAOD,YAAY,GAAGI,eAAf,GAAiCE,cAAxC;EACD;;AAtEmD"}

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

@@ -3,8 +3,10 @@ import { LanesMain } from '@teambit/lanes';
 import { MergingMain } from '@teambit/merging';
 import { Workspace } from '@teambit/workspace';
 import { MergeStrategy, ApplyVersionResults } from '@teambit/legacy/dist/consumer/versions-ops/merge-version';
+import { ScopeMain } from '@teambit/scope';
 import { Logger, LoggerMain } from '@teambit/logger';
 import { RemoveMain } from '@teambit/remove';
+import { ExportMain } from '@teambit/export';
 export declare type MergeLaneOptions = {
     mergeStrategy: MergeStrategy;
     noSnap: boolean;
@@ -27,21 +29,32 @@ export declare class MergeLanesMain {
     private lanes;
     private logger;
     private remove;
-    constructor(workspace: Workspace | undefined, merging: MergingMain, lanes: LanesMain, logger: Logger, remove: RemoveMain);
+    private scope;
+    private exporter;
+    constructor(workspace: Workspace | undefined, merging: MergingMain, lanes: LanesMain, logger: Logger, remove: RemoveMain, scope: ScopeMain, exporter: ExportMain);
     mergeLane(laneName: string, options: MergeLaneOptions): Promise<{
         mergeResults: ApplyVersionResults;
         deleteResults: any;
     }>;
+    mergeFromScope(laneName: string, options: Partial<MergeLaneOptions> & {
+        push?: boolean;
+    }): Promise<{
+        mergedPreviously: string[];
+        mergedNow: string[];
+        exportedIds: string[];
+    }>;
     static slots: never[];
     static dependencies: import("@teambit/harmony").Aspect[];
     static runtime: import("@teambit/harmony").RuntimeDefinition;
-    static provider([lanes, cli, workspace, merging, loggerMain, remove]: [
+    static provider([lanes, cli, workspace, merging, loggerMain, remove, scope, exporter]: [
         LanesMain,
         CLIMain,
         Workspace,
         MergingMain,
         LoggerMain,
-        RemoveMain
+        RemoveMain,
+        ScopeMain,
+        ExportMain
     ]): Promise<MergeLanesMain>;
 }
 export default MergeLanesMain;

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

@@ -2,8 +2,12 @@
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
+require("core-js/modules/es.array.flat.js");
+
 require("core-js/modules/es.array.iterator.js");
 
+require("core-js/modules/es.array.unscopables.flat.js");
+
 require("core-js/modules/es.promise.js");
 
 Object.defineProperty(exports, "__esModule", {
@@ -101,6 +105,26 @@ function _bitId() {
   return data;
 }
 
+function _scope() {
+  const data = require("@teambit/scope");
+
+  _scope = function () {
+    return data;
+  };
+
+  return data;
+}
+
+function _scopeComponentsImporter() {
+  const data = _interopRequireDefault(require("@teambit/legacy/dist/scope/component-ops/scope-components-importer"));
+
+  _scopeComponentsImporter = function () {
+    return data;
+  };
+
+  return data;
+}
+
 function _laneId() {
   const data = require("@teambit/lane-id");
 
@@ -141,6 +165,36 @@ function _remove() {
   return data;
 }
 
+function _lodash() {
+  const data = require("lodash");
+
+  _lodash = function () {
+    return data;
+  };
+
+  return data;
+}
+
+function _export() {
+  const data = require("@teambit/export");
+
+  _export = function () {
+    return data;
+  };
+
+  return data;
+}
+
+function _getDivergeData() {
+  const data = require("@teambit/legacy/dist/scope/component-ops/get-diverge-data");
+
+  _getDivergeData = function () {
+    return data;
+  };
+
+  return data;
+}
+
 function _mergeLanes() {
   const data = require("./merge-lanes.aspect");
 
@@ -161,13 +215,25 @@ function _mergeLane() {
   return data;
 }
 
+function _mergeLaneFromScope() {
+  const data = require("./merge-lane-from-scope.cmd");
+
+  _mergeLaneFromScope = function () {
+    return data;
+  };
+
+  return data;
+}
+
 class MergeLanesMain {
-  constructor(workspace, merging, lanes, logger, remove) {
+  constructor(workspace, merging, lanes, logger, remove, scope, exporter) {
     this.workspace = workspace;
     this.merging = merging;
     this.lanes = lanes;
     this.logger = logger;
     this.remove = remove;
+    this.scope = scope;
+    this.exporter = exporter;
   }
 
   async mergeLane(laneName, options) {
@@ -339,13 +405,82 @@ class MergeLanesMain {
     }
   }
 
-  static async provider([lanes, cli, workspace, merging, loggerMain, remove]) {
+  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);
+    const laneIds = lane.toBitIds();
+
+    const scopeComponentsImporter = _scopeComponentsImporter().default.getInstance(this.scope.legacyScope);
+
+    await scopeComponentsImporter.importManyDeltaWithoutDeps(laneIds, true, lane, true); // get their main as well
+
+    await scopeComponentsImporter.importManyDeltaWithoutDeps(laneIds.toVersionLatest(), true, undefined, true);
+    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 bitObjectsPerComp = await (0, _pMapSeries().default)(laneIds, async id => {
+      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)) {
+        mergedPreviously.push(id);
+        return undefined;
+      }
+
+      const divergeData = await (0, _getDivergeData().getDivergeData)(repo, modelComponent, laneHead, mainHead);
+      const modifiedVersion = squashOneComp(_laneId().DEFAULT_LANE, laneId, id, divergeData, versionObj);
+      modelComponent.setHead(laneHead);
+      const objects = [modelComponent, modifiedVersion];
+      mergedNow.push(id);
+      return {
+        id,
+        objects
+      };
+    });
+    const bitObjects = (0, _lodash().compact)(bitObjectsPerComp).map(b => b.objects);
+    await repo.writeObjectsToTheFS(bitObjects.flat());
+    let exportedIds = [];
+
+    if (options.push) {
+      const ids = (0, _lodash().compact)(bitObjectsPerComp).map(b => b.id);
+
+      const bitIds = _bitId().BitIds.fromArray(ids);
+
+      const {
+        exported
+      } = await this.exporter.exportMany({
+        scope: this.scope.legacyScope,
+        ids: bitIds,
+        idsWithFutureScope: bitIds,
+        allVersions: false
+      });
+      exportedIds = exported.map(id => id.toString());
+    }
+
+    return {
+      mergedPreviously: mergedPreviously.map(id => id.toString()),
+      mergedNow: mergedNow.map(id => id.toString()),
+      exportedIds
+    };
+  }
+
+  static async provider([lanes, cli, workspace, merging, loggerMain, remove, scope, exporter]) {
     var _lanesCommand$command;
 
     const logger = loggerMain.createLogger(_mergeLanes().MergeLanesAspect.id);
     const lanesCommand = cli.getCommand('lane');
-    const mergeLanesMain = new MergeLanesMain(workspace, merging, lanes, logger, remove);
+    const mergeLanesMain = new MergeLanesMain(workspace, merging, lanes, logger, remove, scope, exporter);
     lanesCommand === null || lanesCommand === void 0 ? void 0 : (_lanesCommand$command = lanesCommand.commands) === null || _lanesCommand$command === void 0 ? void 0 : _lanesCommand$command.push(new (_mergeLane().MergeLaneCmd)(mergeLanesMain));
+    cli.register(new (_mergeLaneFromScope().MergeLaneFromScopeCmd)(mergeLanesMain));
     return mergeLanesMain;
   }
 
@@ -353,7 +488,7 @@ class MergeLanesMain {
 
 exports.MergeLanesMain = MergeLanesMain;
 (0, _defineProperty2().default)(MergeLanesMain, "slots", []);
-(0, _defineProperty2().default)(MergeLanesMain, "dependencies", [_lanes().LanesAspect, _cli().CLIAspect, _workspace().default, _merging().default, _logger().LoggerAspect, _remove().RemoveAspect]);
+(0, _defineProperty2().default)(MergeLanesMain, "dependencies", [_lanes().LanesAspect, _cli().CLIAspect, _workspace().default, _merging().default, _logger().LoggerAspect, _remove().RemoveAspect, _scope().ScopeAspect, _export().ExportAspect]);
 (0, _defineProperty2().default)(MergeLanesMain, "runtime", _cli().MainRuntime);
 
 async function filterComponentsStatus(allComponentsStatus, compIdsToKeep, allBitIds, workspace, includeDeps = false, lane) {
@@ -452,52 +587,63 @@ function squashSnaps(allComponentsStatus, otherLaneId, consumer) {
       throw new Error(`unable to squash. divergeData is missing from ${id.toString()}`);
     }
 
-    if (divergeData.isDiverged()) {
-      throw new (_bitError().BitError)(`unable to squash because ${id.toString()} is diverged in history.
+    const modifiedComp = squashOneComp(currentLaneName, otherLaneId, id, divergeData, componentFromModel);
+    if (modifiedComp) consumer.scope.objects.add(modifiedComp);
+  });
+}
+/**
+ * returns Version object if it was modified. otherwise, returns undefined
+ */
+
+
+function squashOneComp(currentLaneName, otherLaneId, id, divergeData, componentFromModel) {
+  if (divergeData.isDiverged()) {
+    throw new (_bitError().BitError)(`unable to squash because ${id.toString()} is diverged in history.
 consider switching to "${otherLaneId.name}" first, merging "${currentLaneName}", then switching back to "${currentLaneName}" and merging "${otherLaneId.name}"
 alternatively, use "--no-squash" flag to keep the entire history of "${otherLaneId.name}"`);
-    }
+  }
 
-    if (divergeData.isLocalAhead()) {
-      // nothing to do. current is ahead, nothing to merge. (it was probably filtered out already as a "failedComponent")
-      return;
-    }
+  if (divergeData.isLocalAhead()) {
+    // nothing to do. current is ahead, nothing to merge. (it was probably filtered out already as a "failedComponent")
+    return undefined;
+  }
 
-    if (!divergeData.isRemoteAhead()) {
-      // nothing to do. current and remote are the same, nothing to merge. (it was probably filtered out already as a "failedComponent")
-      return;
-    } // remote is ahead and was not diverge.
+  if (!divergeData.isRemoteAhead()) {
+    // nothing to do. current and remote are the same, nothing to merge. (it was probably filtered out already as a "failedComponent")
+    return undefined;
+  } // remote is ahead and was not diverge.
 
 
-    const remoteSnaps = divergeData.snapsOnRemoteOnly;
+  const remoteSnaps = divergeData.snapsOnRemoteOnly;
 
-    if (remoteSnaps.length === 0) {
-      throw new Error(`remote is ahead but it has no snaps. it's impossible`);
-    } // if (remoteSnaps.length === 1) {
-    //   // nothing to squash. it has only one commit.
-    //   return;
-    // }
+  if (remoteSnaps.length === 0) {
+    throw new Error(`remote is ahead but it has no snaps. it's impossible`);
+  } // no need to check this case. even if it has only one snap ahead, we want to do the "squash", and run "addAsOnlyParent"
+  // to make sure it doesn't not have two parents.
+  // if (remoteSnaps.length === 1) {
+  //   // nothing to squash. it has only one commit.
+  //   return;
+  // }
 
 
-    if (!componentFromModel) {
-      throw new Error('unable to squash, the componentFromModel is missing');
-    }
+  if (!componentFromModel) {
+    throw new Error('unable to squash, the componentFromModel is missing');
+  }
 
-    const currentParents = componentFromModel.parents; // do the squash.
+  const currentParents = componentFromModel.parents; // do the squash.
 
-    if (divergeData.commonSnapBeforeDiverge) {
-      componentFromModel.addAsOnlyParent(divergeData.commonSnapBeforeDiverge);
-    } else {
-      // there is no commonSnapBeforeDiverge. the local has no snaps, all are remote, no need for parents. keep only head.
-      componentFromModel.parents.forEach(ref => componentFromModel.removeParent(ref));
-    }
+  if (divergeData.commonSnapBeforeDiverge) {
+    componentFromModel.addAsOnlyParent(divergeData.commonSnapBeforeDiverge);
+  } else {
+    // there is no commonSnapBeforeDiverge. the local has no snaps, all are remote, no need for parents. keep only head.
+    componentFromModel.parents.forEach(ref => componentFromModel.removeParent(ref));
+  }
 
-    componentFromModel.setSquashed({
-      previousParents: currentParents,
-      laneId: otherLaneId
-    });
-    consumer.scope.objects.add(componentFromModel);
+  componentFromModel.setSquashed({
+    previousParents: currentParents,
+    laneId: otherLaneId
   });
+  return componentFromModel;
 }
 
 _mergeLanes().MergeLanesAspect.addRuntime(MergeLanesMain);

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

@@ -1 +1 @@
-{"version":3,"names":["MergeLanesMain","constructor","workspace","merging","lanes","logger","remove","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","scope","loadLane","isDefaultLane","getOtherLane","undefined","lane","fetchLaneWithItsComponents","otherLane","getBitIds","Error","DEFAULT_LANE","getDefaultLaneIdsFromLane","toBitIds","bitIds","debug","otherLaneName","getAllComponentsStatus","tmp","Tmp","componentsStatus","Promise","all","map","bitId","getComponentMergeStatus","clear","err","allComponentsStatus","componentIds","resolveMultipleComponentIds","compIdsFromPattern","filterIdsFromPoolIdsByPattern","filterComponentsStatus","forEach","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","onDestroy","failureMsgs","chalk","bold","red","join","provider","cli","loggerMain","createLogger","MergeLanesAspect","lanesCommand","getCommand","mergeLanesMain","commands","MergeLaneCmd","LanesAspect","CLIAspect","WorkspaceAspect","MergingAspect","LoggerAspect","RemoveAspect","MainRuntime","compIdsToKeep","allBitIds","bitIdsFromPattern","BitIds","fromArray","bitIdsNotFromPattern","hasWithoutVersion","filteredComponentStatus","depsToAdd","pMapSeries","compId","fromStatus","divergeData","remoteVersions","snapsOnRemoteOnly","modelComponent","getModelComponent","remoteVersion","versionObj","loadVersion","objects","flattenedDeps","getAllFlattenedDependencies","depsNotIncludeInPattern","depsOnLane","dep","isOnLane","isIdOnLane","d","depsUniq","uniqFromArray","currentLaneName","succeededComponents","componentFromModel","isDiverged","isLocalAhead","isRemoteAhead","remoteSnaps","currentParents","parents","commonSnapBeforeDiverge","addAsOnlyParent","ref","removeParent","setSquashed","previousParents","add","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 } 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 { ComponentID } from '@teambit/component-id';\nimport { DEFAULT_LANE, LaneId } from '@teambit/lane-id';\nimport { Lane } from '@teambit/legacy/dist/scope/models';\nimport { Tmp } from '@teambit/legacy/dist/scope/repositories';\nimport { Logger, LoggerAspect, LoggerMain } from '@teambit/logger';\nimport { RemoveAspect, RemoveMain } from '@teambit/remove';\nimport { MergeLanesAspect } from './merge-lanes.aspect';\nimport { MergeLaneCmd } from './merge-lane.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  ) {}\n\n  async mergeLane(\n    laneName: string,\n    options: MergeLaneOptions\n  ): Promise<{ mergeResults: ApplyVersionResults; deleteResults: any }> {\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    const otherLaneName = isDefaultLane ? DEFAULT_LANE : otherLaneId.toString();\n\n    const getAllComponentsStatus = async (): Promise<ComponentMergeStatus[]> => {\n      const tmp = new Tmp(consumer.scope);\n      try {\n        const componentsStatus = await Promise.all(\n          bitIds.map((bitId) =>\n            this.merging.getComponentMergeStatus(bitId, currentLane, otherLaneName, {\n              resolveUnrelated,\n              ignoreConfigChanges,\n            })\n          )\n        );\n        await tmp.clear();\n        return componentsStatus;\n      } catch (err: any) {\n        await tmp.clear();\n        throw err;\n      }\n    };\n    let allComponentsStatus = await getAllComponentsStatus();\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      );\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      );\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 (currentLaneId.isDefault() && !noSquash) {\n      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\n    await this.workspace.consumer.onDestroy();\n\n    return { mergeResults, deleteResults };\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  static slots = [];\n  static dependencies = [LanesAspect, CLIAspect, WorkspaceAspect, MergingAspect, LoggerAspect, RemoveAspect];\n  static runtime = MainRuntime;\n\n  static async provider([lanes, cli, workspace, merging, loggerMain, remove]: [\n    LanesMain,\n    CLIMain,\n    Workspace,\n    MergingMain,\n    LoggerMain,\n    RemoveMain\n  ]) {\n    const logger = loggerMain.createLogger(MergeLanesAspect.id);\n    const lanesCommand = cli.getCommand('lane');\n    const mergeLanesMain = new MergeLanesMain(workspace, merging, lanes, logger, remove);\n    lanesCommand?.commands?.push(new MergeLaneCmd(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  lane?: Lane\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    const { divergeData } = fromStatus;\n    if (!divergeData) {\n      throw new Error(`filterComponentsStatus: unable to find divergeData for ${compId.toString()}`);\n    }\n    const remoteVersions = divergeData.snapsOnRemoteOnly;\n    if (!remoteVersions.length) {\n      return;\n    }\n    const modelComponent = await workspace.consumer.scope.getModelComponent(compId._legacy);\n    // optimization suggestion: if squash is given, check only the last version.\n    await pMapSeries(remoteVersions, 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, lane);\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\nfunction squashSnaps(allComponentsStatus: ComponentMergeStatus[], otherLaneId: LaneId, consumer: Consumer) {\n  const currentLaneName = consumer.getCurrentLaneId().name;\n  const succeededComponents = allComponentsStatus.filter((c) => !c.unmergedMessage);\n  succeededComponents.forEach(({ id, divergeData, componentFromModel }) => {\n    if (!divergeData) {\n      throw new Error(`unable to squash. divergeData is missing from ${id.toString()}`);\n    }\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.isLocalAhead()) {\n      // nothing to do. current is ahead, nothing to merge. (it was probably filtered out already as a \"failedComponent\")\n      return;\n    }\n    if (!divergeData.isRemoteAhead()) {\n      // nothing to do. current and remote are the same, nothing to merge. (it was probably filtered out already as a \"failedComponent\")\n      return;\n    }\n    // remote is ahead and was not diverge.\n    const remoteSnaps = divergeData.snapsOnRemoteOnly;\n    if (remoteSnaps.length === 0) {\n      throw new Error(`remote is ahead but it has no snaps. it's impossible`);\n    }\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    consumer.scope.objects.add(componentFromModel);\n  });\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","getDefaultLaneIdsFromLane","toBitIds","bitIds","debug","otherLaneName","getAllComponentsStatus","tmp","Tmp","componentsStatus","Promise","all","map","bitId","getComponentMergeStatus","clear","err","allComponentsStatus","componentIds","resolveMultipleComponentIds","compIdsFromPattern","filterIdsFromPoolIdsByPattern","filterComponentsStatus","forEach","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","onDestroy","failureMsgs","chalk","bold","red","join","mergeFromScope","LaneId","parse","importLaneObject","laneIds","scopeComponentsImporter","ScopeComponentsImporter","getInstance","legacyScope","importManyDeltaWithoutDeps","toVersionLatest","repo","objects","mergedPreviously","mergedNow","bitObjectsPerComp","pMapSeries","modelComponent","getModelComponent","versionObj","loadVersion","version","laneHead","getRef","mainHead","divergeData","getDivergeData","modifiedVersion","squashOneComp","setHead","bitObjects","compact","b","writeObjectsToTheFS","flat","exportedIds","ids","BitIds","fromArray","exported","exportMany","idsWithFutureScope","allVersions","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","remoteVersions","snapsOnRemoteOnly","remoteVersion","flattenedDeps","getAllFlattenedDependencies","depsNotIncludeInPattern","depsOnLane","dep","isOnLane","isIdOnLane","d","depsUniq","uniqFromArray","currentLaneName","succeededComponents","componentFromModel","modifiedComp","add","isDiverged","isLocalAhead","isRemoteAhead","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 } 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 { Tmp } from '@teambit/legacy/dist/scope/repositories';\nimport { Logger, LoggerAspect, LoggerMain } from '@teambit/logger';\nimport { DivergeData } from '@teambit/legacy/dist/scope/component-ops/diverge-data';\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 }> {\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    const otherLaneName = isDefaultLane ? DEFAULT_LANE : otherLaneId.toString();\n\n    const getAllComponentsStatus = async (): Promise<ComponentMergeStatus[]> => {\n      const tmp = new Tmp(consumer.scope);\n      try {\n        const componentsStatus = await Promise.all(\n          bitIds.map((bitId) =>\n            this.merging.getComponentMergeStatus(bitId, currentLane, otherLaneName, {\n              resolveUnrelated,\n              ignoreConfigChanges,\n            })\n          )\n        );\n        await tmp.clear();\n        return componentsStatus;\n      } catch (err: any) {\n        await tmp.clear();\n        throw err;\n      }\n    };\n    let allComponentsStatus = await getAllComponentsStatus();\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      );\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      );\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 (currentLaneId.isDefault() && !noSquash) {\n      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\n    await this.workspace.consumer.onDestroy();\n\n    return { mergeResults, deleteResults };\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 scopeComponentsImporter = ScopeComponentsImporter.getInstance(this.scope.legacyScope);\n    await scopeComponentsImporter.importManyDeltaWithoutDeps(laneIds, true, lane, true);\n    // get their main as well\n    await scopeComponentsImporter.importManyDeltaWithoutDeps(laneIds.toVersionLatest(), true, undefined, true);\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(laneIds, 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(repo, modelComponent, laneHead, mainHead);\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      });\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  lane?: Lane\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    const { divergeData } = fromStatus;\n    if (!divergeData) {\n      throw new Error(`filterComponentsStatus: unable to find divergeData for ${compId.toString()}`);\n    }\n    const remoteVersions = divergeData.snapsOnRemoteOnly;\n    if (!remoteVersions.length) {\n      return;\n    }\n    const modelComponent = await workspace.consumer.scope.getModelComponent(compId._legacy);\n    // optimization suggestion: if squash is given, check only the last version.\n    await pMapSeries(remoteVersions, 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, lane);\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\nfunction squashSnaps(allComponentsStatus: ComponentMergeStatus[], otherLaneId: LaneId, consumer: Consumer) {\n  const currentLaneName = consumer.getCurrentLaneId().name;\n  const succeededComponents = allComponentsStatus.filter((c) => !c.unmergedMessage);\n  succeededComponents.forEach(({ 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) consumer.scope.objects.add(modifiedComp);\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: DivergeData,\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.isLocalAhead()) {\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.isRemoteAhead()) {\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.snapsOnRemoteOnly;\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,31 +1,35 @@
 {
   "name": "@teambit/merge-lanes",
-  "version": "0.0.38",
+  "version": "0.0.40",
   "homepage": "https://bit.dev/teambit/lanes/merge-lanes",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.lanes",
     "name": "merge-lanes",
-    "version": "0.0.38"
+    "version": "0.0.40"
   },
   "dependencies": {
     "chalk": "2.4.2",
+    "lodash": "4.17.21",
     "p-map-series": "2.1.0",
     "@babel/runtime": "7.12.18",
     "core-js": "^3.0.0",
     "@teambit/harmony": "0.3.3",
     "@teambit/bit-error": "0.0.400",
-    "@teambit/cli": "0.0.572",
-    "@teambit/merging": "0.0.176",
+    "@teambit/cli": "0.0.574",
+    "@teambit/merging": "0.0.178",
     "@teambit/component-id": "0.0.417",
-    "@teambit/lane-id": "0.0.90",
-    "@teambit/lanes": "0.0.433",
+    "@teambit/export": "0.0.863",
+    "@teambit/lane-id": "0.0.92",
+    "@teambit/lanes": "0.0.435",
     "@teambit/legacy-bit-id": "0.0.414",
-    "@teambit/logger": "0.0.665",
-    "@teambit/remove": "0.0.38",
-    "@teambit/workspace": "0.0.861"
+    "@teambit/logger": "0.0.667",
+    "@teambit/remove": "0.0.40",
+    "@teambit/scope": "0.0.863",
+    "@teambit/workspace": "0.0.863"
   },
   "devDependencies": {
+    "@types/lodash": "4.14.165",
     "@types/mocha": "9.1.0",
     "@types/testing-library__jest-dom": "5.9.5",
     "@types/jest": "^26.0.0",
@@ -34,7 +38,7 @@
     "@types/node": "12.20.4"
   },
   "peerDependencies": {
-    "@teambit/legacy": "1.0.352",
+    "@teambit/legacy": "1.0.355",
     "react-dom": "^16.8.0 || ^17.0.0",
     "react": "^16.8.0 || ^17.0.0"
   },