@teambit/merge-lanes 0.0.1

package/dist/index.d.ts

@@ -0,0 +1,4 @@
+import { MergeLanesAspect } from './merge-lanes.aspect';
+export type { MergeLanesMain } from './merge-lanes.main.runtime';
+export default MergeLanesAspect;
+export { MergeLanesAspect };

package/dist/index.js

@@ -0,0 +1,28 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "MergeLanesAspect", {
+  enumerable: true,
+  get: function () {
+    return _mergeLanes().MergeLanesAspect;
+  }
+});
+exports.default = void 0;
+
+function _mergeLanes() {
+  const data = require("./merge-lanes.aspect");
+
+  _mergeLanes = function () {
+    return data;
+  };
+
+  return data;
+}
+
+var _default = _mergeLanes().MergeLanesAspect;
+
+exports.default = _default;
+
+//# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["MergeLanesAspect"],"sources":["index.ts"],"sourcesContent":["import { MergeLanesAspect } from './merge-lanes.aspect';\n\nexport type { MergeLanesMain } from './merge-lanes.main.runtime';\nexport default MergeLanesAspect;\nexport { MergeLanesAspect };\n"],"mappings":";;;;;;;;;;;;;AAAA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;eAGeA,8B"}

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

@@ -0,0 +1,34 @@
+import { Command, CommandOptions } from '@teambit/cli';
+import { MergeLanesMain } from './merge-lanes.main.runtime';
+export declare class MergeLaneCmd 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], { ours, theirs, manual, build, workspace: existingOnWorkspaceOnly, noSnap, message: snapMessage, keepReadme, squash, skipDependencyInstallation, remote, includeDeps, verbose, }: {
+        ours: boolean;
+        theirs: boolean;
+        manual: boolean;
+        workspace?: boolean;
+        build?: boolean;
+        noSnap: boolean;
+        message: string;
+        keepReadme?: boolean;
+        squash: boolean;
+        skipDependencyInstallation?: boolean;
+        remote: boolean;
+        includeDeps?: boolean;
+        verbose?: boolean;
+    }): Promise<string>;
+}

package/dist/merge-lane.cmd.js

