@teambit/merge-lanes 1.0.1284 → 1.0.1286

package/dist/lanes-check-conflicts.route.d.ts

@@ -1,4 +1,4 @@
-import type { Route, Request, Response } from '@teambit/express';
+import type { Route, Middleware } from '@teambit/express';
 import { Verb } from '@teambit/express';
 import type { Logger } from '@teambit/logger';
 import type { MergeLanesMain } from './merge-lanes.main.runtime';
@@ -9,5 +9,5 @@ export declare class LanesCheckConflictsRoute implements Route {
     method: string;
     route: string;
     verb: Verb;
-    middlewares: ((req: Request, res: Response) => Promise<import("express").Response<any, Record<string, any>>>)[];
+    middlewares: Middleware[];
 }

package/dist/lanes-check-conflicts.route.js.map

@@ -1 +1 @@
-{"version":3,"names":["_express","data","require","ownKeys","e","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","LanesCheckConflictsRoute","constructor","mergeLanes","logger","Verb","READ","req","res","body","sourceLane","targetLane","status","send","conflicts","checkLaneForConflicts","conflictsOutput","map","conflict","id","toString","json","error","exports"],"sources":["lanes-check-conflicts.route.ts"],"sourcesContent":["import type { Route, Request, Response } from '@teambit/express';\nimport { Verb } from '@teambit/express';\nimport type { Logger } from '@teambit/logger';\nimport type { MergeLanesMain } from './merge-lanes.main.runtime';\n\nexport class LanesCheckConflictsRoute implements Route {\n  constructor(\n    private mergeLanes: MergeLanesMain,\n    private logger: Logger\n  ) {}\n\n  method = 'post';\n  route = '/lanes/check-conflicts';\n  verb = Verb.READ;\n\n  middlewares = [\n    async (req: Request, res: Response) => {\n      const { body } = req;\n      const sourceLane = body.sourceLane;\n      const targetLane = body.targetLane;\n      if (!sourceLane) {\n        return res.status(400).send('Missing sourceLane in body');\n      }\n      if (!targetLane) {\n        return res.status(400).send('Missing targetLane in body');\n      }\n      try {\n        const { conflicts } = await this.mergeLanes.checkLaneForConflicts(sourceLane, targetLane, {});\n        const conflictsOutput = conflicts.map((conflict) => {\n          return {\n            ...conflict,\n            id: conflict.id.toString(),\n          };\n        });\n        return res.json({ conflicts: conflictsOutput });\n      } catch (e: any) {\n        this.logger.error(e.toString());\n        return res.status(500).send(e.toString());\n      }\n    },\n  ];\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_express","data","require","ownKeys","e","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","LanesCheckConflictsRoute","constructor","mergeLanes","logger","Verb","READ","req","res","body","sourceLane","targetLane","status","send","conflicts","checkLaneForConflicts","conflictsOutput","map","conflict","id","toString","json","error","exports"],"sources":["lanes-check-conflicts.route.ts"],"sourcesContent":["import type { Route, Request, Response, Middleware } from '@teambit/express';\nimport { Verb } from '@teambit/express';\nimport type { Logger } from '@teambit/logger';\nimport type { MergeLanesMain } from './merge-lanes.main.runtime';\n\nexport class LanesCheckConflictsRoute implements Route {\n  constructor(\n    private mergeLanes: MergeLanesMain,\n    private logger: Logger\n  ) {}\n\n  method = 'post';\n  route = '/lanes/check-conflicts';\n  verb = Verb.READ;\n\n  middlewares: Middleware[] = [\n    async (req: Request, res: Response) => {\n      const { body } = req;\n      const sourceLane = body.sourceLane;\n      const targetLane = body.targetLane;\n      if (!sourceLane) {\n        return res.status(400).send('Missing sourceLane in body');\n      }\n      if (!targetLane) {\n        return res.status(400).send('Missing targetLane in body');\n      }\n      try {\n        const { conflicts } = await this.mergeLanes.checkLaneForConflicts(sourceLane, targetLane, {});\n        const conflictsOutput = conflicts.map((conflict) => {\n          return {\n            ...conflict,\n            id: conflict.id.toString(),\n          };\n        });\n        return res.json({ conflicts: conflictsOutput });\n      } catch (e: any) {\n        this.logger.error(e.toString());\n        return res.status(500).send(e.toString());\n      }\n    },\n  ];\n}\n"],"mappings":"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","ignoreList":[]}

package/dist/last-merged.d.ts

@@ -1,3 +1,4 @@
+import type { ComponentID } from '@teambit/component-id';
 import type { ScopeMain } from '@teambit/scope';
 import type { Lane } from '@teambit/objects';
 import type { Consumer } from '@teambit/legacy.consumer';
