@teambit/merge-lanes 1.0.424 → 1.0.426

package/artifacts/__bit_junit.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <testsuites tests="1" failures="0" errors="0" skipped="0">
-  <testsuite name="teambit.lanes/merge-lanes@1.0.424" tests="1" failures="0" errors="0" skipped="0">
+  <testsuite name="teambit.lanes/merge-lanes@1.0.426" tests="1" failures="0" errors="0" skipped="0">
     <testcase classname="dist/merge-lane.spec.js" name="should merge successfully the specified pattern only" time="0.001"/>
   </testsuite>
 </testsuites>

package/artifacts/schema.json

@@ -3953,7 +3953,7 @@
   "componentId": {
     "scope": "teambit.lanes",
     "name": "merge-lanes",
-    "version": "1.0.424"
+    "version": "1.0.426"
   },
   "taggedModuleExports": []
 }

package/dist/last-merged.js.map

@@ -1 +1 @@
-{"version":3,"names":["_path","data","_interopRequireDefault","require","_tempy","_fsExtra","_yesno","_chalk","_legacy","_legacyCli","_stagedSnaps","_bitError","_objects","e","__esModule","default","LAST_MERGED_LANE_FILENAME","LAST_MERGED_BITMAP_FILENAME","LastMerged","constructor","scope","consumer","logger","path","getLastMergedPath","takeSnapshot","currentLane","copyOfCurrentLane","clone","undefined","copyOfBitmap","tempy","file","copyOfWorkspaceJsonc","copyOfStagedSnaps","fs","copyFile","bitMap","mapPath","config","stagedSnaps","isEmpty","StagedSnaps","getPath","stagedConfig","getStagedConfig","copyOfStagedConfig","filePath","persistSnapshot","snapshot","remove","ensureDir","getLastMergedBitmapPath","getLastMergedWorkspacePath","compressed","compress","outputFile","getLastMergedLanePath","getLastMergedStagedSnapsPath","getLastMergedStagedConfigPath","restoreLaneObjectFromLastMerged","pathExistsSync","BitError","lastLane","getLastMergedLaneContentIfExists","laneFromBackup","BitObject","parseObject","legacyScope","objects","writeObjectsToTheFS","restoreFromLastMerged","mergeAbortOpts","previousBitmapBuffer","readFile","previousBitmap","BitMap","loadFromContentWithoutLoadingFiles","currentRootDirs","getAllTrackDirs","previousRootDirs","compDirsToRemove","Object","keys","filter","dir","silent","mergeAbortPrompt","Promise","all","map","deleteFile","dirsToRemove","clearStatusLine","dirsToRemoveStr","length","join","ok","yesno","question","chalk","bold","PromptCanceled","filename","getFileContentIfExist","err","code","exports"],"sources":["last-merged.ts"],"sourcesContent":["import path from 'path';\nimport tempy from 'tempy';\nimport fs from 'fs-extra';\nimport yesno from 'yesno';\nimport chalk from 'chalk';\nimport { BitMap } from '@teambit/legacy.bit-map';\nimport { PromptCanceled } from '@teambit/legacy.cli.prompts';\nimport { ScopeMain } from '@teambit/scope';\nimport { Lane } from '@teambit/legacy/dist/scope/models';\nimport { StagedSnaps } from '@teambit/legacy/dist/scope/staged-snaps';\nimport { Consumer } from '@teambit/legacy/dist/consumer';\nimport { BitError } from '@teambit/bit-error';\nimport { BitObject } from '@teambit/legacy/dist/scope/objects';\nimport { Logger } from '@teambit/logger';\nimport { MergeAbortOpts } from './merge-abort.cmd';\n\nconst LAST_MERGED_LANE_FILENAME = 'lane';\nconst LAST_MERGED_BITMAP_FILENAME = 'bitmap';\n\ntype Snapshot = {\n  copyOfCurrentLane?: Lane;\n  copyOfBitmap: string;\n  copyOfWorkspaceJsonc: string;\n  copyOfStagedSnaps?: string;\n  copyOfStagedConfig?: string;\n};\n\nexport class LastMerged {\n  constructor(private scope: ScopeMain, private consumer: Consumer, private logger: Logger) {}\n\n  get path() {\n    return this.scope.getLastMergedPath();\n  }\n\n  async takeSnapshot(currentLane?: Lane | null): Promise<Snapshot> {\n    const consumer = this.consumer;\n    const copyOfCurrentLane = currentLane ? currentLane.clone() : undefined;\n    const copyOfBitmap = tempy.file();\n    const copyOfWorkspaceJsonc = tempy.file();\n    let copyOfStagedSnaps: string | undefined;\n    await fs.copyFile(consumer.bitMap.mapPath, copyOfBitmap);\n    await fs.copyFile(consumer.config.path, copyOfWorkspaceJsonc);\n    if (!consumer.scope.stagedSnaps.isEmpty()) {\n      copyOfStagedSnaps = tempy.file();\n      await fs.copyFile(StagedSnaps.getPath(consumer.scope.path), copyOfStagedSnaps);\n    }\n    const stagedConfig = await this.scope.getStagedConfig();\n    let copyOfStagedConfig: string | undefined;\n    if (!stagedConfig.isEmpty()) {\n      copyOfStagedConfig = tempy.file();\n      await fs.copyFile(stagedConfig.filePath, copyOfStagedConfig);\n    }\n\n    return {\n      copyOfCurrentLane,\n      copyOfBitmap,\n      copyOfWorkspaceJsonc,\n      copyOfStagedSnaps,\n      copyOfStagedConfig,\n    };\n  }\n\n  async persistSnapshot(snapshot: Snapshot) {\n    const { copyOfCurrentLane, copyOfBitmap, copyOfWorkspaceJsonc, copyOfStagedSnaps, copyOfStagedConfig } = snapshot;\n    await fs.remove(this.path);\n    await fs.ensureDir(this.path);\n    await fs.copyFile(copyOfBitmap, this.getLastMergedBitmapPath());\n    await fs.copyFile(copyOfWorkspaceJsonc, this.getLastMergedWorkspacePath());\n    if (copyOfCurrentLane) {\n      const compressed = await copyOfCurrentLane.compress();\n      await fs.outputFile(this.getLastMergedLanePath(), compressed);\n    }\n    if (copyOfStagedSnaps) {\n      await fs.copyFile(copyOfStagedSnaps, this.getLastMergedStagedSnapsPath());\n    }\n    if (copyOfStagedConfig) {\n      await fs.copyFile(copyOfStagedConfig, this.getLastMergedStagedConfigPath());\n    }\n  }\n\n  async restoreLaneObjectFromLastMerged() {\n    if (!fs.pathExistsSync(this.path)) {\n      throw new BitError(`unable to abort the last lane-merge because \"bit export\" was running since then`);\n    }\n    const lastLane = await this.getLastMergedLaneContentIfExists();\n    if (!lastLane) {\n      throw new BitError(\n        `unable to revert the last lane-merge because the ${LAST_MERGED_LANE_FILENAME} is missing from ${this.path}`\n      );\n    }\n    const laneFromBackup = await BitObject.parseObject(lastLane, LAST_MERGED_LANE_FILENAME);\n    await this.scope.legacyScope.objects.writeObjectsToTheFS([laneFromBackup]);\n  }\n\n  async restoreFromLastMerged(mergeAbortOpts: MergeAbortOpts, currentLane?: Lane | null) {\n    if (!fs.pathExistsSync(this.path)) {\n      throw new BitError(`unable to abort the last lane-merge because \"bit export\" was running since then`);\n    }\n    const lastLane = await this.getLastMergedLaneContentIfExists();\n\n    if (!fs.pathExistsSync(this.getLastMergedBitmapPath())) {\n      throw new BitError(\n        `unable to abort the last lane-merge because the ${LAST_MERGED_BITMAP_FILENAME} is missing from ${this.path}`\n      );\n    }\n    if (!fs.pathExistsSync(this.getLastMergedWorkspacePath())) {\n      throw new BitError(\n        `unable to abort the last lane-merge because the workspace.jsonc is missing from ${this.path}`\n      );\n    }\n    if (currentLane) {\n      if (!lastLane) {\n        throw new BitError(\n          `unable to abort the last lane-merge because the ${LAST_MERGED_LANE_FILENAME} is missing from ${this.path}`\n        );\n      }\n      const laneFromBackup = await BitObject.parseObject(lastLane, LAST_MERGED_LANE_FILENAME);\n      await this.scope.legacyScope.objects.writeObjectsToTheFS([laneFromBackup]);\n    }\n    const previousBitmapBuffer = await fs.readFile(this.getLastMergedBitmapPath());\n    const previousBitmap = BitMap.loadFromContentWithoutLoadingFiles(previousBitmapBuffer, '', '', '');\n    const currentRootDirs = this.consumer.bitMap.getAllTrackDirs();\n    const previousRootDirs = previousBitmap.getAllTrackDirs();\n    const compDirsToRemove = Object.keys(currentRootDirs).filter((dir) => !previousRootDirs[dir]);\n\n    if (!mergeAbortOpts.silent) {\n      await this.mergeAbortPrompt(compDirsToRemove);\n    }\n    await Promise.all(compDirsToRemove.map((dir) => fs.remove(dir))); // it doesn't throw if not-exist, so we're good here.\n    await fs.copyFile(this.getLastMergedBitmapPath(), this.consumer.bitMap.mapPath);\n    await fs.copyFile(this.getLastMergedWorkspacePath(), this.consumer.config.path);\n    if (fs.pathExistsSync(this.getLastMergedStagedSnapsPath())) {\n      await fs.copyFile(this.getLastMergedStagedSnapsPath(), StagedSnaps.getPath(this.scope.path));\n    } else {\n      await this.scope.legacyScope.stagedSnaps.deleteFile();\n    }\n    const stagedConfig = await this.scope.getStagedConfig();\n    if (fs.pathExistsSync(this.getLastMergedStagedConfigPath())) {\n      await fs.copyFile(this.getLastMergedStagedConfigPath(), stagedConfig.filePath);\n    } else {\n      await stagedConfig.deleteFile();\n    }\n    await fs.remove(this.path);\n\n    return {\n      compDirsToRemove,\n    };\n  }\n\n  private async mergeAbortPrompt(dirsToRemove: string[]) {\n    this.logger.clearStatusLine();\n    const dirsToRemoveStr = dirsToRemove.length\n      ? `\\nThe following directories introduced by the merge will be deleted: ${dirsToRemove.join(', ')}`\n      : '';\n    const ok = await yesno({\n      question: `Code changes that were done since the last lane-merge will be lost.${dirsToRemoveStr}\nThe .bitmap and workspace.jsonc files will be restored to the state before the merge.\nThis action is irreversible.\n${chalk.bold('Do you want to continue? [yes(y)/no(n)]')}`,\n    });\n    if (!ok) {\n      throw new PromptCanceled();\n    }\n  }\n\n  private async getLastMergedLaneContentIfExists(): Promise<Buffer | null> {\n    const filename = this.getLastMergedLanePath();\n    return this.getFileContentIfExist(filename);\n  }\n  private async getFileContentIfExist(filename: string): Promise<Buffer | null> {\n    try {\n      return await fs.readFile(filename);\n    } catch (err: any) {\n      if (err.code === 'ENOENT') return null;\n      throw err;\n    }\n  }\n  private getLastMergedBitmapPath() {\n    return path.join(this.path, LAST_MERGED_BITMAP_FILENAME);\n  }\n  private getLastMergedWorkspacePath() {\n    return path.join(this.path, 'workspace.jsonc');\n  }\n  private getLastMergedLanePath() {\n    return path.join(this.path, LAST_MERGED_LANE_FILENAME);\n  }\n  private getLastMergedStagedSnapsPath() {\n    return path.join(this.path, 'staged-snaps');\n  }\n  private getLastMergedStagedConfigPath() {\n    return path.join(this.path, 'staged-config.json');\n  }\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_path","data","_interopRequireDefault","require","_tempy","_fsExtra","_yesno","_chalk","_legacy","_legacyCli","_stagedSnaps","_bitError","_objects","e","__esModule","default","LAST_MERGED_LANE_FILENAME","LAST_MERGED_BITMAP_FILENAME","LastMerged","constructor","scope","consumer","logger","path","getLastMergedPath","takeSnapshot","currentLane","copyOfCurrentLane","clone","undefined","copyOfBitmap","tempy","file","copyOfWorkspaceJsonc","copyOfStagedSnaps","fs","copyFile","bitMap","mapPath","config","stagedSnaps","isEmpty","StagedSnaps","getPath","stagedConfig","getStagedConfig","copyOfStagedConfig","filePath","persistSnapshot","snapshot","remove","ensureDir","getLastMergedBitmapPath","getLastMergedWorkspacePath","compressed","compress","outputFile","getLastMergedLanePath","getLastMergedStagedSnapsPath","getLastMergedStagedConfigPath","restoreLaneObjectFromLastMerged","pathExistsSync","BitError","lastLane","getLastMergedLaneContentIfExists","laneFromBackup","BitObject","parseObject","legacyScope","objects","writeObjectsToTheFS","restoreFromLastMerged","mergeAbortOpts","previousBitmapBuffer","readFile","previousBitmap","BitMap","loadFromContentWithoutLoadingFiles","currentRootDirs","getAllTrackDirs","previousRootDirs","compDirsToRemove","Object","keys","filter","dir","silent","mergeAbortPrompt","Promise","all","map","deleteFile","dirsToRemove","clearStatusLine","dirsToRemoveStr","length","join","ok","yesno","question","chalk","bold","PromptCanceled","filename","getFileContentIfExist","err","code","exports"],"sources":["last-merged.ts"],"sourcesContent":["import path from 'path';\nimport tempy from 'tempy';\nimport fs from 'fs-extra';\nimport yesno from 'yesno';\nimport chalk from 'chalk';\nimport { BitMap } from '@teambit/legacy.bit-map';\nimport { PromptCanceled } from '@teambit/legacy.cli.prompts';\nimport { ScopeMain } from '@teambit/scope';\nimport { Lane } from '@teambit/legacy/dist/scope/models';\nimport { StagedSnaps } from '@teambit/legacy/dist/scope/staged-snaps';\nimport { Consumer } from '@teambit/legacy/dist/consumer';\nimport { BitError } from '@teambit/bit-error';\nimport { BitObject } from '@teambit/legacy/dist/scope/objects';\nimport { Logger } from '@teambit/logger';\nimport { MergeAbortOpts } from './merge-abort.cmd';\n\nconst LAST_MERGED_LANE_FILENAME = 'lane';\nconst LAST_MERGED_BITMAP_FILENAME = 'bitmap';\n\ntype Snapshot = {\n  copyOfCurrentLane?: Lane;\n  copyOfBitmap: string;\n  copyOfWorkspaceJsonc: string;\n  copyOfStagedSnaps?: string;\n  copyOfStagedConfig?: string;\n};\n\nexport class LastMerged {\n  constructor(\n    private scope: ScopeMain,\n    private consumer: Consumer,\n    private logger: Logger\n  ) {}\n\n  get path() {\n    return this.scope.getLastMergedPath();\n  }\n\n  async takeSnapshot(currentLane?: Lane | null): Promise<Snapshot> {\n    const consumer = this.consumer;\n    const copyOfCurrentLane = currentLane ? currentLane.clone() : undefined;\n    const copyOfBitmap = tempy.file();\n    const copyOfWorkspaceJsonc = tempy.file();\n    let copyOfStagedSnaps: string | undefined;\n    await fs.copyFile(consumer.bitMap.mapPath, copyOfBitmap);\n    await fs.copyFile(consumer.config.path, copyOfWorkspaceJsonc);\n    if (!consumer.scope.stagedSnaps.isEmpty()) {\n      copyOfStagedSnaps = tempy.file();\n      await fs.copyFile(StagedSnaps.getPath(consumer.scope.path), copyOfStagedSnaps);\n    }\n    const stagedConfig = await this.scope.getStagedConfig();\n    let copyOfStagedConfig: string | undefined;\n    if (!stagedConfig.isEmpty()) {\n      copyOfStagedConfig = tempy.file();\n      await fs.copyFile(stagedConfig.filePath, copyOfStagedConfig);\n    }\n\n    return {\n      copyOfCurrentLane,\n      copyOfBitmap,\n      copyOfWorkspaceJsonc,\n      copyOfStagedSnaps,\n      copyOfStagedConfig,\n    };\n  }\n\n  async persistSnapshot(snapshot: Snapshot) {\n    const { copyOfCurrentLane, copyOfBitmap, copyOfWorkspaceJsonc, copyOfStagedSnaps, copyOfStagedConfig } = snapshot;\n    await fs.remove(this.path);\n    await fs.ensureDir(this.path);\n    await fs.copyFile(copyOfBitmap, this.getLastMergedBitmapPath());\n    await fs.copyFile(copyOfWorkspaceJsonc, this.getLastMergedWorkspacePath());\n    if (copyOfCurrentLane) {\n      const compressed = await copyOfCurrentLane.compress();\n      await fs.outputFile(this.getLastMergedLanePath(), compressed);\n    }\n    if (copyOfStagedSnaps) {\n      await fs.copyFile(copyOfStagedSnaps, this.getLastMergedStagedSnapsPath());\n    }\n    if (copyOfStagedConfig) {\n      await fs.copyFile(copyOfStagedConfig, this.getLastMergedStagedConfigPath());\n    }\n  }\n\n  async restoreLaneObjectFromLastMerged() {\n    if (!fs.pathExistsSync(this.path)) {\n      throw new BitError(`unable to abort the last lane-merge because \"bit export\" was running since then`);\n    }\n    const lastLane = await this.getLastMergedLaneContentIfExists();\n    if (!lastLane) {\n      throw new BitError(\n        `unable to revert the last lane-merge because the ${LAST_MERGED_LANE_FILENAME} is missing from ${this.path}`\n      );\n    }\n    const laneFromBackup = await BitObject.parseObject(lastLane, LAST_MERGED_LANE_FILENAME);\n    await this.scope.legacyScope.objects.writeObjectsToTheFS([laneFromBackup]);\n  }\n\n  async restoreFromLastMerged(mergeAbortOpts: MergeAbortOpts, currentLane?: Lane | null) {\n    if (!fs.pathExistsSync(this.path)) {\n      throw new BitError(`unable to abort the last lane-merge because \"bit export\" was running since then`);\n    }\n    const lastLane = await this.getLastMergedLaneContentIfExists();\n\n    if (!fs.pathExistsSync(this.getLastMergedBitmapPath())) {\n      throw new BitError(\n        `unable to abort the last lane-merge because the ${LAST_MERGED_BITMAP_FILENAME} is missing from ${this.path}`\n      );\n    }\n    if (!fs.pathExistsSync(this.getLastMergedWorkspacePath())) {\n      throw new BitError(\n        `unable to abort the last lane-merge because the workspace.jsonc is missing from ${this.path}`\n      );\n    }\n    if (currentLane) {\n      if (!lastLane) {\n        throw new BitError(\n          `unable to abort the last lane-merge because the ${LAST_MERGED_LANE_FILENAME} is missing from ${this.path}`\n        );\n      }\n      const laneFromBackup = await BitObject.parseObject(lastLane, LAST_MERGED_LANE_FILENAME);\n      await this.scope.legacyScope.objects.writeObjectsToTheFS([laneFromBackup]);\n    }\n    const previousBitmapBuffer = await fs.readFile(this.getLastMergedBitmapPath());\n    const previousBitmap = BitMap.loadFromContentWithoutLoadingFiles(previousBitmapBuffer, '', '', '');\n    const currentRootDirs = this.consumer.bitMap.getAllTrackDirs();\n    const previousRootDirs = previousBitmap.getAllTrackDirs();\n    const compDirsToRemove = Object.keys(currentRootDirs).filter((dir) => !previousRootDirs[dir]);\n\n    if (!mergeAbortOpts.silent) {\n      await this.mergeAbortPrompt(compDirsToRemove);\n    }\n    await Promise.all(compDirsToRemove.map((dir) => fs.remove(dir))); // it doesn't throw if not-exist, so we're good here.\n    await fs.copyFile(this.getLastMergedBitmapPath(), this.consumer.bitMap.mapPath);\n    await fs.copyFile(this.getLastMergedWorkspacePath(), this.consumer.config.path);\n    if (fs.pathExistsSync(this.getLastMergedStagedSnapsPath())) {\n      await fs.copyFile(this.getLastMergedStagedSnapsPath(), StagedSnaps.getPath(this.scope.path));\n    } else {\n      await this.scope.legacyScope.stagedSnaps.deleteFile();\n    }\n    const stagedConfig = await this.scope.getStagedConfig();\n    if (fs.pathExistsSync(this.getLastMergedStagedConfigPath())) {\n      await fs.copyFile(this.getLastMergedStagedConfigPath(), stagedConfig.filePath);\n    } else {\n      await stagedConfig.deleteFile();\n    }\n    await fs.remove(this.path);\n\n    return {\n      compDirsToRemove,\n    };\n  }\n\n  private async mergeAbortPrompt(dirsToRemove: string[]) {\n    this.logger.clearStatusLine();\n    const dirsToRemoveStr = dirsToRemove.length\n      ? `\\nThe following directories introduced by the merge will be deleted: ${dirsToRemove.join(', ')}`\n      : '';\n    const ok = await yesno({\n      question: `Code changes that were done since the last lane-merge will be lost.${dirsToRemoveStr}\nThe .bitmap and workspace.jsonc files will be restored to the state before the merge.\nThis action is irreversible.\n${chalk.bold('Do you want to continue? [yes(y)/no(n)]')}`,\n    });\n    if (!ok) {\n      throw new PromptCanceled();\n    }\n  }\n\n  private async getLastMergedLaneContentIfExists(): Promise<Buffer | null> {\n    const filename = this.getLastMergedLanePath();\n    return this.getFileContentIfExist(filename);\n  }\n  private async getFileContentIfExist(filename: string): Promise<Buffer | null> {\n    try {\n      return await fs.readFile(filename);\n    } catch (err: any) {\n      if (err.code === 'ENOENT') return null;\n      throw err;\n    }\n  }\n  private getLastMergedBitmapPath() {\n    return path.join(this.path, LAST_MERGED_BITMAP_FILENAME);\n  }\n  private getLastMergedWorkspacePath() {\n    return path.join(this.path, 'workspace.jsonc');\n  }\n  private getLastMergedLanePath() {\n    return path.join(this.path, LAST_MERGED_LANE_FILENAME);\n  }\n  private getLastMergedStagedSnapsPath() {\n    return path.join(this.path, 'staged-snaps');\n  }\n  private getLastMergedStagedConfigPath() {\n    return path.join(this.path, 'staged-config.json');\n  }\n}\n"],"mappings":"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","ignoreList":[]}

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

