@teambit/merging 0.0.0-eaf913ca46effcb8ff9b877448fd09b87df7cdcd → 0.0.0-eb5529db44f2883f5e1ec0022ee8b8d4e2615e86

package/dist/index.d.ts

@@ -1,8 +1,8 @@
 import { MergingAspect } from './merging.aspect';
-export { mergeReport, applyVersionReport, conflictSummaryReport, installationErrorOutput, compilationErrorOutput, getRemovedOutput, getAddedOutput, getWorkspaceConfigUpdateOutput, } from './merge-cmd';
-export { compIsAlreadyMergedMsg } from './merge-status-provider';
-export { threeWayMerge, getMergeStrategyInteractive, MergeStrategy, FileStatus, MergeOptions, MergeResultsThreeWay, } from './merge-version';
-export { MergeFileResult, MergeFileParams, mergeFiles } from './merge-files';
-export type { MergingMain, ComponentMergeStatus, ApplyVersionResults, ApplyVersionResult, FilesStatus, FailedComponents, } from './merging.main.runtime';
+export { mergeReport } from './merge-cmd';
+export { compIsAlreadyMergedMsg, compHasBeenRemovedMsg } from './merge-status-provider';
+export type { MergingMain, ComponentMergeStatus } from './merging.main.runtime';
+export type { ApplyVersionResult, ApplyVersionResults, FailedComponents, FilesStatus, } from '@teambit/component.modules.merge-helper';
+export { FileStatus, getMergeStrategyInteractive, getMergeStrategy, MergeOptions, MergeStrategy, threeWayMerge, MergeResultsThreeWay, } from '@teambit/component.modules.merge-helper';
 export default MergingAspect;
 export { MergingAspect };

package/dist/index.js