@@ -9,6 +10,7 @@ type Snapshot = {
     copyOfWorkspaceJsonc: string;
     copyOfStagedSnaps?: string;
     copyOfStagedConfig?: string;
+    copyOfMainComponents?: Buffer[];
 };
 export declare class LastMerged {
     private scope;
@@ -16,13 +18,22 @@ export declare class LastMerged {
     private logger;
     constructor(scope: ScopeMain, consumer: Consumer, logger: Logger);
     get path(): string;
-    takeSnapshot(currentLane?: Lane | null): Promise<Snapshot>;
+    /**
+     * `idsToMerge` is needed when merging into main. a lane keeps the heads of its components in the lane object, main
+     * keeps them in the component objects, so these are copied to restore the heads the merge moves.
+     */
+    takeSnapshot(currentLane?: Lane | null, idsToMerge?: ComponentID[]): Promise<Snapshot>;
+    private compressComponentObjects;
     persistSnapshot(snapshot: Snapshot): Promise<void>;
     restoreLaneObjectFromLastMerged(): Promise<void>;
     restoreFromLastMerged(mergeAbortOpts: MergeAbortOpts, currentLane?: Lane | null): Promise<{
         compDirsToRemove: string[];
     }>;
     private mergeAbortPrompt;
+    /**
+     * restore the component objects as they were before merging into main, which restores their main heads.
+     */
+    private restoreMainComponents;
     private getLastMergedLaneContentIfExists;
     private getFileContentIfExist;
     private getLastMergedBitmapPath;
@@ -30,5 +41,6 @@ export declare class LastMerged {
     private getLastMergedLanePath;
     private getLastMergedStagedSnapsPath;
     private getLastMergedStagedConfigPath;
+    private getLastMergedMainComponentsPath;
 }
 export {};

package/dist/last-merged.js

@@ -46,6 +46,13 @@ function _legacy() {
   };
   return data;
 }
+function _lodash() {
+  const data = require("lodash");
+  _lodash = function () {
+    return data;
+  };
+  return data;
+}
 function _objects() {
   const data = require("@teambit/objects");
   _objects = function () {
@@ -75,6 +82,7 @@ class PromptCanceled extends _bitError().BitError {
 }
 const LAST_MERGED_LANE_FILENAME = 'lane';
 const LAST_MERGED_BITMAP_FILENAME = 'bitmap';
+const LAST_MERGED_MAIN_COMPONENTS_DIR = 'main-components';
 class LastMerged {
   constructor(scope, consumer, logger) {
     this.scope = scope;
@@ -84,7 +92,12 @@ class LastMerged {
   get path() {
     return this.scope.getLastMergedPath();
   }
-  async takeSnapshot(currentLane) {
+
+  /**
+   * `idsToMerge` is needed when merging into main. a lane keeps the heads of its components in the lane object, main
+   * keeps them in the component objects, so these are copied to restore the heads the merge moves.
+   */
+  async takeSnapshot(currentLane, idsToMerge = []) {
     const consumer = this.consumer;
     const copyOfCurrentLane = currentLane ? currentLane.clone() : undefined;
     const copyOfBitmap = _tempy().default.file();
@@ -102,14 +115,20 @@ class LastMerged {
       copyOfStagedConfig = _tempy().default.file();
       await _fsExtra().default.copyFile(stagedConfig.filePath, copyOfStagedConfig);
     }
+    const copyOfMainComponents = currentLane ? undefined : await this.compressComponentObjects(idsToMerge);
     return {
       copyOfCurrentLane,
       copyOfBitmap,
       copyOfWorkspaceJsonc,
       copyOfStagedSnaps,
-      copyOfStagedConfig
+      copyOfStagedConfig,
+      copyOfMainComponents
     };
   }
+  async compressComponentObjects(ids) {
+    const modelComponents = await Promise.all(ids.map(id => this.scope.legacyScope.getModelComponentIfExist(id.changeVersion(undefined))));
+    return Promise.all((0, _lodash().compact)(modelComponents).map(modelComponent => modelComponent.compress()));
+  }
   async persistSnapshot(snapshot) {
     const {
       copyOfCurrentLane,
@@ -132,6 +151,7 @@ class LastMerged {
     if (copyOfStagedConfig) {
       await _fsExtra().default.copyFile(copyOfStagedConfig, this.getLastMergedStagedConfigPath());
     }
+    await Promise.all((snapshot.copyOfMainComponents || []).map((compressed, index) => _fsExtra().default.outputFile(_path().default.join(this.getLastMergedMainComponentsPath(), String(index)), compressed)));
   }
   async restoreLaneObjectFromLastMerged() {
     if (!_fsExtra().default.pathExistsSync(this.path)) {
@@ -155,12 +175,8 @@ class LastMerged {
     if (!_fsExtra().default.pathExistsSync(this.getLastMergedWorkspacePath())) {
       throw new (_bitError().BitError)(`unable to abort the last lane-merge because the workspace.jsonc is missing from ${this.path}`);
     }
-    if (currentLane) {
-      if (!lastLane) {
-        throw new (_bitError().BitError)(`unable to abort the last lane-merge because the ${LAST_MERGED_LANE_FILENAME} is missing from ${this.path}`);
-      }
-      const laneFromBackup = await _objects().BitObject.parseObject(lastLane, LAST_MERGED_LANE_FILENAME);
-      await this.scope.legacyScope.objects.writeObjectsToTheFS([laneFromBackup]);
+    if (currentLane && !lastLane) {
+      throw new (_bitError().BitError)(`unable to abort the last lane-merge because the ${LAST_MERGED_LANE_FILENAME} is missing from ${this.path}`);
     }
     const previousBitmapBuffer = await _fsExtra().default.readFile(this.getLastMergedBitmapPath());
     const previousBitmap = _legacy().BitMap.loadFromContentWithoutLoadingFiles(previousBitmapBuffer, '', '', '');
@@ -170,6 +186,12 @@ class LastMerged {
     if (!mergeAbortOpts.silent) {
       await this.mergeAbortPrompt(compDirsToRemove);
     }
+    if (currentLane) {
+      const laneFromBackup = await _objects().BitObject.parseObject(lastLane, LAST_MERGED_LANE_FILENAME);
+      await this.scope.legacyScope.objects.writeObjectsToTheFS([laneFromBackup]);
+    } else {
+      await this.restoreMainComponents();
+    }
     await Promise.all(compDirsToRemove.map(dir => _fsExtra().default.remove(dir))); // it doesn't throw if not-exist, so we're good here.
     await _fsExtra().default.copyFile(this.getLastMergedBitmapPath(), this.consumer.bitMap.mapPath);
     await _fsExtra().default.copyFile(this.getLastMergedWorkspacePath(), this.consumer.config.path);
@@ -202,6 +224,20 @@ ${_chalk().default.bold('Do you want to continue? [yes(y)/no(n)]')}`
       throw new PromptCanceled();
     }
   }
+
+  /**
+   * restore the component objects as they were before merging into main, which restores their main heads.
+   */
+  async restoreMainComponents() {
+    const dir = this.getLastMergedMainComponentsPath();
+    // a snapshot of an older bit, or of a merge with no components, has no such dir
+    const filenames = await _fsExtra().default.readdir(dir).catch(err => {
+      if (err.code === 'ENOENT') return [];
+      throw err;
+    });
+    const modelComponents = await Promise.all(filenames.map(async filename => _objects().BitObject.parseObject(await _fsExtra().default.readFile(_path().default.join(dir, filename)), filename)));
+    await this.scope.legacyScope.objects.writeObjectsToTheFS(modelComponents);
+  }
   async getLastMergedLaneContentIfExists() {
     const filename = this.getLastMergedLanePath();
     return this.getFileContentIfExist(filename);
@@ -229,6 +265,9 @@ ${_chalk().default.bold('Do you want to continue? [yes(y)/no(n)]')}`
   getLastMergedStagedConfigPath() {
     return _path().default.join(this.path, 'staged-config.json');
   }
+  getLastMergedMainComponentsPath() {
+    return _path().default.join(this.path, LAST_MERGED_MAIN_COMPONENTS_DIR);
+  }
 }
 exports.LastMerged = LastMerged;
 

package/dist/last-merged.js.map

@@ -1 +1 @@
-{"version":3,"names":["_path","data","_interopRequireDefault","require","_tempy","_fsExtra","_yesno","_chalk","_legacy","_objects","_legacy2","_bitError","e","__esModule","default","PromptCanceled","BitError","constructor","chalk","yellow","LAST_MERGED_LANE_FILENAME","LAST_MERGED_BITMAP_FILENAME","LastMerged","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","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","bold","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 type { ScopeMain } from '@teambit/scope';\nimport type { Lane } from '@teambit/objects';\nimport { BitObject } from '@teambit/objects';\nimport { StagedSnaps } from '@teambit/legacy.scope';\nimport type { Consumer } from '@teambit/legacy.consumer';\nimport { BitError } from '@teambit/bit-error';\nimport type { Logger } from '@teambit/logger';\nimport type { MergeAbortOpts } from './merge-abort.cmd';\n\nclass PromptCanceled extends BitError {\n  constructor() {\n    super(chalk.yellow('operation aborted'));\n  }\n}\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":[]}
+{"version":3,"names":["_path","data","_interopRequireDefault","require","_tempy","_fsExtra","_yesno","_chalk","_legacy","_lodash","_objects","_legacy2","_bitError","e","__esModule","default","PromptCanceled","BitError","constructor","chalk","yellow","LAST_MERGED_LANE_FILENAME","LAST_MERGED_BITMAP_FILENAME","LAST_MERGED_MAIN_COMPONENTS_DIR","LastMerged","scope","consumer","logger","path","getLastMergedPath","takeSnapshot","currentLane","idsToMerge","copyOfCurrentLane","clone","undefined","copyOfBitmap","tempy","file","copyOfWorkspaceJsonc","copyOfStagedSnaps","fs","copyFile","bitMap","mapPath","config","stagedSnaps","isEmpty","StagedSnaps","getPath","stagedConfig","getStagedConfig","copyOfStagedConfig","filePath","copyOfMainComponents","compressComponentObjects","ids","modelComponents","Promise","all","map","id","legacyScope","getModelComponentIfExist","changeVersion","compact","modelComponent","compress","persistSnapshot","snapshot","remove","ensureDir","getLastMergedBitmapPath","getLastMergedWorkspacePath","compressed","outputFile","getLastMergedLanePath","getLastMergedStagedSnapsPath","getLastMergedStagedConfigPath","index","join","getLastMergedMainComponentsPath","String","restoreLaneObjectFromLastMerged","pathExistsSync","lastLane","getLastMergedLaneContentIfExists","laneFromBackup","BitObject","parseObject","objects","writeObjectsToTheFS","restoreFromLastMerged","mergeAbortOpts","previousBitmapBuffer","readFile","previousBitmap","BitMap","loadFromContentWithoutLoadingFiles","currentRootDirs","getAllTrackDirs","previousRootDirs","compDirsToRemove","Object","keys","filter","dir","silent","mergeAbortPrompt","restoreMainComponents","deleteFile","dirsToRemove","clearStatusLine","dirsToRemoveStr","length","ok","yesno","question","bold","filenames","readdir","catch","err","code","filename","getFileContentIfExist","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 { compact } from 'lodash';\nimport type { ComponentID } from '@teambit/component-id';\nimport type { ScopeMain } from '@teambit/scope';\nimport type { Lane } from '@teambit/objects';\nimport { BitObject } from '@teambit/objects';\nimport { StagedSnaps } from '@teambit/legacy.scope';\nimport type { Consumer } from '@teambit/legacy.consumer';\nimport { BitError } from '@teambit/bit-error';\nimport type { Logger } from '@teambit/logger';\nimport type { MergeAbortOpts } from './merge-abort.cmd';\n\nclass PromptCanceled extends BitError {\n  constructor() {\n    super(chalk.yellow('operation aborted'));\n  }\n}\n\nconst LAST_MERGED_LANE_FILENAME = 'lane';\nconst LAST_MERGED_BITMAP_FILENAME = 'bitmap';\nconst LAST_MERGED_MAIN_COMPONENTS_DIR = 'main-components';\n\ntype Snapshot = {\n  copyOfCurrentLane?: Lane;\n  copyOfBitmap: string;\n  copyOfWorkspaceJsonc: string;\n  copyOfStagedSnaps?: string;\n  copyOfStagedConfig?: string;\n  copyOfMainComponents?: Buffer[];\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  /**\n   * `idsToMerge` is needed when merging into main. a lane keeps the heads of its components in the lane object, main\n   * keeps them in the component objects, so these are copied to restore the heads the merge moves.\n   */\n  async takeSnapshot(currentLane?: Lane | null, idsToMerge: ComponentID[] = []): 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    const copyOfMainComponents = currentLane ? undefined : await this.compressComponentObjects(idsToMerge);\n\n    return {\n      copyOfCurrentLane,\n      copyOfBitmap,\n      copyOfWorkspaceJsonc,\n      copyOfStagedSnaps,\n      copyOfStagedConfig,\n      copyOfMainComponents,\n    };\n  }\n\n  private async compressComponentObjects(ids: ComponentID[]): Promise<Buffer[]> {\n    const modelComponents = await Promise.all(\n      ids.map((id) => this.scope.legacyScope.getModelComponentIfExist(id.changeVersion(undefined)))\n    );\n    return Promise.all(compact(modelComponents).map((modelComponent) => modelComponent.compress()));\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    await Promise.all(\n      (snapshot.copyOfMainComponents || []).map((compressed, index) =>\n        fs.outputFile(path.join(this.getLastMergedMainComponentsPath(), String(index)), compressed)\n      )\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 && !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 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    if (currentLane) {\n      const laneFromBackup = await BitObject.parseObject(lastLane as Buffer, LAST_MERGED_LANE_FILENAME);\n      await this.scope.legacyScope.objects.writeObjectsToTheFS([laneFromBackup]);\n    } else {\n      await this.restoreMainComponents();\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  /**\n   * restore the component objects as they were before merging into main, which restores their main heads.\n   */\n  private async restoreMainComponents() {\n    const dir = this.getLastMergedMainComponentsPath();\n    // a snapshot of an older bit, or of a merge with no components, has no such dir\n    const filenames: string[] = await fs.readdir(dir).catch((err) => {\n      if (err.code === 'ENOENT') return [];\n      throw err;\n    });\n    const modelComponents = await Promise.all(\n      filenames.map(async (filename) => BitObject.parseObject(await fs.readFile(path.join(dir, filename)), filename))\n    );\n    await this.scope.legacyScope.objects.writeObjectsToTheFS(modelComponents);\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  private getLastMergedMainComponentsPath() {\n    return path.join(this.path, LAST_MERGED_MAIN_COMPONENTS_DIR);\n  }\n}\n"],"mappings":"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","ignoreList":[]}

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

@@ -333,7 +333,8 @@ class MergeLanesMain {
       await this.importer.importHeadArtifactsFromLane(laneToFetchArtifactsFrom, ids, true);
     }
     const lastMerged = consumer ? new (_lastMerged().LastMerged)(this.scope, consumer, this.logger) : undefined;
-    const snapshot = await lastMerged?.takeSnapshot(currentLane);
+    // not only the succeeded ones. with "--tag", the unchanged components are tagged as well
+    const snapshot = await lastMerged?.takeSnapshot(currentLane, allComponentsStatus.map(c => c.id));
     const mergeResults = await this.merging.mergeSnaps({
       mergeStrategy,
       allComponentsStatus,

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

@@ -1 +1 @@
-{"version":3,"names":["_bitError","data","require","_path","_interopRequireDefault","_harmonyModules","_cli","_importer","_lanes","_merging","_componentModules","_workspace","_configStore","_harmonyModules2","_componentId","_objects","_componentVersion","_pMapSeries","_scope","_laneId","_logger","_checkout","_remove","_lodash","_export","_mergeLanes","_mergeLane","_missingCompsToMerge","_mergeAbort","_lastMerged","_mergeMove","_express","_lanesCheckConflicts","e","__esModule","default","_defineProperty","r","t","_toPropertyKey","Object","defineProperty","value","enumerable","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","shouldIncludeUpdateDependents","undefined","mergeLane","validateMergeFlags","currentLane","otherLane","laneToFetchArtifactsFrom","idsToMerge","resolveMergeContext","mergeStrategy","noAutoSnap","noSnap","tag","snapMessage","existingOnWorkspaceOnly","build","loose","keepReadme","squash","noSquash","pattern","includeDeps","skipDependencyInstallation","resolveUnrelated","ignoreConfigChanges","throwIfNotUpToDate","detachHead","legacyScope","debug","toString","shouldSquash","isDefault","allComponentsStatus","getMergeStatus","handleTargetAheadAsDiverged","shouldMergeAspectsData","componentIds","compIdsFromPattern","filterIdsFromPoolIdsByPattern","filterComponentsStatus","forEach","bitId","find","c","id","isEqualWithoutVersion","push","unchangedLegitimately","unchangedMessage","workspaceIds","listIds","filter","throwForFailures","succeededComponents","squashSnaps","messageTitle","ids","map","importHeadArtifactsFromLane","lastMerged","LastMerged","snapshot","takeSnapshot","mergeResults","mergeSnaps","persistSnapshot","mergedSuccessfully","failedComponents","length","every","failedComponent","deleteResults","readmeComponent","readmeComponentId","changeVersion","head","hash","removeLocallyByIds","reasonForRemoval","readmeResult","configMergeResults","compact","configMergeResult","mergedSnapIds","ComponentIdList","fromArray","mergeSnapResults","snappedComponents","componentsWithConfigConflicts","hasConflicts","compIdStr","conflicts","mergedSuccessfullyIds","components","files","keys","filesStatus","f","FileStatus","manual","binaryConflict","config","includes","toStringWithoutVersion","snappedId","searchWithoutVersion","importMissingReferencedDeps","onDestroy","name","checkedHashes","Set","candidateRefs","pMapSeries","modelComponent","getModelComponentIfExist","headVersion","loadVersion","objects","flattenedDependencies","loadFlattenedDependencies","depId","version","isSnap","has","add","Ref","from","existingRefs","hasMultiple","existingHashes","ref","missingHashes","scopeImporter","importManyObjects","subRefs","versionObject","load","refsWithOptions","existingSubRefs","missingSubRefs","isEqual","skipFetch","excludeNonLaneComps","fetchCurrent","fetchLaneWithItsComponents","loadLane","isDefaultLane","getMainIdsToMerge","compIdList","toVersionLatest","importObjectsFromMainIfExist","getOtherLane","lane","shouldFetch","isNew","getBitIds","resolveMainHeadsFromRemote","idsWithHead","Promise","all","getHeadOnMain","modelComponents","getModelComponent","toComponentId","Error","toComponentIdsIncludeUpdateDependents","toComponentIds","checkLaneForConflicts","sourceLaneIdStr","targetLaneIdStr","parseLaneIdFromString","modifiedFiles","conflict","isBinaryConflict","configData","co","configConflict","generateMergeConflictFile","filePath","mergeMove","newLaneName","OutsideWorkspaceError","lastMerge","restoreLaneObjectFromLastMerged","newLaneResult","createLane","abortLaneMerge","checkoutProps","mergeAbortOpts","getCurrentLane","compDirsToRemove","restoreFromLastMerged","_reloadConsumer","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","fromLaneId","toLaneId","status","diffStatus","skipChanges","compsNotUpToDate","componentsStatus","s","upToDate","componentId","provider","cli","loggerMain","configStore","express","createLogger","MergeLanesAspect","lanesCommand","getCommand","mergeLanesMain","commands","MergeLaneCmd","MergeAbortLaneCmd","MergeMoveLaneCmd","register","LanesCheckConflictsRoute","exports","LanesAspect","CLIAspect","WorkspaceAspect","MergingAspect","LoggerAspect","RemoveAspect","ScopeAspect","ExportAspect","ImporterAspect","CheckoutAspect","ConfigStoreAspect","ExpressAspect","MainRuntime","compIdsToKeep","allBitIds","bitIdsFromPattern","bitIdsNotFromPattern","hasWithoutVersion","filteredComponentStatus","depsToAdd","missingDepsFromHead","missingDepsFromHistory","versionsToCheckPerId","compId","fromStatus","divergeData","targetVersions","snapsOnTargetOnly","headOnTarget","getCompHeadIncludeUpdateDependents","toImport","v","flat","importWithoutDeps","cache","includeVersionHistory","reason","remoteVersion","versionObj","flattenedDeps","depsNotIncludeInPattern","depsOnLane","dep","isOnLane","isIdOnLane","depsOnLaneStr","MissingCompsToMerge","uniq","depsWithoutVersion","d","depsUniqWithoutVersion","uniqFromArray","opts","currentLaneName","log","getLogForSquash","componentFromModel","modifiedComp","squashOneComp","versionHistory","updateRebasedVersionHistory","isDiverged","isSourceAhead","isTargetAhead","remoteSnaps","getAllMessages","versionObjects","message","getFinalMessage","allMessage","allMessageStr","m","currentParents","parents","commonSnapBeforeDiverge","doSquash","addAsOnlyParent","removeParent","finalMessage","setSquashed","previousParents","addRuntime","_default"],"sources":["merge-lanes.main.runtime.ts"],"sourcesContent":["import { BitError } from '@teambit/bit-error';\nimport path from 'path';\nimport type { CLIMain } from '@teambit/cli';\nimport { MainRuntime } from '@teambit/harmony.modules.runtimes';\nimport { CLIAspect } from '@teambit/cli';\nimport type { ImporterMain } from '@teambit/importer';\nimport { ImporterAspect } from '@teambit/importer';\nimport type { LanesMain } from '@teambit/lanes';\nimport { LanesAspect } from '@teambit/lanes';\nimport type { MergingMain, ComponentMergeStatus } from '@teambit/merging';\nimport type { ApplyVersionResults, MergeStrategy } from '@teambit/component.modules.merge-helper';\nimport { MergingAspect } from '@teambit/merging';\nimport { FileStatus } from '@teambit/component.modules.merge-helper';\nimport type { Workspace } from '@teambit/workspace';\nimport { WorkspaceAspect, OutsideWorkspaceError } from '@teambit/workspace';\nimport type { ConfigStoreMain } from '@teambit/config-store';\nimport { ConfigStoreAspect } from '@teambit/config-store';\nimport { getLogForSquash } from '@teambit/harmony.modules.get-basic-log';\nimport type { ComponentID } from '@teambit/component-id';\nimport { ComponentIdList } from '@teambit/component-id';\nimport type { Lane, Version, Log } from '@teambit/objects';\nimport { Ref } from '@teambit/objects';\nimport { isSnap } from '@teambit/component-version';\nimport pMapSeries from 'p-map-series';\nimport type { Scope as LegacyScope } from '@teambit/legacy.scope';\nimport type { ScopeMain } from '@teambit/scope';\nimport { ScopeAspect } from '@teambit/scope';\nimport type { LaneId } from '@teambit/lane-id';\nimport { DEFAULT_LANE } from '@teambit/lane-id';\nimport type { ConfigMergeResult } from '@teambit/config-merger';\nimport type { Logger, LoggerMain } from '@teambit/logger';\nimport { LoggerAspect } from '@teambit/logger';\nimport type { CheckoutMain, CheckoutProps } from '@teambit/checkout';\nimport { CheckoutAspect, throwForFailures } from '@teambit/checkout';\nimport type { SnapsDistance } from '@teambit/component.snap-distance';\nimport type { RemoveMain } from '@teambit/remove';\nimport { RemoveAspect } from '@teambit/remove';\nimport { compact, uniq } from 'lodash';\nimport type { ExportMain } from '@teambit/export';\nimport { ExportAspect } from '@teambit/export';\nimport { MergeLanesAspect } from './merge-lanes.aspect';\nimport { MergeLaneCmd } from './merge-lane.cmd';\nimport { MissingCompsToMerge } from './exceptions/missing-comps-to-merge';\nimport type { MergeAbortOpts } from './merge-abort.cmd';\nimport { MergeAbortLaneCmd } from './merge-abort.cmd';\nimport { LastMerged } from './last-merged';\nimport { MergeMoveLaneCmd } from './merge-move.cmd';\nimport type { ExpressMain } from '@teambit/express';\nimport { ExpressAspect } from '@teambit/express';\nimport { LanesCheckConflictsRoute } from './lanes-check-conflicts.route';\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  detachHead?: boolean;\n  loose?: boolean; // relevant for --build, to allow build to succeed even if tasks like tests or lint fail\n  // opt in to resolving each component's head on main from the REMOTE scope (via getHeadOnMain) when\n  // merging from main, so a base that lives only on the remote is still merged. off by default: the\n  // merge resolves heads from the local scope only (matches the historical behavior), so this remote\n  // round-trip is paid solely by callers that explicitly need it, not every merge-from-main consumer.\n  resolveMainHeadsFromRemote?: boolean;\n};\nexport type ConflictPerId = { id: ComponentID; files: string[]; config?: boolean; configConflict?: string };\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    // Hidden lane updateDependents must participate in every merge — otherwise main→lane refresh\n    // (`bit lane merge main`) leaves the lane's cascaded entries stuck on their old main-head\n    // base, and lane→main merge would push a partially-consistent lane state. The bare-scope\n    // counterpart (`bit _merge-lane`, used by Ripple / the UI's \"update lane\" button) already\n    // sets this; the workspace path was the missing leg.\n    if (options.shouldIncludeUpdateDependents === undefined) {\n      options.shouldIncludeUpdateDependents = true;\n    }\n    return this.mergeLane(otherLaneId, currentLaneId, options);\n  }\n\n  /**\n   * merge otherLaneId into currentLaneId\n   */\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    this.validateMergeFlags(otherLaneId, currentLaneId, options);\n    const { currentLane, otherLane, laneToFetchArtifactsFrom, idsToMerge } = await this.resolveMergeContext(\n      otherLaneId,\n      currentLaneId,\n      options\n    );\n\n    const {\n      mergeStrategy,\n      noAutoSnap,\n      noSnap,\n      tag,\n      snapMessage,\n      existingOnWorkspaceOnly,\n      build,\n      loose,\n      keepReadme,\n      squash,\n      noSquash,\n      pattern,\n      includeDeps,\n      skipDependencyInstallation,\n      resolveUnrelated,\n      ignoreConfigChanges,\n      throwIfNotUpToDate,\n      detachHead,\n    } = options;\n    const legacyScope = this.scope.legacyScope;\n    const consumer = this.workspace?.consumer;\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        detachHead,\n        shouldMergeAspectsData: true,\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, {\n        messageTitle: options.snapMessage,\n        detachHead,\n      });\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      detachHead,\n      loose,\n      shouldSquash,\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 mergedSnapIds = ComponentIdList.fromArray(\n      mergeResults.mergeSnapResults?.snappedComponents.map((c) => c.id) || []\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 {\n        const snappedId = mergedSnapIds.searchWithoutVersion(c.id);\n        mergedSuccessfullyIds.push(snappedId || c.id);\n      }\n    });\n\n    // A merged head may reference — via its flattened dependencies — a non-head snap of another\n    // component. When merging to main the squash removes intermediate snaps from each component's own\n    // chain, and a bare-scope merge (`bit _merge-lane --push`) exports heads only; in both cases such a\n    // referenced snap wouldn't be exported, and on lean lanes it lives only on the lane scope. Import\n    // any missing one now so the export can ship it (otherwise the remote's dependency-integrity check\n    // would reject the push). Not needed for non-squash workspace merges, which export full history.\n    if (shouldSquash || !this.workspace) {\n      await this.importMissingReferencedDeps(mergedSuccessfullyIds, otherLane);\n    }\n\n    await this.workspace?.consumer.onDestroy(`lane-merge (${otherLaneId.name})`);\n\n    return { mergeResults, deleteResults, configMergeResults, mergedSuccessfullyIds, conflicts };\n  }\n\n  /**\n   * A merged component head may reference, via its flattened dependencies, a non-head snap of another\n   * component — e.g. a deleted component that keeps pinning an older snap of a dependency that has\n   * since advanced. On lean lanes those snaps live only on the lane scope and are not fetched by the\n   * merge, so the heads-only export (used by `bit _merge-lane --push`) would leave them out and the\n   * remote's dependency-integrity check would fail. Import any such missing snap from the lane scope.\n   */\n  private async importMissingReferencedDeps(ids: ComponentID[], otherLane?: Lane) {\n    // the missing snaps live on the lane scope (lean lanes). without the source lane we don't know\n    // where to fetch them from, so there's nothing to do.\n    if (!otherLane) return;\n    const legacyScope = this.scope.legacyScope;\n    // one existence check per unique hash — the same snap appears in the flattened list of many heads\n    const checkedHashes = new Set<string>();\n    const candidateRefs: Ref[] = [];\n    await pMapSeries(ids, async (id) => {\n      // strip the version — a versioned lookup (sources.get) returns undefined when that Version\n      // object is missing locally, and only the model is needed here anyway (for its head).\n      const modelComponent = await legacyScope.getModelComponentIfExist(id.changeVersion(undefined));\n      const head = modelComponent?.head;\n      if (!modelComponent || !head) return;\n      const headVersion = await modelComponent.loadVersion(head.toString(), legacyScope.objects, false);\n      if (!headVersion) return;\n      // flattened (not only direct) to mirror the remote-side check, which validates the flattened\n      // dependencies of every exported head (see throwForMissingLocalDependencies). cheap: only the\n      // heads are loaded and each unique hash is stat-ed once.\n      const flattenedDependencies = await headVersion.loadFlattenedDependencies(legacyScope.objects);\n      flattenedDependencies.forEach((depId) => {\n        // the remote check validates only same-scope deps (it skips `depId.scope !== scope.name`,\n        // cross-scope deps are fetched later by the remote itself), so same-scope is all the export\n        // needs to ship. this also filters out the vast majority of the flattened list.\n        if (depId.scope !== id.scope) return;\n        // only snaps can go missing this way — tags live on the home scope and are never squashed\n        // off a lane. (a tag version is a semver string, not an object hash, so Ref.from would be\n        // bogus for it anyway.)\n        if (!depId.version || !isSnap(depId.version)) return;\n        if (checkedHashes.has(depId.version)) return;\n        checkedHashes.add(depId.version);\n        candidateRefs.push(Ref.from(depId.version));\n      });\n    });\n    // hasMultiple bounds the I/O concurrency, unlike a Promise.all of has() calls\n    const existingRefs = await legacyScope.objects.hasMultiple(candidateRefs);\n    const existingHashes = new Set(existingRefs.map((ref) => ref.toString()));\n    const missingHashes = candidateRefs.map((ref) => ref.toString()).filter((hash) => !existingHashes.has(hash));\n    if (!missingHashes.length) return;\n    this.logger.debug(\n      `importMissingReferencedDeps, importing ${missingHashes.length} non-head dependency snaps referenced by the merged heads from ${otherLane.scope}`\n    );\n    // fetch the raw objects only (by hash, from the lane scope). importManyObjects does not touch\n    // component models/heads, so it can't leave a component pointing at a version whose object is\n    // missing — unlike a component-level import.\n    await legacyScope.scopeImporter.importManyObjects({ [otherLane.scope]: missingHashes });\n    // a Version object references other objects the export must ship along with it — the file\n    // sources and the flattened-edges/dependencies-graph. fetch the missing ones too. (parents are\n    // not needed — the export doesn't collect them for these versions. artifacts are not needed\n    // either — the export tolerates missing artifacts for such non-local versions.)\n    const subRefs: Ref[] = [];\n    await pMapSeries(missingHashes, async (hash) => {\n      const versionObject = (await legacyScope.objects.load(Ref.from(hash))) as Version | null;\n      if (!versionObject) return; // the hash could not be fetched after all\n      versionObject.refsWithOptions(false, false).forEach((ref) => {\n        if (checkedHashes.has(ref.toString())) return;\n        checkedHashes.add(ref.toString());\n        subRefs.push(ref);\n      });\n    });\n    const existingSubRefs = new Set((await legacyScope.objects.hasMultiple(subRefs)).map((ref) => ref.toString()));\n    const missingSubRefs = subRefs.map((ref) => ref.toString()).filter((hash) => !existingSubRefs.has(hash));\n    if (!missingSubRefs.length) return;\n    await legacyScope.scopeImporter.importManyObjects({ [otherLane.scope]: missingSubRefs });\n  }\n\n  private validateMergeFlags(otherLaneId: LaneId, currentLaneId: LaneId, options: MergeLaneOptions) {\n    const { tag, resolveUnrelated, detachHead } = options;\n\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 (detachHead && !currentLaneId.isDefault()) {\n      throw new BitError(`unable to detach head. the current lane is not main`);\n    }\n  }\n\n  private async resolveMergeContext(otherLaneId: LaneId, currentLaneId: LaneId, options: Partial<MergeLaneOptions>) {\n    const { skipFetch, excludeNonLaneComps, shouldIncludeUpdateDependents, fetchCurrent } = options;\n    const legacyScope = this.scope.legacyScope;\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        // pass `shouldIncludeUpdateDependents` so the prefetch covers main objects for the\n        // lane's hidden entries too — the per-component merge engine needs main-side Version\n        // objects locally to compute divergence against the hidden cascade snaps.\n        const ids = await this.getMainIdsToMerge(currentLane, !excludeNonLaneComps, shouldIncludeUpdateDependents);\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        // note: fetching always includes the lane's hidden updateDependents (and routes them to the\n        // lane's scope); `shouldIncludeUpdateDependents` still governs whether they take part in the\n        // merge itself, via `idsToMerge` below.\n        const otherLane = await this.lanes.fetchLaneWithItsComponents(otherLaneId);\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        if (options.resolveMainHeadsFromRemote) {\n          // opt-in: resolve each head on main falling back to the remote scope, so a base that lives on\n          // the remote but wasn't fetched locally is still included instead of being skipped. a component\n          // with no head on main at all is genuinely new and dropped.\n          const idsWithHead = await Promise.all(\n            ids.map(async (id) => {\n              const head = await this.lanes.getHeadOnMain(id);\n              return head ? id.changeVersion(head) : null;\n            })\n          );\n          return compact(idsWithHead);\n        }\n        // default: resolve heads from the local scope only (historical behavior). a component not in the\n        // local scope throws, and one with no local head was never merged to main and is dropped.\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    return {\n      currentLane,\n      otherLane,\n      laneToFetchArtifactsFrom,\n      idsToMerge,\n    };\n  }\n\n  /**\n   * check conflicts in case of merging sourceLaneId into targetLaneId\n   */\n  async checkLaneForConflicts(\n    sourceLaneIdStr: string,\n    targetLaneIdStr: string,\n    options: Partial<MergeLaneOptions>\n  ): Promise<{\n    conflicts: ConflictPerId[];\n  }> {\n    const legacyScope = this.scope.legacyScope;\n    const otherLaneId: LaneId = await legacyScope.lanes.parseLaneIdFromString(sourceLaneIdStr);\n    const currentLaneId: LaneId = await legacyScope.lanes.parseLaneIdFromString(targetLaneIdStr);\n    options.excludeNonLaneComps = true;\n    const { currentLane, otherLane, idsToMerge } = await this.resolveMergeContext(otherLaneId, currentLaneId, options);\n\n    const allComponentsStatus = await this.merging.getMergeStatus(\n      idsToMerge,\n      {\n        mergeStrategy: 'manual',\n      },\n      currentLane,\n      otherLane\n    );\n\n    throwForFailures(allComponentsStatus);\n\n    const configMergeResults = compact(allComponentsStatus.map((c) => c.configMergeResult));\n    const componentsWithConfigConflicts = configMergeResults.filter((c) => c.hasConflicts()).map((c) => c.compIdStr);\n    const conflicts: ConflictPerId[] = [];\n    allComponentsStatus.forEach((c) => {\n      const files = c.mergeResults?.modifiedFiles.filter((f) => f.conflict || f.isBinaryConflict) || [];\n      const config = componentsWithConfigConflicts.includes(c.id.toStringWithoutVersion());\n      if (files.length || config) {\n        const configData = configMergeResults.find((co) => co.compIdStr === c.id.toStringWithoutVersion());\n        const configConflict = configData?.generateMergeConflictFile() || undefined;\n        conflicts.push({ id: c.id, files: files.map((f) => f.filePath), config, configConflict });\n      }\n    });\n\n    return { 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  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    ConfigStoreAspect,\n    ExpressAspect,\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    configStore,\n    express,\n  ]: [\n    LanesMain,\n    CLIMain,\n    Workspace,\n    MergingMain,\n    LoggerMain,\n    RemoveMain,\n    ScopeMain,\n    ExportMain,\n    ImporterMain,\n    CheckoutMain,\n    ConfigStoreMain,\n    ExpressMain,\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, configStore));\n    lanesCommand?.commands?.push(new MergeAbortLaneCmd(mergeLanesMain));\n    lanesCommand?.commands?.push(new MergeMoveLaneCmd(mergeLanesMain));\n    express.register([new LanesCheckConflictsRoute(mergeLanesMain, logger)]);\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.getCompHeadIncludeUpdateDependents(compId) : 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 = await versionObj.loadFlattenedDependencies(legacyScope.objects);\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.getCompHeadIncludeUpdateDependents(compId) : 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 squashSnaps(\n  succeededComponents: ComponentMergeStatus[],\n  currentLaneId: LaneId,\n  otherLaneId: LaneId,\n  scope: LegacyScope,\n  opts: { messageTitle?: string; detachHead?: boolean } = {}\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        opts\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  opts: { messageTitle?: string; detachHead?: boolean } = {}\n): Promise<Version | undefined> {\n  const { messageTitle, detachHead } = opts;\n  const shouldSquash = () => {\n    if (divergeData.isDiverged()) {\n      if (detachHead) {\n        // for detach head, it's ok to have it as diverged. as long as the target is ahead, we want to squash.\n        return true;\n      }\n      // diverged + --squash: skip the parent-rewrite path here. the merge snap will be created\n      // by snapForMerge with a single parent (and squashed metadata) because the corresponding\n      // UnmergedComponent entry has `shouldSquash: true`. see snapping.main.runtime.ts.\n      return false;\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 false;\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 false;\n    }\n    return true;\n  };\n\n  if (!shouldSquash()) {\n    return undefined;\n  }\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","_harmonyModules","_cli","_importer","_lanes","_merging","_componentModules","_workspace","_configStore","_harmonyModules2","_componentId","_objects","_componentVersion","_pMapSeries","_scope","_laneId","_logger","_checkout","_remove","_lodash","_export","_mergeLanes","_mergeLane","_missingCompsToMerge","_mergeAbort","_lastMerged","_mergeMove","_express","_lanesCheckConflicts","e","__esModule","default","_defineProperty","r","t","_toPropertyKey","Object","defineProperty","value","enumerable","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","shouldIncludeUpdateDependents","undefined","mergeLane","validateMergeFlags","currentLane","otherLane","laneToFetchArtifactsFrom","idsToMerge","resolveMergeContext","mergeStrategy","noAutoSnap","noSnap","tag","snapMessage","existingOnWorkspaceOnly","build","loose","keepReadme","squash","noSquash","pattern","includeDeps","skipDependencyInstallation","resolveUnrelated","ignoreConfigChanges","throwIfNotUpToDate","detachHead","legacyScope","debug","toString","shouldSquash","isDefault","allComponentsStatus","getMergeStatus","handleTargetAheadAsDiverged","shouldMergeAspectsData","componentIds","compIdsFromPattern","filterIdsFromPoolIdsByPattern","filterComponentsStatus","forEach","bitId","find","c","id","isEqualWithoutVersion","push","unchangedLegitimately","unchangedMessage","workspaceIds","listIds","filter","throwForFailures","succeededComponents","squashSnaps","messageTitle","ids","map","importHeadArtifactsFromLane","lastMerged","LastMerged","snapshot","takeSnapshot","mergeResults","mergeSnaps","persistSnapshot","mergedSuccessfully","failedComponents","length","every","failedComponent","deleteResults","readmeComponent","readmeComponentId","changeVersion","head","hash","removeLocallyByIds","reasonForRemoval","readmeResult","configMergeResults","compact","configMergeResult","mergedSnapIds","ComponentIdList","fromArray","mergeSnapResults","snappedComponents","componentsWithConfigConflicts","hasConflicts","compIdStr","conflicts","mergedSuccessfullyIds","components","files","keys","filesStatus","f","FileStatus","manual","binaryConflict","config","includes","toStringWithoutVersion","snappedId","searchWithoutVersion","importMissingReferencedDeps","onDestroy","name","checkedHashes","Set","candidateRefs","pMapSeries","modelComponent","getModelComponentIfExist","headVersion","loadVersion","objects","flattenedDependencies","loadFlattenedDependencies","depId","version","isSnap","has","add","Ref","from","existingRefs","hasMultiple","existingHashes","ref","missingHashes","scopeImporter","importManyObjects","subRefs","versionObject","load","refsWithOptions","existingSubRefs","missingSubRefs","isEqual","skipFetch","excludeNonLaneComps","fetchCurrent","fetchLaneWithItsComponents","loadLane","isDefaultLane","getMainIdsToMerge","compIdList","toVersionLatest","importObjectsFromMainIfExist","getOtherLane","lane","shouldFetch","isNew","getBitIds","resolveMainHeadsFromRemote","idsWithHead","Promise","all","getHeadOnMain","modelComponents","getModelComponent","toComponentId","Error","toComponentIdsIncludeUpdateDependents","toComponentIds","checkLaneForConflicts","sourceLaneIdStr","targetLaneIdStr","parseLaneIdFromString","modifiedFiles","conflict","isBinaryConflict","configData","co","configConflict","generateMergeConflictFile","filePath","mergeMove","newLaneName","OutsideWorkspaceError","lastMerge","restoreLaneObjectFromLastMerged","newLaneResult","createLane","abortLaneMerge","checkoutProps","mergeAbortOpts","getCurrentLane","compDirsToRemove","restoreFromLastMerged","_reloadConsumer","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","fromLaneId","toLaneId","status","diffStatus","skipChanges","compsNotUpToDate","componentsStatus","s","upToDate","componentId","provider","cli","loggerMain","configStore","express","createLogger","MergeLanesAspect","lanesCommand","getCommand","mergeLanesMain","commands","MergeLaneCmd","MergeAbortLaneCmd","MergeMoveLaneCmd","register","LanesCheckConflictsRoute","exports","LanesAspect","CLIAspect","WorkspaceAspect","MergingAspect","LoggerAspect","RemoveAspect","ScopeAspect","ExportAspect","ImporterAspect","CheckoutAspect","ConfigStoreAspect","ExpressAspect","MainRuntime","compIdsToKeep","allBitIds","bitIdsFromPattern","bitIdsNotFromPattern","hasWithoutVersion","filteredComponentStatus","depsToAdd","missingDepsFromHead","missingDepsFromHistory","versionsToCheckPerId","compId","fromStatus","divergeData","targetVersions","snapsOnTargetOnly","headOnTarget","getCompHeadIncludeUpdateDependents","toImport","v","flat","importWithoutDeps","cache","includeVersionHistory","reason","remoteVersion","versionObj","flattenedDeps","depsNotIncludeInPattern","depsOnLane","dep","isOnLane","isIdOnLane","depsOnLaneStr","MissingCompsToMerge","uniq","depsWithoutVersion","d","depsUniqWithoutVersion","uniqFromArray","opts","currentLaneName","log","getLogForSquash","componentFromModel","modifiedComp","squashOneComp","versionHistory","updateRebasedVersionHistory","isDiverged","isSourceAhead","isTargetAhead","remoteSnaps","getAllMessages","versionObjects","message","getFinalMessage","allMessage","allMessageStr","m","currentParents","parents","commonSnapBeforeDiverge","doSquash","addAsOnlyParent","removeParent","finalMessage","setSquashed","previousParents","addRuntime","_default"],"sources":["merge-lanes.main.runtime.ts"],"sourcesContent":["import { BitError } from '@teambit/bit-error';\nimport path from 'path';\nimport type { CLIMain } from '@teambit/cli';\nimport { MainRuntime } from '@teambit/harmony.modules.runtimes';\nimport { CLIAspect } from '@teambit/cli';\nimport type { ImporterMain } from '@teambit/importer';\nimport { ImporterAspect } from '@teambit/importer';\nimport type { LanesMain } from '@teambit/lanes';\nimport { LanesAspect } from '@teambit/lanes';\nimport type { MergingMain, ComponentMergeStatus } from '@teambit/merging';\nimport type { ApplyVersionResults, MergeStrategy } from '@teambit/component.modules.merge-helper';\nimport { MergingAspect } from '@teambit/merging';\nimport { FileStatus } from '@teambit/component.modules.merge-helper';\nimport type { Workspace } from '@teambit/workspace';\nimport { WorkspaceAspect, OutsideWorkspaceError } from '@teambit/workspace';\nimport type { ConfigStoreMain } from '@teambit/config-store';\nimport { ConfigStoreAspect } from '@teambit/config-store';\nimport { getLogForSquash } from '@teambit/harmony.modules.get-basic-log';\nimport type { ComponentID } from '@teambit/component-id';\nimport { ComponentIdList } from '@teambit/component-id';\nimport type { Lane, Version, Log } from '@teambit/objects';\nimport { Ref } from '@teambit/objects';\nimport { isSnap } from '@teambit/component-version';\nimport pMapSeries from 'p-map-series';\nimport type { Scope as LegacyScope } from '@teambit/legacy.scope';\nimport type { ScopeMain } from '@teambit/scope';\nimport { ScopeAspect } from '@teambit/scope';\nimport type { LaneId } from '@teambit/lane-id';\nimport { DEFAULT_LANE } from '@teambit/lane-id';\nimport type { ConfigMergeResult } from '@teambit/config-merger';\nimport type { Logger, LoggerMain } from '@teambit/logger';\nimport { LoggerAspect } from '@teambit/logger';\nimport type { CheckoutMain, CheckoutProps } from '@teambit/checkout';\nimport { CheckoutAspect, throwForFailures } from '@teambit/checkout';\nimport type { SnapsDistance } from '@teambit/component.snap-distance';\nimport type { RemoveMain } from '@teambit/remove';\nimport { RemoveAspect } from '@teambit/remove';\nimport { compact, uniq } from 'lodash';\nimport type { ExportMain } from '@teambit/export';\nimport { ExportAspect } from '@teambit/export';\nimport { MergeLanesAspect } from './merge-lanes.aspect';\nimport { MergeLaneCmd } from './merge-lane.cmd';\nimport { MissingCompsToMerge } from './exceptions/missing-comps-to-merge';\nimport type { MergeAbortOpts } from './merge-abort.cmd';\nimport { MergeAbortLaneCmd } from './merge-abort.cmd';\nimport { LastMerged } from './last-merged';\nimport { MergeMoveLaneCmd } from './merge-move.cmd';\nimport type { ExpressMain } from '@teambit/express';\nimport { ExpressAspect } from '@teambit/express';\nimport { LanesCheckConflictsRoute } from './lanes-check-conflicts.route';\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  detachHead?: boolean;\n  loose?: boolean; // relevant for --build, to allow build to succeed even if tasks like tests or lint fail\n  // opt in to resolving each component's head on main from the REMOTE scope (via getHeadOnMain) when\n  // merging from main, so a base that lives only on the remote is still merged. off by default: the\n  // merge resolves heads from the local scope only (matches the historical behavior), so this remote\n  // round-trip is paid solely by callers that explicitly need it, not every merge-from-main consumer.\n  resolveMainHeadsFromRemote?: boolean;\n};\nexport type ConflictPerId = { id: ComponentID; files: string[]; config?: boolean; configConflict?: string };\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    // Hidden lane updateDependents must participate in every merge — otherwise main→lane refresh\n    // (`bit lane merge main`) leaves the lane's cascaded entries stuck on their old main-head\n    // base, and lane→main merge would push a partially-consistent lane state. The bare-scope\n    // counterpart (`bit _merge-lane`, used by Ripple / the UI's \"update lane\" button) already\n    // sets this; the workspace path was the missing leg.\n    if (options.shouldIncludeUpdateDependents === undefined) {\n      options.shouldIncludeUpdateDependents = true;\n    }\n    return this.mergeLane(otherLaneId, currentLaneId, options);\n  }\n\n  /**\n   * merge otherLaneId into currentLaneId\n   */\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    this.validateMergeFlags(otherLaneId, currentLaneId, options);\n    const { currentLane, otherLane, laneToFetchArtifactsFrom, idsToMerge } = await this.resolveMergeContext(\n      otherLaneId,\n      currentLaneId,\n      options\n    );\n\n    const {\n      mergeStrategy,\n      noAutoSnap,\n      noSnap,\n      tag,\n      snapMessage,\n      existingOnWorkspaceOnly,\n      build,\n      loose,\n      keepReadme,\n      squash,\n      noSquash,\n      pattern,\n      includeDeps,\n      skipDependencyInstallation,\n      resolveUnrelated,\n      ignoreConfigChanges,\n      throwIfNotUpToDate,\n      detachHead,\n    } = options;\n    const legacyScope = this.scope.legacyScope;\n    const consumer = this.workspace?.consumer;\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        detachHead,\n        shouldMergeAspectsData: true,\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, {\n        messageTitle: options.snapMessage,\n        detachHead,\n      });\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    // not only the succeeded ones. with \"--tag\", the unchanged components are tagged as well\n    const snapshot = await lastMerged?.takeSnapshot(\n      currentLane,\n      allComponentsStatus.map((c) => c.id)\n    );\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      detachHead,\n      loose,\n      shouldSquash,\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 mergedSnapIds = ComponentIdList.fromArray(\n      mergeResults.mergeSnapResults?.snappedComponents.map((c) => c.id) || []\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 {\n        const snappedId = mergedSnapIds.searchWithoutVersion(c.id);\n        mergedSuccessfullyIds.push(snappedId || c.id);\n      }\n    });\n\n    // A merged head may reference — via its flattened dependencies — a non-head snap of another\n    // component. When merging to main the squash removes intermediate snaps from each component's own\n    // chain, and a bare-scope merge (`bit _merge-lane --push`) exports heads only; in both cases such a\n    // referenced snap wouldn't be exported, and on lean lanes it lives only on the lane scope. Import\n    // any missing one now so the export can ship it (otherwise the remote's dependency-integrity check\n    // would reject the push). Not needed for non-squash workspace merges, which export full history.\n    if (shouldSquash || !this.workspace) {\n      await this.importMissingReferencedDeps(mergedSuccessfullyIds, otherLane);\n    }\n\n    await this.workspace?.consumer.onDestroy(`lane-merge (${otherLaneId.name})`);\n\n    return { mergeResults, deleteResults, configMergeResults, mergedSuccessfullyIds, conflicts };\n  }\n\n  /**\n   * A merged component head may reference, via its flattened dependencies, a non-head snap of another\n   * component — e.g. a deleted component that keeps pinning an older snap of a dependency that has\n   * since advanced. On lean lanes those snaps live only on the lane scope and are not fetched by the\n   * merge, so the heads-only export (used by `bit _merge-lane --push`) would leave them out and the\n   * remote's dependency-integrity check would fail. Import any such missing snap from the lane scope.\n   */\n  private async importMissingReferencedDeps(ids: ComponentID[], otherLane?: Lane) {\n    // the missing snaps live on the lane scope (lean lanes). without the source lane we don't know\n    // where to fetch them from, so there's nothing to do.\n    if (!otherLane) return;\n    const legacyScope = this.scope.legacyScope;\n    // one existence check per unique hash — the same snap appears in the flattened list of many heads\n    const checkedHashes = new Set<string>();\n    const candidateRefs: Ref[] = [];\n    await pMapSeries(ids, async (id) => {\n      // strip the version — a versioned lookup (sources.get) returns undefined when that Version\n      // object is missing locally, and only the model is needed here anyway (for its head).\n      const modelComponent = await legacyScope.getModelComponentIfExist(id.changeVersion(undefined));\n      const head = modelComponent?.head;\n      if (!modelComponent || !head) return;\n      const headVersion = await modelComponent.loadVersion(head.toString(), legacyScope.objects, false);\n      if (!headVersion) return;\n      // flattened (not only direct) to mirror the remote-side check, which validates the flattened\n      // dependencies of every exported head (see throwForMissingLocalDependencies). cheap: only the\n      // heads are loaded and each unique hash is stat-ed once.\n      const flattenedDependencies = await headVersion.loadFlattenedDependencies(legacyScope.objects);\n      flattenedDependencies.forEach((depId) => {\n        // the remote check validates only same-scope deps (it skips `depId.scope !== scope.name`,\n        // cross-scope deps are fetched later by the remote itself), so same-scope is all the export\n        // needs to ship. this also filters out the vast majority of the flattened list.\n        if (depId.scope !== id.scope) return;\n        // only snaps can go missing this way — tags live on the home scope and are never squashed\n        // off a lane. (a tag version is a semver string, not an object hash, so Ref.from would be\n        // bogus for it anyway.)\n        if (!depId.version || !isSnap(depId.version)) return;\n        if (checkedHashes.has(depId.version)) return;\n        checkedHashes.add(depId.version);\n        candidateRefs.push(Ref.from(depId.version));\n      });\n    });\n    // hasMultiple bounds the I/O concurrency, unlike a Promise.all of has() calls\n    const existingRefs = await legacyScope.objects.hasMultiple(candidateRefs);\n    const existingHashes = new Set(existingRefs.map((ref) => ref.toString()));\n    const missingHashes = candidateRefs.map((ref) => ref.toString()).filter((hash) => !existingHashes.has(hash));\n    if (!missingHashes.length) return;\n    this.logger.debug(\n      `importMissingReferencedDeps, importing ${missingHashes.length} non-head dependency snaps referenced by the merged heads from ${otherLane.scope}`\n    );\n    // fetch the raw objects only (by hash, from the lane scope). importManyObjects does not touch\n    // component models/heads, so it can't leave a component pointing at a version whose object is\n    // missing — unlike a component-level import.\n    await legacyScope.scopeImporter.importManyObjects({ [otherLane.scope]: missingHashes });\n    // a Version object references other objects the export must ship along with it — the file\n    // sources and the flattened-edges/dependencies-graph. fetch the missing ones too. (parents are\n    // not needed — the export doesn't collect them for these versions. artifacts are not needed\n    // either — the export tolerates missing artifacts for such non-local versions.)\n    const subRefs: Ref[] = [];\n    await pMapSeries(missingHashes, async (hash) => {\n      const versionObject = (await legacyScope.objects.load(Ref.from(hash))) as Version | null;\n      if (!versionObject) return; // the hash could not be fetched after all\n      versionObject.refsWithOptions(false, false).forEach((ref) => {\n        if (checkedHashes.has(ref.toString())) return;\n        checkedHashes.add(ref.toString());\n        subRefs.push(ref);\n      });\n    });\n    const existingSubRefs = new Set((await legacyScope.objects.hasMultiple(subRefs)).map((ref) => ref.toString()));\n    const missingSubRefs = subRefs.map((ref) => ref.toString()).filter((hash) => !existingSubRefs.has(hash));\n    if (!missingSubRefs.length) return;\n    await legacyScope.scopeImporter.importManyObjects({ [otherLane.scope]: missingSubRefs });\n  }\n\n  private validateMergeFlags(otherLaneId: LaneId, currentLaneId: LaneId, options: MergeLaneOptions) {\n    const { tag, resolveUnrelated, detachHead } = options;\n\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 (detachHead && !currentLaneId.isDefault()) {\n      throw new BitError(`unable to detach head. the current lane is not main`);\n    }\n  }\n\n  private async resolveMergeContext(otherLaneId: LaneId, currentLaneId: LaneId, options: Partial<MergeLaneOptions>) {\n    const { skipFetch, excludeNonLaneComps, shouldIncludeUpdateDependents, fetchCurrent } = options;\n    const legacyScope = this.scope.legacyScope;\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        // pass `shouldIncludeUpdateDependents` so the prefetch covers main objects for the\n        // lane's hidden entries too — the per-component merge engine needs main-side Version\n        // objects locally to compute divergence against the hidden cascade snaps.\n        const ids = await this.getMainIdsToMerge(currentLane, !excludeNonLaneComps, shouldIncludeUpdateDependents);\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        // note: fetching always includes the lane's hidden updateDependents (and routes them to the\n        // lane's scope); `shouldIncludeUpdateDependents` still governs whether they take part in the\n        // merge itself, via `idsToMerge` below.\n        const otherLane = await this.lanes.fetchLaneWithItsComponents(otherLaneId);\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        if (options.resolveMainHeadsFromRemote) {\n          // opt-in: resolve each head on main falling back to the remote scope, so a base that lives on\n          // the remote but wasn't fetched locally is still included instead of being skipped. a component\n          // with no head on main at all is genuinely new and dropped.\n          const idsWithHead = await Promise.all(\n            ids.map(async (id) => {\n              const head = await this.lanes.getHeadOnMain(id);\n              return head ? id.changeVersion(head) : null;\n            })\n          );\n          return compact(idsWithHead);\n        }\n        // default: resolve heads from the local scope only (historical behavior). a component not in the\n        // local scope throws, and one with no local head was never merged to main and is dropped.\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    return {\n      currentLane,\n      otherLane,\n      laneToFetchArtifactsFrom,\n      idsToMerge,\n    };\n  }\n\n  /**\n   * check conflicts in case of merging sourceLaneId into targetLaneId\n   */\n  async checkLaneForConflicts(\n    sourceLaneIdStr: string,\n    targetLaneIdStr: string,\n    options: Partial<MergeLaneOptions>\n  ): Promise<{\n    conflicts: ConflictPerId[];\n  }> {\n    const legacyScope = this.scope.legacyScope;\n    const otherLaneId: LaneId = await legacyScope.lanes.parseLaneIdFromString(sourceLaneIdStr);\n    const currentLaneId: LaneId = await legacyScope.lanes.parseLaneIdFromString(targetLaneIdStr);\n    options.excludeNonLaneComps = true;\n    const { currentLane, otherLane, idsToMerge } = await this.resolveMergeContext(otherLaneId, currentLaneId, options);\n\n    const allComponentsStatus = await this.merging.getMergeStatus(\n      idsToMerge,\n      {\n        mergeStrategy: 'manual',\n      },\n      currentLane,\n      otherLane\n    );\n\n    throwForFailures(allComponentsStatus);\n\n    const configMergeResults = compact(allComponentsStatus.map((c) => c.configMergeResult));\n    const componentsWithConfigConflicts = configMergeResults.filter((c) => c.hasConflicts()).map((c) => c.compIdStr);\n    const conflicts: ConflictPerId[] = [];\n    allComponentsStatus.forEach((c) => {\n      const files = c.mergeResults?.modifiedFiles.filter((f) => f.conflict || f.isBinaryConflict) || [];\n      const config = componentsWithConfigConflicts.includes(c.id.toStringWithoutVersion());\n      if (files.length || config) {\n        const configData = configMergeResults.find((co) => co.compIdStr === c.id.toStringWithoutVersion());\n        const configConflict = configData?.generateMergeConflictFile() || undefined;\n        conflicts.push({ id: c.id, files: files.map((f) => f.filePath), config, configConflict });\n      }\n    });\n\n    return { 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  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    ConfigStoreAspect,\n    ExpressAspect,\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    configStore,\n    express,\n  ]: [\n    LanesMain,\n    CLIMain,\n    Workspace,\n    MergingMain,\n    LoggerMain,\n    RemoveMain,\n    ScopeMain,\n    ExportMain,\n    ImporterMain,\n    CheckoutMain,\n    ConfigStoreMain,\n    ExpressMain,\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, configStore));\n    lanesCommand?.commands?.push(new MergeAbortLaneCmd(mergeLanesMain));\n    lanesCommand?.commands?.push(new MergeMoveLaneCmd(mergeLanesMain));\n    express.register([new LanesCheckConflictsRoute(mergeLanesMain, logger)]);\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.getCompHeadIncludeUpdateDependents(compId) : 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 = await versionObj.loadFlattenedDependencies(legacyScope.objects);\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.getCompHeadIncludeUpdateDependents(compId) : 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 squashSnaps(\n  succeededComponents: ComponentMergeStatus[],\n  currentLaneId: LaneId,\n  otherLaneId: LaneId,\n  scope: LegacyScope,\n  opts: { messageTitle?: string; detachHead?: boolean } = {}\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        opts\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  opts: { messageTitle?: string; detachHead?: boolean } = {}\n): Promise<Version | undefined> {\n  const { messageTitle, detachHead } = opts;\n  const shouldSquash = () => {\n    if (divergeData.isDiverged()) {\n      if (detachHead) {\n        // for detach head, it's ok to have it as diverged. as long as the target is ahead, we want to squash.\n        return true;\n      }\n      // diverged + --squash: skip the parent-rewrite path here. the merge snap will be created\n      // by snapForMerge with a single parent (and squashed metadata) because the corresponding\n      // UnmergedComponent entry has `shouldSquash: true`. see snapping.main.runtime.ts.\n      return false;\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 false;\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 false;\n    }\n    return true;\n  };\n\n  if (!shouldSquash()) {\n    return undefined;\n  }\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,57 +1,57 @@
 {
   "name": "@teambit/merge-lanes",
-  "version": "1.0.1284",
+  "version": "1.0.1286",
   "homepage": "https://bit.cloud/teambit/lanes/merge-lanes",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.lanes",
     "name": "merge-lanes",
-    "version": "1.0.1284"
+    "version": "1.0.1286"
   },
   "dependencies": {
     "chalk": "4.1.2",
     "fs-extra": "10.0.0",
+    "lodash": "4.18.1",
     "tempy": "1.0.1",
     "yesno": "0.4.0",
-    "lodash": "4.18.1",
     "p-map-series": "2.1.0",
     "@teambit/express": "0.0.1508",
     "@teambit/logger": "0.0.1502",
     "@teambit/bit-error": "0.0.404",
-    "@teambit/legacy.constants": "0.0.50",
-    "@teambit/harmony": "0.4.12",
     "@teambit/component-id": "1.2.5",
-    "@teambit/component-version": "1.0.4",
-    "@teambit/harmony.modules.runtimes": "0.0.4",
-    "@teambit/lane-id": "0.0.312",
     "@teambit/legacy.bit-map": "0.0.250",
     "@teambit/legacy.consumer": "0.0.196",
     "@teambit/legacy.scope": "0.0.196",
-    "@teambit/objects": "0.0.731",
-    "@teambit/scope": "1.0.1254",
-    "@teambit/checkout": "1.0.1263",
     "@teambit/cli": "0.0.1427",
     "@teambit/component.modules.merge-helper": "0.0.140",
     "@teambit/config-store": "0.0.308",
-    "@teambit/merging": "1.0.1265",
-    "@teambit/remove": "1.0.1256",
+    "@teambit/legacy.constants": "0.0.50",
+    "@teambit/harmony": "0.4.12",
+    "@teambit/component-version": "1.0.4",
     "@teambit/component.snap-distance": "0.0.193",
-    "@teambit/config-merger": "0.0.1122",
-    "@teambit/export": "1.0.1258",
     "@teambit/harmony.modules.get-basic-log": "0.0.197",
-    "@teambit/importer": "1.0.1256",
-    "@teambit/lanes": "1.0.1284",
-    "@teambit/workspace": "1.0.1255"
+    "@teambit/harmony.modules.runtimes": "0.0.4",
+    "@teambit/lane-id": "0.0.312",
+    "@teambit/objects": "0.0.732",
+    "@teambit/scope": "1.0.1255",
+    "@teambit/checkout": "1.0.1264",
+    "@teambit/merging": "1.0.1266",
+    "@teambit/remove": "1.0.1257",
+    "@teambit/config-merger": "0.0.1123",
+    "@teambit/export": "1.0.1259",
+    "@teambit/importer": "1.0.1257",
+    "@teambit/lanes": "1.0.1285",
+    "@teambit/workspace": "1.0.1256"
   },
   "devDependencies": {
     "@types/fs-extra": "9.0.7",
     "@types/lodash": "4.14.165",
     "@types/mocha": "9.1.0",
-    "@teambit/harmony.envs.core-aspect-env": "2.1.2",
     "@teambit/component.testing.mock-components": "0.0.472",
     "@teambit/harmony.testing.load-aspect": "0.0.466",
-    "@teambit/snapping": "1.0.1261",
-    "@teambit/workspace.testing.mock-workspace": "0.0.280"
+    "@teambit/workspace.testing.mock-workspace": "0.0.280",
+    "@teambit/harmony.envs.core-aspect-env": "2.1.2",
+    "@teambit/snapping": "1.0.1262"
   },
   "peerDependencies": {
     "chai": "5.2.1"