@@ -1 +1 @@
-{"version":3,"names":["_chalk","data","_interopRequireDefault","require","_merging","_constants","_bitError","_remove","e","__esModule","default","ownKeys","r","t","Object","keys","getOwnPropertySymbols","o","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","defineProperty","_toPropertyKey","value","configurable","writable","i","_toPrimitive","Symbol","toPrimitive","call","TypeError","String","Number","MergeLaneCmd","constructor","mergeLanes","globalConfig","name","description","COMPONENT_PATTERN_HELP","report","pattern","ours","theirs","manual","autoMergeResolve","build","workspace","existingOnWorkspaceOnly","squash","noAutoSnap","noSnap","tag","message","snapMessage","keepReadme","noSquash","skipDependencyInstallation","skipFetch","includeDeps","resolveUnrelated","ignoreConfigChanges","verbose","excludeNonLaneComps","getBool","CFG_FORCE_LOCAL_BUILD","Boolean","BitError","mergeStrategy","getResolveUnrelated","undefined","Error","mergeResults","deleteResults","configMergeResults","mergeLaneByCLI","mergeResult","mergeReport","deleteOutput","localResult","removeTemplate","remoteResult","map","item","readmeResult","chalk","yellow","exports"],"sources":["merge-lane.cmd.ts"],"sourcesContent":["import chalk from 'chalk';\nimport { Command, CommandOptions } from '@teambit/cli';\nimport { mergeReport, MergeStrategy } from '@teambit/merging';\nimport { GlobalConfigMain } from '@teambit/global-config';\nimport { COMPONENT_PATTERN_HELP, CFG_FORCE_LOCAL_BUILD } from '@teambit/legacy/dist/constants';\nimport { BitError } from '@teambit/bit-error';\nimport { removeTemplate } from '@teambit/remove';\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 to the current lane`;\n  extendedDescription = `by default, the provided lane will be fetched from the remote before merging.\nto merge the lane from the local scope without updating it first, use \"--skip-fetch\" flag.\n\nwhen the current and merge candidate lanes are diverged in history and the files could be merged with no conflicts,\nthese components will be snap-merged to complete the merge. use \"no-auto-snap\" to opt-out, or \"tag\" to tag instead.\n\nwhen the components are not diverged in history, and the current lane is behind the merge candidate, the merge will\nsimply update the components and the heads according to the merge candidate.\nto opt-out, use \"--no-snap\", the components will be written as the merge candidate, and will be left as modified.\n\nin case a component in both ends don't share history (no snap is found in common), the merge will require \"--resolve-unrelated\" flag.\nthis flag keeps the history of one end and saves a reference to the other end. the decision of which end to keep is determined by the following:\n1. if the component exists on main, then the history linked to main will be kept.\nin this case, the strategy of \"--resolve-unrelated\" only determines which source-code to keep. it's not about the history.\n2. if the component doesn't exist on main, then by default, the history of the current lane will be kept.\nunless \"--resolve-unrelated\" is set to \"theirs\", in which case the history of the other lane will be kept.\n2. a. an edge case: if the component is deleted on the current lane, the strategy will always be \"theirs\".\nso then the history (and the source-code) of the other lane will be kept.\n`;\n  arguments = [\n    {\n      name: 'lane',\n      description: 'lane-name or full lane-id (if remote) to merge to the current lane',\n    },\n    {\n      name: 'pattern',\n      description: `partially merge the lane - only components that match the specified component-pattern\nComponent pattern format: ${COMPONENT_PATTERN_HELP}`,\n    },\n  ];\n  alias = '';\n  options = [\n    [\n      '',\n      'manual',\n      'same as \"--auto-merge-resolve manual\". in case of merge conflict, write the files with the conflict markers',\n    ],\n    [\n      'r',\n      'auto-merge-resolve <merge-strategy>',\n      'in case of a merge conflict, resolve according to the provided strategy: [ours, theirs, manual]',\n    ],\n    ['', 'ours', 'DEPRECATED. use --auto-merge-resolve. in case of a conflict, keep local modifications'],\n    ['', 'theirs', 'DEPRECATED. use --auto-merge-resolve. in case of a conflict, override local with incoming changes'],\n    ['', 'workspace', 'merge only lane components that are in the current workspace'],\n    [\n      '',\n      'no-auto-snap',\n      'do not auto snap after merge completed without conflicts of diverged components (see command description)',\n    ],\n    ['', 'no-snap', 'do not pass snaps from the other lane even for non-diverged components (see command description)'],\n    ['', 'tag', 'auto-tag all lane components after merging into main (or 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', 'relevant for merging lanes into main, which by default squashes all lane snaps'],\n    ['', 'squash', 'relevant for merging a lane into another non-main lane, which by default does not squash'],\n    [\n      '',\n      'ignore-config-changes',\n      'allow merging when components are modified due to config changes (such as dependencies) only and not files',\n    ],\n    ['', 'verbose', 'show details of components that were not merged successfully'],\n    ['x', 'skip-dependency-installation', 'do not install dependencies of the imported components'],\n    ['', 'skip-fetch', 'use the local state of target-lane if exits locally, without updating it from the remote'],\n    [\n      '',\n      'include-deps',\n      'relevant for \"pattern\" and \"--workspace\". merge also dependencies of the specified components',\n    ],\n    [\n      '',\n      'resolve-unrelated [merge-strategy]',\n      'relevant when a component on a lane and the component on main have nothing in common. merge-strategy can be \"ours\" (default) or \"theirs\"',\n    ],\n    [\n      '',\n      'include-non-lane-comps',\n      'DEPRECATED (this is now the default). when merging main, include workspace components that are not on the lane (by default only lane components are merged)',\n    ],\n    [\n      '',\n      'exclude-non-lane-comps',\n      'when merging main into a lane, exclude workspace components that are not on the lane (by default all workspace components are merged)',\n    ],\n  ] as CommandOptions;\n  loader = true;\n  private = true;\n  remoteOp = true;\n\n  constructor(private mergeLanes: MergeLanesMain, private globalConfig: GlobalConfigMain) {}\n\n  async report(\n    [name, pattern]: [string, string],\n    {\n      ours,\n      theirs,\n      manual,\n      autoMergeResolve,\n      build,\n      workspace: existingOnWorkspaceOnly = false,\n      squash = false,\n      noAutoSnap = false,\n      noSnap = false,\n      tag = false,\n      message: snapMessage = '',\n      keepReadme = false,\n      noSquash = false,\n      skipDependencyInstallation = false,\n      skipFetch = false,\n      includeDeps = false,\n      resolveUnrelated,\n      ignoreConfigChanges,\n      verbose = false,\n      excludeNonLaneComps = false,\n    }: {\n      ours?: boolean;\n      theirs?: boolean;\n      manual?: boolean;\n      autoMergeResolve?: string;\n      workspace?: boolean;\n      build?: boolean;\n      noAutoSnap: boolean;\n      noSnap: boolean;\n      tag: boolean;\n      message: string;\n      keepReadme?: boolean;\n      squash?: boolean;\n      noSquash: boolean;\n      skipDependencyInstallation?: boolean;\n      skipFetch: boolean;\n      includeDeps?: boolean;\n      resolveUnrelated?: string | boolean;\n      ignoreConfigChanges?: boolean;\n      verbose?: boolean;\n      excludeNonLaneComps?: boolean;\n    }\n  ): Promise<string> {\n    build = (await this.globalConfig.getBool(CFG_FORCE_LOCAL_BUILD)) || Boolean(build);\n    if (ours || theirs) {\n      throw new BitError(\n        'the \"--ours\" and \"--theirs\" flags are deprecated. use \"--auto-merge-resolve\" instead. see \"bit lane merge --help\" for more information'\n      );\n    }\n    if (\n      autoMergeResolve &&\n      autoMergeResolve !== 'ours' &&\n      autoMergeResolve !== 'theirs' &&\n      autoMergeResolve !== 'manual'\n    ) {\n      throw new BitError('--auto-merge-resolve must be one of the following: [ours, theirs, manual]');\n    }\n    if (manual) autoMergeResolve = 'manual';\n    const mergeStrategy = autoMergeResolve;\n    if (noAutoSnap && snapMessage) throw new BitError('unable to use \"no-snap\" 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, configMergeResults } = await this.mergeLanes.mergeLaneByCLI(name, {\n      build,\n      // @ts-ignore\n      mergeStrategy,\n      ours,\n      theirs,\n      existingOnWorkspaceOnly,\n      noAutoSnap,\n      noSnap,\n      snapMessage,\n      keepReadme,\n      squash,\n      noSquash,\n      tag,\n      pattern,\n      skipDependencyInstallation,\n      skipFetch,\n      resolveUnrelated: getResolveUnrelated(),\n      ignoreConfigChanges,\n      includeDeps,\n      excludeNonLaneComps,\n    });\n\n    const mergeResult = mergeReport({ ...mergeResults, configMergeResults, verbose });\n    const deleteOutput = `\\n${deleteResults.localResult ? removeTemplate(deleteResults.localResult, false) : ''}${(\n      deleteResults.remoteResult || []\n    ).map((item) => removeTemplate(item, true))}${\n      (deleteResults.readmeResult && chalk.yellow(deleteResults.readmeResult)) || ''\n    }\\n`;\n    return mergeResult + deleteOutput;\n  }\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_chalk","data","_interopRequireDefault","require","_merging","_constants","_bitError","_remove","e","__esModule","default","ownKeys","r","t","Object","keys","getOwnPropertySymbols","o","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","defineProperty","_toPropertyKey","value","configurable","writable","i","_toPrimitive","Symbol","toPrimitive","call","TypeError","String","Number","MergeLaneCmd","constructor","mergeLanes","globalConfig","name","description","COMPONENT_PATTERN_HELP","report","pattern","ours","theirs","manual","autoMergeResolve","build","workspace","existingOnWorkspaceOnly","squash","noAutoSnap","noSnap","tag","message","snapMessage","keepReadme","noSquash","skipDependencyInstallation","skipFetch","includeDeps","resolveUnrelated","ignoreConfigChanges","verbose","excludeNonLaneComps","getBool","CFG_FORCE_LOCAL_BUILD","Boolean","BitError","mergeStrategy","getResolveUnrelated","undefined","Error","mergeResults","deleteResults","configMergeResults","mergeLaneByCLI","mergeResult","mergeReport","deleteOutput","localResult","removeTemplate","remoteResult","map","item","readmeResult","chalk","yellow","exports"],"sources":["merge-lane.cmd.ts"],"sourcesContent":["import chalk from 'chalk';\nimport { Command, CommandOptions } from '@teambit/cli';\nimport { mergeReport, MergeStrategy } from '@teambit/merging';\nimport { GlobalConfigMain } from '@teambit/global-config';\nimport { COMPONENT_PATTERN_HELP, CFG_FORCE_LOCAL_BUILD } from '@teambit/legacy/dist/constants';\nimport { BitError } from '@teambit/bit-error';\nimport { removeTemplate } from '@teambit/remove';\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 to the current lane`;\n  extendedDescription = `by default, the provided lane will be fetched from the remote before merging.\nto merge the lane from the local scope without updating it first, use \"--skip-fetch\" flag.\n\nwhen the current and merge candidate lanes are diverged in history and the files could be merged with no conflicts,\nthese components will be snap-merged to complete the merge. use \"no-auto-snap\" to opt-out, or \"tag\" to tag instead.\n\nwhen the components are not diverged in history, and the current lane is behind the merge candidate, the merge will\nsimply update the components and the heads according to the merge candidate.\nto opt-out, use \"--no-snap\", the components will be written as the merge candidate, and will be left as modified.\n\nin case a component in both ends don't share history (no snap is found in common), the merge will require \"--resolve-unrelated\" flag.\nthis flag keeps the history of one end and saves a reference to the other end. the decision of which end to keep is determined by the following:\n1. if the component exists on main, then the history linked to main will be kept.\nin this case, the strategy of \"--resolve-unrelated\" only determines which source-code to keep. it's not about the history.\n2. if the component doesn't exist on main, then by default, the history of the current lane will be kept.\nunless \"--resolve-unrelated\" is set to \"theirs\", in which case the history of the other lane will be kept.\n2. a. an edge case: if the component is deleted on the current lane, the strategy will always be \"theirs\".\nso then the history (and the source-code) of the other lane will be kept.\n`;\n  arguments = [\n    {\n      name: 'lane',\n      description: 'lane-name or full lane-id (if remote) to merge to the current lane',\n    },\n    {\n      name: 'pattern',\n      description: `partially merge the lane - only components that match the specified component-pattern\nComponent pattern format: ${COMPONENT_PATTERN_HELP}`,\n    },\n  ];\n  alias = '';\n  options = [\n    [\n      '',\n      'manual',\n      'same as \"--auto-merge-resolve manual\". in case of merge conflict, write the files with the conflict markers',\n    ],\n    [\n      'r',\n      'auto-merge-resolve <merge-strategy>',\n      'in case of a merge conflict, resolve according to the provided strategy: [ours, theirs, manual]',\n    ],\n    ['', 'ours', 'DEPRECATED. use --auto-merge-resolve. in case of a conflict, keep local modifications'],\n    ['', 'theirs', 'DEPRECATED. use --auto-merge-resolve. in case of a conflict, override local with incoming changes'],\n    ['', 'workspace', 'merge only lane components that are in the current workspace'],\n    [\n      '',\n      'no-auto-snap',\n      'do not auto snap after merge completed without conflicts of diverged components (see command description)',\n    ],\n    ['', 'no-snap', 'do not pass snaps from the other lane even for non-diverged components (see command description)'],\n    ['', 'tag', 'auto-tag all lane components after merging into main (or 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', 'relevant for merging lanes into main, which by default squashes all lane snaps'],\n    ['', 'squash', 'relevant for merging a lane into another non-main lane, which by default does not squash'],\n    [\n      '',\n      'ignore-config-changes',\n      'allow merging when components are modified due to config changes (such as dependencies) only and not files',\n    ],\n    ['', 'verbose', 'show details of components that were not merged successfully'],\n    ['x', 'skip-dependency-installation', 'do not install dependencies of the imported components'],\n    ['', 'skip-fetch', 'use the local state of target-lane if exits locally, without updating it from the remote'],\n    [\n      '',\n      'include-deps',\n      'relevant for \"pattern\" and \"--workspace\". merge also dependencies of the specified components',\n    ],\n    [\n      '',\n      'resolve-unrelated [merge-strategy]',\n      'relevant when a component on a lane and the component on main have nothing in common. merge-strategy can be \"ours\" (default) or \"theirs\"',\n    ],\n    [\n      '',\n      'include-non-lane-comps',\n      'DEPRECATED (this is now the default). when merging main, include workspace components that are not on the lane (by default only lane components are merged)',\n    ],\n    [\n      '',\n      'exclude-non-lane-comps',\n      'when merging main into a lane, exclude workspace components that are not on the lane (by default all workspace components are merged)',\n    ],\n  ] as CommandOptions;\n  loader = true;\n  private = true;\n  remoteOp = true;\n\n  constructor(\n    private mergeLanes: MergeLanesMain,\n    private globalConfig: GlobalConfigMain\n  ) {}\n\n  async report(\n    [name, pattern]: [string, string],\n    {\n      ours,\n      theirs,\n      manual,\n      autoMergeResolve,\n      build,\n      workspace: existingOnWorkspaceOnly = false,\n      squash = false,\n      noAutoSnap = false,\n      noSnap = false,\n      tag = false,\n      message: snapMessage = '',\n      keepReadme = false,\n      noSquash = false,\n      skipDependencyInstallation = false,\n      skipFetch = false,\n      includeDeps = false,\n      resolveUnrelated,\n      ignoreConfigChanges,\n      verbose = false,\n      excludeNonLaneComps = false,\n    }: {\n      ours?: boolean;\n      theirs?: boolean;\n      manual?: boolean;\n      autoMergeResolve?: string;\n      workspace?: boolean;\n      build?: boolean;\n      noAutoSnap: boolean;\n      noSnap: boolean;\n      tag: boolean;\n      message: string;\n      keepReadme?: boolean;\n      squash?: boolean;\n      noSquash: boolean;\n      skipDependencyInstallation?: boolean;\n      skipFetch: boolean;\n      includeDeps?: boolean;\n      resolveUnrelated?: string | boolean;\n      ignoreConfigChanges?: boolean;\n      verbose?: boolean;\n      excludeNonLaneComps?: boolean;\n    }\n  ): Promise<string> {\n    build = (await this.globalConfig.getBool(CFG_FORCE_LOCAL_BUILD)) || Boolean(build);\n    if (ours || theirs) {\n      throw new BitError(\n        'the \"--ours\" and \"--theirs\" flags are deprecated. use \"--auto-merge-resolve\" instead. see \"bit lane merge --help\" for more information'\n      );\n    }\n    if (\n      autoMergeResolve &&\n      autoMergeResolve !== 'ours' &&\n      autoMergeResolve !== 'theirs' &&\n      autoMergeResolve !== 'manual'\n    ) {\n      throw new BitError('--auto-merge-resolve must be one of the following: [ours, theirs, manual]');\n    }\n    if (manual) autoMergeResolve = 'manual';\n    const mergeStrategy = autoMergeResolve;\n    if (noAutoSnap && snapMessage) throw new BitError('unable to use \"no-snap\" 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, configMergeResults } = await this.mergeLanes.mergeLaneByCLI(name, {\n      build,\n      // @ts-ignore\n      mergeStrategy,\n      ours,\n      theirs,\n      existingOnWorkspaceOnly,\n      noAutoSnap,\n      noSnap,\n      snapMessage,\n      keepReadme,\n      squash,\n      noSquash,\n      tag,\n      pattern,\n      skipDependencyInstallation,\n      skipFetch,\n      resolveUnrelated: getResolveUnrelated(),\n      ignoreConfigChanges,\n      includeDeps,\n      excludeNonLaneComps,\n    });\n\n    const mergeResult = mergeReport({ ...mergeResults, configMergeResults, verbose });\n    const deleteOutput = `\\n${deleteResults.localResult ? removeTemplate(deleteResults.localResult, false) : ''}${(\n      deleteResults.remoteResult || []\n    ).map((item) => removeTemplate(item, true))}${\n      (deleteResults.readmeResult && chalk.yellow(deleteResults.readmeResult)) || ''\n    }\\n`;\n    return mergeResult + deleteOutput;\n  }\n}\n"],"mappings":"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","ignoreList":[]}

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

