@teambit/merge-lanes 0.0.0-012f21d51d884d0035b43584f4bd41f1410e77b9

package/dist/esm.mjs

@@ -0,0 +1,7 @@
+// eslint-disable-next-line import/no-unresolved
+import cjsModule from './index.js';
+
+export const MergeLanesAspect = cjsModule.MergeLanesAspect;
+
+export default cjsModule;
+

package/dist/exceptions/missing-comps-to-merge.d.ts

@@ -0,0 +1,6 @@
+import { BitError } from '@teambit/bit-error';
+export declare class MissingCompsToMerge extends BitError {
+    constructor(missingDepsFromHead: {
+        [depId: string]: string[];
+    }, missingDepsFromHistory: string[]);
+}

package/dist/exceptions/missing-comps-to-merge.js

@@ -0,0 +1,39 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.MissingCompsToMerge = void 0;
+function _bitError() {
+  const data = require("@teambit/bit-error");
+  _bitError = function () {
+    return data;
+  };
+  return data;
+}
+class MissingCompsToMerge extends _bitError().BitError {
+  constructor(missingDepsFromHead, missingDepsFromHistory) {
+    const getMissingHeadDepsStr = () => {
+      if (!Object.keys(missingDepsFromHead).length) return '';
+      const title = 'The following are missing dependencies from the head version:';
+      const missingDepsStr = Object.keys(missingDepsFromHead).map(dep => {
+        const originComps = missingDepsFromHead[dep];
+        return `${dep} => (dependency of: ${originComps.map(d => d.toString()).join(', ')})`;
+      });
+      return `${title}\n${missingDepsStr.join('\n')}`;
+    };
+    const getMissingHistoryDepsStr = () => {
+      if (!missingDepsFromHistory.length) return '';
+      const title = 'The following are dependencies from previous versions, which you can avoid merging by using --squash flag:';
+      return `\n${title}\n${missingDepsFromHistory.join('\n')}`;
+    };
+    super(`Failed to merge the lane partially as some components have dependencies which were not included.
+consider adding "--include-deps" flag to include them.
+
+${getMissingHeadDepsStr()}
+${getMissingHistoryDepsStr()}`);
+  }
+}
+exports.MissingCompsToMerge = MissingCompsToMerge;
+
+//# sourceMappingURL=missing-comps-to-merge.js.map