@@ -0,0 +1,162 @@
+"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.MergeLaneCmd = 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 _mergeVersion() {
+  const data = require("@teambit/legacy/dist/consumer/versions-ops/merge-version");
+
+  _mergeVersion = function () {
+    return data;
+  };
+
+  return data;
+}
+
+function _merging() {
+  const data = require("@teambit/merging");
+
+  _merging = function () {
+    return data;
+  };
+
+  return data;
+}
+
+function _featureToggle() {
+  const data = require("@teambit/legacy/dist/api/consumer/lib/feature-toggle");
+
+  _featureToggle = function () {
+    return data;
+  };
+
+  return data;
+}
+
+function _bitError() {
+  const data = require("@teambit/bit-error");
+
+  _bitError = function () {
+    return data;
+  };
+
+  return data;
+}
+
+function _removeTemplate() {
+  const data = _interopRequireDefault(require("@teambit/legacy/dist/cli/templates/remove-template"));
+
+  _removeTemplate = function () {
+    return data;
+  };
+
+  return data;
+}
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2().default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+class MergeLaneCmd {
+  constructor(mergeLanes) {
+    this.mergeLanes = mergeLanes;
+    (0, _defineProperty2().default)(this, "name", 'merge <lane> [pattern]');
+    (0, _defineProperty2().default)(this, "description", `merge a local or a remote lane`);
+    (0, _defineProperty2().default)(this, "extendedDescription", `if the <lane> exists locally, it will be merged from the local lane.
+otherwise, it will fetch the lane from the remote and merge it.
+in case the <lane> exists locally but you want to merge the remote version of it, use --remote flag`);
+    (0, _defineProperty2().default)(this, "arguments", [{
+      name: 'lane',
+      description: 'lane-name or lane-id (if not exists locally) to merge to the current lane'
+    }, {
+      name: 'pattern',
+      description: 'EXPERIMENTAL. partially merge the lane with the specified component-pattern'
+    }]);
+    (0, _defineProperty2().default)(this, "alias", '');
+    (0, _defineProperty2().default)(this, "options", [['', 'ours', 'in case of a conflict, override the used version with the current modification'], ['', 'theirs', 'in case of a conflict, override the current modification with the specified version'], ['', 'manual', 'in case of a conflict, leave the files with a conflict state to resolve them manually later'], ['', 'workspace', 'merge only components in a lane that exist in the workspace'], ['', 'no-snap', 'do not auto snap in case the merge completed without conflicts'], ['', 'build', 'in case of snap during the merge, run the build-pipeline (similar to bit snap --build)'], ['m', 'message <message>', 'override the default message for the auto snap'], ['', 'keep-readme', 'skip deleting the lane readme component after merging'], ['', 'squash', 'EXPERIMENTAL. squash multiple snaps. keep the last one only'], ['', 'verbose', 'show details of components that were not merged legitimately'], ['', 'skip-dependency-installation', 'do not install packages of the imported components'], ['', 'remote', 'relevant when the target-lane locally is differ than the remote and you want the remote'], ['', 'include-deps', 'EXPERIMENTAL. relevant for "--pattern" and "--workspace". 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], {
+    ours = false,
+    theirs = false,
+    manual = false,
+    build,
+    workspace: existingOnWorkspaceOnly = false,
+    noSnap = false,
+    message: snapMessage = '',
+    keepReadme = false,
+    squash = false,
+    skipDependencyInstallation = false,
+    remote = false,
+    includeDeps = false,
+    verbose = false
+  }) {
+    build = (0, _featureToggle().isFeatureEnabled)(_featureToggle().BUILD_ON_CI) ? Boolean(build) : true;
+    const mergeStrategy = (0, _mergeVersion().getMergeStrategy)(ours, theirs, manual);
+    if (noSnap && snapMessage) throw new (_bitError().BitError)('unable to use "noSnap" and "message" flags together');
+
+    if (includeDeps && !pattern && !existingOnWorkspaceOnly) {
+      throw new (_bitError().BitError)(`"--include-deps" flag is relevant only for --workspace and --pattern flags`);
+    }
+
+    const {
+      mergeResults,
+      deleteResults
+    } = await this.mergeLanes.mergeLane(name, {
+      build,
+      // @ts-ignore
+      mergeStrategy,
+      existingOnWorkspaceOnly,
+      noSnap,
+      snapMessage,
+      keepReadme,
+      squash,
+      pattern,
+      skipDependencyInstallation,
+      remote,
+      includeDeps
+    });
+    const mergeResult = (0, _merging().mergeReport)(_objectSpread(_objectSpread({}, mergeResults), {}, {
+      verbose
+    }));
+    const deleteResult = `${deleteResults.localResult ? (0, _removeTemplate().default)(deleteResults.localResult, false) : ''}${(deleteResults.remoteResult || []).map(item => (0, _removeTemplate().default)(item, true))}${deleteResults.readmeResult && _chalk().default.yellow(deleteResults.readmeResult) || ''}\n`;
+    return mergeResult + deleteResult;
+  }
+
+}
+
+exports.MergeLaneCmd = MergeLaneCmd;
+
+//# sourceMappingURL=merge-lane.cmd.js.map

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

@@ -0,0 +1 @@
+{"version":3,"names":["MergeLaneCmd","constructor","mergeLanes","name","description","report","pattern","ours","theirs","manual","build","workspace","existingOnWorkspaceOnly","noSnap","message","snapMessage","keepReadme","squash","skipDependencyInstallation","remote","includeDeps","verbose","isFeatureEnabled","BUILD_ON_CI","Boolean","mergeStrategy","getMergeStrategy","BitError","mergeResults","deleteResults","mergeLane","mergeResult","mergeReport","deleteResult","localResult","paintRemoved","remoteResult","map","item","readmeResult","chalk","yellow"],"sources":["merge-lane.cmd.ts"],"sourcesContent":["import chalk from 'chalk';\nimport { Command, CommandOptions } from '@teambit/cli';\nimport { getMergeStrategy } from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport { mergeReport } from '@teambit/merging';\nimport { BUILD_ON_CI, isFeatureEnabled } from '@teambit/legacy/dist/api/consumer/lib/feature-toggle';\nimport { BitError } from '@teambit/bit-error';\nimport paintRemoved from '@teambit/legacy/dist/cli/templates/remove-template';\nimport { MergeLanesMain } from './merge-lanes.main.runtime';\n\nexport class MergeLaneCmd implements Command {\n  name = 'merge <lane> [pattern]';\n  description = `merge a local or a remote lane`;\n  extendedDescription = `if the <lane> exists locally, it will be merged from the local lane.\notherwise, it will fetch the lane from the remote and merge it.\nin case the <lane> exists locally but you want to merge the remote version of it, use --remote flag`;\n  arguments = [\n    {\n      name: 'lane',\n      description: 'lane-name or lane-id (if not exists locally) to merge to the current lane',\n    },\n    {\n      name: 'pattern',\n      description: 'EXPERIMENTAL. partially merge the lane with the specified component-pattern',\n    },\n  ];\n  alias = '';\n  options = [\n    ['', 'ours', 'in case of a conflict, override the used version with the current modification'],\n    ['', 'theirs', 'in case of a conflict, override the current modification with the specified version'],\n    ['', 'manual', 'in case of a conflict, leave the files with a conflict state to resolve them manually later'],\n    ['', 'workspace', 'merge only components in a lane that exist in the workspace'],\n    ['', 'no-snap', 'do not auto snap in case the merge completed without conflicts'],\n    ['', 'build', 'in case of snap during the merge, run the build-pipeline (similar to bit snap --build)'],\n    ['m', 'message <message>', 'override the default message for the auto snap'],\n    ['', 'keep-readme', 'skip deleting the lane readme component after merging'],\n    ['', 'squash', 'EXPERIMENTAL. squash multiple snaps. keep the last one only'],\n    ['', 'verbose', 'show details of components that were not merged legitimately'],\n    ['', 'skip-dependency-installation', 'do not install packages of the imported components'],\n    ['', 'remote', 'relevant when the target-lane locally is differ than the remote and you want the remote'],\n    [\n      '',\n      'include-deps',\n      'EXPERIMENTAL. relevant for \"--pattern\" and \"--workspace\". merge also dependencies of the given components',\n    ],\n  ] as CommandOptions;\n  loader = true;\n  private = true;\n  migration = true;\n  remoteOp = true;\n\n  constructor(private mergeLanes: MergeLanesMain) {}\n\n  async report(\n    [name, pattern]: [string, string],\n    {\n      ours = false,\n      theirs = false,\n      manual = false,\n      build,\n      workspace: existingOnWorkspaceOnly = false,\n      noSnap = false,\n      message: snapMessage = '',\n      keepReadme = false,\n      squash = false,\n      skipDependencyInstallation = false,\n      remote = false,\n      includeDeps = false,\n      verbose = false,\n    }: {\n      ours: boolean;\n      theirs: boolean;\n      manual: boolean;\n      workspace?: boolean;\n      build?: boolean;\n      noSnap: boolean;\n      message: string;\n      keepReadme?: boolean;\n      squash: boolean;\n      skipDependencyInstallation?: boolean;\n      remote: boolean;\n      includeDeps?: boolean;\n      verbose?: boolean;\n    }\n  ): Promise<string> {\n    build = isFeatureEnabled(BUILD_ON_CI) ? Boolean(build) : true;\n    const mergeStrategy = getMergeStrategy(ours, theirs, manual);\n    if (noSnap && snapMessage) throw new BitError('unable to use \"noSnap\" and \"message\" flags together');\n    if (includeDeps && !pattern && !existingOnWorkspaceOnly) {\n      throw new BitError(`\"--include-deps\" flag is relevant only for --workspace and --pattern flags`);\n    }\n    const { mergeResults, deleteResults } = await this.mergeLanes.mergeLane(name, {\n      build,\n      // @ts-ignore\n      mergeStrategy,\n      existingOnWorkspaceOnly,\n      noSnap,\n      snapMessage,\n      keepReadme,\n      squash,\n      pattern,\n      skipDependencyInstallation,\n      remote,\n      includeDeps,\n    });\n\n    const mergeResult = mergeReport({ ...mergeResults, verbose });\n    const deleteResult = `${deleteResults.localResult ? paintRemoved(deleteResults.localResult, false) : ''}${(\n      deleteResults.remoteResult || []\n    ).map((item) => paintRemoved(item, true))}${\n      (deleteResults.readmeResult && chalk.yellow(deleteResults.readmeResult)) || ''\n    }\\n`;\n    return mergeResult + deleteResult;\n  }\n}\n"],"mappings":"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"}

package/dist/merge-lanes.aspect.d.ts

@@ -0,0 +1,2 @@
+import { Aspect } from '@teambit/harmony';
+export declare const MergeLanesAspect: Aspect;

package/dist/merge-lanes.aspect.js

@@ -0,0 +1,24 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.MergeLanesAspect = void 0;
+
+function _harmony() {
+  const data = require("@teambit/harmony");
+
+  _harmony = function () {
+    return data;
+  };
+
+  return data;
+}
+
+const MergeLanesAspect = _harmony().Aspect.create({
+  id: 'teambit.lanes/merge-lanes'
+});
+
+exports.MergeLanesAspect = MergeLanesAspect;
+
+//# sourceMappingURL=merge-lanes.aspect.js.map

package/dist/merge-lanes.aspect.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["MergeLanesAspect","Aspect","create","id"],"sources":["merge-lanes.aspect.ts"],"sourcesContent":["import { Aspect } from '@teambit/harmony';\n\nexport const MergeLanesAspect = Aspect.create({\n  id: 'teambit.lanes/merge-lanes',\n});\n"],"mappings":";;;;;;;AAAA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AAEO,MAAMA,gBAAgB,GAAGC,iBAAA,CAAOC,MAAP,CAAc;EAC5CC,EAAE,EAAE;AADwC,CAAd,CAAzB"}

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

@@ -0,0 +1,44 @@
+import { CLIMain } from '@teambit/cli';
+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 { Logger, LoggerMain } from '@teambit/logger';
+import { RemoveMain } from '@teambit/remove';
+export declare type MergeLaneOptions = {
+    mergeStrategy: MergeStrategy;
+    noSnap: boolean;
+    snapMessage: string;
+    existingOnWorkspaceOnly: boolean;
+    build: boolean;
+    keepReadme: boolean;
+    squash: boolean;
+    pattern?: string;
+    includeDeps?: boolean;
+    skipDependencyInstallation?: boolean;
+    remote?: boolean;
+};
+export declare class MergeLanesMain {
+    private workspace;
+    private merging;
+    private lanes;
+    private logger;
+    private remove;
+    constructor(workspace: Workspace | undefined, merging: MergingMain, lanes: LanesMain, logger: Logger, remove: RemoveMain);
+    mergeLane(laneName: string, options: MergeLaneOptions): Promise<{
+        mergeResults: ApplyVersionResults;
+        deleteResults: any;
+    }>;
+    static slots: never[];
+    static dependencies: import("@teambit/harmony").Aspect[];
+    static runtime: import("@teambit/harmony").RuntimeDefinition;
+    static provider([lanes, cli, workspace, merging, loggerMain, remove]: [
+        LanesMain,
+        CLIMain,
+        Workspace,
+        MergingMain,
+        LoggerMain,
+        RemoveMain
+    ]): Promise<MergeLanesMain>;
+}
+export default MergeLanesMain;

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

@@ -0,0 +1,493 @@
+"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.default = exports.MergeLanesMain = void 0;
+
+function _defineProperty2() {
+  const data = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
+  _defineProperty2 = function () {
+    return data;
+  };
+
+  return data;
+}
+
+function _bitError() {
+  const data = require("@teambit/bit-error");
+
+  _bitError = function () {
+    return data;
+  };
+
+  return data;
+}
+
+function _cli() {
+  const data = require("@teambit/cli");
+
+  _cli = function () {
+    return data;
+  };
+
+  return data;
+}
+
+function _lanes() {
+  const data = require("@teambit/lanes");
+
+  _lanes = function () {
+    return data;
+  };
+
+  return data;
+}
+
+function _merging() {
+  const data = _interopRequireDefault(require("@teambit/merging"));
+
+  _merging = function () {
+    return data;
+  };
+
+  return data;
+}
+
+function _workspace() {
+  const data = _interopRequireDefault(require("@teambit/workspace"));
+
+  _workspace = function () {
+    return data;
+  };
+
+  return data;
+}
+
+function _chalk() {
+  const data = _interopRequireDefault(require("chalk"));
+
+  _chalk = function () {
+    return data;
+  };
+
+  return data;
+}
+
+function _pMapSeries() {
+  const data = _interopRequireDefault(require("p-map-series"));
+
+  _pMapSeries = function () {
+    return data;
+  };
+
+  return data;
+}
+
+function _bitId() {
+  const data = require("@teambit/legacy/dist/bit-id");
+
+  _bitId = function () {
+    return data;
+  };
+
+  return data;
+}
+
+function _laneId() {
+  const data = require("@teambit/lane-id");
+
+  _laneId = function () {
+    return data;
+  };
+
+  return data;
+}
+
+function _repositories() {
+  const data = require("@teambit/legacy/dist/scope/repositories");
+
+  _repositories = function () {
+    return data;
+  };
+
+  return data;
+}
+
+function _logger() {
+  const data = require("@teambit/logger");
+
+  _logger = function () {
+    return data;
+  };
+
+  return data;
+}
+
+function _remove() {
+  const data = require("@teambit/remove");
+
+  _remove = function () {
+    return data;
+  };
+
+  return data;
+}
+
+function _mergeLanes() {
+  const data = require("./merge-lanes.aspect");
+
+  _mergeLanes = function () {
+    return data;
+  };
+
+  return data;
+}
+
+function _mergeLane() {
+  const data = require("./merge-lane.cmd");
+
+  _mergeLane = function () {
+    return data;
+  };
+
+  return data;
+}
+
+class MergeLanesMain {
+  constructor(workspace, merging, lanes, logger, remove) {
+    this.workspace = workspace;
+    this.merging = merging;
+    this.lanes = lanes;
+    this.logger = logger;
+    this.remove = remove;
+  }
+
+  async mergeLane(laneName, options) {
+    if (!this.workspace) {
+      throw new (_bitError().BitError)(`unable to merge a lane outside of Bit workspace`);
+    }
+
+    const consumer = this.workspace.consumer;
+    const {
+      mergeStrategy,
+      noSnap,
+      snapMessage,
+      existingOnWorkspaceOnly,
+      build,
+      keepReadme,
+      squash,
+      pattern,
+      includeDeps,
+      skipDependencyInstallation,
+      remote
+    } = options;
+    const currentLaneId = consumer.getCurrentLaneId();
+    const otherLaneId = await consumer.getParsedLaneId(laneName);
+
+    if (otherLaneId.isEqual(currentLaneId)) {
+      throw new (_bitError().BitError)(`unable to merge lane "${otherLaneId.toString()}", you're already at this lane. to get updates, simply run "bit checkout head"`);
+    }
+
+    const currentLane = currentLaneId.isDefault() ? null : await consumer.scope.loadLane(currentLaneId);
+    const isDefaultLane = otherLaneId.isDefault();
+
+    const getOtherLane = async () => {
+      if (isDefaultLane) {
+        return undefined;
+      }
+
+      const lane = await consumer.scope.loadLane(otherLaneId);
+
+      if (remote || !lane) {
+        return this.lanes.fetchLaneWithItsComponents(otherLaneId);
+      }
+
+      return lane;
+    };
+
+    const otherLane = await getOtherLane();
+
+    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);
+      }
+
+      if (!otherLane) throw new Error(`lane must be defined for non-default`);
+      return otherLane.toBitIds();
+    };
+
+    const bitIds = await getBitIds();
+    this.logger.debug(`merging the following bitIds: ${bitIds.toString()}`);
+    const otherLaneName = isDefaultLane ? _laneId().DEFAULT_LANE : otherLaneId.toString();
+
+    const getAllComponentsStatus = async () => {
+      const tmp = new (_repositories().Tmp)(consumer.scope);
+
+      try {
+        const componentsStatus = await Promise.all(bitIds.map(bitId => this.merging.getComponentMergeStatus(bitId, currentLane, otherLaneName)));
+        await tmp.clear();
+        return componentsStatus;
+      } catch (err) {
+        await tmp.clear();
+        throw err;
+      }
+    };
+
+    let allComponentsStatus = await getAllComponentsStatus();
+
+    if (pattern) {
+      const componentIds = await this.workspace.resolveMultipleComponentIds(bitIds);
+      const compIdsFromPattern = this.workspace.scope.filterIdsFromPoolIdsByPattern(pattern, componentIds);
+      allComponentsStatus = await filterComponentsStatus(allComponentsStatus, compIdsFromPattern, bitIds, this.workspace, includeDeps, otherLane || undefined);
+      bitIds.forEach(bitId => {
+        if (!allComponentsStatus.find(c => c.id.isEqualWithoutVersion(bitId))) {
+          allComponentsStatus.push({
+            id: bitId,
+            unmergedLegitimately: true,
+            unmergedMessage: `excluded by pattern`
+          });
+        }
+      });
+    }
+
+    if (existingOnWorkspaceOnly) {
+      const workspaceIds = await this.workspace.listIds();
+      const compIdsFromPattern = workspaceIds.filter(id => allComponentsStatus.find(c => c.id.isEqualWithoutVersion(id._legacy)));
+      allComponentsStatus = await filterComponentsStatus(allComponentsStatus, compIdsFromPattern, bitIds, this.workspace, includeDeps);
+      bitIds.forEach(bitId => {
+        if (!allComponentsStatus.find(c => c.id.isEqualWithoutVersion(bitId))) {
+          allComponentsStatus.push({
+            id: bitId,
+            unmergedLegitimately: true,
+            unmergedMessage: `not in the workspace`
+          });
+        }
+      });
+    }
+
+    throwForFailures();
+
+    if (squash) {
+      squashSnaps(allComponentsStatus, laneName, consumer);
+    }
+
+    const mergeResults = await this.merging.mergeSnaps({
+      mergeStrategy,
+      allComponentsStatus,
+      remoteName: otherLane ? otherLane.scope : null,
+      laneId: otherLaneId,
+      localLane: currentLane,
+      noSnap,
+      snapMessage,
+      build,
+      skipDependencyInstallation
+    });
+    const mergedSuccessfully = !mergeResults.failedComponents || mergeResults.failedComponents.length === 0 || mergeResults.failedComponents.every(failedComponent => failedComponent.unchangedLegitimately);
+    let deleteResults = {};
+
+    if (!keepReadme && otherLane && otherLane.readmeComponent && mergedSuccessfully) {
+      var _otherLane$readmeComp, _otherLane$readmeComp2;
+
+      const readmeComponentId = otherLane.readmeComponent.id.changeVersion((_otherLane$readmeComp = otherLane.readmeComponent) === null || _otherLane$readmeComp === void 0 ? void 0 : (_otherLane$readmeComp2 = _otherLane$readmeComp.head) === null || _otherLane$readmeComp2 === void 0 ? void 0 : _otherLane$readmeComp2.hash).toString();
+      deleteResults = await this.remove.remove({
+        componentsPattern: readmeComponentId,
+        force: false,
+        remote: false,
+        track: false,
+        deleteFiles: true
+      });
+    } else if (otherLane && !otherLane.readmeComponent) {
+      deleteResults = {
+        readmeResult: `\nlane ${otherLane.name} doesn't have a readme component`
+      };
+    }
+
+    await this.workspace.consumer.onDestroy();
+    return {
+      mergeResults,
+      deleteResults
+    };
+
+    function throwForFailures() {
+      const failedComponents = allComponentsStatus.filter(c => c.unmergedMessage && !c.unmergedLegitimately);
+
+      if (failedComponents.length) {
+        const failureMsgs = failedComponents.map(failedComponent => `${_chalk().default.bold(failedComponent.id.toString())} - ${_chalk().default.red(failedComponent.unmergedMessage)}`).join('\n');
+        throw new (_bitError().BitError)(`unable to merge due to the following failures:\n${failureMsgs}`);
+      }
+    }
+  }
+
+  static async provider([lanes, cli, workspace, merging, loggerMain, remove]) {
+    var _lanesCommand$command;
+
+    const logger = loggerMain.createLogger(_mergeLanes().MergeLanesAspect.id);
+    const lanesCommand = cli.getCommand('lane');
+    const mergeLanesMain = new MergeLanesMain(workspace, merging, lanes, logger, remove);
+    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));
+    return 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, "runtime", _cli().MainRuntime);
+
+async function filterComponentsStatus(allComponentsStatus, compIdsToKeep, allBitIds, workspace, includeDeps = false, lane) {
+  const bitIdsFromPattern = _bitId().BitIds.fromArray(compIdsToKeep.map(c => c._legacy));
+
+  const bitIdsNotFromPattern = allBitIds.filter(bitId => !bitIdsFromPattern.hasWithoutVersion(bitId));
+  const filteredComponentStatus = [];
+  const depsToAdd = [];
+  await (0, _pMapSeries().default)(compIdsToKeep, async compId => {
+    const fromStatus = allComponentsStatus.find(c => c.id.isEqualWithoutVersion(compId._legacy));
+
+    if (!fromStatus) {
+      throw new Error(`filterComponentsStatus: unable to find ${compId.toString()} in component-status`);
+    }
+
+    filteredComponentStatus.push(fromStatus);
+
+    if (fromStatus.unmergedMessage) {
+      return;
+    }
+
+    const {
+      divergeData
+    } = fromStatus;
+
+    if (!divergeData) {
+      throw new Error(`filterComponentsStatus: unable to find divergeData for ${compId.toString()}`);
+    }
+
+    const remoteVersions = divergeData.snapsOnRemoteOnly;
+
+    if (!remoteVersions.length) {
+      return;
+    }
+
+    const modelComponent = await workspace.consumer.scope.getModelComponent(compId._legacy); // optimization suggestion: if squash is given, check only the last version.
+
+    const laneIds = lane === null || lane === void 0 ? void 0 : lane.toBitIds();
+    await (0, _pMapSeries().default)(remoteVersions, async remoteVersion => {
+      const versionObj = await modelComponent.loadVersion(remoteVersion.toString(), workspace.consumer.scope.objects);
+      const flattenedDeps = versionObj.getAllFlattenedDependencies();
+      const depsNotIncludeInPattern = flattenedDeps.filter(id => bitIdsNotFromPattern.find(bitId => bitId.isEqualWithoutVersion(id)));
+
+      if (!depsNotIncludeInPattern.length) {
+        return;
+      }
+
+      const depsOnLane = [];
+      await Promise.all(depsNotIncludeInPattern.map(async dep => {
+        const isOnLane = await workspace.consumer.scope.isIdOnLane(dep, lane, laneIds);
+
+        if (isOnLane) {
+          depsOnLane.push(dep);
+        }
+      }));
+
+      if (!depsOnLane.length) {
+        return;
+      }
+
+      if (!includeDeps) {
+        throw new (_bitError().BitError)(`unable to merge ${compId.toString()}.
+it has (in version ${remoteVersion.toString()}) the following dependencies which were not included in the pattern. consider adding "--include-deps" flag
+${depsOnLane.map(d => d.toString()).join('\n')}`);
+      }
+
+      depsToAdd.push(...depsOnLane);
+    });
+  });
+
+  if (depsToAdd.length) {
+    const depsUniq = _bitId().BitIds.uniqFromArray(depsToAdd);
+
+    depsUniq.forEach(id => {
+      const fromStatus = allComponentsStatus.find(c => c.id.isEqualWithoutVersion(id));
+
+      if (!fromStatus) {
+        throw new Error(`filterComponentsStatus: unable to find ${id.toString()} in component-status`);
+      }
+
+      filteredComponentStatus.push(fromStatus);
+    });
+  }
+
+  return filteredComponentStatus;
+}
+
+function squashSnaps(allComponentsStatus, laneName, consumer) {
+  const succeededComponents = allComponentsStatus.filter(c => !c.unmergedMessage);
+  succeededComponents.forEach(({
+    id,
+    divergeData,
+    componentFromModel
+  }) => {
+    if (!divergeData) {
+      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.
+consider switching to ${laneName} first, merging this lane, then switching back to this lane and merging ${laneName}`);
+    }
+
+    if (divergeData.isLocalAhead()) {
+      // nothing to do. current is ahead, nothing to merge. (it was probably filtered out already as a "failedComponent")
+      return;
+    }
+
+    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.
+
+
+    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 (!componentFromModel) {
+      throw new Error('unable to squash, the componentFromModel is missing');
+    } // 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));
+    }
+
+    const squashedSnaps = remoteSnaps.filter(snap => !snap.isEqual(componentFromModel.hash()));
+    componentFromModel.setSquashed(squashedSnaps);
+    consumer.scope.objects.add(componentFromModel);
+  });
+}
+
+_mergeLanes().MergeLanesAspect.addRuntime(MergeLanesMain);
+
+var _default = MergeLanesMain;
+exports.default = _default;
+
+//# sourceMappingURL=merge-lanes.main.runtime.js.map

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

@@ -0,0 +1 @@
+{"version":3,"names":["MergeLanesMain","constructor","workspace","merging","lanes","logger","remove","mergeLane","laneName","options","BitError","consumer","mergeStrategy","noSnap","snapMessage","existingOnWorkspaceOnly","build","keepReadme","squash","pattern","includeDeps","skipDependencyInstallation","remote","currentLaneId","getCurrentLaneId","otherLaneId","getParsedLaneId","isEqual","toString","currentLane","isDefault","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","remoteName","laneId","localLane","mergedSuccessfully","failedComponents","length","every","failedComponent","unchangedLegitimately","deleteResults","readmeComponent","readmeComponentId","changeVersion","head","hash","componentsPattern","force","track","deleteFiles","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","laneIds","remoteVersion","versionObj","loadVersion","objects","flattenedDeps","getAllFlattenedDependencies","depsNotIncludeInPattern","depsOnLane","dep","isOnLane","isIdOnLane","d","depsUniq","uniqFromArray","succeededComponents","componentFromModel","isDiverged","isLocalAhead","isRemoteAhead","remoteSnaps","commonSnapBeforeDiverge","addAsOnlyParent","parents","ref","removeParent","squashedSnaps","snap","setSquashed","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 } 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  squash: boolean;\n  pattern?: string;\n  includeDeps?: boolean;\n  skipDependencyInstallation?: 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      snapMessage,\n      existingOnWorkspaceOnly,\n      build,\n      keepReadme,\n      squash,\n      pattern,\n      includeDeps,\n      skipDependencyInstallation,\n      remote,\n    } = options;\n\n    const currentLaneId = consumer.getCurrentLaneId();\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) => this.merging.getComponentMergeStatus(bitId, currentLane, otherLaneName))\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 (squash) {\n      squashSnaps(allComponentsStatus, laneName, consumer);\n    }\n\n    const mergeResults = await this.merging.mergeSnaps({\n      mergeStrategy,\n      allComponentsStatus,\n      remoteName: otherLane ? otherLane.scope : null,\n      laneId: otherLaneId,\n      localLane: currentLane,\n      noSnap,\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      });\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    const laneIds = lane?.toBitIds();\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, laneIds);\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[], laneName: string, consumer: Consumer) {\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 ${laneName} first, merging this lane, then switching back to this lane and merging ${laneName}`);\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    // 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    const squashedSnaps = remoteSnaps.filter((snap) => !snap.isEqual(componentFromModel.hash()));\n    componentFromModel.setSquashed(squashedSnaps);\n    consumer.scope.objects.add(componentFromModel);\n  });\n}\n\nMergeLanesAspect.addRuntime(MergeLanesMain);\n\nexport default MergeLanesMain;\n"],"mappings":"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"}

package/package.json

@@ -0,0 +1,62 @@
+{
+  "name": "@teambit/merge-lanes",
+  "version": "0.0.1",
+  "main": "dist/index.js",
+  "componentId": {
+    "scope": "teambit.lanes",
+    "name": "merge-lanes",
+    "version": "0.0.1"
+  },
+  "dependencies": {
+    "chalk": "2.4.2",
+    "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.394",
+    "@teambit/cli": "0.0.552",
+    "@teambit/merging": "0.0.139",
+    "@teambit/component-id": "0.0.405",
+    "@teambit/lane-id": "0.0.71",
+    "@teambit/lanes": "0.0.396",
+    "@teambit/legacy-bit-id": "0.0.402",
+    "@teambit/logger": "0.0.645",
+    "@teambit/remove": "0.0.1",
+    "@teambit/workspace": "0.0.824"
+  },
+  "devDependencies": {
+    "@types/mocha": "9.1.0",
+    "@types/testing-library__jest-dom": "5.9.5",
+    "@types/jest": "^26.0.0",
+    "@types/react-dom": "^17.0.5",
+    "@types/react": "^17.0.8",
+    "@types/node": "12.20.4"
+  },
+  "peerDependencies": {
+    "@teambit/legacy": "1.0.335",
+    "react-dom": "^16.8.0 || ^17.0.0",
+    "react": "^16.8.0 || ^17.0.0"
+  },
+  "license": "Apache-2.0",
+  "private": false,
+  "engines": {
+    "node": ">=12.22.0"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/teambit/bit"
+  },
+  "keywords": [
+    "bit",
+    "bit-aspect",
+    "components",
+    "collaboration",
+    "web",
+    "react",
+    "react-components",
+    "angular",
+    "angular-components",
+    "vue",
+    "vue-components"
+  ]
+}

package/preview-1661225521544.js

@@ -0,0 +1,5 @@
+;
+;
+
+export const compositions = [];
+export const overview = [];

package/tsconfig.json

@@ -0,0 +1,40 @@
+{
+  "compilerOptions": {
+    "lib": [
+      "es2019",
+      "DOM",
+      "ES6",
+      "DOM.Iterable",
+      "ScriptHost"
+    ],
+    "target": "es2015",
+    "module": "commonjs",
+    "jsx": "react",
+    "allowJs": true,
+    "composite": true,
+    "declaration": true,
+    "sourceMap": true,
+    "skipLibCheck": true,
+    "experimentalDecorators": true,
+    "outDir": "dist",
+    "moduleResolution": "node",
+    "esModuleInterop": true,
+    "rootDir": ".",
+    "resolveJsonModule": true,
+    "emitDeclarationOnly": true,
+    "emitDecoratorMetadata": true,
+    "allowSyntheticDefaultImports": true,
+    "strictPropertyInitialization": false,
+    "strict": true,
+    "noImplicitAny": false,
+    "preserveConstEnums": true
+  },
+  "exclude": [
+    "dist",
+    "package.json"
+  ],
+  "include": [
+    "**/*",
+    "**/*.json"
+  ]
+}

package/types/asset.d.ts

@@ -0,0 +1,29 @@
+declare module '*.png' {
+  const value: any;
+  export = value;
+}
+declare module '*.svg' {
+  import type { FunctionComponent, SVGProps } from 'react';
+
+  export const ReactComponent: FunctionComponent<SVGProps<SVGSVGElement> & { title?: string }>;
+  const src: string;
+  export default src;
+}
+
+// @TODO Gilad
+declare module '*.jpg' {
+  const value: any;
+  export = value;
+}
+declare module '*.jpeg' {
+  const value: any;
+  export = value;
+}
+declare module '*.gif' {
+  const value: any;
+  export = value;
+}
+declare module '*.bmp' {
+  const value: any;
+  export = value;
+}

package/types/style.d.ts

@@ -0,0 +1,42 @@
+declare module '*.module.css' {
+  const classes: { readonly [key: string]: string };
+  export default classes;
+}
+declare module '*.module.scss' {
+  const classes: { readonly [key: string]: string };
+  export default classes;
+}
+declare module '*.module.sass' {
+  const classes: { readonly [key: string]: string };
+  export default classes;
+}
+
+declare module '*.module.less' {
+  const classes: { readonly [key: string]: string };
+  export default classes;
+}
+
+declare module '*.less' {
+  const classes: { readonly [key: string]: string };
+  export default classes;
+}
+
+declare module '*.css' {
+  const classes: { readonly [key: string]: string };
+  export default classes;
+}
+
+declare module '*.sass' {
+  const classes: { readonly [key: string]: string };
+  export default classes;
+}
+
+declare module '*.scss' {
+  const classes: { readonly [key: string]: string };
+  export default classes;
+}
+
+declare module '*.mdx' {
+  const component: any;
+  export default component;
+}