@@ -1 +1 @@
-{"version":3,"names":["_bitError","data","require","_path","_interopRequireDefault","_cli","_importer","_lanes","_merging","_workspace","_harmonyModules","_componentId","_pMapSeries","_scope","_laneId","_logger","_checkout","_remove","_lodash","_export","_globalConfig","_mergeLanes","_mergeLane","_mergeLaneFromScope","_missingCompsToMerge","_mergeAbort","_lastMerged","_mergeMove","e","__esModule","default","ownKeys","r","t","Object","keys","getOwnPropertySymbols","o","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","defineProperty","_toPropertyKey","value","configurable","writable","i","_toPrimitive","Symbol","toPrimitive","call","TypeError","String","Number","MergeLanesMain","constructor","workspace","merging","lanes","logger","remove","scope","exporter","importer","checkout","mergeLaneByCLI","laneName","options","BitError","currentLaneId","consumer","getCurrentLaneId","otherLaneId","getParsedLaneId","mergeLane","mergeStrategy","noAutoSnap","noSnap","tag","snapMessage","existingOnWorkspaceOnly","build","keepReadme","squash","noSquash","pattern","includeDeps","skipDependencyInstallation","resolveUnrelated","ignoreConfigChanges","skipFetch","excludeNonLaneComps","shouldIncludeUpdateDependents","throwIfNotUpToDate","fetchCurrent","legacyScope","isDefault","toString","isEqual","fetchLaneWithItsComponents","currentLane","undefined","loadLane","isDefaultLane","ids","getMainIdsToMerge","compIdList","ComponentIdList","fromArray","toVersionLatest","importObjectsFromMainIfExist","laneToFetchArtifactsFrom","getOtherLane","lane","shouldFetch","isNew","otherLane","getBitIds","modelComponents","Promise","all","map","id","getModelComponent","compact","c","head","toComponentId","changeVersion","Error","toComponentIdsIncludeUpdateDependents","toComponentIds","idsToMerge","debug","shouldSquash","allComponentsStatus","getMergeStatus","handleTargetAheadAsDiverged","componentIds","compIdsFromPattern","filterIdsFromPoolIdsByPattern","filterComponentsStatus","bitId","find","isEqualWithoutVersion","unchangedLegitimately","unchangedMessage","workspaceIds","listIds","throwForFailures","succeededComponents","squashSnaps","importHeadArtifactsFromLane","lastMerged","LastMerged","snapshot","takeSnapshot","mergeResults","mergeSnaps","persistSnapshot","mergedSuccessfully","failedComponents","every","failedComponent","deleteResults","readmeComponent","readmeComponentId","hash","removeLocallyByIds","reasonForRemoval","readmeResult","configMergeResults","configMergeResult","componentsWithConfigConflicts","hasConflicts","compIdStr","conflicts","mergedSuccessfullyIds","components","files","filesStatus","f","FileStatus","manual","binaryConflict","config","includes","toStringWithoutVersion","onDestroy","name","mergeMove","newLaneName","OutsideWorkspaceError","lastMerge","restoreLaneObjectFromLastMerged","newLaneResult","createLane","abortLaneMerge","checkoutProps","mergeAbortOpts","getCurrentLane","compDirsToRemove","restoreFromLastMerged","_reloadConsumer","objects","unmergedComponents","removeAllComponents","write","configMergeFile","getConflictMergeFile","delete","checkoutResults","checkoutError","restoreMissingComponents","err","error","restoredItems","path","basename","bitMap","mapPath","join","includeNonLaneComps","includeUpdateDependents","DEFAULT_LANE","laneIds","isExported","mainNotOnLane","laneId","mergeFromScope","fromLane","toLane","fromLaneId","parseLaneId","toLaneId","getDefaultLaneId","LaneId","parse","exportIfNeeded","idsToExport","laneToExport","compIdsList","exported","exportMany","idsWithFutureScope","laneObject","allVersions","exportHeadsOnly","throwForMissingArtifacts","exportOrigin","setCurrentLaneId","mergeSnapResults","mergeSnapError","generateMergeConflictFile","snappedIds","snappedComponents","exportedIds","mergedNow","mergedPreviously","compIsAlreadyMergedMsg","unmerged","reason","status","diffStatus","skipChanges","compsNotUpToDate","componentsStatus","s","upToDate","componentId","provider","cli","loggerMain","globalConfig","createLogger","MergeLanesAspect","lanesCommand","getCommand","mergeLanesMain","commands","MergeLaneCmd","MergeAbortLaneCmd","MergeMoveLaneCmd","register","MergeLaneFromScopeCmd","exports","LanesAspect","CLIAspect","WorkspaceAspect","MergingAspect","LoggerAspect","RemoveAspect","ScopeAspect","ExportAspect","ImporterAspect","CheckoutAspect","GlobalConfigAspect","MainRuntime","compIdsToKeep","allBitIds","bitIdsFromPattern","bitIdsNotFromPattern","hasWithoutVersion","filteredComponentStatus","depsToAdd","missingDepsFromHead","missingDepsFromHistory","versionsToCheckPerId","pMapSeries","compId","fromStatus","divergeData","targetVersions","snapsOnTargetOnly","modelComponent","headOnTarget","getComponent","toImport","v","flat","scopeImporter","importWithoutDeps","cache","includeVersionHistory","remoteVersion","versionObj","loadVersion","flattenedDeps","getAllFlattenedDependencies","depsNotIncludeInPattern","depsOnLane","dep","isOnLane","isIdOnLane","depsOnLaneStr","MissingCompsToMerge","uniq","depsWithoutVersion","d","depsUniqWithoutVersion","uniqFromArray","getLogForSquash","basicLog","getBasicLog","log","message","messageTitle","currentLaneName","componentFromModel","modifiedComp","squashOneComp","add","versionHistory","updateRebasedVersionHistory","isDiverged","isSourceAhead","isTargetAhead","remoteSnaps","getAllMessages","importManyObjects","versionObjects","load","getFinalMessage","allMessage","allMessageStr","m","currentParents","parents","commonSnapBeforeDiverge","doSquash","addAsOnlyParent","getModelComponentIfExist","ref","removeParent","finalMessage","setSquashed","previousParents","addRuntime","_default"],"sources":["merge-lanes.main.runtime.ts"],"sourcesContent":["import { BitError } from '@teambit/bit-error';\nimport path from 'path';\nimport { CLIAspect, CLIMain, MainRuntime } from '@teambit/cli';\nimport { ImporterAspect, ImporterMain } from '@teambit/importer';\nimport { LanesAspect, LanesMain } from '@teambit/lanes';\nimport {\n  MergingAspect,\n  MergingMain,\n  ComponentMergeStatus,\n  ApplyVersionResults,\n  compIsAlreadyMergedMsg,\n  FileStatus,\n  MergeStrategy,\n} from '@teambit/merging';\nimport { WorkspaceAspect, OutsideWorkspaceError, Workspace } from '@teambit/workspace';\nimport { getBasicLog } from '@teambit/harmony.modules.get-basic-log';\nimport { ComponentID, ComponentIdList } from '@teambit/component-id';\nimport { Log } from '@teambit/legacy/dist/scope/models/version';\nimport pMapSeries from 'p-map-series';\nimport { Scope as LegacyScope } from '@teambit/legacy/dist/scope';\nimport { ScopeAspect, ScopeMain } from '@teambit/scope';\nimport { DEFAULT_LANE, LaneId } from '@teambit/lane-id';\nimport { ConfigMergeResult } from '@teambit/config-merger';\nimport { Lane, Version } from '@teambit/legacy/dist/scope/models';\nimport { Logger, LoggerAspect, LoggerMain } from '@teambit/logger';\nimport { CheckoutAspect, CheckoutMain, CheckoutProps, throwForFailures } from '@teambit/checkout';\nimport { SnapsDistance } from '@teambit/legacy/dist/scope/component-ops/snaps-distance';\nimport { RemoveAspect, RemoveMain } from '@teambit/remove';\nimport { compact, uniq } from 'lodash';\nimport { ExportAspect, ExportMain } from '@teambit/export';\nimport { GlobalConfigAspect, GlobalConfigMain } from '@teambit/global-config';\nimport { Ref } from '@teambit/legacy/dist/scope/objects';\nimport { MergeLanesAspect } from './merge-lanes.aspect';\nimport { MergeLaneCmd } from './merge-lane.cmd';\nimport { MergeLaneFromScopeCmd } from './merge-lane-from-scope.cmd';\nimport { MissingCompsToMerge } from './exceptions/missing-comps-to-merge';\nimport { MergeAbortLaneCmd, MergeAbortOpts } from './merge-abort.cmd';\nimport { LastMerged } from './last-merged';\nimport { MergeMoveLaneCmd } from './merge-move.cmd';\n\nexport type MergeLaneOptions = {\n  mergeStrategy: MergeStrategy;\n  ours?: boolean;\n  theirs?: boolean;\n  noAutoSnap?: boolean;\n  noSnap?: boolean;\n  snapMessage?: string;\n  existingOnWorkspaceOnly?: boolean;\n  build?: boolean;\n  keepReadme?: boolean;\n  squash?: boolean;\n  noSquash?: boolean;\n  tag?: boolean;\n  pattern?: string;\n  includeDeps?: boolean;\n  skipDependencyInstallation?: boolean;\n  resolveUnrelated?: MergeStrategy;\n  ignoreConfigChanges?: boolean;\n  skipFetch?: boolean;\n  excludeNonLaneComps?: boolean;\n  shouldIncludeUpdateDependents?: boolean;\n  throwIfNotUpToDate?: boolean; // relevant when merging from a scope\n  fetchCurrent?: boolean; // needed when merging from a bare-scope (because it's empty)\n};\nexport type ConflictPerId = { id: ComponentID; files: string[]; config?: boolean };\nexport type MergeFromScopeResult = {\n  mergedNow: ComponentID[];\n  exportedIds: ComponentID[];\n  unmerged: { id: ComponentID; reason: string }[]; // reasons currently are: ahead / already-merge / removed\n  conflicts?: ConflictPerId[]; // relevant in case of diverge (currently possible only when merging from main to a lane)\n  snappedIds?: ComponentID[]; // relevant in case of diverge (currently possible only when merging from main to a lane)\n  mergedPreviously: ComponentID[];\n  mergeSnapError?: Error;\n};\n\nexport class MergeLanesMain {\n  constructor(\n    private workspace: Workspace | undefined,\n    private merging: MergingMain,\n    readonly lanes: LanesMain,\n    readonly logger: Logger,\n    private remove: RemoveMain,\n    private scope: ScopeMain,\n    private exporter: ExportMain,\n    private importer: ImporterMain,\n    private checkout: CheckoutMain\n  ) {}\n\n  async mergeLaneByCLI(laneName: string, options: MergeLaneOptions) {\n    if (!this.workspace) {\n      throw new BitError(`unable to merge a lane outside of Bit workspace`);\n    }\n    const currentLaneId = this.workspace.consumer.getCurrentLaneId();\n    const otherLaneId = await this.workspace.consumer.getParsedLaneId(laneName);\n    return this.mergeLane(otherLaneId, currentLaneId, options);\n  }\n\n  // eslint-disable-next-line complexity\n  async mergeLane(\n    otherLaneId: LaneId,\n    currentLaneId: LaneId,\n    options: MergeLaneOptions\n  ): Promise<{\n    mergeResults: ApplyVersionResults;\n    deleteResults: any;\n    configMergeResults: ConfigMergeResult[];\n    mergedSuccessfullyIds: ComponentID[];\n    conflicts: ConflictPerId[];\n  }> {\n    const consumer = this.workspace?.consumer;\n\n    const {\n      mergeStrategy,\n      noAutoSnap,\n      noSnap,\n      tag,\n      snapMessage,\n      existingOnWorkspaceOnly,\n      build,\n      keepReadme,\n      squash,\n      noSquash,\n      pattern,\n      includeDeps,\n      skipDependencyInstallation,\n      resolveUnrelated,\n      ignoreConfigChanges,\n      skipFetch,\n      excludeNonLaneComps,\n      shouldIncludeUpdateDependents,\n      throwIfNotUpToDate,\n      fetchCurrent,\n    } = options;\n    const legacyScope = this.scope.legacyScope;\n    if (tag && !currentLaneId.isDefault()) {\n      throw new BitError(`--tag only possible when on main. currently checked out to ${currentLaneId.toString()}`);\n    }\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    if (resolveUnrelated && currentLaneId.isDefault()) {\n      throw new BitError(\n        `unable to resolve unrelated when on main. switch to ${otherLaneId.toString()} and run \"bit lane merge main --resolve-unrelated\"`\n      );\n    }\n    if (fetchCurrent && !currentLaneId.isDefault()) {\n      // if current is default, it'll be fetch later on\n      await this.lanes.fetchLaneWithItsComponents(currentLaneId);\n    }\n    const currentLane = currentLaneId.isDefault() ? undefined : await legacyScope.loadLane(currentLaneId);\n    const isDefaultLane = otherLaneId.isDefault();\n    if (isDefaultLane) {\n      if (!skipFetch) {\n        const ids = await this.getMainIdsToMerge(currentLane, !excludeNonLaneComps);\n        const compIdList = ComponentIdList.fromArray(ids).toVersionLatest();\n        await this.importer.importObjectsFromMainIfExist(compIdList);\n      }\n    }\n    let laneToFetchArtifactsFrom: Lane | undefined;\n    const getOtherLane = async () => {\n      let lane = await legacyScope.loadLane(otherLaneId);\n      const shouldFetch = !lane || (!skipFetch && !lane.isNew);\n      if (shouldFetch) {\n        // don't assign `lane` to the result of this command. otherwise, if you have local snaps, it'll ignore them and use the remote-lane.\n        const otherLane = await this.lanes.fetchLaneWithItsComponents(otherLaneId, shouldIncludeUpdateDependents);\n        laneToFetchArtifactsFrom = otherLane;\n        lane = await legacyScope.loadLane(otherLaneId);\n      }\n      return lane;\n    };\n    const otherLane = isDefaultLane ? undefined : await getOtherLane();\n    if (fetchCurrent && otherLane && currentLaneId.isDefault()) {\n      const ids = await this.getMainIdsToMerge(otherLane, false, shouldIncludeUpdateDependents);\n      const compIdList = ComponentIdList.fromArray(ids).toVersionLatest();\n      await this.importer.importObjectsFromMainIfExist(compIdList);\n    }\n    const getBitIds = async () => {\n      if (isDefaultLane) {\n        const ids = await this.getMainIdsToMerge(currentLane, !excludeNonLaneComps, shouldIncludeUpdateDependents);\n        const modelComponents = await Promise.all(ids.map((id) => this.scope.legacyScope.getModelComponent(id)));\n        return compact(\n          modelComponents.map((c) => {\n            if (!c.head) return null; // probably the component was never merged to main\n            return c.toComponentId().changeVersion(c.head.toString());\n          })\n        );\n      }\n      if (!otherLane) throw new Error(`lane must be defined for non-default`);\n      return shouldIncludeUpdateDependents\n        ? otherLane.toComponentIdsIncludeUpdateDependents()\n        : otherLane.toComponentIds();\n    };\n    const idsToMerge = await getBitIds();\n\n    if (throwIfNotUpToDate) await this.throwIfNotUpToDate(otherLaneId, currentLaneId);\n\n    this.logger.debug(`merging the following ids: ${idsToMerge.toString()}`);\n\n    const shouldSquash = squash || (currentLaneId.isDefault() && !noSquash);\n    let allComponentsStatus = await this.merging.getMergeStatus(\n      idsToMerge,\n      {\n        resolveUnrelated,\n        ignoreConfigChanges,\n        shouldSquash,\n        mergeStrategy,\n        handleTargetAheadAsDiverged: noSnap,\n      },\n      currentLane,\n      otherLane\n    );\n\n    if (pattern) {\n      const componentIds = idsToMerge;\n      const compIdsFromPattern = await (this.workspace || this.scope).filterIdsFromPoolIdsByPattern(\n        pattern,\n        componentIds\n      );\n      allComponentsStatus = await filterComponentsStatus(\n        allComponentsStatus,\n        compIdsFromPattern,\n        idsToMerge,\n        legacyScope,\n        includeDeps,\n        otherLane,\n        shouldSquash\n      );\n      idsToMerge.forEach((bitId) => {\n        if (!allComponentsStatus.find((c) => c.id.isEqualWithoutVersion(bitId))) {\n          allComponentsStatus.push({ id: bitId, unchangedLegitimately: true, unchangedMessage: `excluded by pattern` });\n        }\n      });\n    }\n    if (existingOnWorkspaceOnly && this.workspace) {\n      const workspaceIds = this.workspace.listIds();\n      const compIdsFromPattern = workspaceIds.filter((id) =>\n        allComponentsStatus.find((c) => c.id.isEqualWithoutVersion(id))\n      );\n      allComponentsStatus = await filterComponentsStatus(\n        allComponentsStatus,\n        compIdsFromPattern,\n        idsToMerge,\n        legacyScope,\n        includeDeps,\n        otherLane,\n        shouldSquash\n      );\n      idsToMerge.forEach((bitId) => {\n        if (!allComponentsStatus.find((c) => c.id.isEqualWithoutVersion(bitId))) {\n          allComponentsStatus.push({\n            id: bitId,\n            unchangedLegitimately: true,\n            unchangedMessage: `not in the workspace`,\n          });\n        }\n      });\n    }\n\n    throwForFailures(allComponentsStatus);\n\n    const succeededComponents = allComponentsStatus.filter((c) => !c.unchangedMessage);\n    if (shouldSquash) {\n      await squashSnaps(succeededComponents, currentLaneId, otherLaneId, legacyScope, options.snapMessage);\n    }\n\n    if (laneToFetchArtifactsFrom) {\n      const ids = allComponentsStatus.map((c) => c.id);\n      await this.importer.importHeadArtifactsFromLane(laneToFetchArtifactsFrom, ids, true);\n    }\n\n    const lastMerged = consumer ? new LastMerged(this.scope, consumer, this.logger) : undefined;\n    const snapshot = await lastMerged?.takeSnapshot(currentLane);\n\n    const mergeResults = await this.merging.mergeSnaps({\n      mergeStrategy,\n      allComponentsStatus,\n      otherLaneId,\n      currentLane,\n      noAutoSnap,\n      noSnap,\n      tag,\n      snapMessage,\n      build,\n      skipDependencyInstallation,\n    });\n\n    if (snapshot) await lastMerged?.persistSnapshot(snapshot);\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.changeVersion(otherLane.readmeComponent?.head?.hash);\n      deleteResults = await this.remove.removeLocallyByIds([readmeComponentId], { reasonForRemoval: 'lane-merge' });\n    } else if (otherLane && !otherLane.readmeComponent) {\n      deleteResults = { readmeResult: '' };\n    }\n    const configMergeResults = compact(allComponentsStatus.map((c) => c.configMergeResult));\n\n    const componentsWithConfigConflicts = configMergeResults.filter((c) => c.hasConflicts()).map((c) => c.compIdStr);\n    const conflicts: ConflictPerId[] = [];\n    const mergedSuccessfullyIds: ComponentID[] = [];\n    mergeResults.components?.forEach((c) => {\n      const files = Object.keys(c.filesStatus).filter(\n        (f) => c.filesStatus[f] === FileStatus.manual || c.filesStatus[f] === FileStatus.binaryConflict\n      );\n      const config = componentsWithConfigConflicts.includes(c.id.toStringWithoutVersion());\n      if (files.length || config) {\n        conflicts.push({ id: c.id, files, config });\n      } else mergedSuccessfullyIds.push(c.id);\n    });\n\n    await this.workspace?.consumer.onDestroy(`lane-merge (${otherLaneId.name})`);\n\n    return { mergeResults, deleteResults, configMergeResults, mergedSuccessfullyIds, conflicts };\n  }\n\n  async mergeMove(newLaneName: string, options: { scope?: string }) {\n    if (!this.workspace) throw new OutsideWorkspaceError();\n    const lastMerge = new LastMerged(this.scope, this.workspace.consumer, this.logger);\n    await lastMerge.restoreLaneObjectFromLastMerged();\n    const newLaneResult = await this.lanes.createLane(newLaneName, { scope: options.scope });\n    return newLaneResult;\n  }\n\n  async abortLaneMerge(checkoutProps: CheckoutProps, mergeAbortOpts: MergeAbortOpts) {\n    if (!this.workspace) throw new OutsideWorkspaceError();\n    const lastMerge = new LastMerged(this.scope, this.workspace.consumer, this.logger);\n    const currentLane = await this.lanes.getCurrentLane();\n    const { compDirsToRemove } = await lastMerge.restoreFromLastMerged(mergeAbortOpts, currentLane);\n\n    await this.workspace._reloadConsumer();\n\n    this.workspace.consumer.scope.objects.unmergedComponents.removeAllComponents();\n    await this.workspace.consumer.scope.objects.unmergedComponents.write();\n\n    const configMergeFile = this.workspace.getConflictMergeFile();\n    await configMergeFile.delete();\n\n    let checkoutResults: ApplyVersionResults | undefined;\n    let checkoutError: Error | undefined;\n    checkoutProps.ids = this.workspace.listIds();\n    checkoutProps.restoreMissingComponents = true;\n    try {\n      checkoutResults = await this.checkout.checkout(checkoutProps);\n    } catch (err: any) {\n      this.logger.error(`merge-abort got an error during the checkout stage`, err);\n      checkoutError = err;\n    }\n\n    const restoredItems = [\n      `${path.basename(this.workspace.consumer.bitMap.mapPath)} file`,\n      `${path.basename(this.workspace.consumer.config.path)} file`,\n    ];\n    if (compDirsToRemove.length) {\n      restoredItems.push(`deleted components directories: ${compDirsToRemove.join(', ')}`);\n    }\n    if (currentLane) {\n      restoredItems.push(`${currentLane.id()} lane object`);\n    }\n\n    return { checkoutResults, restoredItems, checkoutError };\n  }\n\n  private async getMainIdsToMerge(lane?: Lane | null, includeNonLaneComps = true, includeUpdateDependents = false) {\n    if (!lane) throw new Error(`unable to merge ${DEFAULT_LANE}, the current lane was not found`);\n    const laneIds = includeUpdateDependents ? lane.toComponentIdsIncludeUpdateDependents() : lane.toComponentIds();\n    const ids = laneIds.filter((id) => this.scope.isExported(id));\n    if (includeNonLaneComps) {\n      if (!this.workspace) {\n        throw new BitError(`getMainIdsToMerge needs workspace`);\n      }\n      const workspaceIds = this.workspace.listIds();\n      const mainNotOnLane = workspaceIds.filter(\n        (id) => !laneIds.find((laneId) => laneId.isEqualWithoutVersion(id)) && this.scope.isExported(id)\n      );\n      ids.push(...mainNotOnLane);\n    }\n    return ids;\n  }\n\n  async mergeFromScope(\n    fromLane: string,\n    toLane: string,\n    options: Partial<MergeLaneOptions> & { push?: boolean; reMerge?: boolean }\n  ): Promise<MergeFromScopeResult> {\n    if (this.workspace) {\n      throw new BitError(\n        `unable to run this command from a workspace, please create a new bare-scope and run it from there`\n      );\n    }\n    const fromLaneId = await this.lanes.parseLaneId(fromLane);\n    const toLaneId = toLane === DEFAULT_LANE ? this.lanes.getDefaultLaneId() : LaneId.parse(toLane);\n    const shouldIncludeUpdateDependents = toLaneId.isDefault();\n\n    const exportIfNeeded = async (idsToExport: ComponentID[], laneToExport?: Lane): Promise<ComponentID[]> => {\n      if (!options.push) return [];\n      const shouldSquash = toLaneId.isDefault() && !options.noSquash; // only when merging to main we squash.\n      const compIdsList = ComponentIdList.fromArray(idsToExport);\n      const { exported } = await this.exporter.exportMany({\n        scope: this.scope.legacyScope,\n        ids: compIdsList,\n        idsWithFutureScope: compIdsList,\n        laneObject: laneToExport,\n        allVersions: false,\n        // no need to export anything else other than the head. the normal calculation of what to export won't apply here\n        // as it is done from the scope.\n        // @todo: if we merge main to a lane, then no need to export all main history, it'll be fetched later by fetchMissingHistory.\n        // once a change is done in the exporter about this, uncomment the next line.\n        // exportHeadsOnly: shouldSquash || fromLaneId.isDefault(),\n        exportHeadsOnly: shouldSquash,\n        // all artifacts must be pushed. otherwise, they'll be missing from the component-scopes.\n        // unless this is a merge from main to a lane, in which case it's not necessary to export the artifacts as\n        // the user importing them will get them from main.\n        throwForMissingArtifacts: !fromLaneId.isDefault(),\n        exportOrigin: 'lane-merge',\n      });\n      return exported;\n    };\n\n    // current -> target (to)\n    // other -> source (from)\n    options.mergeStrategy = 'manual';\n    options.excludeNonLaneComps = true;\n    options.skipDependencyInstallation = true;\n    options.shouldIncludeUpdateDependents = shouldIncludeUpdateDependents;\n    options.throwIfNotUpToDate = !fromLaneId.isDefault();\n    options.fetchCurrent = true;\n    this.scope.legacyScope.setCurrentLaneId(toLaneId);\n\n    const { mergeResults, configMergeResults, conflicts, mergedSuccessfullyIds } = await this.mergeLane(\n      fromLaneId,\n      toLaneId,\n      options as MergeLaneOptions\n    );\n\n    const { mergeSnapResults, failedComponents, mergeSnapError } = mergeResults;\n\n    if (configMergeResults.length) {\n      this.logger.debug(\n        `found the following config conflicts: ${configMergeResults\n          .map((c) => `\\n${c.compIdStr}\\n${c.generateMergeConflictFile()}`)\n          .join('\\n')}`\n      );\n    }\n\n    const snappedIds = mergeSnapResults?.snappedComponents.map((c) => c.id) || [];\n\n    const laneToExport = toLaneId.isDefault() ? undefined : await this.lanes.loadLane(toLaneId); // needs to be loaded again after the merge as it changed\n    const exportedIds =\n      conflicts.length || mergeSnapError\n        ? []\n        : await exportIfNeeded(\n            mergedSuccessfullyIds.map((id) => id.changeVersion(undefined)),\n            laneToExport\n          );\n\n    return {\n      mergedNow: mergedSuccessfullyIds,\n      mergedPreviously:\n        failedComponents\n          ?.filter(({ unchangedMessage }) => unchangedMessage === compIsAlreadyMergedMsg)\n          .map((c) => c.id) || [],\n      exportedIds,\n      unmerged: failedComponents?.map((c) => ({ id: c.id, reason: c.unchangedMessage })) || [],\n      conflicts,\n      snappedIds,\n      mergeSnapError,\n    };\n  }\n  private async throwIfNotUpToDate(fromLaneId: LaneId, toLaneId: LaneId) {\n    const status = await this.lanes.diffStatus(fromLaneId, toLaneId, { skipChanges: true });\n    const compsNotUpToDate = status.componentsStatus.filter((s) => !s.upToDate);\n    if (compsNotUpToDate.length) {\n      throw new Error(`unable to merge, the following components are not up-to-date:\n${compsNotUpToDate.map((s) => s.componentId.toString()).join('\\n')}`);\n    }\n  }\n\n  static slots = [];\n  static dependencies = [\n    LanesAspect,\n    CLIAspect,\n    WorkspaceAspect,\n    MergingAspect,\n    LoggerAspect,\n    RemoveAspect,\n    ScopeAspect,\n    ExportAspect,\n    ImporterAspect,\n    CheckoutAspect,\n    GlobalConfigAspect,\n  ];\n  static runtime = MainRuntime;\n\n  static async provider([\n    lanes,\n    cli,\n    workspace,\n    merging,\n    loggerMain,\n    remove,\n    scope,\n    exporter,\n    importer,\n    checkout,\n    globalConfig,\n  ]: [\n    LanesMain,\n    CLIMain,\n    Workspace,\n    MergingMain,\n    LoggerMain,\n    RemoveMain,\n    ScopeMain,\n    ExportMain,\n    ImporterMain,\n    CheckoutMain,\n    GlobalConfigMain\n  ]) {\n    const logger = loggerMain.createLogger(MergeLanesAspect.id);\n    const lanesCommand = cli.getCommand('lane');\n    const mergeLanesMain = new MergeLanesMain(\n      workspace,\n      merging,\n      lanes,\n      logger,\n      remove,\n      scope,\n      exporter,\n      importer,\n      checkout\n    );\n    lanesCommand?.commands?.push(new MergeLaneCmd(mergeLanesMain, globalConfig));\n    lanesCommand?.commands?.push(new MergeAbortLaneCmd(mergeLanesMain));\n    lanesCommand?.commands?.push(new MergeMoveLaneCmd(mergeLanesMain));\n    cli.register(new MergeLaneFromScopeCmd(mergeLanesMain));\n    return mergeLanesMain;\n  }\n}\n\nasync function filterComponentsStatus(\n  allComponentsStatus: ComponentMergeStatus[],\n  compIdsToKeep: ComponentID[],\n  allBitIds: ComponentID[],\n  legacyScope: LegacyScope,\n  includeDeps = false,\n  otherLane?: Lane, // lane that gets merged into the current lane. if not provided, it's main that gets merged into the current lane\n  shouldSquash?: boolean\n): Promise<ComponentMergeStatus[]> {\n  const bitIdsFromPattern = ComponentIdList.fromArray(compIdsToKeep);\n  const bitIdsNotFromPattern = allBitIds.filter((bitId) => !bitIdsFromPattern.hasWithoutVersion(bitId));\n  const filteredComponentStatus: ComponentMergeStatus[] = [];\n  const depsToAdd: ComponentID[] = [];\n  const missingDepsFromHead = {};\n  const missingDepsFromHistory: string[] = [];\n\n  const versionsToCheckPerId = await pMapSeries(compIdsToKeep, async (compId) => {\n    const fromStatus = allComponentsStatus.find((c) => c.id.isEqualWithoutVersion(compId));\n    if (!fromStatus) {\n      throw new Error(`filterComponentsStatus: unable to find ${compId.toString()} in component-status`);\n    }\n    filteredComponentStatus.push(fromStatus);\n    if (fromStatus.unchangedMessage) {\n      return undefined;\n    }\n    if (!otherLane) {\n      // if merging main, no need to check whether the deps are included in the pattern.\n      return undefined;\n    }\n    const { divergeData } = fromStatus;\n    if (!divergeData) {\n      throw new Error(`filterComponentsStatus: unable to find divergeData for ${compId.toString()}`);\n    }\n    let targetVersions: Ref[] = divergeData.snapsOnTargetOnly;\n    if (!targetVersions.length) {\n      return undefined;\n    }\n    const modelComponent = await legacyScope.getModelComponent(compId);\n    if (shouldSquash) {\n      // no need to check all versions, we merge only the head\n      const headOnTarget = otherLane ? otherLane.getComponent(compId)?.head : modelComponent.head;\n      if (!headOnTarget) {\n        throw new Error(`filterComponentsStatus: unable to find head for ${compId.toString()}`);\n      }\n      targetVersions = [headOnTarget];\n    }\n\n    return { compId, targetVersions, modelComponent };\n  });\n\n  // all these versions needs to be imported to load them later and check whether they have dependencies on the target lane\n  const toImport = compact(versionsToCheckPerId)\n    .map((c) => c.targetVersions.map((v) => c.compId.changeVersion(v.toString())))\n    .flat();\n  await legacyScope.scopeImporter.importWithoutDeps(ComponentIdList.fromArray(toImport), {\n    lane: otherLane,\n    cache: true,\n    includeVersionHistory: false,\n    reason: 'import all history of given patterns components to check whether they have dependencies on the lane',\n  });\n\n  await pMapSeries(compact(versionsToCheckPerId), async ({ compId, targetVersions, modelComponent }) => {\n    await pMapSeries(targetVersions, async (remoteVersion) => {\n      const versionObj = await modelComponent.loadVersion(remoteVersion.toString(), legacyScope.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: ComponentID[] = [];\n      await Promise.all(\n        depsNotIncludeInPattern.map(async (dep) => {\n          const isOnLane = await legacyScope.isIdOnLane(dep, otherLane);\n          if (isOnLane) {\n            depsOnLane.push(dep);\n          }\n        })\n      );\n      if (!depsOnLane.length) {\n        return;\n      }\n      if (includeDeps) {\n        depsToAdd.push(...depsOnLane);\n      } else {\n        const headOnTarget = otherLane ? otherLane.getComponent(compId)?.head : modelComponent.head;\n        const depsOnLaneStr = depsOnLane.map((dep) => dep.toStringWithoutVersion());\n        if (headOnTarget?.isEqual(remoteVersion)) {\n          depsOnLaneStr.forEach((dep) => {\n            (missingDepsFromHead[dep] ||= []).push(compId.toStringWithoutVersion());\n          });\n        } else {\n          missingDepsFromHistory.push(...depsOnLaneStr);\n        }\n      }\n    });\n  });\n  if (Object.keys(missingDepsFromHead).length || missingDepsFromHistory.length) {\n    throw new MissingCompsToMerge(missingDepsFromHead, uniq(missingDepsFromHistory));\n  }\n\n  if (depsToAdd.length) {\n    // remove the version, otherwise, the uniq gives duplicate components with different versions.\n    const depsWithoutVersion = depsToAdd.map((d) => d.changeVersion(undefined));\n    const depsUniqWithoutVersion = ComponentIdList.uniqFromArray(depsWithoutVersion);\n    depsUniqWithoutVersion.forEach((id) => {\n      const fromStatus = allComponentsStatus.find((c) => c.id.isEqualWithoutVersion(id));\n      if (!fromStatus) {\n        throw new Error(`filterComponentsStatus: unable to find ${id.toString()} in component-status`);\n      }\n      filteredComponentStatus.push(fromStatus);\n    });\n  }\n  return filteredComponentStatus;\n}\n\nasync function getLogForSquash(otherLaneId: LaneId) {\n  const basicLog = await getBasicLog();\n  const log = {\n    ...basicLog,\n    message: `squashed during merge from ${otherLaneId.toString()}`,\n  };\n  return log;\n}\n\nasync function squashSnaps(\n  succeededComponents: ComponentMergeStatus[],\n  currentLaneId: LaneId,\n  otherLaneId: LaneId,\n  scope: LegacyScope,\n  messageTitle?: string\n) {\n  const currentLaneName = currentLaneId.name;\n  const log = await getLogForSquash(otherLaneId);\n\n  await Promise.all(\n    succeededComponents.map(async ({ id, divergeData, componentFromModel }) => {\n      if (!divergeData) {\n        throw new Error(`unable to squash. divergeData is missing from ${id.toString()}`);\n      }\n\n      const modifiedComp = await squashOneComp(\n        currentLaneName,\n        otherLaneId,\n        id,\n        divergeData,\n        log,\n        scope,\n        componentFromModel,\n        messageTitle\n      );\n      if (modifiedComp) {\n        scope.objects.add(modifiedComp);\n        const modelComponent = await scope.getModelComponent(id);\n        const versionHistory = await modelComponent.updateRebasedVersionHistory(scope.objects, [modifiedComp]);\n        if (versionHistory) scope.objects.add(versionHistory);\n      }\n    })\n  );\n}\n\n/**\n * returns Version object if it was modified. otherwise, returns undefined\n */\nasync function squashOneComp(\n  currentLaneName: string,\n  otherLaneId: LaneId,\n  id: ComponentID,\n  divergeData: SnapsDistance,\n  log: Log,\n  scope: LegacyScope,\n  componentFromModel?: Version,\n  messageTitle?: string\n): Promise<Version | undefined> {\n  if (divergeData.isDiverged()) {\n    throw new BitError(`unable to squash because ${id.toString()} is diverged in history.\nconsider switching to \"${\n      otherLaneId.name\n    }\" first, merging \"${currentLaneName}\", then switching back to \"${currentLaneName}\" and merging \"${\n      otherLaneId.name\n    }\"\nalternatively, use \"--no-squash\" flag to keep the entire history of \"${otherLaneId.name}\"`);\n  }\n  if (divergeData.isSourceAhead()) {\n    // nothing to do. current is ahead, nothing to merge. (it was probably filtered out already as a \"failedComponent\")\n    return undefined;\n  }\n  if (!divergeData.isTargetAhead()) {\n    // nothing to do. current and remote are the same, nothing to merge. (it was probably filtered out already as a \"failedComponent\")\n    return undefined;\n  }\n  // remote is ahead and was not diverge.\n  const remoteSnaps = divergeData.snapsOnTargetOnly;\n  if (remoteSnaps.length === 0) {\n    throw new Error(`remote is ahead but it has no snaps. it's impossible`);\n  }\n  const getAllMessages = async () => {\n    if (!messageTitle) return [];\n    await scope.scopeImporter.importManyObjects({ [otherLaneId.scope]: remoteSnaps.map((s) => s.toString()) });\n    const versionObjects = (await Promise.all(remoteSnaps.map((s) => scope.objects.load(s)))) as Version[];\n    return compact(versionObjects).map((v) => v.log.message);\n  };\n  const getFinalMessage = async (): Promise<string | undefined> => {\n    if (!messageTitle) return undefined;\n    const allMessage = await getAllMessages();\n    const allMessageStr = compact(allMessage)\n      .map((m) => `[*] ${m}`)\n      .join('\\n');\n    return `${messageTitle}\\n${allMessageStr}`;\n  };\n  if (!componentFromModel) {\n    throw new Error('unable to squash, the componentFromModel is missing');\n  }\n  const currentParents = componentFromModel.parents;\n\n  // if the remote has only one snap, there is nothing to squash.\n  // other checks here is to make sure `componentFromModel.addAsOnlyParent` call is not needed.\n  if (remoteSnaps.length === 1 && divergeData.commonSnapBeforeDiverge && currentParents.length === 1) {\n    return undefined;\n  }\n\n  const doSquash = async () => {\n    if (divergeData.commonSnapBeforeDiverge) {\n      componentFromModel.addAsOnlyParent(divergeData.commonSnapBeforeDiverge);\n      return;\n    }\n    if (currentLaneName !== DEFAULT_LANE) {\n      // when squashing into lane, we have to take main into account\n      const modelComponent = await scope.getModelComponentIfExist(id);\n      if (!modelComponent) throw new Error(`missing ModelComponent for ${id.toString()}`);\n      if (modelComponent.head) {\n        componentFromModel.addAsOnlyParent(modelComponent.head);\n        return;\n      }\n    }\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\n  await doSquash();\n\n  const finalMessage = await getFinalMessage();\n  componentFromModel.setSquashed({ previousParents: currentParents, laneId: otherLaneId }, log, finalMessage);\n  return componentFromModel;\n}\n\nMergeLanesAspect.addRuntime(MergeLanesMain);\n\nexport default MergeLanesMain;\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_bitError","data","require","_path","_interopRequireDefault","_cli","_importer","_lanes","_merging","_workspace","_harmonyModules","_componentId","_pMapSeries","_scope","_laneId","_logger","_checkout","_remove","_lodash","_export","_globalConfig","_mergeLanes","_mergeLane","_mergeLaneFromScope","_missingCompsToMerge","_mergeAbort","_lastMerged","_mergeMove","e","__esModule","default","ownKeys","r","t","Object","keys","getOwnPropertySymbols","o","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","defineProperty","_toPropertyKey","value","configurable","writable","i","_toPrimitive","Symbol","toPrimitive","call","TypeError","String","Number","MergeLanesMain","constructor","workspace","merging","lanes","logger","remove","scope","exporter","importer","checkout","mergeLaneByCLI","laneName","options","BitError","currentLaneId","consumer","getCurrentLaneId","otherLaneId","getParsedLaneId","mergeLane","mergeStrategy","noAutoSnap","noSnap","tag","snapMessage","existingOnWorkspaceOnly","build","keepReadme","squash","noSquash","pattern","includeDeps","skipDependencyInstallation","resolveUnrelated","ignoreConfigChanges","skipFetch","excludeNonLaneComps","shouldIncludeUpdateDependents","throwIfNotUpToDate","fetchCurrent","legacyScope","isDefault","toString","isEqual","fetchLaneWithItsComponents","currentLane","undefined","loadLane","isDefaultLane","ids","getMainIdsToMerge","compIdList","ComponentIdList","fromArray","toVersionLatest","importObjectsFromMainIfExist","laneToFetchArtifactsFrom","getOtherLane","lane","shouldFetch","isNew","otherLane","getBitIds","modelComponents","Promise","all","map","id","getModelComponent","compact","c","head","toComponentId","changeVersion","Error","toComponentIdsIncludeUpdateDependents","toComponentIds","idsToMerge","debug","shouldSquash","allComponentsStatus","getMergeStatus","handleTargetAheadAsDiverged","componentIds","compIdsFromPattern","filterIdsFromPoolIdsByPattern","filterComponentsStatus","bitId","find","isEqualWithoutVersion","unchangedLegitimately","unchangedMessage","workspaceIds","listIds","throwForFailures","succeededComponents","squashSnaps","importHeadArtifactsFromLane","lastMerged","LastMerged","snapshot","takeSnapshot","mergeResults","mergeSnaps","persistSnapshot","mergedSuccessfully","failedComponents","every","failedComponent","deleteResults","readmeComponent","readmeComponentId","hash","removeLocallyByIds","reasonForRemoval","readmeResult","configMergeResults","configMergeResult","componentsWithConfigConflicts","hasConflicts","compIdStr","conflicts","mergedSuccessfullyIds","components","files","filesStatus","f","FileStatus","manual","binaryConflict","config","includes","toStringWithoutVersion","onDestroy","name","mergeMove","newLaneName","OutsideWorkspaceError","lastMerge","restoreLaneObjectFromLastMerged","newLaneResult","createLane","abortLaneMerge","checkoutProps","mergeAbortOpts","getCurrentLane","compDirsToRemove","restoreFromLastMerged","_reloadConsumer","objects","unmergedComponents","removeAllComponents","write","configMergeFile","getConflictMergeFile","delete","checkoutResults","checkoutError","restoreMissingComponents","err","error","restoredItems","path","basename","bitMap","mapPath","join","includeNonLaneComps","includeUpdateDependents","DEFAULT_LANE","laneIds","isExported","mainNotOnLane","laneId","mergeFromScope","fromLane","toLane","fromLaneId","parseLaneId","toLaneId","getDefaultLaneId","LaneId","parse","exportIfNeeded","idsToExport","laneToExport","compIdsList","exported","exportMany","idsWithFutureScope","laneObject","allVersions","exportHeadsOnly","throwForMissingArtifacts","exportOrigin","setCurrentLaneId","mergeSnapResults","mergeSnapError","generateMergeConflictFile","snappedIds","snappedComponents","exportedIds","mergedNow","mergedPreviously","compIsAlreadyMergedMsg","unmerged","reason","status","diffStatus","skipChanges","compsNotUpToDate","componentsStatus","s","upToDate","componentId","provider","cli","loggerMain","globalConfig","createLogger","MergeLanesAspect","lanesCommand","getCommand","mergeLanesMain","commands","MergeLaneCmd","MergeAbortLaneCmd","MergeMoveLaneCmd","register","MergeLaneFromScopeCmd","exports","LanesAspect","CLIAspect","WorkspaceAspect","MergingAspect","LoggerAspect","RemoveAspect","ScopeAspect","ExportAspect","ImporterAspect","CheckoutAspect","GlobalConfigAspect","MainRuntime","compIdsToKeep","allBitIds","bitIdsFromPattern","bitIdsNotFromPattern","hasWithoutVersion","filteredComponentStatus","depsToAdd","missingDepsFromHead","missingDepsFromHistory","versionsToCheckPerId","pMapSeries","compId","fromStatus","divergeData","targetVersions","snapsOnTargetOnly","modelComponent","headOnTarget","getComponent","toImport","v","flat","scopeImporter","importWithoutDeps","cache","includeVersionHistory","remoteVersion","versionObj","loadVersion","flattenedDeps","getAllFlattenedDependencies","depsNotIncludeInPattern","depsOnLane","dep","isOnLane","isIdOnLane","depsOnLaneStr","MissingCompsToMerge","uniq","depsWithoutVersion","d","depsUniqWithoutVersion","uniqFromArray","getLogForSquash","basicLog","getBasicLog","log","message","messageTitle","currentLaneName","componentFromModel","modifiedComp","squashOneComp","add","versionHistory","updateRebasedVersionHistory","isDiverged","isSourceAhead","isTargetAhead","remoteSnaps","getAllMessages","importManyObjects","versionObjects","load","getFinalMessage","allMessage","allMessageStr","m","currentParents","parents","commonSnapBeforeDiverge","doSquash","addAsOnlyParent","getModelComponentIfExist","ref","removeParent","finalMessage","setSquashed","previousParents","addRuntime","_default"],"sources":["merge-lanes.main.runtime.ts"],"sourcesContent":["import { BitError } from '@teambit/bit-error';\nimport path from 'path';\nimport { CLIAspect, CLIMain, MainRuntime } from '@teambit/cli';\nimport { ImporterAspect, ImporterMain } from '@teambit/importer';\nimport { LanesAspect, LanesMain } from '@teambit/lanes';\nimport {\n  MergingAspect,\n  MergingMain,\n  ComponentMergeStatus,\n  ApplyVersionResults,\n  compIsAlreadyMergedMsg,\n  FileStatus,\n  MergeStrategy,\n} from '@teambit/merging';\nimport { WorkspaceAspect, OutsideWorkspaceError, Workspace } from '@teambit/workspace';\nimport { getBasicLog } from '@teambit/harmony.modules.get-basic-log';\nimport { ComponentID, ComponentIdList } from '@teambit/component-id';\nimport { Log } from '@teambit/legacy/dist/scope/models/version';\nimport pMapSeries from 'p-map-series';\nimport { Scope as LegacyScope } from '@teambit/legacy/dist/scope';\nimport { ScopeAspect, ScopeMain } from '@teambit/scope';\nimport { DEFAULT_LANE, LaneId } from '@teambit/lane-id';\nimport { ConfigMergeResult } from '@teambit/config-merger';\nimport { Lane, Version } from '@teambit/legacy/dist/scope/models';\nimport { Logger, LoggerAspect, LoggerMain } from '@teambit/logger';\nimport { CheckoutAspect, CheckoutMain, CheckoutProps, throwForFailures } from '@teambit/checkout';\nimport { SnapsDistance } from '@teambit/legacy/dist/scope/component-ops/snaps-distance';\nimport { RemoveAspect, RemoveMain } from '@teambit/remove';\nimport { compact, uniq } from 'lodash';\nimport { ExportAspect, ExportMain } from '@teambit/export';\nimport { GlobalConfigAspect, GlobalConfigMain } from '@teambit/global-config';\nimport { Ref } from '@teambit/legacy/dist/scope/objects';\nimport { MergeLanesAspect } from './merge-lanes.aspect';\nimport { MergeLaneCmd } from './merge-lane.cmd';\nimport { MergeLaneFromScopeCmd } from './merge-lane-from-scope.cmd';\nimport { MissingCompsToMerge } from './exceptions/missing-comps-to-merge';\nimport { MergeAbortLaneCmd, MergeAbortOpts } from './merge-abort.cmd';\nimport { LastMerged } from './last-merged';\nimport { MergeMoveLaneCmd } from './merge-move.cmd';\n\nexport type MergeLaneOptions = {\n  mergeStrategy: MergeStrategy;\n  ours?: boolean;\n  theirs?: boolean;\n  noAutoSnap?: boolean;\n  noSnap?: boolean;\n  snapMessage?: string;\n  existingOnWorkspaceOnly?: boolean;\n  build?: boolean;\n  keepReadme?: boolean;\n  squash?: boolean;\n  noSquash?: boolean;\n  tag?: boolean;\n  pattern?: string;\n  includeDeps?: boolean;\n  skipDependencyInstallation?: boolean;\n  resolveUnrelated?: MergeStrategy;\n  ignoreConfigChanges?: boolean;\n  skipFetch?: boolean;\n  excludeNonLaneComps?: boolean;\n  shouldIncludeUpdateDependents?: boolean;\n  throwIfNotUpToDate?: boolean; // relevant when merging from a scope\n  fetchCurrent?: boolean; // needed when merging from a bare-scope (because it's empty)\n};\nexport type ConflictPerId = { id: ComponentID; files: string[]; config?: boolean };\nexport type MergeFromScopeResult = {\n  mergedNow: ComponentID[];\n  exportedIds: ComponentID[];\n  unmerged: { id: ComponentID; reason: string }[]; // reasons currently are: ahead / already-merge / removed\n  conflicts?: ConflictPerId[]; // relevant in case of diverge (currently possible only when merging from main to a lane)\n  snappedIds?: ComponentID[]; // relevant in case of diverge (currently possible only when merging from main to a lane)\n  mergedPreviously: ComponentID[];\n  mergeSnapError?: Error;\n};\n\nexport class MergeLanesMain {\n  constructor(\n    private workspace: Workspace | undefined,\n    private merging: MergingMain,\n    readonly lanes: LanesMain,\n    readonly logger: Logger,\n    private remove: RemoveMain,\n    private scope: ScopeMain,\n    private exporter: ExportMain,\n    private importer: ImporterMain,\n    private checkout: CheckoutMain\n  ) {}\n\n  async mergeLaneByCLI(laneName: string, options: MergeLaneOptions) {\n    if (!this.workspace) {\n      throw new BitError(`unable to merge a lane outside of Bit workspace`);\n    }\n    const currentLaneId = this.workspace.consumer.getCurrentLaneId();\n    const otherLaneId = await this.workspace.consumer.getParsedLaneId(laneName);\n    return this.mergeLane(otherLaneId, currentLaneId, options);\n  }\n\n  // eslint-disable-next-line complexity\n  async mergeLane(\n    otherLaneId: LaneId,\n    currentLaneId: LaneId,\n    options: MergeLaneOptions\n  ): Promise<{\n    mergeResults: ApplyVersionResults;\n    deleteResults: any;\n    configMergeResults: ConfigMergeResult[];\n    mergedSuccessfullyIds: ComponentID[];\n    conflicts: ConflictPerId[];\n  }> {\n    const consumer = this.workspace?.consumer;\n\n    const {\n      mergeStrategy,\n      noAutoSnap,\n      noSnap,\n      tag,\n      snapMessage,\n      existingOnWorkspaceOnly,\n      build,\n      keepReadme,\n      squash,\n      noSquash,\n      pattern,\n      includeDeps,\n      skipDependencyInstallation,\n      resolveUnrelated,\n      ignoreConfigChanges,\n      skipFetch,\n      excludeNonLaneComps,\n      shouldIncludeUpdateDependents,\n      throwIfNotUpToDate,\n      fetchCurrent,\n    } = options;\n    const legacyScope = this.scope.legacyScope;\n    if (tag && !currentLaneId.isDefault()) {\n      throw new BitError(`--tag only possible when on main. currently checked out to ${currentLaneId.toString()}`);\n    }\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    if (resolveUnrelated && currentLaneId.isDefault()) {\n      throw new BitError(\n        `unable to resolve unrelated when on main. switch to ${otherLaneId.toString()} and run \"bit lane merge main --resolve-unrelated\"`\n      );\n    }\n    if (fetchCurrent && !currentLaneId.isDefault()) {\n      // if current is default, it'll be fetch later on\n      await this.lanes.fetchLaneWithItsComponents(currentLaneId);\n    }\n    const currentLane = currentLaneId.isDefault() ? undefined : await legacyScope.loadLane(currentLaneId);\n    const isDefaultLane = otherLaneId.isDefault();\n    if (isDefaultLane) {\n      if (!skipFetch) {\n        const ids = await this.getMainIdsToMerge(currentLane, !excludeNonLaneComps);\n        const compIdList = ComponentIdList.fromArray(ids).toVersionLatest();\n        await this.importer.importObjectsFromMainIfExist(compIdList);\n      }\n    }\n    let laneToFetchArtifactsFrom: Lane | undefined;\n    const getOtherLane = async () => {\n      let lane = await legacyScope.loadLane(otherLaneId);\n      const shouldFetch = !lane || (!skipFetch && !lane.isNew);\n      if (shouldFetch) {\n        // don't assign `lane` to the result of this command. otherwise, if you have local snaps, it'll ignore them and use the remote-lane.\n        const otherLane = await this.lanes.fetchLaneWithItsComponents(otherLaneId, shouldIncludeUpdateDependents);\n        laneToFetchArtifactsFrom = otherLane;\n        lane = await legacyScope.loadLane(otherLaneId);\n      }\n      return lane;\n    };\n    const otherLane = isDefaultLane ? undefined : await getOtherLane();\n    if (fetchCurrent && otherLane && currentLaneId.isDefault()) {\n      const ids = await this.getMainIdsToMerge(otherLane, false, shouldIncludeUpdateDependents);\n      const compIdList = ComponentIdList.fromArray(ids).toVersionLatest();\n      await this.importer.importObjectsFromMainIfExist(compIdList);\n    }\n    const getBitIds = async () => {\n      if (isDefaultLane) {\n        const ids = await this.getMainIdsToMerge(currentLane, !excludeNonLaneComps, shouldIncludeUpdateDependents);\n        const modelComponents = await Promise.all(ids.map((id) => this.scope.legacyScope.getModelComponent(id)));\n        return compact(\n          modelComponents.map((c) => {\n            if (!c.head) return null; // probably the component was never merged to main\n            return c.toComponentId().changeVersion(c.head.toString());\n          })\n        );\n      }\n      if (!otherLane) throw new Error(`lane must be defined for non-default`);\n      return shouldIncludeUpdateDependents\n        ? otherLane.toComponentIdsIncludeUpdateDependents()\n        : otherLane.toComponentIds();\n    };\n    const idsToMerge = await getBitIds();\n\n    if (throwIfNotUpToDate) await this.throwIfNotUpToDate(otherLaneId, currentLaneId);\n\n    this.logger.debug(`merging the following ids: ${idsToMerge.toString()}`);\n\n    const shouldSquash = squash || (currentLaneId.isDefault() && !noSquash);\n    let allComponentsStatus = await this.merging.getMergeStatus(\n      idsToMerge,\n      {\n        resolveUnrelated,\n        ignoreConfigChanges,\n        shouldSquash,\n        mergeStrategy,\n        handleTargetAheadAsDiverged: noSnap,\n      },\n      currentLane,\n      otherLane\n    );\n\n    if (pattern) {\n      const componentIds = idsToMerge;\n      const compIdsFromPattern = await (this.workspace || this.scope).filterIdsFromPoolIdsByPattern(\n        pattern,\n        componentIds\n      );\n      allComponentsStatus = await filterComponentsStatus(\n        allComponentsStatus,\n        compIdsFromPattern,\n        idsToMerge,\n        legacyScope,\n        includeDeps,\n        otherLane,\n        shouldSquash\n      );\n      idsToMerge.forEach((bitId) => {\n        if (!allComponentsStatus.find((c) => c.id.isEqualWithoutVersion(bitId))) {\n          allComponentsStatus.push({ id: bitId, unchangedLegitimately: true, unchangedMessage: `excluded by pattern` });\n        }\n      });\n    }\n    if (existingOnWorkspaceOnly && this.workspace) {\n      const workspaceIds = this.workspace.listIds();\n      const compIdsFromPattern = workspaceIds.filter((id) =>\n        allComponentsStatus.find((c) => c.id.isEqualWithoutVersion(id))\n      );\n      allComponentsStatus = await filterComponentsStatus(\n        allComponentsStatus,\n        compIdsFromPattern,\n        idsToMerge,\n        legacyScope,\n        includeDeps,\n        otherLane,\n        shouldSquash\n      );\n      idsToMerge.forEach((bitId) => {\n        if (!allComponentsStatus.find((c) => c.id.isEqualWithoutVersion(bitId))) {\n          allComponentsStatus.push({\n            id: bitId,\n            unchangedLegitimately: true,\n            unchangedMessage: `not in the workspace`,\n          });\n        }\n      });\n    }\n\n    throwForFailures(allComponentsStatus);\n\n    const succeededComponents = allComponentsStatus.filter((c) => !c.unchangedMessage);\n    if (shouldSquash) {\n      await squashSnaps(succeededComponents, currentLaneId, otherLaneId, legacyScope, options.snapMessage);\n    }\n\n    if (laneToFetchArtifactsFrom) {\n      const ids = allComponentsStatus.map((c) => c.id);\n      await this.importer.importHeadArtifactsFromLane(laneToFetchArtifactsFrom, ids, true);\n    }\n\n    const lastMerged = consumer ? new LastMerged(this.scope, consumer, this.logger) : undefined;\n    const snapshot = await lastMerged?.takeSnapshot(currentLane);\n\n    const mergeResults = await this.merging.mergeSnaps({\n      mergeStrategy,\n      allComponentsStatus,\n      otherLaneId,\n      currentLane,\n      noAutoSnap,\n      noSnap,\n      tag,\n      snapMessage,\n      build,\n      skipDependencyInstallation,\n    });\n\n    if (snapshot) await lastMerged?.persistSnapshot(snapshot);\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.changeVersion(otherLane.readmeComponent?.head?.hash);\n      deleteResults = await this.remove.removeLocallyByIds([readmeComponentId], { reasonForRemoval: 'lane-merge' });\n    } else if (otherLane && !otherLane.readmeComponent) {\n      deleteResults = { readmeResult: '' };\n    }\n    const configMergeResults = compact(allComponentsStatus.map((c) => c.configMergeResult));\n\n    const componentsWithConfigConflicts = configMergeResults.filter((c) => c.hasConflicts()).map((c) => c.compIdStr);\n    const conflicts: ConflictPerId[] = [];\n    const mergedSuccessfullyIds: ComponentID[] = [];\n    mergeResults.components?.forEach((c) => {\n      const files = Object.keys(c.filesStatus).filter(\n        (f) => c.filesStatus[f] === FileStatus.manual || c.filesStatus[f] === FileStatus.binaryConflict\n      );\n      const config = componentsWithConfigConflicts.includes(c.id.toStringWithoutVersion());\n      if (files.length || config) {\n        conflicts.push({ id: c.id, files, config });\n      } else mergedSuccessfullyIds.push(c.id);\n    });\n\n    await this.workspace?.consumer.onDestroy(`lane-merge (${otherLaneId.name})`);\n\n    return { mergeResults, deleteResults, configMergeResults, mergedSuccessfullyIds, conflicts };\n  }\n\n  async mergeMove(newLaneName: string, options: { scope?: string }) {\n    if (!this.workspace) throw new OutsideWorkspaceError();\n    const lastMerge = new LastMerged(this.scope, this.workspace.consumer, this.logger);\n    await lastMerge.restoreLaneObjectFromLastMerged();\n    const newLaneResult = await this.lanes.createLane(newLaneName, { scope: options.scope });\n    return newLaneResult;\n  }\n\n  async abortLaneMerge(checkoutProps: CheckoutProps, mergeAbortOpts: MergeAbortOpts) {\n    if (!this.workspace) throw new OutsideWorkspaceError();\n    const lastMerge = new LastMerged(this.scope, this.workspace.consumer, this.logger);\n    const currentLane = await this.lanes.getCurrentLane();\n    const { compDirsToRemove } = await lastMerge.restoreFromLastMerged(mergeAbortOpts, currentLane);\n\n    await this.workspace._reloadConsumer();\n\n    this.workspace.consumer.scope.objects.unmergedComponents.removeAllComponents();\n    await this.workspace.consumer.scope.objects.unmergedComponents.write();\n\n    const configMergeFile = this.workspace.getConflictMergeFile();\n    await configMergeFile.delete();\n\n    let checkoutResults: ApplyVersionResults | undefined;\n    let checkoutError: Error | undefined;\n    checkoutProps.ids = this.workspace.listIds();\n    checkoutProps.restoreMissingComponents = true;\n    try {\n      checkoutResults = await this.checkout.checkout(checkoutProps);\n    } catch (err: any) {\n      this.logger.error(`merge-abort got an error during the checkout stage`, err);\n      checkoutError = err;\n    }\n\n    const restoredItems = [\n      `${path.basename(this.workspace.consumer.bitMap.mapPath)} file`,\n      `${path.basename(this.workspace.consumer.config.path)} file`,\n    ];\n    if (compDirsToRemove.length) {\n      restoredItems.push(`deleted components directories: ${compDirsToRemove.join(', ')}`);\n    }\n    if (currentLane) {\n      restoredItems.push(`${currentLane.id()} lane object`);\n    }\n\n    return { checkoutResults, restoredItems, checkoutError };\n  }\n\n  private async getMainIdsToMerge(lane?: Lane | null, includeNonLaneComps = true, includeUpdateDependents = false) {\n    if (!lane) throw new Error(`unable to merge ${DEFAULT_LANE}, the current lane was not found`);\n    const laneIds = includeUpdateDependents ? lane.toComponentIdsIncludeUpdateDependents() : lane.toComponentIds();\n    const ids = laneIds.filter((id) => this.scope.isExported(id));\n    if (includeNonLaneComps) {\n      if (!this.workspace) {\n        throw new BitError(`getMainIdsToMerge needs workspace`);\n      }\n      const workspaceIds = this.workspace.listIds();\n      const mainNotOnLane = workspaceIds.filter(\n        (id) => !laneIds.find((laneId) => laneId.isEqualWithoutVersion(id)) && this.scope.isExported(id)\n      );\n      ids.push(...mainNotOnLane);\n    }\n    return ids;\n  }\n\n  async mergeFromScope(\n    fromLane: string,\n    toLane: string,\n    options: Partial<MergeLaneOptions> & { push?: boolean; reMerge?: boolean }\n  ): Promise<MergeFromScopeResult> {\n    if (this.workspace) {\n      throw new BitError(\n        `unable to run this command from a workspace, please create a new bare-scope and run it from there`\n      );\n    }\n    const fromLaneId = await this.lanes.parseLaneId(fromLane);\n    const toLaneId = toLane === DEFAULT_LANE ? this.lanes.getDefaultLaneId() : LaneId.parse(toLane);\n    const shouldIncludeUpdateDependents = toLaneId.isDefault();\n\n    const exportIfNeeded = async (idsToExport: ComponentID[], laneToExport?: Lane): Promise<ComponentID[]> => {\n      if (!options.push) return [];\n      const shouldSquash = toLaneId.isDefault() && !options.noSquash; // only when merging to main we squash.\n      const compIdsList = ComponentIdList.fromArray(idsToExport);\n      const { exported } = await this.exporter.exportMany({\n        scope: this.scope.legacyScope,\n        ids: compIdsList,\n        idsWithFutureScope: compIdsList,\n        laneObject: laneToExport,\n        allVersions: false,\n        // no need to export anything else other than the head. the normal calculation of what to export won't apply here\n        // as it is done from the scope.\n        // @todo: if we merge main to a lane, then no need to export all main history, it'll be fetched later by fetchMissingHistory.\n        // once a change is done in the exporter about this, uncomment the next line.\n        // exportHeadsOnly: shouldSquash || fromLaneId.isDefault(),\n        exportHeadsOnly: shouldSquash,\n        // all artifacts must be pushed. otherwise, they'll be missing from the component-scopes.\n        // unless this is a merge from main to a lane, in which case it's not necessary to export the artifacts as\n        // the user importing them will get them from main.\n        throwForMissingArtifacts: !fromLaneId.isDefault(),\n        exportOrigin: 'lane-merge',\n      });\n      return exported;\n    };\n\n    // current -> target (to)\n    // other -> source (from)\n    options.mergeStrategy = 'manual';\n    options.excludeNonLaneComps = true;\n    options.skipDependencyInstallation = true;\n    options.shouldIncludeUpdateDependents = shouldIncludeUpdateDependents;\n    options.throwIfNotUpToDate = !fromLaneId.isDefault();\n    options.fetchCurrent = true;\n    this.scope.legacyScope.setCurrentLaneId(toLaneId);\n\n    const { mergeResults, configMergeResults, conflicts, mergedSuccessfullyIds } = await this.mergeLane(\n      fromLaneId,\n      toLaneId,\n      options as MergeLaneOptions\n    );\n\n    const { mergeSnapResults, failedComponents, mergeSnapError } = mergeResults;\n\n    if (configMergeResults.length) {\n      this.logger.debug(\n        `found the following config conflicts: ${configMergeResults\n          .map((c) => `\\n${c.compIdStr}\\n${c.generateMergeConflictFile()}`)\n          .join('\\n')}`\n      );\n    }\n\n    const snappedIds = mergeSnapResults?.snappedComponents.map((c) => c.id) || [];\n\n    const laneToExport = toLaneId.isDefault() ? undefined : await this.lanes.loadLane(toLaneId); // needs to be loaded again after the merge as it changed\n    const exportedIds =\n      conflicts.length || mergeSnapError\n        ? []\n        : await exportIfNeeded(\n            mergedSuccessfullyIds.map((id) => id.changeVersion(undefined)),\n            laneToExport\n          );\n\n    return {\n      mergedNow: mergedSuccessfullyIds,\n      mergedPreviously:\n        failedComponents\n          ?.filter(({ unchangedMessage }) => unchangedMessage === compIsAlreadyMergedMsg)\n          .map((c) => c.id) || [],\n      exportedIds,\n      unmerged: failedComponents?.map((c) => ({ id: c.id, reason: c.unchangedMessage })) || [],\n      conflicts,\n      snappedIds,\n      mergeSnapError,\n    };\n  }\n  private async throwIfNotUpToDate(fromLaneId: LaneId, toLaneId: LaneId) {\n    const status = await this.lanes.diffStatus(fromLaneId, toLaneId, { skipChanges: true });\n    const compsNotUpToDate = status.componentsStatus.filter((s) => !s.upToDate);\n    if (compsNotUpToDate.length) {\n      throw new Error(`unable to merge, the following components are not up-to-date:\n${compsNotUpToDate.map((s) => s.componentId.toString()).join('\\n')}`);\n    }\n  }\n\n  static slots = [];\n  static dependencies = [\n    LanesAspect,\n    CLIAspect,\n    WorkspaceAspect,\n    MergingAspect,\n    LoggerAspect,\n    RemoveAspect,\n    ScopeAspect,\n    ExportAspect,\n    ImporterAspect,\n    CheckoutAspect,\n    GlobalConfigAspect,\n  ];\n  static runtime = MainRuntime;\n\n  static async provider([\n    lanes,\n    cli,\n    workspace,\n    merging,\n    loggerMain,\n    remove,\n    scope,\n    exporter,\n    importer,\n    checkout,\n    globalConfig,\n  ]: [\n    LanesMain,\n    CLIMain,\n    Workspace,\n    MergingMain,\n    LoggerMain,\n    RemoveMain,\n    ScopeMain,\n    ExportMain,\n    ImporterMain,\n    CheckoutMain,\n    GlobalConfigMain,\n  ]) {\n    const logger = loggerMain.createLogger(MergeLanesAspect.id);\n    const lanesCommand = cli.getCommand('lane');\n    const mergeLanesMain = new MergeLanesMain(\n      workspace,\n      merging,\n      lanes,\n      logger,\n      remove,\n      scope,\n      exporter,\n      importer,\n      checkout\n    );\n    lanesCommand?.commands?.push(new MergeLaneCmd(mergeLanesMain, globalConfig));\n    lanesCommand?.commands?.push(new MergeAbortLaneCmd(mergeLanesMain));\n    lanesCommand?.commands?.push(new MergeMoveLaneCmd(mergeLanesMain));\n    cli.register(new MergeLaneFromScopeCmd(mergeLanesMain));\n    return mergeLanesMain;\n  }\n}\n\nasync function filterComponentsStatus(\n  allComponentsStatus: ComponentMergeStatus[],\n  compIdsToKeep: ComponentID[],\n  allBitIds: ComponentID[],\n  legacyScope: LegacyScope,\n  includeDeps = false,\n  otherLane?: Lane, // lane that gets merged into the current lane. if not provided, it's main that gets merged into the current lane\n  shouldSquash?: boolean\n): Promise<ComponentMergeStatus[]> {\n  const bitIdsFromPattern = ComponentIdList.fromArray(compIdsToKeep);\n  const bitIdsNotFromPattern = allBitIds.filter((bitId) => !bitIdsFromPattern.hasWithoutVersion(bitId));\n  const filteredComponentStatus: ComponentMergeStatus[] = [];\n  const depsToAdd: ComponentID[] = [];\n  const missingDepsFromHead = {};\n  const missingDepsFromHistory: string[] = [];\n\n  const versionsToCheckPerId = await pMapSeries(compIdsToKeep, async (compId) => {\n    const fromStatus = allComponentsStatus.find((c) => c.id.isEqualWithoutVersion(compId));\n    if (!fromStatus) {\n      throw new Error(`filterComponentsStatus: unable to find ${compId.toString()} in component-status`);\n    }\n    filteredComponentStatus.push(fromStatus);\n    if (fromStatus.unchangedMessage) {\n      return undefined;\n    }\n    if (!otherLane) {\n      // if merging main, no need to check whether the deps are included in the pattern.\n      return undefined;\n    }\n    const { divergeData } = fromStatus;\n    if (!divergeData) {\n      throw new Error(`filterComponentsStatus: unable to find divergeData for ${compId.toString()}`);\n    }\n    let targetVersions: Ref[] = divergeData.snapsOnTargetOnly;\n    if (!targetVersions.length) {\n      return undefined;\n    }\n    const modelComponent = await legacyScope.getModelComponent(compId);\n    if (shouldSquash) {\n      // no need to check all versions, we merge only the head\n      const headOnTarget = otherLane ? otherLane.getComponent(compId)?.head : modelComponent.head;\n      if (!headOnTarget) {\n        throw new Error(`filterComponentsStatus: unable to find head for ${compId.toString()}`);\n      }\n      targetVersions = [headOnTarget];\n    }\n\n    return { compId, targetVersions, modelComponent };\n  });\n\n  // all these versions needs to be imported to load them later and check whether they have dependencies on the target lane\n  const toImport = compact(versionsToCheckPerId)\n    .map((c) => c.targetVersions.map((v) => c.compId.changeVersion(v.toString())))\n    .flat();\n  await legacyScope.scopeImporter.importWithoutDeps(ComponentIdList.fromArray(toImport), {\n    lane: otherLane,\n    cache: true,\n    includeVersionHistory: false,\n    reason: 'import all history of given patterns components to check whether they have dependencies on the lane',\n  });\n\n  await pMapSeries(compact(versionsToCheckPerId), async ({ compId, targetVersions, modelComponent }) => {\n    await pMapSeries(targetVersions, async (remoteVersion) => {\n      const versionObj = await modelComponent.loadVersion(remoteVersion.toString(), legacyScope.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: ComponentID[] = [];\n      await Promise.all(\n        depsNotIncludeInPattern.map(async (dep) => {\n          const isOnLane = await legacyScope.isIdOnLane(dep, otherLane);\n          if (isOnLane) {\n            depsOnLane.push(dep);\n          }\n        })\n      );\n      if (!depsOnLane.length) {\n        return;\n      }\n      if (includeDeps) {\n        depsToAdd.push(...depsOnLane);\n      } else {\n        const headOnTarget = otherLane ? otherLane.getComponent(compId)?.head : modelComponent.head;\n        const depsOnLaneStr = depsOnLane.map((dep) => dep.toStringWithoutVersion());\n        if (headOnTarget?.isEqual(remoteVersion)) {\n          depsOnLaneStr.forEach((dep) => {\n            (missingDepsFromHead[dep] ||= []).push(compId.toStringWithoutVersion());\n          });\n        } else {\n          missingDepsFromHistory.push(...depsOnLaneStr);\n        }\n      }\n    });\n  });\n  if (Object.keys(missingDepsFromHead).length || missingDepsFromHistory.length) {\n    throw new MissingCompsToMerge(missingDepsFromHead, uniq(missingDepsFromHistory));\n  }\n\n  if (depsToAdd.length) {\n    // remove the version, otherwise, the uniq gives duplicate components with different versions.\n    const depsWithoutVersion = depsToAdd.map((d) => d.changeVersion(undefined));\n    const depsUniqWithoutVersion = ComponentIdList.uniqFromArray(depsWithoutVersion);\n    depsUniqWithoutVersion.forEach((id) => {\n      const fromStatus = allComponentsStatus.find((c) => c.id.isEqualWithoutVersion(id));\n      if (!fromStatus) {\n        throw new Error(`filterComponentsStatus: unable to find ${id.toString()} in component-status`);\n      }\n      filteredComponentStatus.push(fromStatus);\n    });\n  }\n  return filteredComponentStatus;\n}\n\nasync function getLogForSquash(otherLaneId: LaneId) {\n  const basicLog = await getBasicLog();\n  const log = {\n    ...basicLog,\n    message: `squashed during merge from ${otherLaneId.toString()}`,\n  };\n  return log;\n}\n\nasync function squashSnaps(\n  succeededComponents: ComponentMergeStatus[],\n  currentLaneId: LaneId,\n  otherLaneId: LaneId,\n  scope: LegacyScope,\n  messageTitle?: string\n) {\n  const currentLaneName = currentLaneId.name;\n  const log = await getLogForSquash(otherLaneId);\n\n  await Promise.all(\n    succeededComponents.map(async ({ id, divergeData, componentFromModel }) => {\n      if (!divergeData) {\n        throw new Error(`unable to squash. divergeData is missing from ${id.toString()}`);\n      }\n\n      const modifiedComp = await squashOneComp(\n        currentLaneName,\n        otherLaneId,\n        id,\n        divergeData,\n        log,\n        scope,\n        componentFromModel,\n        messageTitle\n      );\n      if (modifiedComp) {\n        scope.objects.add(modifiedComp);\n        const modelComponent = await scope.getModelComponent(id);\n        const versionHistory = await modelComponent.updateRebasedVersionHistory(scope.objects, [modifiedComp]);\n        if (versionHistory) scope.objects.add(versionHistory);\n      }\n    })\n  );\n}\n\n/**\n * returns Version object if it was modified. otherwise, returns undefined\n */\nasync function squashOneComp(\n  currentLaneName: string,\n  otherLaneId: LaneId,\n  id: ComponentID,\n  divergeData: SnapsDistance,\n  log: Log,\n  scope: LegacyScope,\n  componentFromModel?: Version,\n  messageTitle?: string\n): Promise<Version | undefined> {\n  if (divergeData.isDiverged()) {\n    throw new BitError(`unable to squash because ${id.toString()} is diverged in history.\nconsider switching to \"${\n      otherLaneId.name\n    }\" first, merging \"${currentLaneName}\", then switching back to \"${currentLaneName}\" and merging \"${\n      otherLaneId.name\n    }\"\nalternatively, use \"--no-squash\" flag to keep the entire history of \"${otherLaneId.name}\"`);\n  }\n  if (divergeData.isSourceAhead()) {\n    // nothing to do. current is ahead, nothing to merge. (it was probably filtered out already as a \"failedComponent\")\n    return undefined;\n  }\n  if (!divergeData.isTargetAhead()) {\n    // nothing to do. current and remote are the same, nothing to merge. (it was probably filtered out already as a \"failedComponent\")\n    return undefined;\n  }\n  // remote is ahead and was not diverge.\n  const remoteSnaps = divergeData.snapsOnTargetOnly;\n  if (remoteSnaps.length === 0) {\n    throw new Error(`remote is ahead but it has no snaps. it's impossible`);\n  }\n  const getAllMessages = async () => {\n    if (!messageTitle) return [];\n    await scope.scopeImporter.importManyObjects({ [otherLaneId.scope]: remoteSnaps.map((s) => s.toString()) });\n    const versionObjects = (await Promise.all(remoteSnaps.map((s) => scope.objects.load(s)))) as Version[];\n    return compact(versionObjects).map((v) => v.log.message);\n  };\n  const getFinalMessage = async (): Promise<string | undefined> => {\n    if (!messageTitle) return undefined;\n    const allMessage = await getAllMessages();\n    const allMessageStr = compact(allMessage)\n      .map((m) => `[*] ${m}`)\n      .join('\\n');\n    return `${messageTitle}\\n${allMessageStr}`;\n  };\n  if (!componentFromModel) {\n    throw new Error('unable to squash, the componentFromModel is missing');\n  }\n  const currentParents = componentFromModel.parents;\n\n  // if the remote has only one snap, there is nothing to squash.\n  // other checks here is to make sure `componentFromModel.addAsOnlyParent` call is not needed.\n  if (remoteSnaps.length === 1 && divergeData.commonSnapBeforeDiverge && currentParents.length === 1) {\n    return undefined;\n  }\n\n  const doSquash = async () => {\n    if (divergeData.commonSnapBeforeDiverge) {\n      componentFromModel.addAsOnlyParent(divergeData.commonSnapBeforeDiverge);\n      return;\n    }\n    if (currentLaneName !== DEFAULT_LANE) {\n      // when squashing into lane, we have to take main into account\n      const modelComponent = await scope.getModelComponentIfExist(id);\n      if (!modelComponent) throw new Error(`missing ModelComponent for ${id.toString()}`);\n      if (modelComponent.head) {\n        componentFromModel.addAsOnlyParent(modelComponent.head);\n        return;\n      }\n    }\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\n  await doSquash();\n\n  const finalMessage = await getFinalMessage();\n  componentFromModel.setSquashed({ previousParents: currentParents, laneId: otherLaneId }, log, finalMessage);\n  return componentFromModel;\n}\n\nMergeLanesAspect.addRuntime(MergeLanesMain);\n\nexport default MergeLanesMain;\n"],"mappings":"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","ignoreList":[]}

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@teambit/merge-lanes",
-  "version": "1.0.424",
+  "version": "1.0.426",
   "homepage": "https://bit.cloud/teambit/lanes/merge-lanes",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.lanes",
     "name": "merge-lanes",