package/dist/exceptions/missing-comps-to-merge.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["_bitError","data","require","MissingCompsToMerge","BitError","constructor","missingDepsFromHead","missingDepsFromHistory","getMissingHeadDepsStr","Object","keys","length","title","missingDepsStr","map","dep","originComps","d","toString","join","getMissingHistoryDepsStr","exports"],"sources":["missing-comps-to-merge.ts"],"sourcesContent":["import { BitError } from '@teambit/bit-error';\n\nexport class MissingCompsToMerge extends BitError {\n  constructor(missingDepsFromHead: { [depId: string]: string[] }, missingDepsFromHistory: string[]) {\n    const getMissingHeadDepsStr = () => {\n      if (!Object.keys(missingDepsFromHead).length) return '';\n      const title = 'The following are missing dependencies from the head version:';\n      const missingDepsStr = Object.keys(missingDepsFromHead).map((dep) => {\n        const originComps = missingDepsFromHead[dep];\n        return `${dep} => (dependency of: ${originComps.map((d) => d.toString()).join(', ')})`;\n      });\n      return `${title}\\n${missingDepsStr.join('\\n')}`;\n    };\n    const getMissingHistoryDepsStr = () => {\n      if (!missingDepsFromHistory.length) return '';\n      const title =\n        'The following are dependencies from previous versions, which you can avoid merging by using --squash flag:';\n      return `\\n${title}\\n${missingDepsFromHistory.join('\\n')}`;\n    };\n\n    super(`Failed to merge the lane partially as some components have dependencies which were not included.\nconsider adding \"--include-deps\" flag to include them.\n\n${getMissingHeadDepsStr()}\n${getMissingHistoryDepsStr()}`);\n  }\n}\n"],"mappings":";;;;;;AAAA,SAAAA,UAAA;EAAA,MAAAC,IAAA,GAAAC,OAAA;EAAAF,SAAA,YAAAA,CAAA;IAAA,OAAAC,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAEO,MAAME,mBAAmB,SAASC,oBAAQ,CAAC;EAChDC,WAAWA,CAACC,mBAAkD,EAAEC,sBAAgC,EAAE;IAChG,MAAMC,qBAAqB,GAAGA,CAAA,KAAM;MAClC,IAAI,CAACC,MAAM,CAACC,IAAI,CAACJ,mBAAmB,CAAC,CAACK,MAAM,EAAE,OAAO,EAAE;MACvD,MAAMC,KAAK,GAAG,+DAA+D;MAC7E,MAAMC,cAAc,GAAGJ,MAAM,CAACC,IAAI,CAACJ,mBAAmB,CAAC,CAACQ,GAAG,CAAEC,GAAG,IAAK;QACnE,MAAMC,WAAW,GAAGV,mBAAmB,CAACS,GAAG,CAAC;QAC5C,OAAO,GAAGA,GAAG,uBAAuBC,WAAW,CAACF,GAAG,CAAEG,CAAC,IAAKA,CAAC,CAACC,QAAQ,CAAC,CAAC,CAAC,CAACC,IAAI,CAAC,IAAI,CAAC,GAAG;MACxF,CAAC,CAAC;MACF,OAAO,GAAGP,KAAK,KAAKC,cAAc,CAACM,IAAI,CAAC,IAAI,CAAC,EAAE;IACjD,CAAC;IACD,MAAMC,wBAAwB,GAAGA,CAAA,KAAM;MACrC,IAAI,CAACb,sBAAsB,CAACI,MAAM,EAAE,OAAO,EAAE;MAC7C,MAAMC,KAAK,GACT,4GAA4G;MAC9G,OAAO,KAAKA,KAAK,KAAKL,sBAAsB,CAACY,IAAI,CAAC,IAAI,CAAC,EAAE;IAC3D,CAAC;IAED,KAAK,CAAC;AACV;AACA;AACA,EAAEX,qBAAqB,CAAC,CAAC;AACzB,EAAEY,wBAAwB,CAAC,CAAC,EAAE,CAAC;EAC7B;AACF;AAACC,OAAA,CAAAlB,mBAAA,GAAAA,mBAAA","ignoreList":[]}

package/dist/index.d.ts

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

package/dist/index.js

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

package/dist/index.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["_mergeLanes","data","require","_default","exports","default","MergeLanesAspect"],"sources":["index.ts"],"sourcesContent":["import { MergeLanesAspect } from './merge-lanes.aspect';\n\nexport type { MergeLanesMain, MergeLaneOptions, ConflictPerId } from './merge-lanes.main.runtime';\nexport default MergeLanesAspect;\nexport { MergeLanesAspect };\n"],"mappings":";;;;;;;;;;;;AAAA,SAAAA,YAAA;EAAA,MAAAC,IAAA,GAAAC,OAAA;EAAAF,WAAA,YAAAA,CAAA;IAAA,OAAAC,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAAwD,IAAAE,QAAA,GAAAC,OAAA,CAAAC,OAAA,GAGzCC,8BAAgB","ignoreList":[]}

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

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

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

@@ -0,0 +1,59 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.LanesCheckConflictsRoute = void 0;
+function _express() {
+  const data = require("@teambit/express");
+  _express = function () {
+    return data;
+  };
+  return data;
+}
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+class LanesCheckConflictsRoute {
+  constructor(mergeLanes, logger) {
+    this.mergeLanes = mergeLanes;
+    this.logger = logger;
+    _defineProperty(this, "method", 'post');
+    _defineProperty(this, "route", '/lanes/check-conflicts');
+    _defineProperty(this, "verb", _express().Verb.READ);
+    _defineProperty(this, "middlewares", [async (req, res) => {
+      const {
+        body
+      } = req;
+      const sourceLane = body.sourceLane;
+      const targetLane = body.targetLane;
+      if (!sourceLane) {
+        return res.status(400).send('Missing sourceLane in body');
+      }
+      if (!targetLane) {
+        return res.status(400).send('Missing targetLane in body');
+      }
+      try {
+        const {
+          conflicts
+        } = await this.mergeLanes.checkLaneForConflicts(sourceLane, targetLane, {});
+        const conflictsOutput = conflicts.map(conflict => {
+          return _objectSpread(_objectSpread({}, conflict), {}, {
+            id: conflict.id.toString()
+          });
+        });
+        return res.json({
+          conflicts: conflictsOutput
+        });
+      } catch (e) {
+        this.logger.error(e.toString());
+        return res.status(500).send(e.toString());
+      }
+    }]);
+  }
+}
+exports.LanesCheckConflictsRoute = LanesCheckConflictsRoute;
+
+//# sourceMappingURL=lanes-check-conflicts.route.js.map

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