@@ -6,37 +6,25 @@ Object.defineProperty(exports, "__esModule", {
 Object.defineProperty(exports, "FileStatus", {
   enumerable: true,
   get: function () {
-    return _mergeVersion().FileStatus;
-  }
-});
-Object.defineProperty(exports, "MergeFileParams", {
-  enumerable: true,
-  get: function () {
-    return _mergeFiles().MergeFileParams;
-  }
-});
-Object.defineProperty(exports, "MergeFileResult", {
-  enumerable: true,
-  get: function () {
-    return _mergeFiles().MergeFileResult;
+    return _componentModules().FileStatus;
   }
 });
 Object.defineProperty(exports, "MergeOptions", {
   enumerable: true,
   get: function () {
-    return _mergeVersion().MergeOptions;
+    return _componentModules().MergeOptions;
   }
 });
 Object.defineProperty(exports, "MergeResultsThreeWay", {
   enumerable: true,
   get: function () {
-    return _mergeVersion().MergeResultsThreeWay;
+    return _componentModules().MergeResultsThreeWay;
   }
 });
 Object.defineProperty(exports, "MergeStrategy", {
   enumerable: true,
   get: function () {
-    return _mergeVersion().MergeStrategy;
+    return _componentModules().MergeStrategy;
   }
 });
 Object.defineProperty(exports, "MergingAspect", {
@@ -45,10 +33,10 @@ Object.defineProperty(exports, "MergingAspect", {
     return _merging().MergingAspect;
   }
 });
-Object.defineProperty(exports, "applyVersionReport", {
+Object.defineProperty(exports, "compHasBeenRemovedMsg", {
   enumerable: true,
   get: function () {
-    return _mergeCmd().applyVersionReport;
+    return _mergeStatusProvider().compHasBeenRemovedMsg;
   }
 });
 Object.defineProperty(exports, "compIsAlreadyMergedMsg", {
@@ -57,53 +45,17 @@ Object.defineProperty(exports, "compIsAlreadyMergedMsg", {
     return _mergeStatusProvider().compIsAlreadyMergedMsg;
   }
 });
-Object.defineProperty(exports, "compilationErrorOutput", {
-  enumerable: true,
-  get: function () {
-    return _mergeCmd().compilationErrorOutput;
-  }
-});
-Object.defineProperty(exports, "conflictSummaryReport", {
-  enumerable: true,
-  get: function () {
-    return _mergeCmd().conflictSummaryReport;
-  }
-});
 exports.default = void 0;
-Object.defineProperty(exports, "getAddedOutput", {
+Object.defineProperty(exports, "getMergeStrategy", {
   enumerable: true,
   get: function () {
-    return _mergeCmd().getAddedOutput;
+    return _componentModules().getMergeStrategy;
   }
 });
 Object.defineProperty(exports, "getMergeStrategyInteractive", {
   enumerable: true,
   get: function () {
-    return _mergeVersion().getMergeStrategyInteractive;
-  }
-});
-Object.defineProperty(exports, "getRemovedOutput", {
-  enumerable: true,
-  get: function () {
-    return _mergeCmd().getRemovedOutput;
-  }
-});
-Object.defineProperty(exports, "getWorkspaceConfigUpdateOutput", {
-  enumerable: true,
-  get: function () {
-    return _mergeCmd().getWorkspaceConfigUpdateOutput;
-  }
-});
-Object.defineProperty(exports, "installationErrorOutput", {
-  enumerable: true,
-  get: function () {
-    return _mergeCmd().installationErrorOutput;
-  }
-});
-Object.defineProperty(exports, "mergeFiles", {
-  enumerable: true,
-  get: function () {
-    return _mergeFiles().mergeFiles;
+    return _componentModules().getMergeStrategyInteractive;
   }
 });
 Object.defineProperty(exports, "mergeReport", {
@@ -115,7 +67,7 @@ Object.defineProperty(exports, "mergeReport", {
 Object.defineProperty(exports, "threeWayMerge", {
   enumerable: true,
   get: function () {
-    return _mergeVersion().threeWayMerge;
+    return _componentModules().threeWayMerge;
   }
 });
 function _merging() {
@@ -139,20 +91,14 @@ function _mergeStatusProvider() {
   };
   return data;
 }
-function _mergeVersion() {
-  const data = require("./merge-version");
-  _mergeVersion = function () {
-    return data;
-  };
-  return data;
-}
-function _mergeFiles() {
-  const data = require("./merge-files");
-  _mergeFiles = function () {
+function _componentModules() {
+  const data = require("@teambit/component.modules.merge-helper");
+  _componentModules = function () {
     return data;
   };
   return data;
 }
+// Re-export types and functions from merge-helper for backward compatibility
 var _default = exports.default = _merging().MergingAspect;
 
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["_merging","data","require","_mergeCmd","_mergeStatusProvider","_mergeVersion","_mergeFiles","_default","exports","default","MergingAspect"],"sources":["index.ts"],"sourcesContent":["import { MergingAspect } from './merging.aspect';\n\nexport {\n  mergeReport,\n  applyVersionReport,\n  conflictSummaryReport,\n  installationErrorOutput,\n  compilationErrorOutput,\n  getRemovedOutput,\n  getAddedOutput,\n  getWorkspaceConfigUpdateOutput,\n} from './merge-cmd';\nexport { compIsAlreadyMergedMsg } from './merge-status-provider';\nexport {\n  threeWayMerge,\n  getMergeStrategyInteractive,\n  MergeStrategy,\n  FileStatus,\n  MergeOptions,\n  MergeResultsThreeWay,\n} from './merge-version';\nexport { MergeFileResult, MergeFileParams, mergeFiles } from './merge-files';\nexport type {\n  MergingMain,\n  ComponentMergeStatus,\n  ApplyVersionResults,\n  ApplyVersionResult,\n  FilesStatus,\n  FailedComponents,\n} from './merging.main.runtime';\nexport default MergingAspect;\nexport { MergingAspect };\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,SAAAA,SAAA;EAAA,MAAAC,IAAA,GAAAC,OAAA;EAAAF,QAAA,YAAAA,CAAA;IAAA,OAAAC,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAEA,SAAAE,UAAA;EAAA,MAAAF,IAAA,GAAAC,OAAA;EAAAC,SAAA,YAAAA,CAAA;IAAA,OAAAF,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAUA,SAAAG,qBAAA;EAAA,MAAAH,IAAA,GAAAC,OAAA;EAAAE,oBAAA,YAAAA,CAAA;IAAA,OAAAH,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAI,cAAA;EAAA,MAAAJ,IAAA,GAAAC,OAAA;EAAAG,aAAA,YAAAA,CAAA;IAAA,OAAAJ,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAQA,SAAAK,YAAA;EAAA,MAAAL,IAAA,GAAAC,OAAA;EAAAI,WAAA,YAAAA,CAAA;IAAA,OAAAL,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAA6E,IAAAM,QAAA,GAAAC,OAAA,CAAAC,OAAA,GAS9DC,wBAAa","ignoreList":[]}
+{"version":3,"names":["_merging","data","require","_mergeCmd","_mergeStatusProvider","_componentModules","_default","exports","default","MergingAspect"],"sources":["index.ts"],"sourcesContent":["import { MergingAspect } from './merging.aspect';\n\nexport { mergeReport } from './merge-cmd';\nexport { compIsAlreadyMergedMsg, compHasBeenRemovedMsg } from './merge-status-provider';\nexport type { MergingMain, ComponentMergeStatus } from './merging.main.runtime';\n\n// Re-export types and functions from merge-helper for backward compatibility\nexport type {\n  ApplyVersionResult,\n  ApplyVersionResults,\n  FailedComponents,\n  FilesStatus,\n} from '@teambit/component.modules.merge-helper';\nexport {\n  FileStatus,\n  getMergeStrategyInteractive,\n  getMergeStrategy,\n  MergeOptions,\n  MergeStrategy,\n  threeWayMerge,\n  MergeResultsThreeWay,\n} from '@teambit/component.modules.merge-helper';\n\nexport default MergingAspect;\nexport { MergingAspect };\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,SAAAA,SAAA;EAAA,MAAAC,IAAA,GAAAC,OAAA;EAAAF,QAAA,YAAAA,CAAA;IAAA,OAAAC,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAEA,SAAAE,UAAA;EAAA,MAAAF,IAAA,GAAAC,OAAA;EAAAC,SAAA,YAAAA,CAAA;IAAA,OAAAF,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAG,qBAAA;EAAA,MAAAH,IAAA,GAAAC,OAAA;EAAAE,oBAAA,YAAAA,CAAA;IAAA,OAAAH,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAUA,SAAAI,kBAAA;EAAA,MAAAJ,IAAA,GAAAC,OAAA;EAAAG,iBAAA,YAAAA,CAAA;IAAA,OAAAJ,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAPA;AAAA,IAAAK,QAAA,GAAAC,OAAA,CAAAC,OAAA,GAiBeC,wBAAa","ignoreList":[]}

package/dist/merge-cmd.d.ts

@@ -1,9 +1,8 @@
-import { Command, CommandOptions } from '@teambit/cli';
-import { ComponentID } from '@teambit/component-id';
-import { ConfigMergeResult, WorkspaceConfigUpdateResult } from '@teambit/config-merger';
-import { MergeStrategy } from './merge-version';
-import { ApplyVersionResults, MergingMain, ApplyVersionResult } from './merging.main.runtime';
-import { ConfigStoreMain } from '@teambit/config-store';
+import type { Command, CommandOptions } from '@teambit/cli';
+import type { ConfigMergeResult } from '@teambit/config-merger';
+import { type MergeStrategy, type ApplyVersionResults } from '@teambit/component.modules.merge-helper';
+import type { MergingMain } from './merging.main.runtime';
+import type { ConfigStoreMain } from '@teambit/config-store';
 export declare class MergeCmd implements Command {
     private merging;
     private configStore;
@@ -37,18 +36,3 @@ export declare class MergeCmd implements Command {
 export declare function mergeReport({ components, failedComponents, removedComponents, version, mergeSnapResults, mergeSnapError, leftUnresolvedConflicts, verbose, configMergeResults, workspaceConfigUpdateResult, }: ApplyVersionResults & {
     configMergeResults?: ConfigMergeResult[];
 }): string;
-export declare function getWorkspaceConfigUpdateOutput(workspaceConfigUpdateResult?: WorkspaceConfigUpdateResult): string;
-/**
- * shows only the file-changes section.
- * if all files are "unchanged", it returns an empty string
- */
-export declare function applyVersionReport(components: ApplyVersionResult[], addName?: boolean, showVersion?: boolean): string;
-export declare function conflictSummaryReport(components: ApplyVersionResult[]): {
-    conflictedComponents: number;
-    conflictedFiles: number;
-    conflictStr: string;
-};
-export declare function installationErrorOutput(installationError?: Error): string;
-export declare function compilationErrorOutput(compilationError?: Error): string;
-export declare function getRemovedOutput(removedComponents?: ComponentID[]): string;
-export declare function getAddedOutput(addedComponents?: ComponentID[]): string;

package/dist/merge-cmd.js

@@ -4,13 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.MergeCmd = void 0;
-exports.applyVersionReport = applyVersionReport;
-exports.compilationErrorOutput = compilationErrorOutput;
-exports.conflictSummaryReport = conflictSummaryReport;
-exports.getAddedOutput = getAddedOutput;
-exports.getRemovedOutput = getRemovedOutput;
-exports.getWorkspaceConfigUpdateOutput = getWorkspaceConfigUpdateOutput;
-exports.installationErrorOutput = installationErrorOutput;
 exports.mergeReport = mergeReport;
 function _chalk() {
   const data = _interopRequireDefault(require("chalk"));
@@ -40,9 +33,16 @@ function _bitError() {
   };
   return data;
 }
-function _mergeVersion() {
-  const data = require("./merge-version");
-  _mergeVersion = function () {
+function _componentModules() {
+  const data = require("@teambit/component.modules.merge-helper");
+  _componentModules = function () {
+    return data;
+  };
+  return data;
+}
+function _mergeStatusProvider() {
+  const data = require("./merge-status-provider");
+  _mergeStatusProvider = function () {
     return data;
   };
   return data;
@@ -56,17 +56,18 @@ class MergeCmd {
     this.merging = merging;
     this.configStore = configStore;
     _defineProperty(this, "name", 'merge [component-pattern]');
-    _defineProperty(this, "description", 'merge changes of the remote head into local - auto-snaps all merged components');
+    _defineProperty(this, "description", 'merge diverged component history when local and remote have different versions');
     _defineProperty(this, "helpUrl", 'reference/components/merging-changes');
     _defineProperty(this, "group", 'version-control');
     _defineProperty(this, "arguments", [{
       name: 'component-pattern',
       description: _legacy().COMPONENT_PATTERN_HELP
     }]);
-    _defineProperty(this, "extendedDescription", `merge changes of the remote head into local when they are diverged. when on a lane, merge the remote head of the lane into the local
-and creates snaps for merged components that have diverged, on the lane.
-if no ids are specified, all pending-merge components will be merged. (run "bit status" to list them).
-optionally use '--abort' to revert the last merge. to revert a lane merge, use "bit lane merge-abort" command.`);
+    _defineProperty(this, "extendedDescription", `resolves diverged component history when both local and remote have created different snaps/tags from the same base version.
+if no component pattern is specified, all pending-merge components will be merged (run 'bit status' to list them).
+'bit status' will show diverged components and suggest either merging or resetting local changes.
+preferred approach: use 'bit reset' to remove local versions, then 'bit checkout head' to get remote versions.
+for lane-to-lane merging, use 'bit lane merge' instead.`);
     _defineProperty(this, "alias", '');
     _defineProperty(this, "options", [['', 'ours', 'DEPRECATED. use --auto-merge-resolve. in case of a conflict, keep the local modification'], ['', 'theirs', 'DEPRECATED. use --auto-merge-resolve. in case of a conflict, override the local modification with the specified version'], ['', 'manual', 'same as "--auto-merge-resolve manual". in case of merge conflict, write the files with the conflict markers'], ['r', 'auto-merge-resolve <merge-strategy>', 'in case of a conflict, resolve according to the strategy: [ours, theirs, manual]'], ['', 'abort', 'in case of an unresolved merge, revert to pre-merge state'], ['', 'resolve', 'mark an unresolved merge as resolved and create a new snap with the changes'], ['', 'no-snap', 'do not auto snap even if the merge completed without conflicts'], ['', 'build', 'in case of snap during the merge, run the build-pipeline (similar to bit snap --build)'], ['', 'verbose', 'show details of components that were not merged successfully'], ['x', 'skip-dependency-installation', 'do not install new dependencies resulting from the merge'], ['m', 'message <message>', 'override the default message for the auto snap']]);
     _defineProperty(this, "loader", true);
@@ -139,7 +140,7 @@ function mergeReport({
   const getSuccessOutput = () => {
     if (!components || !components.length) return '';
     const title = `successfully merged ${components.length} components${version ? `from version ${_chalk().default.bold(version)}` : ''}\n`;
-    const fileChangesReport = applyVersionReport(components);
+    const fileChangesReport = (0, _componentModules().applyVersionReport)(components);
     return _chalk().default.bold(title) + fileChangesReport;
   };
   let componentsWithConflicts = 0;
@@ -148,7 +149,7 @@ function mergeReport({
     const title = `files with conflicts summary\n`;
     const suggestion = `\n\nmerge process not completed due to the conflicts above. fix conflicts manually and then run "bit install".
 once ready, snap/tag the components to complete the merge.`;
-    const conflictSummary = conflictSummaryReport(components);
+    const conflictSummary = (0, _componentModules().conflictSummaryReport)(components);
     componentsWithConflicts = conflictSummary.conflictedComponents;
     return _chalk().default.underline(title) + conflictSummary.conflictStr + _chalk().default.yellow(suggestion);
   };
@@ -187,17 +188,30 @@ ${mergeSnapError.message}
   };
   const getFailureOutput = () => {
     if (!failedComponents || !failedComponents.length) return '';
-    const title = '\nmerge skipped for the following component(s)';
-    const body = (0, _lodash().compact)(failedComponents.map(failedComponent => {
-      // all failures here are "unchangedLegitimately". otherwise, it would have been thrown as an error
-      if (!verbose) return null;
-      return `${_chalk().default.bold(failedComponent.id.toString())} - ${_chalk().default.white(failedComponent.unchangedMessage)}`;
-    })).join('\n');
-    if (!body) {
-      return `${_chalk().default.bold(`\nmerge skipped legitimately for ${failedComponents.length} component(s)`)}
-(use --verbose to list them next time)`;
+    // always show removed components - the user needs to know about these
+    const skippedRemoved = failedComponents.filter(fc => fc.unchangedMessage === _mergeStatusProvider().compHasBeenRemovedMsg);
+    const otherComponents = failedComponents.filter(fc => fc.unchangedMessage !== _mergeStatusProvider().compHasBeenRemovedMsg);
+    const parts = [];
+    if (skippedRemoved.length) {
+      const removedTitle = _chalk().default.yellow(`\nmerge skipped for ${skippedRemoved.length} soft-removed component(s):`);
+      const removedBody = skippedRemoved.map(fc => `${_chalk().default.bold(fc.id.toString())}`).join('\n');
+      const removedHint = _chalk().default.yellow(`(use "bit recover <component-id>" to restore, then re-run the merge)`);
+      parts.push(`${removedTitle}\n${removedBody}\n${removedHint}`);
+    }
+    if (otherComponents.length) {
+      const title = '\nmerge skipped for the following component(s)';
+      const body = (0, _lodash().compact)(otherComponents.map(failedComponent => {
+        // all failures here are "unchangedLegitimately". otherwise, it would have been thrown as an error
+        if (!verbose) return null;
+        return `${_chalk().default.bold(failedComponent.id.toString())} - ${_chalk().default.white(failedComponent.unchangedMessage)}`;
+      })).join('\n');
+      if (!body) {
+        parts.push(`${_chalk().default.bold(`\nmerge skipped legitimately for ${otherComponents.length} component(s)`)}\n(use --verbose to list them next time)`);
+      } else {
+        parts.push(`${_chalk().default.underline(title)}\n${body}`);
+      }
     }
-    return `${_chalk().default.underline(title)}\n${body}`;
+    return parts.join('\n');
   };
   const getSummary = () => {
     const merged = components?.length || 0;
@@ -217,115 +231,7 @@ ${mergeSnapError.message}
     const conflictStr = `\nConflicts: ${_chalk().default.bold(getConflictStr() || 'none')}`;
     return title + mergedStr + unchangedLegitimatelyStr + autoSnappedStr + removedStr + conflictStr;
   };
-  return (0, _lodash().compact)([getSuccessOutput(), getFailureOutput(), getRemovedOutput(removedComponents), getSnapsOutput(), getConfigMergeConflictSummary(), getWorkspaceConfigUpdateOutput(workspaceConfigUpdateResult), getConflictSummary(), getSummary()]).join('\n\n');
-}
-function getWorkspaceConfigUpdateOutput(workspaceConfigUpdateResult) {
-  if (!workspaceConfigUpdateResult) return '';
-  const {
-    workspaceConfigConflictWriteError,
-    workspaceDepsConflicts,
-    workspaceDepsUpdates,
-    workspaceDepsUnchanged
-  } = workspaceConfigUpdateResult;
-  const getWorkspaceConflictsOutput = () => {
-    if (!workspaceDepsConflicts && !workspaceConfigConflictWriteError) return '';
-    if (workspaceConfigConflictWriteError) {
-      return `${_chalk().default.red(workspaceConfigConflictWriteError.message)}`;
-    }
-    return _chalk().default.yellow('workspace.jsonc has conflicts, please edit the file and fix them');
-  };
-  const getWorkspaceUnchangedDepsOutput = () => {
-    if (!workspaceDepsUnchanged) return '';
-    const title = '\nworkspace.jsonc was unable to update the following dependencies';
-    const body = Object.keys(workspaceDepsUnchanged).map(pkgName => {
-      return `  ${pkgName}: ${workspaceDepsUnchanged[pkgName]}`;
-    }).join('\n');
-    return `${_chalk().default.underline(title)}\n${body}`;
-  };
-  return (0, _lodash().compact)([getWorkspaceUnchangedDepsOutput(), getWorkspaceDepsOutput(workspaceDepsUpdates), getWorkspaceConflictsOutput()]).join('\n\n');
-}
-function getWorkspaceDepsOutput(workspaceDepsUpdates) {
-  if (!workspaceDepsUpdates) return '';
-  const title = '\nworkspace.jsonc has been updated with the following dependencies';
-  const body = Object.keys(workspaceDepsUpdates).map(pkgName => {
-    const [from, to] = workspaceDepsUpdates[pkgName];
-    return `  ${pkgName}: ${from} => ${to}`;
-  }).join('\n');
-  return `${_chalk().default.underline(title)}\n${body}`;
-}
-
-/**
- * shows only the file-changes section.
- * if all files are "unchanged", it returns an empty string
- */
-function applyVersionReport(components, addName = true, showVersion = false) {
-  const tab = addName ? '\t' : '';
-  const fileChanges = (0, _lodash().compact)(components.map(component => {
-    const name = showVersion ? component.id.toString() : component.id.toStringWithoutVersion();
-    const files = (0, _lodash().compact)(Object.keys(component.filesStatus).map(file => {
-      if (component.filesStatus[file] === _mergeVersion().FileStatus.unchanged) return null;
-      const note = component.filesStatus[file] === _mergeVersion().FileStatus.manual ? _chalk().default.white('automatic merge failed. please fix conflicts manually and then run "bit install"') : '';
-      return `${tab}${String(component.filesStatus[file])} ${_chalk().default.bold(file)} ${note}`;
-    })).join('\n');
-    if (!files) return null;
-    return `${addName ? name : ''}\n${_chalk().default.cyan(files)}`;
-  })).join('\n\n');
-  if (!fileChanges) {
-    return '';
-  }
-  const title = `\n${_legacy().FILE_CHANGES_CHECKOUT_MSG}\n`;
-  return _chalk().default.underline(title) + fileChanges;
-}
-function conflictSummaryReport(components) {
-  const tab = '\t';
-  let conflictedComponents = 0;
-  let conflictedFiles = 0;
-  const conflictStr = (0, _lodash().compact)(components.map(component => {
-    const name = component.id.toStringWithoutVersion();
-    const files = (0, _lodash().compact)(Object.keys(component.filesStatus).map(file => {
-      if (component.filesStatus[file] === _mergeVersion().FileStatus.manual) {
-        conflictedFiles += 1;
-        return `${tab}${String(component.filesStatus[file])} ${_chalk().default.bold(file)}`;
-      }
-      return null;
-    }));
-    if (!files.length) return null;
-    conflictedComponents += 1;
-    return `${name}\n${_chalk().default.cyan(files.join('\n'))}`;
-  })).join('\n');
-  return {
-    conflictedComponents,
-    conflictedFiles,
-    conflictStr
-  };
-}
-function installationErrorOutput(installationError) {
-  if (!installationError) return '';
-  const title = _chalk().default.underline('Installation Error');
-  const subTitle = 'The following error was thrown by the package manager:';
-  const body = _chalk().default.red(installationError.message);
-  const suggestion = 'Use "bit install" to complete the installation, remove the imported components using "bit remove <comp id>" or remove the missing dependencies from their source code';
-  return `${title}\n${subTitle}\n${body}\n${suggestion}`;
-}
-function compilationErrorOutput(compilationError) {
-  if (!compilationError) return '';
-  const title = _chalk().default.underline('Compilation Error');
-  const subTitle = 'The following error was thrown by the compiler';
-  const body = _chalk().default.red(compilationError.message);
-  const suggestion = 'Please fix the issue and run "bit compile"';
-  return `${title}\n${subTitle}\n${body}\n${suggestion}`;
-}
-function getRemovedOutput(removedComponents) {
-  if (!removedComponents?.length) return '';
-  const title = `the following ${removedComponents.length} component(s) have been removed`;
-  const body = removedComponents.join('\n');
-  return `${_chalk().default.underline(title)}\n${body}`;
-}
-function getAddedOutput(addedComponents) {
-  if (!addedComponents?.length) return '';
-  const title = `the following ${addedComponents.length} component(s) have been added`;
-  const body = addedComponents.join('\n');
-  return `${_chalk().default.underline(title)}\n${body}`;
+  return (0, _lodash().compact)([getSuccessOutput(), getFailureOutput(), (0, _componentModules().getRemovedOutput)(removedComponents), getSnapsOutput(), getConfigMergeConflictSummary(), (0, _componentModules().getWorkspaceConfigUpdateOutput)(workspaceConfigUpdateResult), getConflictSummary(), getSummary()]).join('\n\n');
 }
 
 //# sourceMappingURL=merge-cmd.js.map

package/dist/merge-cmd.js.map

@@ -1 +1 @@
-{"version":3,"names":["_chalk","data","_interopRequireDefault","require","_lodash","_legacy","_bitError","_mergeVersion","e","__esModule","default","_defineProperty","r","t","_toPropertyKey","Object","defineProperty","value","enumerable","configurable","writable","i","_toPrimitive","Symbol","toPrimitive","call","TypeError","String","Number","MergeCmd","constructor","merging","configStore","name","description","COMPONENT_PATTERN_HELP","report","pattern","ours","theirs","manual","autoMergeResolve","abort","resolve","build","noSnap","verbose","message","skipDependencyInstallation","getConfigBoolean","CFG_FORCE_LOCAL_BUILD","Boolean","BitError","components","failedComponents","version","resolvedComponents","abortedComponents","mergeSnapResults","mergeSnapError","merge","title","componentsStr","map","c","id","toStringWithoutVersion","join","chalk","underline","green","mergeReport","exports","removedComponents","leftUnresolvedConflicts","configMergeResults","workspaceConfigUpdateResult","getSuccessOutput","length","bold","fileChangesReport","applyVersionReport","componentsWithConflicts","getConflictSummary","suggestion","conflictSummary","conflictSummaryReport","conflictedComponents","conflictStr","yellow","configMergeWithConflicts","filter","hasConflicts","getConfigMergeConflictSummary","comps","compIdStr","MergeConfigFilename","getSnapsOutput","snappedComponents","autoSnappedResults","outputComponents","component","componentOutput","toString","autoTag","result","triggeredBy","searchWithoutVersion","autoTagComp","a","AUTO_SNAPPED_MSG","getFailureOutput","body","compact","failedComponent","white","unchangedMessage","getSummary","merged","unchangedLegitimately","f","autoSnapped","getConflictStr","ws","workspaceDepsConflicts","mergeConfig","mergedStr","unchangedLegitimatelyStr","autoSnappedStr","removedStr","getRemovedOutput","getWorkspaceConfigUpdateOutput","workspaceConfigConflictWriteError","workspaceDepsUpdates","workspaceDepsUnchanged","getWorkspaceConflictsOutput","red","getWorkspaceUnchangedDepsOutput","keys","pkgName","getWorkspaceDepsOutput","from","to","addName","showVersion","tab","fileChanges","files","filesStatus","file","FileStatus","unchanged","note","cyan","FILE_CHANGES_CHECKOUT_MSG","conflictedFiles","installationErrorOutput","installationError","subTitle","compilationErrorOutput","compilationError","getAddedOutput","addedComponents"],"sources":["merge-cmd.ts"],"sourcesContent":["import chalk from 'chalk';\nimport { Command, CommandOptions } from '@teambit/cli';\nimport { ComponentID } from '@teambit/component-id';\nimport { compact } from 'lodash';\nimport {\n  COMPONENT_PATTERN_HELP,\n  AUTO_SNAPPED_MSG,\n  MergeConfigFilename,\n  FILE_CHANGES_CHECKOUT_MSG,\n  CFG_FORCE_LOCAL_BUILD,\n} from '@teambit/legacy.constants';\nimport { ConfigMergeResult, WorkspaceConfigUpdateResult, WorkspaceDepsUpdates } from '@teambit/config-merger';\nimport { BitError } from '@teambit/bit-error';\nimport { FileStatus, MergeStrategy } from './merge-version';\nimport { ApplyVersionResults, MergingMain, ApplyVersionResult } from './merging.main.runtime';\nimport { ConfigStoreMain } from '@teambit/config-store';\n\nexport class MergeCmd implements Command {\n  name = 'merge [component-pattern]';\n  description = 'merge changes of the remote head into local - auto-snaps all merged components';\n  helpUrl = 'reference/components/merging-changes';\n  group = 'version-control';\n  arguments = [{ name: 'component-pattern', description: COMPONENT_PATTERN_HELP }];\n  extendedDescription = `merge changes of the remote head into local when they are diverged. when on a lane, merge the remote head of the lane into the local\nand creates snaps for merged components that have diverged, on the lane.\nif no ids are specified, all pending-merge components will be merged. (run \"bit status\" to list them).\noptionally use '--abort' to revert the last merge. to revert a lane merge, use \"bit lane merge-abort\" command.`;\n  alias = '';\n  options = [\n    ['', 'ours', 'DEPRECATED. use --auto-merge-resolve. in case of a conflict, keep the local modification'],\n    [\n      '',\n      'theirs',\n      'DEPRECATED. use --auto-merge-resolve. in case of a conflict, override the local modification with the specified version',\n    ],\n    [\n      '',\n      'manual',\n      'same as \"--auto-merge-resolve manual\". in case of merge conflict, write the files with the conflict markers',\n    ],\n    [\n      'r',\n      'auto-merge-resolve <merge-strategy>',\n      'in case of a conflict, resolve according to the strategy: [ours, theirs, manual]',\n    ],\n    ['', 'abort', 'in case of an unresolved merge, revert to pre-merge state'],\n    ['', 'resolve', 'mark an unresolved merge as resolved and create a new snap with the changes'],\n    ['', 'no-snap', 'do not auto snap even if the merge completed without conflicts'],\n    ['', 'build', 'in case of snap during the merge, run the build-pipeline (similar to bit snap --build)'],\n    ['', 'verbose', 'show details of components that were not merged successfully'],\n    ['x', 'skip-dependency-installation', 'do not install new dependencies resulting from the merge'],\n    ['m', 'message <message>', 'override the default message for the auto snap'],\n  ] as CommandOptions;\n  loader = true;\n\n  constructor(\n    private merging: MergingMain,\n    private configStore: ConfigStoreMain\n  ) {}\n\n  async report(\n    [pattern]: [string],\n    {\n      ours = false,\n      theirs = false,\n      manual = false,\n      autoMergeResolve,\n      abort = false,\n      resolve = false,\n      build = false,\n      noSnap = false,\n      verbose = false,\n      message,\n      skipDependencyInstallation = false,\n    }: {\n      ours?: boolean;\n      theirs?: boolean;\n      manual?: boolean;\n      autoMergeResolve?: MergeStrategy;\n      abort?: boolean;\n      resolve?: boolean;\n      build?: boolean;\n      noSnap?: boolean;\n      verbose?: boolean;\n      message: string;\n      skipDependencyInstallation?: boolean;\n    }\n  ) {\n    build = this.configStore.getConfigBoolean(CFG_FORCE_LOCAL_BUILD) || Boolean(build);\n    if (ours || theirs) {\n      throw new BitError('the \"--ours\" and \"--theirs\" flags are deprecated. use \"--auto-merge-resolve\" instead');\n    }\n    if (\n      autoMergeResolve &&\n      autoMergeResolve !== 'ours' &&\n      autoMergeResolve !== 'theirs' &&\n      autoMergeResolve !== 'manual'\n    ) {\n      throw new BitError('--auto-merge-resolve must be one of the following: [ours, theirs, manual]');\n    }\n    if (manual) autoMergeResolve = 'manual';\n    if (abort && resolve) throw new BitError('unable to use \"abort\" and \"resolve\" flags together');\n    if (noSnap && message) throw new BitError('unable to use \"noSnap\" and \"message\" flags together');\n    const {\n      components,\n      failedComponents,\n      version,\n      resolvedComponents,\n      abortedComponents,\n      mergeSnapResults,\n      mergeSnapError,\n    }: ApplyVersionResults = await this.merging.merge(\n      pattern,\n      autoMergeResolve as any,\n      abort,\n      resolve,\n      noSnap,\n      message,\n      build,\n      skipDependencyInstallation\n    );\n    if (resolvedComponents) {\n      const title = 'successfully resolved component(s)\\n';\n      const componentsStr = resolvedComponents.map((c) => c.id.toStringWithoutVersion()).join('\\n');\n      return chalk.underline(title) + chalk.green(componentsStr);\n    }\n    if (abortedComponents) {\n      const title = 'successfully aborted the merge of the following component(s)\\n';\n      const componentsStr = abortedComponents.map((c) => c.id.toStringWithoutVersion()).join('\\n');\n      return chalk.underline(title) + chalk.green(componentsStr);\n    }\n\n    return mergeReport({\n      components,\n      failedComponents,\n      version,\n      mergeSnapResults,\n      mergeSnapError,\n      verbose,\n    });\n  }\n}\n\nexport function mergeReport({\n  components,\n  failedComponents,\n  removedComponents,\n  version,\n  mergeSnapResults,\n  mergeSnapError,\n  leftUnresolvedConflicts,\n  verbose,\n  configMergeResults,\n  workspaceConfigUpdateResult,\n}: ApplyVersionResults & { configMergeResults?: ConfigMergeResult[] }): string {\n  const getSuccessOutput = () => {\n    if (!components || !components.length) return '';\n    const title = `successfully merged ${components.length} components${\n      version ? `from version ${chalk.bold(version)}` : ''\n    }\\n`;\n    const fileChangesReport = applyVersionReport(components);\n\n    return chalk.bold(title) + fileChangesReport;\n  };\n\n  let componentsWithConflicts = 0;\n  const getConflictSummary = () => {\n    if (!components || !components.length || !leftUnresolvedConflicts) return '';\n    const title = `files with conflicts summary\\n`;\n    const suggestion = `\\n\\nmerge process not completed due to the conflicts above. fix conflicts manually and then run \"bit install\".\nonce ready, snap/tag the components to complete the merge.`;\n    const conflictSummary = conflictSummaryReport(components);\n    componentsWithConflicts = conflictSummary.conflictedComponents;\n    return chalk.underline(title) + conflictSummary.conflictStr + chalk.yellow(suggestion);\n  };\n\n  const configMergeWithConflicts = configMergeResults?.filter((c) => c.hasConflicts()) || [];\n  const getConfigMergeConflictSummary = () => {\n    if (!configMergeWithConflicts.length) return '';\n    const comps = configMergeWithConflicts.map((c) => c.compIdStr).join('\\n');\n    const title = `components with config-merge conflicts\\n`;\n    const suggestion = `\\nconflicts were found while trying to merge the config. fix them manually by editing the ${MergeConfigFilename} file in the workspace root.\nonce ready, snap/tag the components to complete the merge.`;\n    return chalk.underline(title) + comps + chalk.yellow(suggestion);\n  };\n\n  const getSnapsOutput = () => {\n    if (mergeSnapError) {\n      return `${chalk.bold(\n        'snapping merged components failed with the following error, please fix the issues and snap manually'\n      )}\n${mergeSnapError.message}\n`;\n    }\n    if (!mergeSnapResults || !mergeSnapResults.snappedComponents) return '';\n    const { snappedComponents, autoSnappedResults } = mergeSnapResults;\n    const outputComponents = (comps) => {\n      return comps\n        .map((component) => {\n          let componentOutput = `     > ${component.id.toString()}`;\n          const autoTag = autoSnappedResults.filter((result) => result.triggeredBy.searchWithoutVersion(component.id));\n          if (autoTag.length) {\n            const autoTagComp = autoTag.map((a) => a.component.id.toString());\n            componentOutput += `\\n       ${AUTO_SNAPPED_MSG}: ${autoTagComp.join(', ')}`;\n          }\n          return componentOutput;\n        })\n        .join('\\n');\n    };\n\n    return `${chalk.underline(\n      'merge-snapped components'\n    )}\\n(${'components snapped as a result of the merge'})\\n${outputComponents(snappedComponents)}`;\n  };\n\n  const getFailureOutput = () => {\n    if (!failedComponents || !failedComponents.length) return '';\n    const title = '\\nmerge skipped for the following component(s)';\n    const body = compact(\n      failedComponents.map((failedComponent) => {\n        // all failures here are \"unchangedLegitimately\". otherwise, it would have been thrown as an error\n        if (!verbose) return null;\n        return `${chalk.bold(failedComponent.id.toString())} - ${chalk.white(failedComponent.unchangedMessage)}`;\n      })\n    ).join('\\n');\n    if (!body) {\n      return `${chalk.bold(`\\nmerge skipped legitimately for ${failedComponents.length} component(s)`)}\n(use --verbose to list them next time)`;\n    }\n    return `${chalk.underline(title)}\\n${body}`;\n  };\n\n  const getSummary = () => {\n    const merged = components?.length || 0;\n    const unchangedLegitimately = failedComponents?.filter((f) => f.unchangedLegitimately).length || 0;\n    const autoSnapped =\n      (mergeSnapResults?.snappedComponents.length || 0) + (mergeSnapResults?.autoSnappedResults.length || 0);\n    const getConflictStr = () => {\n      const comps = componentsWithConflicts ? `${componentsWithConflicts} components` : '';\n      const ws = workspaceConfigUpdateResult?.workspaceDepsConflicts ? 'workspace.jsonc file' : '';\n      const mergeConfig = configMergeWithConflicts.length ? `${MergeConfigFilename} file` : '';\n      return compact([comps, ws, mergeConfig]).join(', ');\n    };\n\n    const title = chalk.bold.underline('Merge Summary');\n    const mergedStr = `\\nTotal Merged: ${chalk.bold(merged.toString())}`;\n    const unchangedLegitimatelyStr = `\\nTotal Unchanged: ${chalk.bold(unchangedLegitimately.toString())}`;\n    const autoSnappedStr = `\\nTotal Snapped: ${chalk.bold(autoSnapped.toString())}`;\n    const removedStr = `\\nTotal Removed: ${chalk.bold(removedComponents?.length.toString() || '0')}`;\n    const conflictStr = `\\nConflicts: ${chalk.bold(getConflictStr() || 'none')}`;\n\n    return title + mergedStr + unchangedLegitimatelyStr + autoSnappedStr + removedStr + conflictStr;\n  };\n\n  return compact([\n    getSuccessOutput(),\n    getFailureOutput(),\n    getRemovedOutput(removedComponents),\n    getSnapsOutput(),\n    getConfigMergeConflictSummary(),\n    getWorkspaceConfigUpdateOutput(workspaceConfigUpdateResult),\n    getConflictSummary(),\n    getSummary(),\n  ]).join('\\n\\n');\n}\n\nexport function getWorkspaceConfigUpdateOutput(workspaceConfigUpdateResult?: WorkspaceConfigUpdateResult): string {\n  if (!workspaceConfigUpdateResult) return '';\n  const { workspaceConfigConflictWriteError, workspaceDepsConflicts, workspaceDepsUpdates, workspaceDepsUnchanged } =\n    workspaceConfigUpdateResult;\n\n  const getWorkspaceConflictsOutput = () => {\n    if (!workspaceDepsConflicts && !workspaceConfigConflictWriteError) return '';\n    if (workspaceConfigConflictWriteError) {\n      return `${chalk.red(workspaceConfigConflictWriteError.message)}`;\n    }\n    return chalk.yellow('workspace.jsonc has conflicts, please edit the file and fix them');\n  };\n\n  const getWorkspaceUnchangedDepsOutput = () => {\n    if (!workspaceDepsUnchanged) return '';\n    const title = '\\nworkspace.jsonc was unable to update the following dependencies';\n    const body = Object.keys(workspaceDepsUnchanged)\n      .map((pkgName) => {\n        return `  ${pkgName}: ${workspaceDepsUnchanged[pkgName]}`;\n      })\n      .join('\\n');\n\n    return `${chalk.underline(title)}\\n${body}`;\n  };\n\n  return compact([\n    getWorkspaceUnchangedDepsOutput(),\n    getWorkspaceDepsOutput(workspaceDepsUpdates),\n    getWorkspaceConflictsOutput(),\n  ]).join('\\n\\n');\n}\n\nfunction getWorkspaceDepsOutput(workspaceDepsUpdates?: WorkspaceDepsUpdates): string {\n  if (!workspaceDepsUpdates) return '';\n\n  const title = '\\nworkspace.jsonc has been updated with the following dependencies';\n  const body = Object.keys(workspaceDepsUpdates)\n    .map((pkgName) => {\n      const [from, to] = workspaceDepsUpdates[pkgName];\n      return `  ${pkgName}: ${from} => ${to}`;\n    })\n    .join('\\n');\n\n  return `${chalk.underline(title)}\\n${body}`;\n}\n\n/**\n * shows only the file-changes section.\n * if all files are \"unchanged\", it returns an empty string\n */\nexport function applyVersionReport(components: ApplyVersionResult[], addName = true, showVersion = false): string {\n  const tab = addName ? '\\t' : '';\n  const fileChanges = compact(\n    components.map((component: ApplyVersionResult) => {\n      const name = showVersion ? component.id.toString() : component.id.toStringWithoutVersion();\n      const files = compact(\n        Object.keys(component.filesStatus).map((file) => {\n          if (component.filesStatus[file] === FileStatus.unchanged) return null;\n          const note =\n            component.filesStatus[file] === FileStatus.manual\n              ? chalk.white('automatic merge failed. please fix conflicts manually and then run \"bit install\"')\n              : '';\n          return `${tab}${String(component.filesStatus[file])} ${chalk.bold(file)} ${note}`;\n        })\n      ).join('\\n');\n      if (!files) return null;\n      return `${addName ? name : ''}\\n${chalk.cyan(files)}`;\n    })\n  ).join('\\n\\n');\n  if (!fileChanges) {\n    return '';\n  }\n  const title = `\\n${FILE_CHANGES_CHECKOUT_MSG}\\n`;\n  return chalk.underline(title) + fileChanges;\n}\n\nexport function conflictSummaryReport(components: ApplyVersionResult[]): {\n  conflictedComponents: number;\n  conflictedFiles: number;\n  conflictStr: string;\n} {\n  const tab = '\\t';\n  let conflictedComponents = 0;\n  let conflictedFiles = 0;\n  const conflictStr = compact(\n    components.map((component: ApplyVersionResult) => {\n      const name = component.id.toStringWithoutVersion();\n      const files = compact(\n        Object.keys(component.filesStatus).map((file) => {\n          if (component.filesStatus[file] === FileStatus.manual) {\n            conflictedFiles += 1;\n            return `${tab}${String(component.filesStatus[file])} ${chalk.bold(file)}`;\n          }\n          return null;\n        })\n      );\n      if (!files.length) return null;\n      conflictedComponents += 1;\n      return `${name}\\n${chalk.cyan(files.join('\\n'))}`;\n    })\n  ).join('\\n');\n\n  return { conflictedComponents, conflictedFiles, conflictStr };\n}\n\nexport function installationErrorOutput(installationError?: Error) {\n  if (!installationError) return '';\n  const title = chalk.underline('Installation Error');\n  const subTitle = 'The following error was thrown by the package manager:';\n  const body = chalk.red(installationError.message);\n  const suggestion =\n    'Use \"bit install\" to complete the installation, remove the imported components using \"bit remove <comp id>\" or remove the missing dependencies from their source code';\n  return `${title}\\n${subTitle}\\n${body}\\n${suggestion}`;\n}\n\nexport function compilationErrorOutput(compilationError?: Error) {\n  if (!compilationError) return '';\n  const title = chalk.underline('Compilation Error');\n  const subTitle = 'The following error was thrown by the compiler';\n  const body = chalk.red(compilationError.message);\n  const suggestion = 'Please fix the issue and run \"bit compile\"';\n  return `${title}\\n${subTitle}\\n${body}\\n${suggestion}`;\n}\n\nexport function getRemovedOutput(removedComponents?: ComponentID[]) {\n  if (!removedComponents?.length) return '';\n  const title = `the following ${removedComponents.length} component(s) have been removed`;\n  const body = removedComponents.join('\\n');\n  return `${chalk.underline(title)}\\n${body}`;\n}\n\nexport function getAddedOutput(addedComponents?: ComponentID[]) {\n  if (!addedComponents?.length) return '';\n  const title = `the following ${addedComponents.length} component(s) have been added`;\n  const body = addedComponents.join('\\n');\n  return `${chalk.underline(title)}\\n${body}`;\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_chalk","data","_interopRequireDefault","require","_lodash","_legacy","_bitError","_componentModules","_mergeStatusProvider","e","__esModule","default","_defineProperty","r","t","_toPropertyKey","Object","defineProperty","value","enumerable","configurable","writable","i","_toPrimitive","Symbol","toPrimitive","call","TypeError","String","Number","MergeCmd","constructor","merging","configStore","name","description","COMPONENT_PATTERN_HELP","report","pattern","ours","theirs","manual","autoMergeResolve","abort","resolve","build","noSnap","verbose","message","skipDependencyInstallation","getConfigBoolean","CFG_FORCE_LOCAL_BUILD","Boolean","BitError","components","failedComponents","version","resolvedComponents","abortedComponents","mergeSnapResults","mergeSnapError","merge","title","componentsStr","map","c","id","toStringWithoutVersion","join","chalk","underline","green","mergeReport","exports","removedComponents","leftUnresolvedConflicts","configMergeResults","workspaceConfigUpdateResult","getSuccessOutput","length","bold","fileChangesReport","applyVersionReport","componentsWithConflicts","getConflictSummary","suggestion","conflictSummary","conflictSummaryReport","conflictedComponents","conflictStr","yellow","configMergeWithConflicts","filter","hasConflicts","getConfigMergeConflictSummary","comps","compIdStr","MergeConfigFilename","getSnapsOutput","snappedComponents","autoSnappedResults","outputComponents","component","componentOutput","toString","autoTag","result","triggeredBy","searchWithoutVersion","autoTagComp","a","AUTO_SNAPPED_MSG","getFailureOutput","skippedRemoved","fc","unchangedMessage","compHasBeenRemovedMsg","otherComponents","parts","removedTitle","removedBody","removedHint","push","body","compact","failedComponent","white","getSummary","merged","unchangedLegitimately","f","autoSnapped","getConflictStr","ws","workspaceDepsConflicts","mergeConfig","mergedStr","unchangedLegitimatelyStr","autoSnappedStr","removedStr","getRemovedOutput","getWorkspaceConfigUpdateOutput"],"sources":["merge-cmd.ts"],"sourcesContent":["import chalk from 'chalk';\nimport type { Command, CommandOptions } from '@teambit/cli';\nimport { compact } from 'lodash';\nimport {\n  COMPONENT_PATTERN_HELP,\n  AUTO_SNAPPED_MSG,\n  MergeConfigFilename,\n  CFG_FORCE_LOCAL_BUILD,\n} from '@teambit/legacy.constants';\nimport type { ConfigMergeResult } from '@teambit/config-merger';\nimport { BitError } from '@teambit/bit-error';\nimport {\n  type MergeStrategy,\n  type ApplyVersionResults,\n  applyVersionReport,\n  conflictSummaryReport,\n  getRemovedOutput,\n  getWorkspaceConfigUpdateOutput,\n} from '@teambit/component.modules.merge-helper';\nimport type { MergingMain } from './merging.main.runtime';\nimport { compHasBeenRemovedMsg } from './merge-status-provider';\nimport type { ConfigStoreMain } from '@teambit/config-store';\n\nexport class MergeCmd implements Command {\n  name = 'merge [component-pattern]';\n  description = 'merge diverged component history when local and remote have different versions';\n  helpUrl = 'reference/components/merging-changes';\n  group = 'version-control';\n  arguments = [{ name: 'component-pattern', description: COMPONENT_PATTERN_HELP }];\n  extendedDescription = `resolves diverged component history when both local and remote have created different snaps/tags from the same base version.\nif no component pattern is specified, all pending-merge components will be merged (run 'bit status' to list them).\n'bit status' will show diverged components and suggest either merging or resetting local changes.\npreferred approach: use 'bit reset' to remove local versions, then 'bit checkout head' to get remote versions.\nfor lane-to-lane merging, use 'bit lane merge' instead.`;\n  alias = '';\n  options = [\n    ['', 'ours', 'DEPRECATED. use --auto-merge-resolve. in case of a conflict, keep the local modification'],\n    [\n      '',\n      'theirs',\n      'DEPRECATED. use --auto-merge-resolve. in case of a conflict, override the local modification with the specified version',\n    ],\n    [\n      '',\n      'manual',\n      'same as \"--auto-merge-resolve manual\". in case of merge conflict, write the files with the conflict markers',\n    ],\n    [\n      'r',\n      'auto-merge-resolve <merge-strategy>',\n      'in case of a conflict, resolve according to the strategy: [ours, theirs, manual]',\n    ],\n    ['', 'abort', 'in case of an unresolved merge, revert to pre-merge state'],\n    ['', 'resolve', 'mark an unresolved merge as resolved and create a new snap with the changes'],\n    ['', 'no-snap', 'do not auto snap even if the merge completed without conflicts'],\n    ['', 'build', 'in case of snap during the merge, run the build-pipeline (similar to bit snap --build)'],\n    ['', 'verbose', 'show details of components that were not merged successfully'],\n    ['x', 'skip-dependency-installation', 'do not install new dependencies resulting from the merge'],\n    ['m', 'message <message>', 'override the default message for the auto snap'],\n  ] as CommandOptions;\n  loader = true;\n\n  constructor(\n    private merging: MergingMain,\n    private configStore: ConfigStoreMain\n  ) {}\n\n  async report(\n    [pattern]: [string],\n    {\n      ours = false,\n      theirs = false,\n      manual = false,\n      autoMergeResolve,\n      abort = false,\n      resolve = false,\n      build = false,\n      noSnap = false,\n      verbose = false,\n      message,\n      skipDependencyInstallation = false,\n    }: {\n      ours?: boolean;\n      theirs?: boolean;\n      manual?: boolean;\n      autoMergeResolve?: MergeStrategy;\n      abort?: boolean;\n      resolve?: boolean;\n      build?: boolean;\n      noSnap?: boolean;\n      verbose?: boolean;\n      message: string;\n      skipDependencyInstallation?: boolean;\n    }\n  ) {\n    build = this.configStore.getConfigBoolean(CFG_FORCE_LOCAL_BUILD) || Boolean(build);\n    if (ours || theirs) {\n      throw new BitError('the \"--ours\" and \"--theirs\" flags are deprecated. use \"--auto-merge-resolve\" instead');\n    }\n    if (\n      autoMergeResolve &&\n      autoMergeResolve !== 'ours' &&\n      autoMergeResolve !== 'theirs' &&\n      autoMergeResolve !== 'manual'\n    ) {\n      throw new BitError('--auto-merge-resolve must be one of the following: [ours, theirs, manual]');\n    }\n    if (manual) autoMergeResolve = 'manual';\n    if (abort && resolve) throw new BitError('unable to use \"abort\" and \"resolve\" flags together');\n    if (noSnap && message) throw new BitError('unable to use \"noSnap\" and \"message\" flags together');\n    const {\n      components,\n      failedComponents,\n      version,\n      resolvedComponents,\n      abortedComponents,\n      mergeSnapResults,\n      mergeSnapError,\n    }: ApplyVersionResults = await this.merging.merge(\n      pattern,\n      autoMergeResolve as any,\n      abort,\n      resolve,\n      noSnap,\n      message,\n      build,\n      skipDependencyInstallation\n    );\n    if (resolvedComponents) {\n      const title = 'successfully resolved component(s)\\n';\n      const componentsStr = resolvedComponents.map((c) => c.id.toStringWithoutVersion()).join('\\n');\n      return chalk.underline(title) + chalk.green(componentsStr);\n    }\n    if (abortedComponents) {\n      const title = 'successfully aborted the merge of the following component(s)\\n';\n      const componentsStr = abortedComponents.map((c) => c.id.toStringWithoutVersion()).join('\\n');\n      return chalk.underline(title) + chalk.green(componentsStr);\n    }\n\n    return mergeReport({\n      components,\n      failedComponents,\n      version,\n      mergeSnapResults,\n      mergeSnapError,\n      verbose,\n    });\n  }\n}\n\nexport function mergeReport({\n  components,\n  failedComponents,\n  removedComponents,\n  version,\n  mergeSnapResults,\n  mergeSnapError,\n  leftUnresolvedConflicts,\n  verbose,\n  configMergeResults,\n  workspaceConfigUpdateResult,\n}: ApplyVersionResults & { configMergeResults?: ConfigMergeResult[] }): string {\n  const getSuccessOutput = () => {\n    if (!components || !components.length) return '';\n    const title = `successfully merged ${components.length} components${\n      version ? `from version ${chalk.bold(version)}` : ''\n    }\\n`;\n    const fileChangesReport = applyVersionReport(components);\n\n    return chalk.bold(title) + fileChangesReport;\n  };\n\n  let componentsWithConflicts = 0;\n  const getConflictSummary = () => {\n    if (!components || !components.length || !leftUnresolvedConflicts) return '';\n    const title = `files with conflicts summary\\n`;\n    const suggestion = `\\n\\nmerge process not completed due to the conflicts above. fix conflicts manually and then run \"bit install\".\nonce ready, snap/tag the components to complete the merge.`;\n    const conflictSummary = conflictSummaryReport(components);\n    componentsWithConflicts = conflictSummary.conflictedComponents;\n    return chalk.underline(title) + conflictSummary.conflictStr + chalk.yellow(suggestion);\n  };\n\n  const configMergeWithConflicts = configMergeResults?.filter((c) => c.hasConflicts()) || [];\n  const getConfigMergeConflictSummary = () => {\n    if (!configMergeWithConflicts.length) return '';\n    const comps = configMergeWithConflicts.map((c) => c.compIdStr).join('\\n');\n    const title = `components with config-merge conflicts\\n`;\n    const suggestion = `\\nconflicts were found while trying to merge the config. fix them manually by editing the ${MergeConfigFilename} file in the workspace root.\nonce ready, snap/tag the components to complete the merge.`;\n    return chalk.underline(title) + comps + chalk.yellow(suggestion);\n  };\n\n  const getSnapsOutput = () => {\n    if (mergeSnapError) {\n      return `${chalk.bold(\n        'snapping merged components failed with the following error, please fix the issues and snap manually'\n      )}\n${mergeSnapError.message}\n`;\n    }\n    if (!mergeSnapResults || !mergeSnapResults.snappedComponents) return '';\n    const { snappedComponents, autoSnappedResults } = mergeSnapResults;\n    const outputComponents = (comps) => {\n      return comps\n        .map((component) => {\n          let componentOutput = `     > ${component.id.toString()}`;\n          const autoTag = autoSnappedResults.filter((result) => result.triggeredBy.searchWithoutVersion(component.id));\n          if (autoTag.length) {\n            const autoTagComp = autoTag.map((a) => a.component.id.toString());\n            componentOutput += `\\n       ${AUTO_SNAPPED_MSG}: ${autoTagComp.join(', ')}`;\n          }\n          return componentOutput;\n        })\n        .join('\\n');\n    };\n\n    return `${chalk.underline(\n      'merge-snapped components'\n    )}\\n(${'components snapped as a result of the merge'})\\n${outputComponents(snappedComponents)}`;\n  };\n\n  const getFailureOutput = () => {\n    if (!failedComponents || !failedComponents.length) return '';\n    // always show removed components - the user needs to know about these\n    const skippedRemoved = failedComponents.filter((fc) => fc.unchangedMessage === compHasBeenRemovedMsg);\n    const otherComponents = failedComponents.filter((fc) => fc.unchangedMessage !== compHasBeenRemovedMsg);\n\n    const parts: string[] = [];\n\n    if (skippedRemoved.length) {\n      const removedTitle = chalk.yellow(`\\nmerge skipped for ${skippedRemoved.length} soft-removed component(s):`);\n      const removedBody = skippedRemoved.map((fc) => `${chalk.bold(fc.id.toString())}`).join('\\n');\n      const removedHint = chalk.yellow(`(use \"bit recover <component-id>\" to restore, then re-run the merge)`);\n      parts.push(`${removedTitle}\\n${removedBody}\\n${removedHint}`);\n    }\n\n    if (otherComponents.length) {\n      const title = '\\nmerge skipped for the following component(s)';\n      const body = compact(\n        otherComponents.map((failedComponent) => {\n          // all failures here are \"unchangedLegitimately\". otherwise, it would have been thrown as an error\n          if (!verbose) return null;\n          return `${chalk.bold(failedComponent.id.toString())} - ${chalk.white(failedComponent.unchangedMessage)}`;\n        })\n      ).join('\\n');\n      if (!body) {\n        parts.push(\n          `${chalk.bold(`\\nmerge skipped legitimately for ${otherComponents.length} component(s)`)}\\n(use --verbose to list them next time)`\n        );\n      } else {\n        parts.push(`${chalk.underline(title)}\\n${body}`);\n      }\n    }\n\n    return parts.join('\\n');\n  };\n\n  const getSummary = () => {\n    const merged = components?.length || 0;\n    const unchangedLegitimately = failedComponents?.filter((f) => f.unchangedLegitimately).length || 0;\n    const autoSnapped =\n      (mergeSnapResults?.snappedComponents.length || 0) + (mergeSnapResults?.autoSnappedResults.length || 0);\n    const getConflictStr = () => {\n      const comps = componentsWithConflicts ? `${componentsWithConflicts} components` : '';\n      const ws = workspaceConfigUpdateResult?.workspaceDepsConflicts ? 'workspace.jsonc file' : '';\n      const mergeConfig = configMergeWithConflicts.length ? `${MergeConfigFilename} file` : '';\n      return compact([comps, ws, mergeConfig]).join(', ');\n    };\n\n    const title = chalk.bold.underline('Merge Summary');\n    const mergedStr = `\\nTotal Merged: ${chalk.bold(merged.toString())}`;\n    const unchangedLegitimatelyStr = `\\nTotal Unchanged: ${chalk.bold(unchangedLegitimately.toString())}`;\n    const autoSnappedStr = `\\nTotal Snapped: ${chalk.bold(autoSnapped.toString())}`;\n    const removedStr = `\\nTotal Removed: ${chalk.bold(removedComponents?.length.toString() || '0')}`;\n    const conflictStr = `\\nConflicts: ${chalk.bold(getConflictStr() || 'none')}`;\n\n    return title + mergedStr + unchangedLegitimatelyStr + autoSnappedStr + removedStr + conflictStr;\n  };\n\n  return compact([\n    getSuccessOutput(),\n    getFailureOutput(),\n    getRemovedOutput(removedComponents),\n    getSnapsOutput(),\n    getConfigMergeConflictSummary(),\n    getWorkspaceConfigUpdateOutput(workspaceConfigUpdateResult),\n    getConflictSummary(),\n    getSummary(),\n  ]).join('\\n\\n');\n}\n"],"mappings":";;;;;;;AAAA,SAAAA,OAAA;EAAA,MAAAC,IAAA,GAAAC,sBAAA,CAAAC,OAAA;EAAAH,MAAA,YAAAA,CAAA;IAAA,OAAAC,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAEA,SAAAG,QAAA;EAAA,MAAAH,IAAA,GAAAE,OAAA;EAAAC,OAAA,YAAAA,CAAA;IAAA,OAAAH,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAI,QAAA;EAAA,MAAAJ,IAAA,GAAAE,OAAA;EAAAE,OAAA,YAAAA,CAAA;IAAA,OAAAJ,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAOA,SAAAK,UAAA;EAAA,MAAAL,IAAA,GAAAE,OAAA;EAAAG,SAAA,YAAAA,CAAA;IAAA,OAAAL,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAM,kBAAA;EAAA,MAAAN,IAAA,GAAAE,OAAA;EAAAI,iBAAA,YAAAA,CAAA;IAAA,OAAAN,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AASA,SAAAO,qBAAA;EAAA,MAAAP,IAAA,GAAAE,OAAA;EAAAK,oBAAA,YAAAA,CAAA;IAAA,OAAAP,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAAgE,SAAAC,uBAAAO,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAAA,SAAAG,gBAAAH,CAAA,EAAAI,CAAA,EAAAC,CAAA,YAAAD,CAAA,GAAAE,cAAA,CAAAF,CAAA,MAAAJ,CAAA,GAAAO,MAAA,CAAAC,cAAA,CAAAR,CAAA,EAAAI,CAAA,IAAAK,KAAA,EAAAJ,CAAA,EAAAK,UAAA,MAAAC,YAAA,MAAAC,QAAA,UAAAZ,CAAA,CAAAI,CAAA,IAAAC,CAAA,EAAAL,CAAA;AAAA,SAAAM,eAAAD,CAAA,QAAAQ,CAAA,GAAAC,YAAA,CAAAT,CAAA,uCAAAQ,CAAA,GAAAA,CAAA,GAAAA,CAAA;AAAA,SAAAC,aAAAT,CAAA,EAAAD,CAAA,2BAAAC,CAAA,KAAAA,CAAA,SAAAA,CAAA,MAAAL,CAAA,GAAAK,CAAA,CAAAU,MAAA,CAAAC,WAAA,kBAAAhB,CAAA,QAAAa,CAAA,GAAAb,CAAA,CAAAiB,IAAA,CAAAZ,CAAA,EAAAD,CAAA,uCAAAS,CAAA,SAAAA,CAAA,YAAAK,SAAA,yEAAAd,CAAA,GAAAe,MAAA,GAAAC,MAAA,EAAAf,CAAA;AAGzD,MAAMgB,QAAQ,CAAoB;EAuCvCC,WAAWA,CACDC,OAAoB,EACpBC,WAA4B,EACpC;IAAA,KAFQD,OAAoB,GAApBA,OAAoB;IAAA,KACpBC,WAA4B,GAA5BA,WAA4B;IAAArB,eAAA,eAxC/B,2BAA2B;IAAAA,eAAA,sBACpB,gFAAgF;IAAAA,eAAA,kBACpF,sCAAsC;IAAAA,eAAA,gBACxC,iBAAiB;IAAAA,eAAA,oBACb,CAAC;MAAEsB,IAAI,EAAE,mBAAmB;MAAEC,WAAW,EAAEC;IAAuB,CAAC,CAAC;IAAAxB,eAAA,8BAC1D;AACxB;AACA;AACA;AACA,wDAAwD;IAAAA,eAAA,gBAC9C,EAAE;IAAAA,eAAA,kBACA,CACR,CAAC,EAAE,EAAE,MAAM,EAAE,0FAA0F,CAAC,EACxG,CACE,EAAE,EACF,QAAQ,EACR,yHAAyH,CAC1H,EACD,CACE,EAAE,EACF,QAAQ,EACR,6GAA6G,CAC9G,EACD,CACE,GAAG,EACH,qCAAqC,EACrC,kFAAkF,CACnF,EACD,CAAC,EAAE,EAAE,OAAO,EAAE,2DAA2D,CAAC,EAC1E,CAAC,EAAE,EAAE,SAAS,EAAE,6EAA6E,CAAC,EAC9F,CAAC,EAAE,EAAE,SAAS,EAAE,gEAAgE,CAAC,EACjF,CAAC,EAAE,EAAE,OAAO,EAAE,wFAAwF,CAAC,EACvG,CAAC,EAAE,EAAE,SAAS,EAAE,8DAA8D,CAAC,EAC/E,CAAC,GAAG,EAAE,8BAA8B,EAAE,0DAA0D,CAAC,EACjG,CAAC,GAAG,EAAE,mBAAmB,EAAE,gDAAgD,CAAC,CAC7E;IAAAA,eAAA,iBACQ,IAAI;EAKV;EAEH,MAAMyB,MAAMA,CACV,CAACC,OAAO,CAAW,EACnB;IACEC,IAAI,GAAG,KAAK;IACZC,MAAM,GAAG,KAAK;IACdC,MAAM,GAAG,KAAK;IACdC,gBAAgB;IAChBC,KAAK,GAAG,KAAK;IACbC,OAAO,GAAG,KAAK;IACfC,KAAK,GAAG,KAAK;IACbC,MAAM,GAAG,KAAK;IACdC,OAAO,GAAG,KAAK;IACfC,OAAO;IACPC,0BAA0B,GAAG;EAa/B,CAAC,EACD;IACAJ,KAAK,GAAG,IAAI,CAACZ,WAAW,CAACiB,gBAAgB,CAACC,+BAAqB,CAAC,IAAIC,OAAO,CAACP,KAAK,CAAC;IAClF,IAAIN,IAAI,IAAIC,MAAM,EAAE;MAClB,MAAM,KAAIa,oBAAQ,EAAC,sFAAsF,CAAC;IAC5G;IACA,IACEX,gBAAgB,IAChBA,gBAAgB,KAAK,MAAM,IAC3BA,gBAAgB,KAAK,QAAQ,IAC7BA,gBAAgB,KAAK,QAAQ,EAC7B;MACA,MAAM,KAAIW,oBAAQ,EAAC,2EAA2E,CAAC;IACjG;IACA,IAAIZ,MAAM,EAAEC,gBAAgB,GAAG,QAAQ;IACvC,IAAIC,KAAK,IAAIC,OAAO,EAAE,MAAM,KAAIS,oBAAQ,EAAC,oDAAoD,CAAC;IAC9F,IAAIP,MAAM,IAAIE,OAAO,EAAE,MAAM,KAAIK,oBAAQ,EAAC,qDAAqD,CAAC;IAChG,MAAM;MACJC,UAAU;MACVC,gBAAgB;MAChBC,OAAO;MACPC,kBAAkB;MAClBC,iBAAiB;MACjBC,gBAAgB;MAChBC;IACmB,CAAC,GAAG,MAAM,IAAI,CAAC5B,OAAO,CAAC6B,KAAK,CAC/CvB,OAAO,EACPI,gBAAgB,EAChBC,KAAK,EACLC,OAAO,EACPE,MAAM,EACNE,OAAO,EACPH,KAAK,EACLI,0BACF,CAAC;IACD,IAAIQ,kBAAkB,EAAE;MACtB,MAAMK,KAAK,GAAG,sCAAsC;MACpD,MAAMC,aAAa,GAAGN,kBAAkB,CAACO,GAAG,CAAEC,CAAC,IAAKA,CAAC,CAACC,EAAE,CAACC,sBAAsB,CAAC,CAAC,CAAC,CAACC,IAAI,CAAC,IAAI,CAAC;MAC7F,OAAOC,gBAAK,CAACC,SAAS,CAACR,KAAK,CAAC,GAAGO,gBAAK,CAACE,KAAK,CAACR,aAAa,CAAC;IAC5D;IACA,IAAIL,iBAAiB,EAAE;MACrB,MAAMI,KAAK,GAAG,gEAAgE;MAC9E,MAAMC,aAAa,GAAGL,iBAAiB,CAACM,GAAG,CAAEC,CAAC,IAAKA,CAAC,CAACC,EAAE,CAACC,sBAAsB,CAAC,CAAC,CAAC,CAACC,IAAI,CAAC,IAAI,CAAC;MAC5F,OAAOC,gBAAK,CAACC,SAAS,CAACR,KAAK,CAAC,GAAGO,gBAAK,CAACE,KAAK,CAACR,aAAa,CAAC;IAC5D;IAEA,OAAOS,WAAW,CAAC;MACjBlB,UAAU;MACVC,gBAAgB;MAChBC,OAAO;MACPG,gBAAgB;MAChBC,cAAc;MACdb;IACF,CAAC,CAAC;EACJ;AACF;AAAC0B,OAAA,CAAA3C,QAAA,GAAAA,QAAA;AAEM,SAAS0C,WAAWA,CAAC;EAC1BlB,UAAU;EACVC,gBAAgB;EAChBmB,iBAAiB;EACjBlB,OAAO;EACPG,gBAAgB;EAChBC,cAAc;EACde,uBAAuB;EACvB5B,OAAO;EACP6B,kBAAkB;EAClBC;AACkE,CAAC,EAAU;EAC7E,MAAMC,gBAAgB,GAAGA,CAAA,KAAM;IAC7B,IAAI,CAACxB,UAAU,IAAI,CAACA,UAAU,CAACyB,MAAM,EAAE,OAAO,EAAE;IAChD,MAAMjB,KAAK,GAAG,uBAAuBR,UAAU,CAACyB,MAAM,cACpDvB,OAAO,GAAG,gBAAgBa,gBAAK,CAACW,IAAI,CAACxB,OAAO,CAAC,EAAE,GAAG,EAAE,IAClD;IACJ,MAAMyB,iBAAiB,GAAG,IAAAC,sCAAkB,EAAC5B,UAAU,CAAC;IAExD,OAAOe,gBAAK,CAACW,IAAI,CAAClB,KAAK,CAAC,GAAGmB,iBAAiB;EAC9C,CAAC;EAED,IAAIE,uBAAuB,GAAG,CAAC;EAC/B,MAAMC,kBAAkB,GAAGA,CAAA,KAAM;IAC/B,IAAI,CAAC9B,UAAU,IAAI,CAACA,UAAU,CAACyB,MAAM,IAAI,CAACJ,uBAAuB,EAAE,OAAO,EAAE;IAC5E,MAAMb,KAAK,GAAG,gCAAgC;IAC9C,MAAMuB,UAAU,GAAG;AACvB,2DAA2D;IACvD,MAAMC,eAAe,GAAG,IAAAC,yCAAqB,EAACjC,UAAU,CAAC;IACzD6B,uBAAuB,GAAGG,eAAe,CAACE,oBAAoB;IAC9D,OAAOnB,gBAAK,CAACC,SAAS,CAACR,KAAK,CAAC,GAAGwB,eAAe,CAACG,WAAW,GAAGpB,gBAAK,CAACqB,MAAM,CAACL,UAAU,CAAC;EACxF,CAAC;EAED,MAAMM,wBAAwB,GAAGf,kBAAkB,EAAEgB,MAAM,CAAE3B,CAAC,IAAKA,CAAC,CAAC4B,YAAY,CAAC,CAAC,CAAC,IAAI,EAAE;EAC1F,MAAMC,6BAA6B,GAAGA,CAAA,KAAM;IAC1C,IAAI,CAACH,wBAAwB,CAACZ,MAAM,EAAE,OAAO,EAAE;IAC/C,MAAMgB,KAAK,GAAGJ,wBAAwB,CAAC3B,GAAG,CAAEC,CAAC,IAAKA,CAAC,CAAC+B,SAAS,CAAC,CAAC5B,IAAI,CAAC,IAAI,CAAC;IACzE,MAAMN,KAAK,GAAG,0CAA0C;IACxD,MAAMuB,UAAU,GAAG,6FAA6FY,6BAAmB;AACvI,2DAA2D;IACvD,OAAO5B,gBAAK,CAACC,SAAS,CAACR,KAAK,CAAC,GAAGiC,KAAK,GAAG1B,gBAAK,CAACqB,MAAM,CAACL,UAAU,CAAC;EAClE,CAAC;EAED,MAAMa,cAAc,GAAGA,CAAA,KAAM;IAC3B,IAAItC,cAAc,EAAE;MAClB,OAAO,GAAGS,gBAAK,CAACW,IAAI,CAClB,qGACF,CAAC;AACP,EAAEpB,cAAc,CAACZ,OAAO;AACxB,CAAC;IACG;IACA,IAAI,CAACW,gBAAgB,IAAI,CAACA,gBAAgB,CAACwC,iBAAiB,EAAE,OAAO,EAAE;IACvE,MAAM;MAAEA,iBAAiB;MAAEC;IAAmB,CAAC,GAAGzC,gBAAgB;IAClE,MAAM0C,gBAAgB,GAAIN,KAAK,IAAK;MAClC,OAAOA,KAAK,CACT/B,GAAG,CAAEsC,SAAS,IAAK;QAClB,IAAIC,eAAe,GAAG,UAAUD,SAAS,CAACpC,EAAE,CAACsC,QAAQ,CAAC,CAAC,EAAE;QACzD,MAAMC,OAAO,GAAGL,kBAAkB,CAACR,MAAM,CAAEc,MAAM,IAAKA,MAAM,CAACC,WAAW,CAACC,oBAAoB,CAACN,SAAS,CAACpC,EAAE,CAAC,CAAC;QAC5G,IAAIuC,OAAO,CAAC1B,MAAM,EAAE;UAClB,MAAM8B,WAAW,GAAGJ,OAAO,CAACzC,GAAG,CAAE8C,CAAC,IAAKA,CAAC,CAACR,SAAS,CAACpC,EAAE,CAACsC,QAAQ,CAAC,CAAC,CAAC;UACjED,eAAe,IAAI,YAAYQ,0BAAgB,KAAKF,WAAW,CAACzC,IAAI,CAAC,IAAI,CAAC,EAAE;QAC9E;QACA,OAAOmC,eAAe;MACxB,CAAC,CAAC,CACDnC,IAAI,CAAC,IAAI,CAAC;IACf,CAAC;IAED,OAAO,GAAGC,gBAAK,CAACC,SAAS,CACvB,0BACF,CAAC,MAAM,6CAA6C,MAAM+B,gBAAgB,CAACF,iBAAiB,CAAC,EAAE;EACjG,CAAC;EAED,MAAMa,gBAAgB,GAAGA,CAAA,KAAM;IAC7B,IAAI,CAACzD,gBAAgB,IAAI,CAACA,gBAAgB,CAACwB,MAAM,EAAE,OAAO,EAAE;IAC5D;IACA,MAAMkC,cAAc,GAAG1D,gBAAgB,CAACqC,MAAM,CAAEsB,EAAE,IAAKA,EAAE,CAACC,gBAAgB,KAAKC,4CAAqB,CAAC;IACrG,MAAMC,eAAe,GAAG9D,gBAAgB,CAACqC,MAAM,CAAEsB,EAAE,IAAKA,EAAE,CAACC,gBAAgB,KAAKC,4CAAqB,CAAC;IAEtG,MAAME,KAAe,GAAG,EAAE;IAE1B,IAAIL,cAAc,CAAClC,MAAM,EAAE;MACzB,MAAMwC,YAAY,GAAGlD,gBAAK,CAACqB,MAAM,CAAC,uBAAuBuB,cAAc,CAAClC,MAAM,6BAA6B,CAAC;MAC5G,MAAMyC,WAAW,GAAGP,cAAc,CAACjD,GAAG,CAAEkD,EAAE,IAAK,GAAG7C,gBAAK,CAACW,IAAI,CAACkC,EAAE,CAAChD,EAAE,CAACsC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAACpC,IAAI,CAAC,IAAI,CAAC;MAC5F,MAAMqD,WAAW,GAAGpD,gBAAK,CAACqB,MAAM,CAAC,sEAAsE,CAAC;MACxG4B,KAAK,CAACI,IAAI,CAAC,GAAGH,YAAY,KAAKC,WAAW,KAAKC,WAAW,EAAE,CAAC;IAC/D;IAEA,IAAIJ,eAAe,CAACtC,MAAM,EAAE;MAC1B,MAAMjB,KAAK,GAAG,gDAAgD;MAC9D,MAAM6D,IAAI,GAAG,IAAAC,iBAAO,EAClBP,eAAe,CAACrD,GAAG,CAAE6D,eAAe,IAAK;QACvC;QACA,IAAI,CAAC9E,OAAO,EAAE,OAAO,IAAI;QACzB,OAAO,GAAGsB,gBAAK,CAACW,IAAI,CAAC6C,eAAe,CAAC3D,EAAE,CAACsC,QAAQ,CAAC,CAAC,CAAC,MAAMnC,gBAAK,CAACyD,KAAK,CAACD,eAAe,CAACV,gBAAgB,CAAC,EAAE;MAC1G,CAAC,CACH,CAAC,CAAC/C,IAAI,CAAC,IAAI,CAAC;MACZ,IAAI,CAACuD,IAAI,EAAE;QACTL,KAAK,CAACI,IAAI,CACR,GAAGrD,gBAAK,CAACW,IAAI,CAAC,oCAAoCqC,eAAe,CAACtC,MAAM,eAAe,CAAC,0CAC1F,CAAC;MACH,CAAC,MAAM;QACLuC,KAAK,CAACI,IAAI,CAAC,GAAGrD,gBAAK,CAACC,SAAS,CAACR,KAAK,CAAC,KAAK6D,IAAI,EAAE,CAAC;MAClD;IACF;IAEA,OAAOL,KAAK,CAAClD,IAAI,CAAC,IAAI,CAAC;EACzB,CAAC;EAED,MAAM2D,UAAU,GAAGA,CAAA,KAAM;IACvB,MAAMC,MAAM,GAAG1E,UAAU,EAAEyB,MAAM,IAAI,CAAC;IACtC,MAAMkD,qBAAqB,GAAG1E,gBAAgB,EAAEqC,MAAM,CAAEsC,CAAC,IAAKA,CAAC,CAACD,qBAAqB,CAAC,CAAClD,MAAM,IAAI,CAAC;IAClG,MAAMoD,WAAW,GACf,CAACxE,gBAAgB,EAAEwC,iBAAiB,CAACpB,MAAM,IAAI,CAAC,KAAKpB,gBAAgB,EAAEyC,kBAAkB,CAACrB,MAAM,IAAI,CAAC,CAAC;IACxG,MAAMqD,cAAc,GAAGA,CAAA,KAAM;MAC3B,MAAMrC,KAAK,GAAGZ,uBAAuB,GAAG,GAAGA,uBAAuB,aAAa,GAAG,EAAE;MACpF,MAAMkD,EAAE,GAAGxD,2BAA2B,EAAEyD,sBAAsB,GAAG,sBAAsB,GAAG,EAAE;MAC5F,MAAMC,WAAW,GAAG5C,wBAAwB,CAACZ,MAAM,GAAG,GAAGkB,6BAAmB,OAAO,GAAG,EAAE;MACxF,OAAO,IAAA2B,iBAAO,EAAC,CAAC7B,KAAK,EAAEsC,EAAE,EAAEE,WAAW,CAAC,CAAC,CAACnE,IAAI,CAAC,IAAI,CAAC;IACrD,CAAC;IAED,MAAMN,KAAK,GAAGO,gBAAK,CAACW,IAAI,CAACV,SAAS,CAAC,eAAe,CAAC;IACnD,MAAMkE,SAAS,GAAG,mBAAmBnE,gBAAK,CAACW,IAAI,CAACgD,MAAM,CAACxB,QAAQ,CAAC,CAAC,CAAC,EAAE;IACpE,MAAMiC,wBAAwB,GAAG,sBAAsBpE,gBAAK,CAACW,IAAI,CAACiD,qBAAqB,CAACzB,QAAQ,CAAC,CAAC,CAAC,EAAE;IACrG,MAAMkC,cAAc,GAAG,oBAAoBrE,gBAAK,CAACW,IAAI,CAACmD,WAAW,CAAC3B,QAAQ,CAAC,CAAC,CAAC,EAAE;IAC/E,MAAMmC,UAAU,GAAG,oBAAoBtE,gBAAK,CAACW,IAAI,CAACN,iBAAiB,EAAEK,MAAM,CAACyB,QAAQ,CAAC,CAAC,IAAI,GAAG,CAAC,EAAE;IAChG,MAAMf,WAAW,GAAG,gBAAgBpB,gBAAK,CAACW,IAAI,CAACoD,cAAc,CAAC,CAAC,IAAI,MAAM,CAAC,EAAE;IAE5E,OAAOtE,KAAK,GAAG0E,SAAS,GAAGC,wBAAwB,GAAGC,cAAc,GAAGC,UAAU,GAAGlD,WAAW;EACjG,CAAC;EAED,OAAO,IAAAmC,iBAAO,EAAC,CACb9C,gBAAgB,CAAC,CAAC,EAClBkC,gBAAgB,CAAC,CAAC,EAClB,IAAA4B,oCAAgB,EAAClE,iBAAiB,CAAC,EACnCwB,cAAc,CAAC,CAAC,EAChBJ,6BAA6B,CAAC,CAAC,EAC/B,IAAA+C,kDAA8B,EAAChE,2BAA2B,CAAC,EAC3DO,kBAAkB,CAAC,CAAC,EACpB2C,UAAU,CAAC,CAAC,CACb,CAAC,CAAC3D,IAAI,CAAC,MAAM,CAAC;AACjB","ignoreList":[]}

package/dist/merge-status-provider.d.ts

@@ -1,11 +1,11 @@
-import { Workspace } from '@teambit/workspace';
-import { ComponentID } from '@teambit/component-id';
-import { Lane } from '@teambit/objects';
-import { ImporterMain } from '@teambit/importer';
-import { Logger } from '@teambit/logger';
-import { ScopeMain } from '@teambit/scope';
-import { MergeStrategy } from './merge-version';
-import { ComponentMergeStatus } from './merging.main.runtime';
+import type { Workspace } from '@teambit/workspace';
+import type { ComponentID } from '@teambit/component-id';
+import type { Lane } from '@teambit/objects';
+import type { ImporterMain } from '@teambit/importer';
+import type { Logger } from '@teambit/logger';
+import type { ScopeMain } from '@teambit/scope';
+import type { MergeStrategy } from '@teambit/component.modules.merge-helper';
+import type { ComponentMergeStatus } from './merging.main.runtime';
 export type MergeStatusProviderOptions = {
     resolveUnrelated?: MergeStrategy;
     mergeStrategy: MergeStrategy;
@@ -22,6 +22,7 @@ export type DataMergeResult = {
     conflictedAspects?: ConflictedDataAspects;
 };
 export declare const compIsAlreadyMergedMsg = "component is already merged";
+export declare const compHasBeenRemovedMsg = "component has been removed";
 export declare class MergeStatusProvider {
     private scope;
     private logger;