-    "version": "1.0.424"
+    "version": "1.0.426"
   },
   "dependencies": {
     "chalk": "2.4.2",
@@ -19,22 +19,22 @@
     "@teambit/lane-id": "0.0.311",
     "@teambit/harmony": "0.4.6",
     "@teambit/component-id": "1.2.2",
-    "@teambit/legacy.bit-map": "0.0.37",
+    "@teambit/legacy.bit-map": "0.0.38",
     "@teambit/legacy.cli.prompts": "0.0.2",
-    "@teambit/logger": "0.0.1094",
-    "@teambit/scope": "1.0.424",
-    "@teambit/checkout": "1.0.424",
-    "@teambit/cli": "0.0.1001",
+    "@teambit/logger": "0.0.1096",
+    "@teambit/scope": "1.0.426",
+    "@teambit/checkout": "1.0.426",
+    "@teambit/cli": "0.0.1003",
     "@teambit/legacy.utils": "0.0.6",
-    "@teambit/global-config": "0.0.1004",
-    "@teambit/merging": "1.0.424",
-    "@teambit/remove": "1.0.424",
-    "@teambit/config-merger": "0.0.291",
-    "@teambit/export": "1.0.424",
+    "@teambit/global-config": "0.0.1006",
+    "@teambit/merging": "1.0.426",
+    "@teambit/remove": "1.0.426",
+    "@teambit/config-merger": "0.0.293",
+    "@teambit/export": "1.0.426",
     "@teambit/harmony.modules.get-basic-log": "0.0.1",
-    "@teambit/importer": "1.0.424",
-    "@teambit/lanes": "1.0.424",
-    "@teambit/workspace": "1.0.424"
+    "@teambit/importer": "1.0.426",
+    "@teambit/lanes": "1.0.426",
+    "@teambit/workspace": "1.0.426"
   },
   "devDependencies": {
     "@types/fs-extra": "9.0.7",
@@ -42,9 +42,9 @@
     "chai": "4.3.0",
     "@types/mocha": "9.1.0",
     "@teambit/harmony.envs.core-aspect-env": "0.0.60",
-    "@teambit/component.testing.mock-components": "0.0.239",
-    "@teambit/harmony.testing.load-aspect": "0.0.234",
-    "@teambit/snapping": "1.0.424",
+    "@teambit/component.testing.mock-components": "0.0.240",
+    "@teambit/harmony.testing.load-aspect": "0.0.235",
+    "@teambit/snapping": "1.0.426",
     "@teambit/workspace.testing.mock-workspace": "0.0.27"
   },
   "peerDependencies": {