@@ -0,0 +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":[]}

package/dist/last-merged.d.ts

@@ -0,0 +1,34 @@
+import type { ScopeMain } from '@teambit/scope';
+import type { Lane } from '@teambit/objects';
+import type { Consumer } from '@teambit/legacy.consumer';
+import type { Logger } from '@teambit/logger';
+import type { MergeAbortOpts } from './merge-abort.cmd';
+type Snapshot = {
+    copyOfCurrentLane?: Lane;
+    copyOfBitmap: string;
+    copyOfWorkspaceJsonc: string;
+    copyOfStagedSnaps?: string;
+    copyOfStagedConfig?: string;
+};
+export declare class LastMerged {
+    private scope;
+    private consumer;
+    private logger;
+    constructor(scope: ScopeMain, consumer: Consumer, logger: Logger);
+    get path(): string;
+    takeSnapshot(currentLane?: Lane | null): Promise<Snapshot>;
+    persistSnapshot(snapshot: Snapshot): Promise<void>;
+    restoreLaneObjectFromLastMerged(): Promise<void>;
+    restoreFromLastMerged(mergeAbortOpts: MergeAbortOpts, currentLane?: Lane | null): Promise<{
+        compDirsToRemove: string[];
+    }>;
+    private mergeAbortPrompt;
+    private getLastMergedLaneContentIfExists;
+    private getFileContentIfExist;
+    private getLastMergedBitmapPath;
+    private getLastMergedWorkspacePath;
+    private getLastMergedLanePath;
+    private getLastMergedStagedSnapsPath;
+    private getLastMergedStagedConfigPath;
+}
+export {};

package/dist/last-merged.js

