@teambit/merge-lanes 0.0.7 → 0.0.10

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

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

package/dist/merge-lane.cmd.js

@@ -101,7 +101,7 @@ in case the <lane> exists locally but you want to merge the remote version of it
       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, "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'], ['', 'no-squash', 'EXPERIMENTAL. relevant for merging lanes into main, which by default squash.'], ['', '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'], ['', 'resolve-unrelated [merge-strategy]', 'EXPERIMENTAL. relevant when a component on a lane and the component on main has nothing in common. merge-strategy can be "ours" (default) or "theirs"']]);
     (0, _defineProperty2().default)(this, "loader", true);
     (0, _defineProperty2().default)(this, "private", true);
     (0, _defineProperty2().default)(this, "migration", true);
@@ -117,10 +117,11 @@ in case the <lane> exists locally but you want to merge the remote version of it
     noSnap = false,
     message: snapMessage = '',
     keepReadme = false,
-    squash = false,
+    noSquash = false,
     skipDependencyInstallation = false,
     remote = false,
     includeDeps = false,
+    resolveUnrelated,
     verbose = false
   }) {
     build = (0, _featureToggle().isFeatureEnabled)(_featureToggle().BUILD_ON_CI) ? Boolean(build) : true;
@@ -131,6 +132,21 @@ in case the <lane> exists locally but you want to merge the remote version of it
       throw new (_bitError().BitError)(`"--include-deps" flag is relevant only for --workspace and --pattern flags`);
     }
 
