@teambit/merge-lanes 0.0.29 → 0.0.30

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

@@ -16,13 +16,14 @@ 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, noSquash, skipDependencyInstallation, remote, includeDeps, resolveUnrelated, ignoreConfigChanges, verbose, }: {
+    report([name, pattern]: [string, string], { ours, theirs, manual, build, workspace: existingOnWorkspaceOnly, noSnap, tag, message: snapMessage, keepReadme, noSquash, skipDependencyInstallation, remote, includeDeps, resolveUnrelated, ignoreConfigChanges, verbose, }: {
         ours: boolean;
         theirs: boolean;
         manual: boolean;
         workspace?: boolean;
         build?: boolean;
         noSnap: boolean;
+        tag: boolean;
         message: string;
         keepReadme?: boolean;
         noSquash: boolean;

package/dist/merge-lane.cmd.js

@@ -92,7 +92,9 @@ class MergeLaneCmd {
     (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`);
+in case the <lane> exists locally but you want to merge the remote version of it, use --remote flag.
+when the current and the other lanes are diverged in history and the files could be merged with no conflicts,
+it will snap-merge these components to complete the merge. use "no-snap" to opt-out, or "tag" to tag instead`);
     (0, _defineProperty2().default)(this, "arguments", [{
       name: 'lane',
       description: 'lane-name or lane-id (if not exists locally) to merge to the current lane'
@@ -101,7 +103,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'], ['', 'no-squash', 'EXPERIMENTAL. relevant for merging lanes into main, which by default squash.'], ['', 'ignore-config-changes', 'allow merging when component are modified due to config changes (such as dependencies) only and not files'], ['', 'verbose', 'show details of components that were not merged legitimately'], ['', '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, "options", [['', 'ours', 'in case of a conflict, override the used version with the current modification'], ['', 'theirs', 'in case of a conflict, override the current modification with the specified version'], ['', 'manual', 'in case of a conflict, leave the files with a conflict state to resolve them manually later'], ['', 'workspace', 'merge only components in a lane that exist in the workspace'], ['', 'no-snap', 'do not auto snap in case the merge completed without conflicts'], ['', 'tag', 'tag all lane components after merging into main (also tag-merge in case of snap-merge)'], ['', 'build', 'in case of snap during the merge, run the build-pipeline (similar to bit snap --build)'], ['m', 'message <message>', 'override the default message for the auto snap'], ['', 'keep-readme', 'skip deleting the lane readme component after merging'], ['', 'no-squash', 'EXPERIMENTAL. relevant for merging lanes into main, which by default squash.'], ['', 'ignore-config-changes', 'allow merging when component are modified due to config changes (such as dependencies) only and not files'], ['', 'verbose', 'show details of components that were not merged legitimately'], ['', '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);
@@ -115,6 +117,7 @@ in case the <lane> exists locally but you want to merge the remote version of it
     build,
     workspace: existingOnWorkspaceOnly = false,
     noSnap = false,
+    tag = false,
     message: snapMessage = '',
     keepReadme = false,
     noSquash = false,
@@ -160,6 +163,7 @@ in case the <lane> exists locally but you want to merge the remote version of it
       snapMessage,
       keepReadme,
       noSquash,
+      tag,
       pattern,
       skipDependencyInstallation,
       remote,

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","noSquash","skipDependencyInstallation","remote","includeDeps","resolveUnrelated","ignoreConfigChanges","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    [\n      '',\n      'ignore-config-changes',\n      'allow merging when component are modified due to config changes (such as dependencies) only and not files',\n    ],\n    ['', 'verbose', 'show details of components that were not merged legitimately'],\n    ['', '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      ignoreConfigChanges,\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      ignoreConfigChanges?: boolean;\n      verbose?: boolean;\n    }\n  ): Promise<string> {\n    build = isFeatureEnabled(BUILD_ON_CI) ? Boolean(build) : true;\n    const mergeStrategy = getMergeStrategy(ours, theirs, manual);\n    if (noSnap && snapMessage) throw new BitError('unable to use \"noSnap\" and \"message\" flags together');\n    if (includeDeps && !pattern && !existingOnWorkspaceOnly) {\n      throw new BitError(`\"--include-deps\" flag is relevant only for --workspace and --pattern flags`);\n    }\n    const getResolveUnrelated = (): MergeStrategy | undefined => {\n      if (!resolveUnrelated) return undefined;\n      if (typeof resolveUnrelated === 'boolean') return 'ours';\n      if (resolveUnrelated !== 'ours' && resolveUnrelated !== 'theirs' && resolveUnrelated !== 'manual') {\n        throw new Error('--resolve-unrelated must be one of the following: [ours, theirs, manual]');\n      }\n      return resolveUnrelated;\n    };\n    if (resolveUnrelated && typeof resolveUnrelated === 'boolean') {\n      resolveUnrelated = 'ours';\n    }\n    const { mergeResults, deleteResults } = 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      ignoreConfigChanges,\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","tag","message","snapMessage","keepReadme","noSquash","skipDependencyInstallation","remote","includeDeps","resolveUnrelated","ignoreConfigChanges","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.\nwhen the current and the other lanes are diverged in history and the files could be merged with no conflicts,\nit will snap-merge these components to complete the merge. use \"no-snap\" to opt-out, or \"tag\" to tag instead`;\n  arguments = [\n    {\n      name: 'lane',\n      description: 'lane-name or lane-id (if not exists locally) to merge to the current lane',\n    },\n    {\n      name: 'pattern',\n      description: '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    ['', 'tag', 'tag all lane components after merging into main (also tag-merge in case of snap-merge)'],\n    ['', 'build', 'in case of snap during the merge, run the build-pipeline (similar to bit snap --build)'],\n    ['m', 'message <message>', 'override the default message for the auto snap'],\n    ['', 'keep-readme', 'skip deleting the lane readme component after merging'],\n    ['', 'no-squash', 'EXPERIMENTAL. relevant for merging lanes into main, which by default squash.'],\n    [\n      '',\n      'ignore-config-changes',\n      'allow merging when component are modified due to config changes (such as dependencies) only and not files',\n    ],\n    ['', 'verbose', 'show details of components that were not merged legitimately'],\n    ['', '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      tag = false,\n      message: snapMessage = '',\n      keepReadme = false,\n      noSquash = false,\n      skipDependencyInstallation = false,\n      remote = false,\n      includeDeps = false,\n      resolveUnrelated,\n      ignoreConfigChanges,\n      verbose = false,\n    }: {\n      ours: boolean;\n      theirs: boolean;\n      manual: boolean;\n      workspace?: boolean;\n      build?: boolean;\n      noSnap: boolean;\n      tag: boolean;\n      message: string;\n      keepReadme?: boolean;\n      noSquash: boolean;\n      skipDependencyInstallation?: boolean;\n      remote: boolean;\n      includeDeps?: boolean;\n      resolveUnrelated?: string | boolean;\n      ignoreConfigChanges?: boolean;\n      verbose?: boolean;\n    }\n  ): Promise<string> {\n    build = isFeatureEnabled(BUILD_ON_CI) ? Boolean(build) : true;\n    const mergeStrategy = getMergeStrategy(ours, theirs, manual);\n    if (noSnap && snapMessage) throw new BitError('unable to use \"noSnap\" and \"message\" flags together');\n    if (includeDeps && !pattern && !existingOnWorkspaceOnly) {\n      throw new BitError(`\"--include-deps\" flag is relevant only for --workspace and --pattern flags`);\n    }\n    const getResolveUnrelated = (): MergeStrategy | undefined => {\n      if (!resolveUnrelated) return undefined;\n      if (typeof resolveUnrelated === 'boolean') return 'ours';\n      if (resolveUnrelated !== 'ours' && resolveUnrelated !== 'theirs' && resolveUnrelated !== 'manual') {\n        throw new Error('--resolve-unrelated must be one of the following: [ours, theirs, manual]');\n      }\n      return resolveUnrelated;\n    };\n    if (resolveUnrelated && typeof resolveUnrelated === 'boolean') {\n      resolveUnrelated = 'ours';\n    }\n    const { mergeResults, deleteResults } = await this.mergeLanes.mergeLane(name, {\n      build,\n      // @ts-ignore\n      mergeStrategy,\n      existingOnWorkspaceOnly,\n      noSnap,\n      snapMessage,\n      keepReadme,\n      noSquash,\n      tag,\n      pattern,\n      skipDependencyInstallation,\n      remote,\n      resolveUnrelated: getResolveUnrelated(),\n      ignoreConfigChanges,\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

@@ -13,6 +13,7 @@ export declare type MergeLaneOptions = {
     build: boolean;
     keepReadme: boolean;
     noSquash: boolean;
+    tag?: boolean;
     pattern?: string;
     includeDeps?: boolean;
     skipDependencyInstallation?: boolean;

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

@@ -179,6 +179,7 @@ class MergeLanesMain {
     const {
       mergeStrategy,
       noSnap,
+      tag,
       snapMessage,
       existingOnWorkspaceOnly,
       build,
@@ -192,6 +193,11 @@ class MergeLanesMain {
       remote
     } = options;
     const currentLaneId = consumer.getCurrentLaneId();
+
+    if (tag && !currentLaneId.isDefault()) {
+      throw new (_bitError().BitError)(`--tag only possible when on main. currently checked out to ${currentLaneId.toString()}`);
+    }
+
     const otherLaneId = await consumer.getParsedLaneId(laneName);
 
     if (otherLaneId.isEqual(currentLaneId)) {
@@ -291,6 +297,7 @@ class MergeLanesMain {
       laneId: otherLaneId,
       localLane: currentLane,
       noSnap,
+      tag,
       snapMessage,
       build,
       skipDependencyInstallation

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","noSquash","pattern","includeDeps","skipDependencyInstallation","resolveUnrelated","ignoreConfigChanges","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","fromLane","readmeResult","name","onDestroy","failureMsgs","chalk","bold","red","join","provider","cli","loggerMain","createLogger","MergeLanesAspect","lanesCommand","getCommand","mergeLanesMain","commands","MergeLaneCmd","LanesAspect","CLIAspect","WorkspaceAspect","MergingAspect","LoggerAspect","RemoveAspect","MainRuntime","compIdsToKeep","allBitIds","bitIdsFromPattern","BitIds","fromArray","bitIdsNotFromPattern","hasWithoutVersion","filteredComponentStatus","depsToAdd","pMapSeries","compId","fromStatus","divergeData","remoteVersions","snapsOnRemoteOnly","modelComponent","getModelComponent","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  ignoreConfigChanges?: boolean;\n  remote?: boolean;\n};\n\nexport class MergeLanesMain {\n  constructor(\n    private workspace: Workspace | undefined,\n    private merging: MergingMain,\n    private lanes: LanesMain,\n    private logger: Logger,\n    private remove: RemoveMain\n  ) {}\n\n  async mergeLane(\n    laneName: string,\n    options: MergeLaneOptions\n  ): Promise<{ mergeResults: ApplyVersionResults; deleteResults: any }> {\n    if (!this.workspace) {\n      throw new BitError(`unable to merge a lane outside of Bit workspace`);\n    }\n    const consumer = this.workspace.consumer;\n\n    const {\n      mergeStrategy,\n      noSnap,\n      snapMessage,\n      existingOnWorkspaceOnly,\n      build,\n      keepReadme,\n      noSquash,\n      pattern,\n      includeDeps,\n      skipDependencyInstallation,\n      resolveUnrelated,\n      ignoreConfigChanges,\n      remote,\n    } = options;\n\n    const currentLaneId = consumer.getCurrentLaneId();\n    const otherLaneId = await consumer.getParsedLaneId(laneName);\n    if (otherLaneId.isEqual(currentLaneId)) {\n      throw new BitError(\n        `unable to merge lane \"${otherLaneId.toString()}\", you're already at this lane. to get updates, simply run \"bit checkout head\"`\n      );\n    }\n    const currentLane = currentLaneId.isDefault() ? null : await consumer.scope.loadLane(currentLaneId);\n    const isDefaultLane = otherLaneId.isDefault();\n    const getOtherLane = async () => {\n      if (isDefaultLane) {\n        return undefined;\n      }\n      const lane = await consumer.scope.loadLane(otherLaneId);\n      if (remote || !lane) {\n        return this.lanes.fetchLaneWithItsComponents(otherLaneId);\n      }\n      return lane;\n    };\n    const otherLane = await getOtherLane();\n    const getBitIds = async () => {\n      if (isDefaultLane) {\n        if (!currentLane) throw new Error(`unable to merge ${DEFAULT_LANE}, the current lane was not found`);\n        return consumer.scope.getDefaultLaneIdsFromLane(currentLane);\n      }\n      if (!otherLane) throw new Error(`lane must be defined for non-default`);\n      return otherLane.toBitIds();\n    };\n    const bitIds = await getBitIds();\n    this.logger.debug(`merging the following bitIds: ${bitIds.toString()}`);\n    const otherLaneName = isDefaultLane ? DEFAULT_LANE : otherLaneId.toString();\n\n    const getAllComponentsStatus = async (): Promise<ComponentMergeStatus[]> => {\n      const tmp = new Tmp(consumer.scope);\n      try {\n        const componentsStatus = await Promise.all(\n          bitIds.map((bitId) =>\n            this.merging.getComponentMergeStatus(bitId, currentLane, otherLaneName, {\n              resolveUnrelated,\n              ignoreConfigChanges,\n            })\n          )\n        );\n        await tmp.clear();\n        return componentsStatus;\n      } catch (err: any) {\n        await tmp.clear();\n        throw err;\n      }\n    };\n    let allComponentsStatus = await getAllComponentsStatus();\n\n    if (pattern) {\n      const componentIds = await this.workspace.resolveMultipleComponentIds(bitIds);\n      const compIdsFromPattern = this.workspace.scope.filterIdsFromPoolIdsByPattern(pattern, componentIds);\n      allComponentsStatus = await filterComponentsStatus(\n        allComponentsStatus,\n        compIdsFromPattern,\n        bitIds,\n        this.workspace,\n        includeDeps,\n        otherLane || undefined\n      );\n      bitIds.forEach((bitId) => {\n        if (!allComponentsStatus.find((c) => c.id.isEqualWithoutVersion(bitId))) {\n          allComponentsStatus.push({ id: bitId, unmergedLegitimately: true, unmergedMessage: `excluded by pattern` });\n        }\n      });\n    }\n    if (existingOnWorkspaceOnly) {\n      const workspaceIds = await this.workspace.listIds();\n      const compIdsFromPattern = workspaceIds.filter((id) =>\n        allComponentsStatus.find((c) => c.id.isEqualWithoutVersion(id._legacy))\n      );\n      allComponentsStatus = await filterComponentsStatus(\n        allComponentsStatus,\n        compIdsFromPattern,\n        bitIds,\n        this.workspace,\n        includeDeps\n      );\n      bitIds.forEach((bitId) => {\n        if (!allComponentsStatus.find((c) => c.id.isEqualWithoutVersion(bitId))) {\n          allComponentsStatus.push({ id: bitId, unmergedLegitimately: true, unmergedMessage: `not in the workspace` });\n        }\n      });\n    }\n\n    throwForFailures();\n\n    if (currentLaneId.isDefault() && !noSquash) {\n      squashSnaps(allComponentsStatus, otherLaneId, consumer);\n    }\n\n    const mergeResults = await this.merging.mergeSnaps({\n      mergeStrategy,\n      allComponentsStatus,\n      laneId: otherLaneId,\n      localLane: currentLane,\n      noSnap,\n      snapMessage,\n      build,\n      skipDependencyInstallation,\n    });\n\n    const mergedSuccessfully =\n      !mergeResults.failedComponents ||\n      mergeResults.failedComponents.length === 0 ||\n      mergeResults.failedComponents.every((failedComponent) => failedComponent.unchangedLegitimately);\n\n    let deleteResults = {};\n\n    if (!keepReadme && otherLane && otherLane.readmeComponent && mergedSuccessfully) {\n      const readmeComponentId = otherLane.readmeComponent.id\n        .changeVersion(otherLane.readmeComponent?.head?.hash)\n        .toString();\n\n      deleteResults = await this.remove.remove({\n        componentsPattern: readmeComponentId,\n        force: false,\n        remote: false,\n        track: false,\n        deleteFiles: true,\n        fromLane: false,\n      });\n    } else if (otherLane && !otherLane.readmeComponent) {\n      deleteResults = { readmeResult: `\\nlane ${otherLane.name} doesn't have a readme component` };\n    }\n\n    await this.workspace.consumer.onDestroy();\n\n    return { mergeResults, deleteResults };\n\n    function throwForFailures() {\n      const failedComponents = allComponentsStatus.filter((c) => c.unmergedMessage && !c.unmergedLegitimately);\n      if (failedComponents.length) {\n        const failureMsgs = failedComponents\n          .map(\n            (failedComponent) =>\n              `${chalk.bold(failedComponent.id.toString())} - ${chalk.red(failedComponent.unmergedMessage as string)}`\n          )\n          .join('\\n');\n        throw new BitError(`unable to merge due to the following failures:\\n${failureMsgs}`);\n      }\n    }\n  }\n\n  static slots = [];\n  static dependencies = [LanesAspect, CLIAspect, WorkspaceAspect, MergingAspect, LoggerAspect, RemoveAspect];\n  static runtime = MainRuntime;\n\n  static async provider([lanes, cli, workspace, merging, loggerMain, remove]: [\n    LanesMain,\n    CLIMain,\n    Workspace,\n    MergingMain,\n    LoggerMain,\n    RemoveMain\n  ]) {\n    const logger = loggerMain.createLogger(MergeLanesAspect.id);\n    const lanesCommand = cli.getCommand('lane');\n    const mergeLanesMain = new MergeLanesMain(workspace, merging, lanes, logger, remove);\n    lanesCommand?.commands?.push(new MergeLaneCmd(mergeLanesMain));\n    return mergeLanesMain;\n  }\n}\n\nasync function filterComponentsStatus(\n  allComponentsStatus: ComponentMergeStatus[],\n  compIdsToKeep: ComponentID[],\n  allBitIds: BitId[],\n  workspace: Workspace,\n  includeDeps = false,\n  lane?: Lane\n): Promise<ComponentMergeStatus[]> {\n  const bitIdsFromPattern = BitIds.fromArray(compIdsToKeep.map((c) => c._legacy));\n  const bitIdsNotFromPattern = allBitIds.filter((bitId) => !bitIdsFromPattern.hasWithoutVersion(bitId));\n  const filteredComponentStatus: ComponentMergeStatus[] = [];\n  const depsToAdd: BitId[] = [];\n  await pMapSeries(compIdsToKeep, async (compId) => {\n    const fromStatus = allComponentsStatus.find((c) => c.id.isEqualWithoutVersion(compId._legacy));\n    if (!fromStatus) {\n      throw new Error(`filterComponentsStatus: unable to find ${compId.toString()} in component-status`);\n    }\n    filteredComponentStatus.push(fromStatus);\n    if (fromStatus.unmergedMessage) {\n      return;\n    }\n    const { divergeData } = fromStatus;\n    if (!divergeData) {\n      throw new Error(`filterComponentsStatus: unable to find divergeData for ${compId.toString()}`);\n    }\n    const remoteVersions = divergeData.snapsOnRemoteOnly;\n    if (!remoteVersions.length) {\n      return;\n    }\n    const modelComponent = await workspace.consumer.scope.getModelComponent(compId._legacy);\n    // optimization suggestion: if squash is given, check only the last version.\n    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":"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"}
+{"version":3,"names":["MergeLanesMain","constructor","workspace","merging","lanes","logger","remove","mergeLane","laneName","options","BitError","consumer","mergeStrategy","noSnap","tag","snapMessage","existingOnWorkspaceOnly","build","keepReadme","noSquash","pattern","includeDeps","skipDependencyInstallation","resolveUnrelated","ignoreConfigChanges","remote","currentLaneId","getCurrentLaneId","isDefault","toString","otherLaneId","getParsedLaneId","isEqual","currentLane","scope","loadLane","isDefaultLane","getOtherLane","undefined","lane","fetchLaneWithItsComponents","otherLane","getBitIds","Error","DEFAULT_LANE","getDefaultLaneIdsFromLane","toBitIds","bitIds","debug","otherLaneName","getAllComponentsStatus","tmp","Tmp","componentsStatus","Promise","all","map","bitId","getComponentMergeStatus","clear","err","allComponentsStatus","componentIds","resolveMultipleComponentIds","compIdsFromPattern","filterIdsFromPoolIdsByPattern","filterComponentsStatus","forEach","find","c","id","isEqualWithoutVersion","push","unmergedLegitimately","unmergedMessage","workspaceIds","listIds","filter","_legacy","throwForFailures","squashSnaps","mergeResults","mergeSnaps","laneId","localLane","mergedSuccessfully","failedComponents","length","every","failedComponent","unchangedLegitimately","deleteResults","readmeComponent","readmeComponentId","changeVersion","head","hash","componentsPattern","force","track","deleteFiles","fromLane","readmeResult","name","onDestroy","failureMsgs","chalk","bold","red","join","provider","cli","loggerMain","createLogger","MergeLanesAspect","lanesCommand","getCommand","mergeLanesMain","commands","MergeLaneCmd","LanesAspect","CLIAspect","WorkspaceAspect","MergingAspect","LoggerAspect","RemoveAspect","MainRuntime","compIdsToKeep","allBitIds","bitIdsFromPattern","BitIds","fromArray","bitIdsNotFromPattern","hasWithoutVersion","filteredComponentStatus","depsToAdd","pMapSeries","compId","fromStatus","divergeData","remoteVersions","snapsOnRemoteOnly","modelComponent","getModelComponent","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  tag?: boolean;\n  pattern?: string;\n  includeDeps?: boolean;\n  skipDependencyInstallation?: boolean;\n  resolveUnrelated?: MergeStrategy;\n  ignoreConfigChanges?: boolean;\n  remote?: boolean;\n};\n\nexport class MergeLanesMain {\n  constructor(\n    private workspace: Workspace | undefined,\n    private merging: MergingMain,\n    private lanes: LanesMain,\n    private logger: Logger,\n    private remove: RemoveMain\n  ) {}\n\n  async mergeLane(\n    laneName: string,\n    options: MergeLaneOptions\n  ): Promise<{ mergeResults: ApplyVersionResults; deleteResults: any }> {\n    if (!this.workspace) {\n      throw new BitError(`unable to merge a lane outside of Bit workspace`);\n    }\n    const consumer = this.workspace.consumer;\n\n    const {\n      mergeStrategy,\n      noSnap,\n      tag,\n      snapMessage,\n      existingOnWorkspaceOnly,\n      build,\n      keepReadme,\n      noSquash,\n      pattern,\n      includeDeps,\n      skipDependencyInstallation,\n      resolveUnrelated,\n      ignoreConfigChanges,\n      remote,\n    } = options;\n\n    const currentLaneId = consumer.getCurrentLaneId();\n    if (tag && !currentLaneId.isDefault()) {\n      throw new BitError(`--tag only possible when on main. currently checked out to ${currentLaneId.toString()}`);\n    }\n    const otherLaneId = await consumer.getParsedLaneId(laneName);\n    if (otherLaneId.isEqual(currentLaneId)) {\n      throw new BitError(\n        `unable to merge lane \"${otherLaneId.toString()}\", you're already at this lane. to get updates, simply run \"bit checkout head\"`\n      );\n    }\n    const currentLane = currentLaneId.isDefault() ? null : await consumer.scope.loadLane(currentLaneId);\n    const isDefaultLane = otherLaneId.isDefault();\n    const getOtherLane = async () => {\n      if (isDefaultLane) {\n        return undefined;\n      }\n      const lane = await consumer.scope.loadLane(otherLaneId);\n      if (remote || !lane) {\n        return this.lanes.fetchLaneWithItsComponents(otherLaneId);\n      }\n      return lane;\n    };\n    const otherLane = await getOtherLane();\n    const getBitIds = async () => {\n      if (isDefaultLane) {\n        if (!currentLane) throw new Error(`unable to merge ${DEFAULT_LANE}, the current lane was not found`);\n        return consumer.scope.getDefaultLaneIdsFromLane(currentLane);\n      }\n      if (!otherLane) throw new Error(`lane must be defined for non-default`);\n      return otherLane.toBitIds();\n    };\n    const bitIds = await getBitIds();\n    this.logger.debug(`merging the following bitIds: ${bitIds.toString()}`);\n    const otherLaneName = isDefaultLane ? DEFAULT_LANE : otherLaneId.toString();\n\n    const getAllComponentsStatus = async (): Promise<ComponentMergeStatus[]> => {\n      const tmp = new Tmp(consumer.scope);\n      try {\n        const componentsStatus = await Promise.all(\n          bitIds.map((bitId) =>\n            this.merging.getComponentMergeStatus(bitId, currentLane, otherLaneName, {\n              resolveUnrelated,\n              ignoreConfigChanges,\n            })\n          )\n        );\n        await tmp.clear();\n        return componentsStatus;\n      } catch (err: any) {\n        await tmp.clear();\n        throw err;\n      }\n    };\n    let allComponentsStatus = await getAllComponentsStatus();\n\n    if (pattern) {\n      const componentIds = await this.workspace.resolveMultipleComponentIds(bitIds);\n      const compIdsFromPattern = this.workspace.scope.filterIdsFromPoolIdsByPattern(pattern, componentIds);\n      allComponentsStatus = await filterComponentsStatus(\n        allComponentsStatus,\n        compIdsFromPattern,\n        bitIds,\n        this.workspace,\n        includeDeps,\n        otherLane || undefined\n      );\n      bitIds.forEach((bitId) => {\n        if (!allComponentsStatus.find((c) => c.id.isEqualWithoutVersion(bitId))) {\n          allComponentsStatus.push({ id: bitId, unmergedLegitimately: true, unmergedMessage: `excluded by pattern` });\n        }\n      });\n    }\n    if (existingOnWorkspaceOnly) {\n      const workspaceIds = await this.workspace.listIds();\n      const compIdsFromPattern = workspaceIds.filter((id) =>\n        allComponentsStatus.find((c) => c.id.isEqualWithoutVersion(id._legacy))\n      );\n      allComponentsStatus = await filterComponentsStatus(\n        allComponentsStatus,\n        compIdsFromPattern,\n        bitIds,\n        this.workspace,\n        includeDeps\n      );\n      bitIds.forEach((bitId) => {\n        if (!allComponentsStatus.find((c) => c.id.isEqualWithoutVersion(bitId))) {\n          allComponentsStatus.push({ id: bitId, unmergedLegitimately: true, unmergedMessage: `not in the workspace` });\n        }\n      });\n    }\n\n    throwForFailures();\n\n    if (currentLaneId.isDefault() && !noSquash) {\n      squashSnaps(allComponentsStatus, otherLaneId, consumer);\n    }\n\n    const mergeResults = await this.merging.mergeSnaps({\n      mergeStrategy,\n      allComponentsStatus,\n      laneId: otherLaneId,\n      localLane: currentLane,\n      noSnap,\n      tag,\n      snapMessage,\n      build,\n      skipDependencyInstallation,\n    });\n\n    const mergedSuccessfully =\n      !mergeResults.failedComponents ||\n      mergeResults.failedComponents.length === 0 ||\n      mergeResults.failedComponents.every((failedComponent) => failedComponent.unchangedLegitimately);\n\n    let deleteResults = {};\n\n    if (!keepReadme && otherLane && otherLane.readmeComponent && mergedSuccessfully) {\n      const readmeComponentId = otherLane.readmeComponent.id\n        .changeVersion(otherLane.readmeComponent?.head?.hash)\n        .toString();\n\n      deleteResults = await this.remove.remove({\n        componentsPattern: readmeComponentId,\n        force: false,\n        remote: false,\n        track: false,\n        deleteFiles: true,\n        fromLane: false,\n      });\n    } else if (otherLane && !otherLane.readmeComponent) {\n      deleteResults = { readmeResult: `\\nlane ${otherLane.name} doesn't have a readme component` };\n    }\n\n    await this.workspace.consumer.onDestroy();\n\n    return { mergeResults, deleteResults };\n\n    function throwForFailures() {\n      const failedComponents = allComponentsStatus.filter((c) => c.unmergedMessage && !c.unmergedLegitimately);\n      if (failedComponents.length) {\n        const failureMsgs = failedComponents\n          .map(\n            (failedComponent) =>\n              `${chalk.bold(failedComponent.id.toString())} - ${chalk.red(failedComponent.unmergedMessage as string)}`\n          )\n          .join('\\n');\n        throw new BitError(`unable to merge due to the following failures:\\n${failureMsgs}`);\n      }\n    }\n  }\n\n  static slots = [];\n  static dependencies = [LanesAspect, CLIAspect, WorkspaceAspect, MergingAspect, LoggerAspect, RemoveAspect];\n  static runtime = MainRuntime;\n\n  static async provider([lanes, cli, workspace, merging, loggerMain, remove]: [\n    LanesMain,\n    CLIMain,\n    Workspace,\n    MergingMain,\n    LoggerMain,\n    RemoveMain\n  ]) {\n    const logger = loggerMain.createLogger(MergeLanesAspect.id);\n    const lanesCommand = cli.getCommand('lane');\n    const mergeLanesMain = new MergeLanesMain(workspace, merging, lanes, logger, remove);\n    lanesCommand?.commands?.push(new MergeLaneCmd(mergeLanesMain));\n    return mergeLanesMain;\n  }\n}\n\nasync function filterComponentsStatus(\n  allComponentsStatus: ComponentMergeStatus[],\n  compIdsToKeep: ComponentID[],\n  allBitIds: BitId[],\n  workspace: Workspace,\n  includeDeps = false,\n  lane?: Lane\n): Promise<ComponentMergeStatus[]> {\n  const bitIdsFromPattern = BitIds.fromArray(compIdsToKeep.map((c) => c._legacy));\n  const bitIdsNotFromPattern = allBitIds.filter((bitId) => !bitIdsFromPattern.hasWithoutVersion(bitId));\n  const filteredComponentStatus: ComponentMergeStatus[] = [];\n  const depsToAdd: BitId[] = [];\n  await pMapSeries(compIdsToKeep, async (compId) => {\n    const fromStatus = allComponentsStatus.find((c) => c.id.isEqualWithoutVersion(compId._legacy));\n    if (!fromStatus) {\n      throw new Error(`filterComponentsStatus: unable to find ${compId.toString()} in component-status`);\n    }\n    filteredComponentStatus.push(fromStatus);\n    if (fromStatus.unmergedMessage) {\n      return;\n    }\n    const { divergeData } = fromStatus;\n    if (!divergeData) {\n      throw new Error(`filterComponentsStatus: unable to find divergeData for ${compId.toString()}`);\n    }\n    const remoteVersions = divergeData.snapsOnRemoteOnly;\n    if (!remoteVersions.length) {\n      return;\n    }\n    const modelComponent = await workspace.consumer.scope.getModelComponent(compId._legacy);\n    // optimization suggestion: if squash is given, check only the last version.\n    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":"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"}

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@teambit/merge-lanes",
-  "version": "0.0.29",
+  "version": "0.0.30",
   "homepage": "https://bit.dev/teambit/lanes/merge-lanes",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.lanes",
     "name": "merge-lanes",
-    "version": "0.0.29"
+    "version": "0.0.30"
   },
   "dependencies": {
     "chalk": "2.4.2",
@@ -15,15 +15,15 @@
     "core-js": "^3.0.0",
     "@teambit/bit-error": "0.0.400",
     "@teambit/cli": "0.0.566",
-    "@teambit/merging": "0.0.167",
+    "@teambit/merging": "0.0.168",
     "@teambit/harmony": "0.3.3",
     "@teambit/component-id": "0.0.417",
     "@teambit/lane-id": "0.0.85",
-    "@teambit/lanes": "0.0.424",
+    "@teambit/lanes": "0.0.425",
     "@teambit/legacy-bit-id": "0.0.414",
     "@teambit/logger": "0.0.659",
-    "@teambit/remove": "0.0.29",
-    "@teambit/workspace": "0.0.852"
+    "@teambit/remove": "0.0.30",
+    "@teambit/workspace": "0.0.853"
   },
   "devDependencies": {
     "@types/mocha": "9.1.0",