@@ -0,0 +1,235 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.LastMerged = void 0;
+function _path() {
+  const data = _interopRequireDefault(require("path"));
+  _path = function () {
+    return data;
+  };
+  return data;
+}
+function _tempy() {
+  const data = _interopRequireDefault(require("tempy"));
+  _tempy = function () {
+    return data;
+  };
+  return data;
+}
+function _fsExtra() {
+  const data = _interopRequireDefault(require("fs-extra"));
+  _fsExtra = function () {
+    return data;
+  };
+  return data;
+}
+function _yesno() {
+  const data = _interopRequireDefault(require("yesno"));
+  _yesno = function () {
+    return data;
+  };
+  return data;
+}
+function _chalk() {
+  const data = _interopRequireDefault(require("chalk"));
+  _chalk = function () {
+    return data;
+  };
+  return data;
+}
+function _legacy() {
+  const data = require("@teambit/legacy.bit-map");
+  _legacy = function () {
+    return data;
+  };
+  return data;
+}
+function _objects() {
+  const data = require("@teambit/objects");
+  _objects = function () {
+    return data;
+  };
+  return data;
+}
+function _legacy2() {
+  const data = require("@teambit/legacy.scope");
+  _legacy2 = function () {
+    return data;
+  };
+  return data;
+}
+function _bitError() {
+  const data = require("@teambit/bit-error");
+  _bitError = function () {
+    return data;
+  };
+  return data;
+}
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+class PromptCanceled extends _bitError().BitError {
+  constructor() {
+    super(_chalk().default.yellow('operation aborted'));
+  }
+}
+const LAST_MERGED_LANE_FILENAME = 'lane';
+const LAST_MERGED_BITMAP_FILENAME = 'bitmap';
+class LastMerged {
+  constructor(scope, consumer, logger) {
+    this.scope = scope;
+    this.consumer = consumer;
+    this.logger = logger;
+  }
+  get path() {
+    return this.scope.getLastMergedPath();
+  }
+  async takeSnapshot(currentLane) {
+    const consumer = this.consumer;
+    const copyOfCurrentLane = currentLane ? currentLane.clone() : undefined;
+    const copyOfBitmap = _tempy().default.file();
+    const copyOfWorkspaceJsonc = _tempy().default.file();
+    let copyOfStagedSnaps;
+    await _fsExtra().default.copyFile(consumer.bitMap.mapPath, copyOfBitmap);
+    await _fsExtra().default.copyFile(consumer.config.path, copyOfWorkspaceJsonc);
+    if (!consumer.scope.stagedSnaps.isEmpty()) {
+      copyOfStagedSnaps = _tempy().default.file();
+      await _fsExtra().default.copyFile(_legacy2().StagedSnaps.getPath(consumer.scope.path), copyOfStagedSnaps);
+    }
+    const stagedConfig = await this.scope.getStagedConfig();
+    let copyOfStagedConfig;
+    if (!stagedConfig.isEmpty()) {
+      copyOfStagedConfig = _tempy().default.file();
+      await _fsExtra().default.copyFile(stagedConfig.filePath, copyOfStagedConfig);
+    }
+    return {
+      copyOfCurrentLane,
+      copyOfBitmap,
+      copyOfWorkspaceJsonc,
+      copyOfStagedSnaps,
+      copyOfStagedConfig
+    };
+  }
+  async persistSnapshot(snapshot) {
+    const {
+      copyOfCurrentLane,
+      copyOfBitmap,
+      copyOfWorkspaceJsonc,
+      copyOfStagedSnaps,
+      copyOfStagedConfig
+    } = snapshot;
+    await _fsExtra().default.remove(this.path);
+    await _fsExtra().default.ensureDir(this.path);
+    await _fsExtra().default.copyFile(copyOfBitmap, this.getLastMergedBitmapPath());
+    await _fsExtra().default.copyFile(copyOfWorkspaceJsonc, this.getLastMergedWorkspacePath());
+    if (copyOfCurrentLane) {
+      const compressed = await copyOfCurrentLane.compress();
+      await _fsExtra().default.outputFile(this.getLastMergedLanePath(), compressed);
+    }
+    if (copyOfStagedSnaps) {
+      await _fsExtra().default.copyFile(copyOfStagedSnaps, this.getLastMergedStagedSnapsPath());
+    }
+    if (copyOfStagedConfig) {
+      await _fsExtra().default.copyFile(copyOfStagedConfig, this.getLastMergedStagedConfigPath());
+    }
+  }
+  async restoreLaneObjectFromLastMerged() {
+    if (!_fsExtra().default.pathExistsSync(this.path)) {
+      throw new (_bitError().BitError)(`unable to abort the last lane-merge because "bit export" was running since then`);
+    }
+    const lastLane = await this.getLastMergedLaneContentIfExists();
+    if (!lastLane) {
+      throw new (_bitError().BitError)(`unable to revert 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]);
+  }
+  async restoreFromLastMerged(mergeAbortOpts, currentLane) {
+    if (!_fsExtra().default.pathExistsSync(this.path)) {
+      throw new (_bitError().BitError)(`unable to abort the last lane-merge because "bit export" was running since then`);
+    }
+    const lastLane = await this.getLastMergedLaneContentIfExists();
+    if (!_fsExtra().default.pathExistsSync(this.getLastMergedBitmapPath())) {
+      throw new (_bitError().BitError)(`unable to abort the last lane-merge because the ${LAST_MERGED_BITMAP_FILENAME} is missing from ${this.path}`);
+    }
+    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]);
+    }
+    const previousBitmapBuffer = await _fsExtra().default.readFile(this.getLastMergedBitmapPath());
+    const previousBitmap = _legacy().BitMap.loadFromContentWithoutLoadingFiles(previousBitmapBuffer, '', '', '');
+    const currentRootDirs = this.consumer.bitMap.getAllTrackDirs();
+    const previousRootDirs = previousBitmap.getAllTrackDirs();
+    const compDirsToRemove = Object.keys(currentRootDirs).filter(dir => !previousRootDirs[dir]);
+    if (!mergeAbortOpts.silent) {
+      await this.mergeAbortPrompt(compDirsToRemove);
+    }
+    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);
+    if (_fsExtra().default.pathExistsSync(this.getLastMergedStagedSnapsPath())) {
+      await _fsExtra().default.copyFile(this.getLastMergedStagedSnapsPath(), _legacy2().StagedSnaps.getPath(this.scope.path));
+    } else {
+      await this.scope.legacyScope.stagedSnaps.deleteFile();
+    }
+    const stagedConfig = await this.scope.getStagedConfig();
+    if (_fsExtra().default.pathExistsSync(this.getLastMergedStagedConfigPath())) {
+      await _fsExtra().default.copyFile(this.getLastMergedStagedConfigPath(), stagedConfig.filePath);
+    } else {
+      await stagedConfig.deleteFile();
+    }
+    await _fsExtra().default.remove(this.path);
+    return {
+      compDirsToRemove
+    };
+  }
+  async mergeAbortPrompt(dirsToRemove) {
+    this.logger.clearStatusLine();
+    const dirsToRemoveStr = dirsToRemove.length ? `\nThe following directories introduced by the merge will be deleted: ${dirsToRemove.join(', ')}` : '';
+    const ok = await (0, _yesno().default)({
+      question: `Code changes that were done since the last lane-merge will be lost.${dirsToRemoveStr}
+The .bitmap and workspace.jsonc files will be restored to the state before the merge.
+This action is irreversible.
+${_chalk().default.bold('Do you want to continue? [yes(y)/no(n)]')}`
+    });
+    if (!ok) {
+      throw new PromptCanceled();
+    }
+  }
+  async getLastMergedLaneContentIfExists() {
+    const filename = this.getLastMergedLanePath();
+    return this.getFileContentIfExist(filename);
+  }
+  async getFileContentIfExist(filename) {
+    try {
+      return await _fsExtra().default.readFile(filename);
+    } catch (err) {
+      if (err.code === 'ENOENT') return null;
+      throw err;
+    }
+  }
+  getLastMergedBitmapPath() {
+    return _path().default.join(this.path, LAST_MERGED_BITMAP_FILENAME);
+  }
+  getLastMergedWorkspacePath() {
+    return _path().default.join(this.path, 'workspace.jsonc');
+  }
+  getLastMergedLanePath() {
+    return _path().default.join(this.path, LAST_MERGED_LANE_FILENAME);
+  }
+  getLastMergedStagedSnapsPath() {
+    return _path().default.join(this.path, 'staged-snaps');
+  }
+  getLastMergedStagedConfigPath() {
+    return _path().default.join(this.path, 'staged-config.json');
+  }
+}
+exports.LastMerged = LastMerged;
+
+//# sourceMappingURL=last-merged.js.map

package/dist/last-merged.js.map

@@ -0,0 +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":[]}

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

@@ -0,0 +1,22 @@
+import type { Command, CommandOptions } from '@teambit/cli';
+import type { MergeLanesMain } from './merge-lanes.main.runtime';
+export type MergeAbortOpts = {
+    silent?: boolean;
+};
+export declare class MergeAbortLaneCmd implements Command {
+    private mergeLanes;
+    name: string;
+    description: string;
+    extendedDescription: string;
+    alias: string;
+    options: CommandOptions;
+    loader: boolean;
+    private: boolean;
+    remoteOp: boolean;
+    constructor(mergeLanes: MergeLanesMain);
+    report(_: any, { skipDependencyInstallation, verbose, silent, }: {
+        skipDependencyInstallation?: boolean;
+        verbose?: boolean;
+        silent?: boolean;
+    }): Promise<string>;
+}

package/dist/merge-abort.cmd.js

@@ -0,0 +1,72 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.MergeAbortLaneCmd = void 0;
+function _chalk() {
+  const data = _interopRequireDefault(require("chalk"));
+  _chalk = function () {
+    return data;
+  };
+  return data;
+}
+function _checkout() {
+  const data = require("@teambit/checkout");
+  _checkout = function () {
+    return data;
+  };
+  return data;
+}
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+class MergeAbortLaneCmd {
+  constructor(mergeLanes) {
+    this.mergeLanes = mergeLanes;
+    _defineProperty(this, "name", 'merge-abort');
+    _defineProperty(this, "description", `abort the recent lane-merge. revert the lane object and checkout accordingly`);
+    _defineProperty(this, "extendedDescription", `restore the lane-object to its state before the last "bit lane merge" command.
+also, checkout the workspace components according to the restored lane state`);
+    _defineProperty(this, "alias", '');
+    _defineProperty(this, "options", [['', 'verbose', "show details of components that didn't need to be merged"], ['s', 'silent', 'skip confirmation'], ['x', 'skip-dependency-installation', 'do not install packages of the imported components']]);
+    _defineProperty(this, "loader", true);
+    _defineProperty(this, "private", true);
+    _defineProperty(this, "remoteOp", true);
+  }
+  async report(_, {
+    skipDependencyInstallation = false,
+    verbose = false,
+    silent = false
+  }) {
+    const checkoutProps = {
+      reset: true,
+      all: true,
+      verbose,
+      skipNpmInstall: skipDependencyInstallation
+    };
+    const mergeAbortOpts = {
+      silent
+    };
+    const {
+      checkoutResults,
+      restoredItems,
+      checkoutError
+    } = await this.mergeLanes.abortLaneMerge(checkoutProps, mergeAbortOpts);
+    const getCheckoutErrorStr = () => {
+      if (!checkoutError) return '';
+      const errMsg = `\n\nFailed to change component files to the pre-merge state due to an error:
+${checkoutError.message}
+please fix the error and then run "bit checkout reset --all" to revert the components to the pre-merge state`;
+      return _chalk().default.red(errMsg);
+    };
+    const checkoutOutputStr = checkoutResults ? (0, _checkout().checkoutOutput)(checkoutResults, checkoutProps) : '';
+    const restoredItemsTitle = _chalk().default.green('The following have been restored successfully:');
+    const restoredItemsOutput = restoredItems.map(item => `[√] ${item}`).join('\n');
+    return `${checkoutOutputStr}\n\n${restoredItemsTitle}\n${restoredItemsOutput}${getCheckoutErrorStr()}`;
+  }
+}
+exports.MergeAbortLaneCmd = MergeAbortLaneCmd;
+
+//# sourceMappingURL=merge-abort.cmd.js.map

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

@@ -0,0 +1 @@
+{"version":3,"names":["_chalk","data","_interopRequireDefault","require","_checkout","e","__esModule","default","_defineProperty","r","t","_toPropertyKey","Object","defineProperty","value","enumerable","configurable","writable","i","_toPrimitive","Symbol","toPrimitive","call","TypeError","String","Number","MergeAbortLaneCmd","constructor","mergeLanes","report","_","skipDependencyInstallation","verbose","silent","checkoutProps","reset","all","skipNpmInstall","mergeAbortOpts","checkoutResults","restoredItems","checkoutError","abortLaneMerge","getCheckoutErrorStr","errMsg","message","chalk","red","checkoutOutputStr","checkoutOutput","restoredItemsTitle","green","restoredItemsOutput","map","item","join","exports"],"sources":["merge-abort.cmd.ts"],"sourcesContent":["import chalk from 'chalk';\nimport type { CheckoutProps } from '@teambit/checkout';\nimport { checkoutOutput } from '@teambit/checkout';\nimport type { Command, CommandOptions } from '@teambit/cli';\nimport type { MergeLanesMain } from './merge-lanes.main.runtime';\n\nexport type MergeAbortOpts = {\n  silent?: boolean; // don't show prompt before aborting\n};\n\nexport class MergeAbortLaneCmd implements Command {\n  name = 'merge-abort';\n  description = `abort the recent lane-merge. revert the lane object and checkout accordingly`;\n  extendedDescription = `restore the lane-object to its state before the last \"bit lane merge\" command.\nalso, checkout the workspace components according to the restored lane state`;\n  alias = '';\n  options = [\n    ['', 'verbose', \"show details of components that didn't need to be merged\"],\n    ['s', 'silent', 'skip confirmation'],\n    ['x', 'skip-dependency-installation', 'do not install packages of the imported components'],\n  ] as CommandOptions;\n  loader = true;\n  private = true;\n  remoteOp = true;\n\n  constructor(private mergeLanes: MergeLanesMain) {}\n\n  async report(\n    _,\n    {\n      skipDependencyInstallation = false,\n      verbose = false,\n      silent = false,\n    }: {\n      skipDependencyInstallation?: boolean;\n      verbose?: boolean;\n      silent?: boolean;\n    }\n  ): Promise<string> {\n    const checkoutProps: CheckoutProps = {\n      reset: true,\n      all: true,\n      verbose,\n      skipNpmInstall: skipDependencyInstallation,\n    };\n    const mergeAbortOpts = { silent };\n    const { checkoutResults, restoredItems, checkoutError } = await this.mergeLanes.abortLaneMerge(\n      checkoutProps,\n      mergeAbortOpts\n    );\n\n    const getCheckoutErrorStr = () => {\n      if (!checkoutError) return '';\n      const errMsg = `\\n\\nFailed to change component files to the pre-merge state due to an error:\n${checkoutError.message}\nplease fix the error and then run \"bit checkout reset --all\" to revert the components to the pre-merge state`;\n      return chalk.red(errMsg);\n    };\n\n    const checkoutOutputStr = checkoutResults ? checkoutOutput(checkoutResults, checkoutProps) : '';\n    const restoredItemsTitle = chalk.green('The following have been restored successfully:');\n    const restoredItemsOutput = restoredItems.map((item) => `[√] ${item}`).join('\\n');\n\n    return `${checkoutOutputStr}\\n\\n${restoredItemsTitle}\\n${restoredItemsOutput}${getCheckoutErrorStr()}`;\n  }\n}\n"],"mappings":"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","ignoreList":[]}

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

@@ -0,0 +1,44 @@
+import type { Command, CommandOptions } from '@teambit/cli';
+import type { MergeLanesMain } from './merge-lanes.main.runtime';
+import type { ConfigStoreMain } from '@teambit/config-store';
+export declare class MergeLaneCmd implements Command {
+    private mergeLanes;
+    private configStore;
+    name: string;
+    description: string;
+    extendedDescription: string;
+    arguments: {
+        name: string;
+        description: string;
+    }[];
+    alias: string;
+    options: CommandOptions;
+    loader: boolean;
+    private: boolean;
+    remoteOp: boolean;
+    constructor(mergeLanes: MergeLanesMain, configStore: ConfigStoreMain);
+    report([name, pattern]: [string, string], { ours, theirs, manual, autoMergeResolve, build, workspace: existingOnWorkspaceOnly, squash, noAutoSnap, noSnap, tag, message: snapMessage, keepReadme, noSquash, skipDependencyInstallation, skipFetch, includeDeps, resolveUnrelated, ignoreConfigChanges, verbose, excludeNonLaneComps, detachHead, loose, }: {
+        ours?: boolean;
+        theirs?: boolean;
+        manual?: boolean;
+        autoMergeResolve?: string;
+        workspace?: boolean;
+        build?: boolean;
+        noAutoSnap: boolean;
+        noSnap: boolean;
+        tag: boolean;
+        message: string;
+        keepReadme?: boolean;
+        squash?: boolean;
+        noSquash: boolean;
+        skipDependencyInstallation?: boolean;
+        skipFetch: boolean;
+        includeDeps?: boolean;
+        resolveUnrelated?: string | boolean;
+        ignoreConfigChanges?: boolean;
+        verbose?: boolean;
+        excludeNonLaneComps?: boolean;
+        detachHead?: boolean;
+        loose?: boolean;
+    }): Promise<string>;
+}