+    const getResolveUnrelated = () => {
+      if (!resolveUnrelated) return undefined;
+      if (typeof resolveUnrelated === 'boolean') return 'ours';
+
+      if (resolveUnrelated !== 'ours' && resolveUnrelated !== 'theirs' && resolveUnrelated !== 'manual') {
+        throw new Error('--resolve-unrelated must be one of the following: [ours, theirs, manual]');
+      }
+
+      return resolveUnrelated;
+    };
+
+    if (resolveUnrelated && typeof resolveUnrelated === 'boolean') {
+      resolveUnrelated = 'ours';
+    }
+
     const {
       mergeResults,
       deleteResults
@@ -142,10 +158,11 @@ in case the <lane> exists locally but you want to merge the remote version of it
       noSnap,
       snapMessage,
       keepReadme,
-      squash,
+      noSquash,
       pattern,
       skipDependencyInstallation,
       remote,
+      resolveUnrelated: getResolveUnrelated(),
       includeDeps
     });
     const mergeResult = (0, _merging().mergeReport)(_objectSpread(_objectSpread({}, mergeResults), {}, {

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

@@ -1 +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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"}
+{"version":3,"names":["MergeLaneCmd","constructor","mergeLanes","name","description","report","pattern","ours","theirs","manual","build","workspace","existingOnWorkspaceOnly","noSnap","message","snapMessage","keepReadme","noSquash","skipDependencyInstallation","remote","includeDeps","resolveUnrelated","verbose","isFeatureEnabled","BUILD_ON_CI","Boolean","mergeStrategy","getMergeStrategy","BitError","getResolveUnrelated","undefined","Error","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, MergeStrategy } from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport { mergeReport } from '@teambit/merging';\nimport { BUILD_ON_CI, isFeatureEnabled } from '@teambit/legacy/dist/api/consumer/lib/feature-toggle';\nimport { BitError } from '@teambit/bit-error';\nimport paintRemoved from '@teambit/legacy/dist/cli/templates/remove-template';\nimport { MergeLanesMain } from './merge-lanes.main.runtime';\n\nexport class MergeLaneCmd implements Command {\n  name = 'merge <lane> [pattern]';\n  description = `merge a local or a remote lane`;\n  extendedDescription = `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    ['', '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    ['', '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    [\n      '',\n      'resolve-unrelated [merge-strategy]',\n      'EXPERIMENTAL. relevant when a component on a lane and the component on main has nothing in common. merge-strategy can be \"ours\" (default) or \"theirs\"',\n    ],\n  ] as CommandOptions;\n  loader = true;\n  private = true;\n  migration = true;\n  remoteOp = true;\n\n  constructor(private mergeLanes: MergeLanesMain) {}\n\n  async report(\n    [name, pattern]: [string, string],\n    {\n      ours = false,\n      theirs = false,\n      manual = false,\n      build,\n      workspace: existingOnWorkspaceOnly = false,\n      noSnap = false,\n      message: snapMessage = '',\n      keepReadme = false,\n      noSquash = false,\n      skipDependencyInstallation = false,\n      remote = false,\n      includeDeps = false,\n      resolveUnrelated,\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      noSquash: boolean;\n      skipDependencyInstallation?: boolean;\n      remote: boolean;\n      includeDeps?: boolean;\n      resolveUnrelated?: string | boolean;\n      verbose?: boolean;\n    }\n  ): Promise<string> {\n    build = isFeatureEnabled(BUILD_ON_CI) ? Boolean(build) : true;\n    const mergeStrategy = getMergeStrategy(ours, theirs, manual);\n    if (noSnap && snapMessage) throw new BitError('unable to use \"noSnap\" and \"message\" flags together');\n    if (includeDeps && !pattern && !existingOnWorkspaceOnly) {\n      throw new BitError(`\"--include-deps\" flag is relevant only for --workspace and --pattern flags`);\n    }\n    const getResolveUnrelated = (): MergeStrategy | undefined => {\n      if (!resolveUnrelated) return undefined;\n      if (typeof resolveUnrelated === 'boolean') return 'ours';\n      if (resolveUnrelated !== 'ours' && resolveUnrelated !== 'theirs' && resolveUnrelated !== 'manual') {\n        throw new Error('--resolve-unrelated must be one of the following: [ours, theirs, manual]');\n      }\n      return resolveUnrelated;\n    };\n    if (resolveUnrelated && typeof resolveUnrelated === 'boolean') {\n      resolveUnrelated = 'ours';\n    }\n    const { mergeResults, deleteResults } = await this.mergeLanes.mergeLane(name, {\n      build,\n      // @ts-ignore\n      mergeStrategy,\n      existingOnWorkspaceOnly,\n      noSnap,\n      snapMessage,\n      keepReadme,\n      noSquash,\n      pattern,\n      skipDependencyInstallation,\n      remote,\n      resolveUnrelated: getResolveUnrelated(),\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.main.runtime.d.ts

@@ -12,10 +12,11 @@ export declare type MergeLaneOptions = {
     existingOnWorkspaceOnly: boolean;
     build: boolean;
     keepReadme: boolean;
-    squash: boolean;
+    noSquash: boolean;
     pattern?: string;
     includeDeps?: boolean;
     skipDependencyInstallation?: boolean;
+    resolveUnrelated?: MergeStrategy;
     remote?: boolean;
 };
 export declare class MergeLanesMain {

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

@@ -183,10 +183,11 @@ class MergeLanesMain {
       existingOnWorkspaceOnly,
       build,
       keepReadme,
-      squash,
+      noSquash,
       pattern,
       includeDeps,
       skipDependencyInstallation,
+      resolveUnrelated,
       remote
     } = options;
     const currentLaneId = consumer.getCurrentLaneId();
@@ -233,7 +234,9 @@ class MergeLanesMain {
       const tmp = new (_repositories().Tmp)(consumer.scope);
 
       try {
-        const componentsStatus = await Promise.all(bitIds.map(bitId => this.merging.getComponentMergeStatus(bitId, currentLane, otherLaneName)));
+        const componentsStatus = await Promise.all(bitIds.map(bitId => this.merging.getComponentMergeStatus(bitId, currentLane, otherLaneName, {
+          resolveUnrelated
+        })));
         await tmp.clear();
         return componentsStatus;
       } catch (err) {
@@ -276,14 +279,13 @@ class MergeLanesMain {
 
     throwForFailures();
 
-    if (squash) {
-      squashSnaps(allComponentsStatus, laneName, consumer);
+    if (currentLaneId.isDefault() && !noSquash) {
+      squashSnaps(allComponentsStatus, otherLaneId, consumer);
     }
 
     const mergeResults = await this.merging.mergeSnaps({
       mergeStrategy,
       allComponentsStatus,
-      remoteName: otherLane ? otherLane.scope : null,
       laneId: otherLaneId,
       localLane: currentLane,
       noSnap,
@@ -429,7 +431,8 @@ ${depsOnLane.map(d => d.toString()).join('\n')}`);
   return filteredComponentStatus;
 }
 
-function squashSnaps(allComponentsStatus, laneName, consumer) {
+function squashSnaps(allComponentsStatus, otherLaneId, consumer) {
+  const currentLaneName = consumer.getCurrentLaneId().name;
   const succeededComponents = allComponentsStatus.filter(c => !c.unmergedMessage);
   succeededComponents.forEach(({
     id,
@@ -442,7 +445,8 @@ function squashSnaps(allComponentsStatus, laneName, consumer) {
 
     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}`);
+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()) {
@@ -460,17 +464,17 @@ consider switching to ${laneName} first, merging this lane, then switching back
 
     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 === 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.
+    }
 
+    const currentParents = componentFromModel.parents; // do the squash.
 
     if (divergeData.commonSnapBeforeDiverge) {
       componentFromModel.addAsOnlyParent(divergeData.commonSnapBeforeDiverge);
@@ -479,8 +483,10 @@ consider switching to ${laneName} first, merging this lane, then switching back
       componentFromModel.parents.forEach(ref => componentFromModel.removeParent(ref));
     }
 
-    const squashedSnaps = remoteSnaps.filter(snap => !snap.isEqual(componentFromModel.hash()));
-    componentFromModel.setSquashed(squashedSnaps);
+    componentFromModel.setSquashed({
+      previousParents: currentParents,
+      laneId: otherLaneId
+    });
     consumer.scope.objects.add(componentFromModel);
   });
 }

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","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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"}
+{"version":3,"names":["MergeLanesMain","constructor","workspace","merging","lanes","logger","remove","mergeLane","laneName","options","BitError","consumer","mergeStrategy","noSnap","snapMessage","existingOnWorkspaceOnly","build","keepReadme","noSquash","pattern","includeDeps","skipDependencyInstallation","resolveUnrelated","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","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","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  pattern?: string;\n  includeDeps?: boolean;\n  skipDependencyInstallation?: boolean;\n  resolveUnrelated?: MergeStrategy;\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      noSquash,\n      pattern,\n      includeDeps,\n      skipDependencyInstallation,\n      resolveUnrelated,\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) =>\n            this.merging.getComponentMergeStatus(bitId, currentLane, otherLaneName, { resolveUnrelated })\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      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[], 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":";;;;;;;;;;;;;;;;;;;;;;;AAAA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AAEA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AAGA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AAEA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AAEA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AAiBO,MAAMA,cAAN,CAAqB;EAC1BC,WAAW,CACDC,SADC,EAEDC,OAFC,EAGDC,KAHC,EAIDC,MAJC,EAKDC,MALC,EAMT;IAAA,KALQJ,SAKR,GALQA,SAKR;IAAA,KAJQC,OAIR,GAJQA,OAIR;IAAA,KAHQC,KAGR,GAHQA,KAGR;IAAA,KAFQC,MAER,GAFQA,MAER;IAAA,KADQC,MACR,GADQA,MACR;EAAE;;EAEW,MAATC,SAAS,CACbC,QADa,EAEbC,OAFa,EAGuD;IACpE,IAAI,CAAC,KAAKP,SAAV,EAAqB;MACnB,MAAM,KAAIQ,oBAAJ,EAAc,iDAAd,CAAN;IACD;;IACD,MAAMC,QAAQ,GAAG,KAAKT,SAAL,CAAeS,QAAhC;IAEA,MAAM;MACJC,aADI;MAEJC,MAFI;MAGJC,WAHI;MAIJC,uBAJI;MAKJC,KALI;MAMJC,UANI;MAOJC,QAPI;MAQJC,OARI;MASJC,WATI;MAUJC,0BAVI;MAWJC,gBAXI;MAYJC;IAZI,IAaFd,OAbJ;IAeA,MAAMe,aAAa,GAAGb,QAAQ,CAACc,gBAAT,EAAtB;IACA,MAAMC,WAAW,GAAG,MAAMf,QAAQ,CAACgB,eAAT,CAAyBnB,QAAzB,CAA1B;;IACA,IAAIkB,WAAW,CAACE,OAAZ,CAAoBJ,aAApB,CAAJ,EAAwC;MACtC,MAAM,KAAId,oBAAJ,EACH,yBAAwBgB,WAAW,CAACG,QAAZ,EAAuB,gFAD5C,CAAN;IAGD;;IACD,MAAMC,WAAW,GAAGN,aAAa,CAACO,SAAd,KAA4B,IAA5B,GAAmC,MAAMpB,QAAQ,CAACqB,KAAT,CAAeC,QAAf,CAAwBT,aAAxB,CAA7D;IACA,MAAMU,aAAa,GAAGR,WAAW,CAACK,SAAZ,EAAtB;;IACA,MAAMI,YAAY,GAAG,YAAY;MAC/B,IAAID,aAAJ,EAAmB;QACjB,OAAOE,SAAP;MACD;;MACD,MAAMC,IAAI,GAAG,MAAM1B,QAAQ,CAACqB,KAAT,CAAeC,QAAf,CAAwBP,WAAxB,CAAnB;;MACA,IAAIH,MAAM,IAAI,CAACc,IAAf,EAAqB;QACnB,OAAO,KAAKjC,KAAL,CAAWkC,0BAAX,CAAsCZ,WAAtC,CAAP;MACD;;MACD,OAAOW,IAAP;IACD,CATD;;IAUA,MAAME,SAAS,GAAG,MAAMJ,YAAY,EAApC;;IACA,MAAMK,SAAS,GAAG,YAAY;MAC5B,IAAIN,aAAJ,EAAmB;QACjB,IAAI,CAACJ,WAAL,EAAkB,MAAM,IAAIW,KAAJ,CAAW,mBAAkBC,sBAAa,kCAA1C,CAAN;QAClB,OAAO/B,QAAQ,CAACqB,KAAT,CAAeW,yBAAf,CAAyCb,WAAzC,CAAP;MACD;;MACD,IAAI,CAACS,SAAL,EAAgB,MAAM,IAAIE,KAAJ,CAAW,sCAAX,CAAN;MAChB,OAAOF,SAAS,CAACK,QAAV,EAAP;IACD,CAPD;;IAQA,MAAMC,MAAM,GAAG,MAAML,SAAS,EAA9B;IACA,KAAKnC,MAAL,CAAYyC,KAAZ,CAAmB,iCAAgCD,MAAM,CAAChB,QAAP,EAAkB,EAArE;IACA,MAAMkB,aAAa,GAAGb,aAAa,GAAGQ,sBAAH,GAAkBhB,WAAW,CAACG,QAAZ,EAArD;;IAEA,MAAMmB,sBAAsB,GAAG,YAA6C;MAC1E,MAAMC,GAAG,GAAG,KAAIC,mBAAJ,EAAQvC,QAAQ,CAACqB,KAAjB,CAAZ;;MACA,IAAI;QACF,MAAMmB,gBAAgB,GAAG,MAAMC,OAAO,CAACC,GAAR,CAC7BR,MAAM,CAACS,GAAP,CAAYC,KAAD,IACT,KAAKpD,OAAL,CAAaqD,uBAAb,CAAqCD,KAArC,EAA4CzB,WAA5C,EAAyDiB,aAAzD,EAAwE;UAAEzB;QAAF,CAAxE,CADF,CAD6B,CAA/B;QAKA,MAAM2B,GAAG,CAACQ,KAAJ,EAAN;QACA,OAAON,gBAAP;MACD,CARD,CAQE,OAAOO,GAAP,EAAiB;QACjB,MAAMT,GAAG,CAACQ,KAAJ,EAAN;QACA,MAAMC,GAAN;MACD;IACF,CAdD;;IAeA,IAAIC,mBAAmB,GAAG,MAAMX,sBAAsB,EAAtD;;IAEA,IAAI7B,OAAJ,EAAa;MACX,MAAMyC,YAAY,GAAG,MAAM,KAAK1D,SAAL,CAAe2D,2BAAf,CAA2ChB,MAA3C,CAA3B;MACA,MAAMiB,kBAAkB,GAAG,KAAK5D,SAAL,CAAe8B,KAAf,CAAqB+B,6BAArB,CAAmD5C,OAAnD,EAA4DyC,YAA5D,CAA3B;MACAD,mBAAmB,GAAG,MAAMK,sBAAsB,CAChDL,mBADgD,EAEhDG,kBAFgD,EAGhDjB,MAHgD,EAIhD,KAAK3C,SAJ2C,EAKhDkB,WALgD,EAMhDmB,SAAS,IAAIH,SANmC,CAAlD;MAQAS,MAAM,CAACoB,OAAP,CAAgBV,KAAD,IAAW;QACxB,IAAI,CAACI,mBAAmB,CAACO,IAApB,CAA0BC,CAAD,IAAOA,CAAC,CAACC,EAAF,CAAKC,qBAAL,CAA2Bd,KAA3B,CAAhC,CAAL,EAAyE;UACvEI,mBAAmB,CAACW,IAApB,CAAyB;YAAEF,EAAE,EAAEb,KAAN;YAAagB,oBAAoB,EAAE,IAAnC;YAAyCC,eAAe,EAAG;UAA3D,CAAzB;QACD;MACF,CAJD;IAKD;;IACD,IAAIzD,uBAAJ,EAA6B;MAC3B,MAAM0D,YAAY,GAAG,MAAM,KAAKvE,SAAL,CAAewE,OAAf,EAA3B;MACA,MAAMZ,kBAAkB,GAAGW,YAAY,CAACE,MAAb,CAAqBP,EAAD,IAC7CT,mBAAmB,CAACO,IAApB,CAA0BC,CAAD,IAAOA,CAAC,CAACC,EAAF,CAAKC,qBAAL,CAA2BD,EAAE,CAACQ,OAA9B,CAAhC,CADyB,CAA3B;MAGAjB,mBAAmB,GAAG,MAAMK,sBAAsB,CAChDL,mBADgD,EAEhDG,kBAFgD,EAGhDjB,MAHgD,EAIhD,KAAK3C,SAJ2C,EAKhDkB,WALgD,CAAlD;MAOAyB,MAAM,CAACoB,OAAP,CAAgBV,KAAD,IAAW;QACxB,IAAI,CAACI,mBAAmB,CAACO,IAApB,CAA0BC,CAAD,IAAOA,CAAC,CAACC,EAAF,CAAKC,qBAAL,CAA2Bd,KAA3B,CAAhC,CAAL,EAAyE;UACvEI,mBAAmB,CAACW,IAApB,CAAyB;YAAEF,EAAE,EAAEb,KAAN;YAAagB,oBAAoB,EAAE,IAAnC;YAAyCC,eAAe,EAAG;UAA3D,CAAzB;QACD;MACF,CAJD;IAKD;;IAEDK,gBAAgB;;IAEhB,IAAIrD,aAAa,CAACO,SAAd,MAA6B,CAACb,QAAlC,EAA4C;MAC1C4D,WAAW,CAACnB,mBAAD,EAAsBjC,WAAtB,EAAmCf,QAAnC,CAAX;IACD;;IAED,MAAMoE,YAAY,GAAG,MAAM,KAAK5E,OAAL,CAAa6E,UAAb,CAAwB;MACjDpE,aADiD;MAEjD+C,mBAFiD;MAGjDsB,MAAM,EAAEvD,WAHyC;MAIjDwD,SAAS,EAAEpD,WAJsC;MAKjDjB,MALiD;MAMjDC,WANiD;MAOjDE,KAPiD;MAQjDK;IARiD,CAAxB,CAA3B;IAWA,MAAM8D,kBAAkB,GACtB,CAACJ,YAAY,CAACK,gBAAd,IACAL,YAAY,CAACK,gBAAb,CAA8BC,MAA9B,KAAyC,CADzC,IAEAN,YAAY,CAACK,gBAAb,CAA8BE,KAA9B,CAAqCC,eAAD,IAAqBA,eAAe,CAACC,qBAAzE,CAHF;IAKA,IAAIC,aAAa,GAAG,EAApB;;IAEA,IAAI,CAACxE,UAAD,IAAesB,SAAf,IAA4BA,SAAS,CAACmD,eAAtC,IAAyDP,kBAA7D,EAAiF;MAAA;;MAC/E,MAAMQ,iBAAiB,GAAGpD,SAAS,CAACmD,eAAV,CAA0BtB,EAA1B,CACvBwB,aADuB,0BACTrD,SAAS,CAACmD,eADD,oFACT,sBAA2BG,IADlB,2DACT,uBAAiCC,IADxB,EAEvBjE,QAFuB,EAA1B;MAIA4D,aAAa,GAAG,MAAM,KAAKnF,MAAL,CAAYA,MAAZ,CAAmB;QACvCyF,iBAAiB,EAAEJ,iBADoB;QAEvCK,KAAK,EAAE,KAFgC;QAGvCzE,MAAM,EAAE,KAH+B;QAIvC0E,KAAK,EAAE,KAJgC;QAKvCC,WAAW,EAAE;MAL0B,CAAnB,CAAtB;IAOD,CAZD,MAYO,IAAI3D,SAAS,IAAI,CAACA,SAAS,CAACmD,eAA5B,EAA6C;MAClDD,aAAa,GAAG;QAAEU,YAAY,EAAG,UAAS5D,SAAS,CAAC6D,IAAK;MAAzC,CAAhB;IACD;;IAED,MAAM,KAAKlG,SAAL,CAAeS,QAAf,CAAwB0F,SAAxB,EAAN;IAEA,OAAO;MAAEtB,YAAF;MAAgBU;IAAhB,CAAP;;IAEA,SAASZ,gBAAT,GAA4B;MAC1B,MAAMO,gBAAgB,GAAGzB,mBAAmB,CAACgB,MAApB,CAA4BR,CAAD,IAAOA,CAAC,CAACK,eAAF,IAAqB,CAACL,CAAC,CAACI,oBAA1D,CAAzB;;MACA,IAAIa,gBAAgB,CAACC,MAArB,EAA6B;QAC3B,MAAMiB,WAAW,GAAGlB,gBAAgB,CACjC9B,GADiB,CAEfiC,eAAD,IACG,GAAEgB,gBAAA,CAAMC,IAAN,CAAWjB,eAAe,CAACnB,EAAhB,CAAmBvC,QAAnB,EAAX,CAA0C,MAAK0E,gBAAA,CAAME,GAAN,CAAUlB,eAAe,CAACf,eAA1B,CAAqD,EAHzF,EAKjBkC,IALiB,CAKZ,IALY,CAApB;QAMA,MAAM,KAAIhG,oBAAJ,EAAc,mDAAkD4F,WAAY,EAA5E,CAAN;MACD;IACF;EACF;;EAMoB,aAARK,QAAQ,CAAC,CAACvG,KAAD,EAAQwG,GAAR,EAAa1G,SAAb,EAAwBC,OAAxB,EAAiC0G,UAAjC,EAA6CvG,MAA7C,CAAD,EAOlB;IAAA;;IACD,MAAMD,MAAM,GAAGwG,UAAU,CAACC,YAAX,CAAwBC,8BAAA,CAAiB3C,EAAzC,CAAf;IACA,MAAM4C,YAAY,GAAGJ,GAAG,CAACK,UAAJ,CAAe,MAAf,CAArB;IACA,MAAMC,cAAc,GAAG,IAAIlH,cAAJ,CAAmBE,SAAnB,EAA8BC,OAA9B,EAAuCC,KAAvC,EAA8CC,MAA9C,EAAsDC,MAAtD,CAAvB;IACA0G,YAAY,SAAZ,IAAAA,YAAY,WAAZ,qCAAAA,YAAY,CAAEG,QAAd,gFAAwB7C,IAAxB,CAA6B,KAAI8C,yBAAJ,EAAiBF,cAAjB,CAA7B;IACA,OAAOA,cAAP;EACD;;AAjMyB;;;gCAAflH,c,WAgLI,E;gCAhLJA,c,kBAiLW,CAACqH,oBAAD,EAAcC,gBAAd,EAAyBC,oBAAzB,EAA0CC,kBAA1C,EAAyDC,sBAAzD,EAAuEC,sBAAvE,C;gCAjLX1H,c,aAkLM2H,kB;;AAkBnB,eAAe3D,sBAAf,CACEL,mBADF,EAEEiE,aAFF,EAGEC,SAHF,EAIE3H,SAJF,EAKEkB,WAAW,GAAG,KALhB,EAMEiB,IANF,EAOmC;EACjC,MAAMyF,iBAAiB,GAAGC,eAAA,CAAOC,SAAP,CAAiBJ,aAAa,CAACtE,GAAd,CAAmBa,CAAD,IAAOA,CAAC,CAACS,OAA3B,CAAjB,CAA1B;;EACA,MAAMqD,oBAAoB,GAAGJ,SAAS,CAAClD,MAAV,CAAkBpB,KAAD,IAAW,CAACuE,iBAAiB,CAACI,iBAAlB,CAAoC3E,KAApC,CAA7B,CAA7B;EACA,MAAM4E,uBAA+C,GAAG,EAAxD;EACA,MAAMC,SAAkB,GAAG,EAA3B;EACA,MAAM,IAAAC,qBAAA,EAAWT,aAAX,EAA0B,MAAOU,MAAP,IAAkB;IAChD,MAAMC,UAAU,GAAG5E,mBAAmB,CAACO,IAApB,CAA0BC,CAAD,IAAOA,CAAC,CAACC,EAAF,CAAKC,qBAAL,CAA2BiE,MAAM,CAAC1D,OAAlC,CAAhC,CAAnB;;IACA,IAAI,CAAC2D,UAAL,EAAiB;MACf,MAAM,IAAI9F,KAAJ,CAAW,0CAAyC6F,MAAM,CAACzG,QAAP,EAAkB,sBAAtE,CAAN;IACD;;IACDsG,uBAAuB,CAAC7D,IAAxB,CAA6BiE,UAA7B;;IACA,IAAIA,UAAU,CAAC/D,eAAf,EAAgC;MAC9B;IACD;;IACD,MAAM;MAAEgE;IAAF,IAAkBD,UAAxB;;IACA,IAAI,CAACC,WAAL,EAAkB;MAChB,MAAM,IAAI/F,KAAJ,CAAW,0DAAyD6F,MAAM,CAACzG,QAAP,EAAkB,EAAtF,CAAN;IACD;;IACD,MAAM4G,cAAc,GAAGD,WAAW,CAACE,iBAAnC;;IACA,IAAI,CAACD,cAAc,CAACpD,MAApB,EAA4B;MAC1B;IACD;;IACD,MAAMsD,cAAc,GAAG,MAAMzI,SAAS,CAACS,QAAV,CAAmBqB,KAAnB,CAAyB4G,iBAAzB,CAA2CN,MAAM,CAAC1D,OAAlD,CAA7B,CAjBgD,CAkBhD;;IACA,MAAMiE,OAAO,GAAGxG,IAAH,aAAGA,IAAH,uBAAGA,IAAI,CAAEO,QAAN,EAAhB;IACA,MAAM,IAAAyF,qBAAA,EAAWI,cAAX,EAA2B,MAAOK,aAAP,IAAyB;MACxD,MAAMC,UAAU,GAAG,MAAMJ,cAAc,CAACK,WAAf,CAA2BF,aAAa,CAACjH,QAAd,EAA3B,EAAqD3B,SAAS,CAACS,QAAV,CAAmBqB,KAAnB,CAAyBiH,OAA9E,CAAzB;MACA,MAAMC,aAAa,GAAGH,UAAU,CAACI,2BAAX,EAAtB;MACA,MAAMC,uBAAuB,GAAGF,aAAa,CAACvE,MAAd,CAAsBP,EAAD,IACnD6D,oBAAoB,CAAC/D,IAArB,CAA2BX,KAAD,IAAWA,KAAK,CAACc,qBAAN,CAA4BD,EAA5B,CAArC,CAD8B,CAAhC;;MAGA,IAAI,CAACgF,uBAAuB,CAAC/D,MAA7B,EAAqC;QACnC;MACD;;MACD,MAAMgE,UAAmB,GAAG,EAA5B;MACA,MAAMjG,OAAO,CAACC,GAAR,CACJ+F,uBAAuB,CAAC9F,GAAxB,CAA4B,MAAOgG,GAAP,IAAe;QACzC,MAAMC,QAAQ,GAAG,MAAMrJ,SAAS,CAACS,QAAV,CAAmBqB,KAAnB,CAAyBwH,UAAzB,CAAoCF,GAApC,EAAyCjH,IAAzC,EAA+CwG,OAA/C,CAAvB;;QACA,IAAIU,QAAJ,EAAc;UACZF,UAAU,CAAC/E,IAAX,CAAgBgF,GAAhB;QACD;MACF,CALD,CADI,CAAN;;MAQA,IAAI,CAACD,UAAU,CAAChE,MAAhB,EAAwB;QACtB;MACD;;MACD,IAAI,CAACjE,WAAL,EAAkB;QAChB,MAAM,KAAIV,oBAAJ,EAAc,mBAAkB4H,MAAM,CAACzG,QAAP,EAAkB;AAChE,qBAAqBiH,aAAa,CAACjH,QAAd,EAAyB;AAC9C,EAAEwH,UAAU,CAAC/F,GAAX,CAAgBmG,CAAD,IAAOA,CAAC,CAAC5H,QAAF,EAAtB,EAAoC6E,IAApC,CAAyC,IAAzC,CAA+C,EAFnC,CAAN;MAGD;;MACD0B,SAAS,CAAC9D,IAAV,CAAe,GAAG+E,UAAlB;IACD,CA3BK,CAAN;EA4BD,CAhDK,CAAN;;EAiDA,IAAIjB,SAAS,CAAC/C,MAAd,EAAsB;IACpB,MAAMqE,QAAQ,GAAG3B,eAAA,CAAO4B,aAAP,CAAqBvB,SAArB,CAAjB;;IACAsB,QAAQ,CAACzF,OAAT,CAAkBG,EAAD,IAAQ;MACvB,MAAMmE,UAAU,GAAG5E,mBAAmB,CAACO,IAApB,CAA0BC,CAAD,IAAOA,CAAC,CAACC,EAAF,CAAKC,qBAAL,CAA2BD,EAA3B,CAAhC,CAAnB;;MACA,IAAI,CAACmE,UAAL,EAAiB;QACf,MAAM,IAAI9F,KAAJ,CAAW,0CAAyC2B,EAAE,CAACvC,QAAH,EAAc,sBAAlE,CAAN;MACD;;MACDsG,uBAAuB,CAAC7D,IAAxB,CAA6BiE,UAA7B;IACD,CAND;EAOD;;EACD,OAAOJ,uBAAP;AACD;;AAED,SAASrD,WAAT,CAAqBnB,mBAArB,EAAkEjC,WAAlE,EAAuFf,QAAvF,EAA2G;EACzG,MAAMiJ,eAAe,GAAGjJ,QAAQ,CAACc,gBAAT,GAA4B2E,IAApD;EACA,MAAMyD,mBAAmB,GAAGlG,mBAAmB,CAACgB,MAApB,CAA4BR,CAAD,IAAO,CAACA,CAAC,CAACK,eAArC,CAA5B;EACAqF,mBAAmB,CAAC5F,OAApB,CAA4B,CAAC;IAAEG,EAAF;IAAMoE,WAAN;IAAmBsB;EAAnB,CAAD,KAA6C;IACvE,IAAI,CAACtB,WAAL,EAAkB;MAChB,MAAM,IAAI/F,KAAJ,CAAW,iDAAgD2B,EAAE,CAACvC,QAAH,EAAc,EAAzE,CAAN;IACD;;IACD,IAAI2G,WAAW,CAACuB,UAAZ,EAAJ,EAA8B;MAC5B,MAAM,KAAIrJ,oBAAJ,EAAc,4BAA2B0D,EAAE,CAACvC,QAAH,EAAc;AACnE,yBACQH,WAAW,CAAC0E,IACb,qBAAoBwD,eAAgB,8BAA6BA,eAAgB,kBAChFlI,WAAW,CAAC0E,IACb;AACP,uEAAuE1E,WAAW,CAAC0E,IAAK,GAN5E,CAAN;IAOD;;IACD,IAAIoC,WAAW,CAACwB,YAAZ,EAAJ,EAAgC;MAC9B;MACA;IACD;;IACD,IAAI,CAACxB,WAAW,CAACyB,aAAZ,EAAL,EAAkC;MAChC;MACA;IACD,CApBsE,CAqBvE;;;IACA,MAAMC,WAAW,GAAG1B,WAAW,CAACE,iBAAhC;;IACA,IAAIwB,WAAW,CAAC7E,MAAZ,KAAuB,CAA3B,EAA8B;MAC5B,MAAM,IAAI5C,KAAJ,CAAW,sDAAX,CAAN;IACD,CAzBsE,CA0BvE;IACA;IACA;IACA;;;IACA,IAAI,CAACqH,kBAAL,EAAyB;MACvB,MAAM,IAAIrH,KAAJ,CAAU,qDAAV,CAAN;IACD;;IAED,MAAM0H,cAAc,GAAGL,kBAAkB,CAACM,OAA1C,CAlCuE,CAoCvE;;IACA,IAAI5B,WAAW,CAAC6B,uBAAhB,EAAyC;MACvCP,kBAAkB,CAACQ,eAAnB,CAAmC9B,WAAW,CAAC6B,uBAA/C;IACD,CAFD,MAEO;MACL;MACAP,kBAAkB,CAACM,OAAnB,CAA2BnG,OAA3B,CAAoCsG,GAAD,IAAST,kBAAkB,CAACU,YAAnB,CAAgCD,GAAhC,CAA5C;IACD;;IACDT,kBAAkB,CAACW,WAAnB,CAA+B;MAAEC,eAAe,EAAEP,cAAnB;MAAmClF,MAAM,EAAEvD;IAA3C,CAA/B;IACAf,QAAQ,CAACqB,KAAT,CAAeiH,OAAf,CAAuB0B,GAAvB,CAA2Bb,kBAA3B;EACD,CA7CD;AA8CD;;AAED/C,8BAAA,CAAiB6D,UAAjB,CAA4B5K,cAA5B;;eAEeA,c"}

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@teambit/merge-lanes",
-  "version": "0.0.7",
+  "version": "0.0.10",
   "homepage": "https://bit.dev/teambit/lanes/merge-lanes",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.lanes",
     "name": "merge-lanes",
-    "version": "0.0.7"
+    "version": "0.0.10"
   },
   "dependencies": {
     "chalk": "2.4.2",
@@ -14,16 +14,16 @@
     "@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.555",
-    "@teambit/merging": "0.0.145",
-    "@teambit/component-id": "0.0.405",
-    "@teambit/lane-id": "0.0.74",
-    "@teambit/lanes": "0.0.402",
-    "@teambit/legacy-bit-id": "0.0.402",
-    "@teambit/logger": "0.0.648",
-    "@teambit/remove": "0.0.7",
-    "@teambit/workspace": "0.0.830"
+    "@teambit/bit-error": "0.0.396",
+    "@teambit/cli": "0.0.558",
+    "@teambit/merging": "0.0.148",
+    "@teambit/component-id": "0.0.407",
+    "@teambit/lane-id": "0.0.77",
+    "@teambit/lanes": "0.0.405",
+    "@teambit/legacy-bit-id": "0.0.404",
+    "@teambit/logger": "0.0.651",
+    "@teambit/remove": "0.0.10",
+    "@teambit/workspace": "0.0.833"
   },
   "devDependencies": {
     "@types/mocha": "9.1.0",
@@ -34,7 +34,7 @@
     "@types/node": "12.20.4"
   },
   "peerDependencies": {
-    "@teambit/legacy": "1.0.338",
+    "@teambit/legacy": "1.0.341",
     "react-dom": "^16.8.0 || ^17.0.0",
     "react": "^16.8.0 || ^17.0.0"
   },
@@ -56,8 +56,6 @@
     "react",
     "react-components",
     "angular",
-    "angular-components",
-    "vue",
-    "vue-components"
+    "angular-components"
   ]
 }