@teambit/merging 1.0.130 → 1.0.132

package/dist/config-merge-result.d.ts

@@ -15,3 +15,7 @@ export declare class ConfigMergeResult {
     private formatConflict;
     private concatenateConflicts;
 }
+export declare function parseVersionLineWithConflict(line: string): {
+    currentVal: string;
+    otherVal: string;
+};

package/dist/config-merge-result.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.ConfigMergeResult = void 0;
+exports.parseVersionLineWithConflict = parseVersionLineWithConflict;
 function _dependencyResolver() {
   const data = require("@teambit/dependency-resolver");
   _dependencyResolver = function () {
@@ -77,7 +78,10 @@ ${this.concatenateConflicts(configMergeFormatted)}
     }, undefined, 2).split('\n');
     const conflictLines = mergedConfigSplit.map(line => {
       if (!line.includes(_configMerger().conflictIndicator)) return line;
-      const [, currentVal, otherVal] = line.split('::');
+      const {
+        currentVal,
+        otherVal
+      } = parseVersionLineWithConflict(line);
       return `${'<'.repeat(CONFLICT_MARKER_INDENTATION)} ${this.currentLabel}
 ${' '.repeat(DEP_RESOLVER_VERSION_INDENTATION)}"version": "${currentVal}",
 =======
@@ -148,5 +152,12 @@ ${'>'.repeat(CONFLICT_MARKER_INDENTATION)} ${this.otherLabel}
   }
 }
 exports.ConfigMergeResult = ConfigMergeResult;
+function parseVersionLineWithConflict(line) {
+  const [, currentVal, otherVal] = line.split('::');
+  return {
+    currentVal,
+    otherVal
+  };
+}
 
 //# sourceMappingURL=config-merge-result.js.map

package/dist/config-merge-result.js.map

@@ -1 +1 @@
-{"version":3,"names":["_dependencyResolver","data","require","_lodash","_configMerger","ownKeys","e","r","t","Object","keys","getOwnPropertySymbols","o","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","defineProperty","obj","key","value","_toPropertyKey","configurable","writable","i","_toPrimitive","String","Symbol","toPrimitive","call","TypeError","Number","DEP_RESOLVER_VERSION_INDENTATION","CONFLICT_MARKER_INDENTATION","ConfigMergeResult","constructor","compIdStr","currentLabel","otherLabel","results","hasConflicts","some","result","conflict","generateMergeConflictFile","resultsWithConflict","allConflicts","compact","map","generateConflictStringPerAspect","configMergeFormatted","c","formatConflict","conflictStr","concatenateConflicts","getSuccessfullyMergedConfig","resultsWithMergedConfig","mergedConfig","reduce","acc","curr","currObject","id","getDepsResolverResult","find","DependencyResolverAspect","undefined","depsResolverConfigGenerator","basicConflictGenerator","mergedConfigSplit","JSON","stringify","policy","split","conflictLines","line","includes","conflictIndicator","currentVal","otherVal","repeat","shift","unshift","join","conflictObj","currentConfig","otherConfig","formatConfig","conf","confStr","confStrSplit","pop","replace","conflicts","conflictsWithComma","index","endsWith","conflictSplit","lastLineWithClosingBrace","lastIndexOf","exports"],"sources":["config-merge-result.ts"],"sourcesContent":["import { DependencyResolverAspect } from '@teambit/dependency-resolver';\nimport { compact } from 'lodash';\nimport { MergeStrategyResult, conflictIndicator, GenericConfigOrRemoved } from './config-merger';\n\nconst DEP_RESOLVER_VERSION_INDENTATION = 8;\nconst CONFLICT_MARKER_INDENTATION = 7;\n\nexport class ConfigMergeResult {\n  constructor(\n    readonly compIdStr: string,\n    private currentLabel: string,\n    private otherLabel: string,\n    private results: MergeStrategyResult[]\n  ) {}\n  hasConflicts(): boolean {\n    return this.results.some((result) => result.conflict);\n  }\n  generateMergeConflictFile(): string | null {\n    const resultsWithConflict = this.results.filter((result) => result.conflict);\n    if (!resultsWithConflict.length) return null;\n    const allConflicts = compact(resultsWithConflict.map((result) => this.generateConflictStringPerAspect(result)));\n    const configMergeFormatted = allConflicts.map((c) => this.formatConflict(c));\n    const conflictStr = `{\n${this.concatenateConflicts(configMergeFormatted)}\n}`;\n    return conflictStr;\n  }\n  getSuccessfullyMergedConfig(): Record<string, any> {\n    const resultsWithMergedConfig = this.results.filter((result) => result.mergedConfig);\n    return resultsWithMergedConfig.reduce((acc, curr) => {\n      const currObject = { [curr.id]: curr.mergedConfig };\n      return { ...acc, ...currObject };\n    }, {});\n  }\n\n  getDepsResolverResult(): MergeStrategyResult | undefined {\n    return this.results.find((result) => result.id === DependencyResolverAspect.id);\n  }\n\n  private generateConflictStringPerAspect(result: MergeStrategyResult): string | undefined {\n    if (!result.conflict) return undefined;\n    if (result.id === DependencyResolverAspect.id) {\n      return this.depsResolverConfigGenerator(result.conflict);\n    }\n    return this.basicConflictGenerator(result.id, result.conflict);\n  }\n\n  private depsResolverConfigGenerator(conflict: Record<string, any>): string {\n    const mergedConfigSplit = JSON.stringify({ policy: conflict }, undefined, 2).split('\\n');\n    const conflictLines = mergedConfigSplit.map((line) => {\n      if (!line.includes(conflictIndicator)) return line;\n      const [, currentVal, otherVal] = line.split('::');\n      return `${'<'.repeat(CONFLICT_MARKER_INDENTATION)} ${this.currentLabel}\n${' '.repeat(DEP_RESOLVER_VERSION_INDENTATION)}\"version\": \"${currentVal}\",\n=======\n${' '.repeat(DEP_RESOLVER_VERSION_INDENTATION)}\"version\": \"${otherVal}\",\n${'>'.repeat(CONFLICT_MARKER_INDENTATION)} ${this.otherLabel}`;\n    });\n    // replace the first line with line with the id\n    conflictLines.shift();\n    conflictLines.unshift(`\"${DependencyResolverAspect.id}\": {`);\n    return conflictLines.join('\\n');\n  }\n\n  private basicConflictGenerator(id: string, conflictObj: Record<string, any>): string {\n    const { currentConfig, otherConfig } = conflictObj;\n    let conflict: string;\n    if (currentConfig === '-') {\n      conflict = `${'<'.repeat(CONFLICT_MARKER_INDENTATION)} ${this.currentLabel}\n\"${id}\": \"-\"\n=======\n\"${id}\": ${JSON.stringify(otherConfig, undefined, 2)}\n${'>'.repeat(CONFLICT_MARKER_INDENTATION)} ${this.otherLabel}`;\n    } else if (otherConfig === '-') {\n      conflict = `${'<'.repeat(CONFLICT_MARKER_INDENTATION)} ${this.currentLabel}\n\"${id}\": ${JSON.stringify(currentConfig, undefined, 2)}\n=======\n\"${id}\": \"-\"\n${'>'.repeat(CONFLICT_MARKER_INDENTATION)} ${this.otherLabel}`;\n    } else {\n      const formatConfig = (conf: GenericConfigOrRemoved) => {\n        const confStr = JSON.stringify(conf, undefined, 2);\n        const confStrSplit = confStr.split('\\n');\n        confStrSplit.shift(); // remove first {\n        confStrSplit.pop(); // remove last }\n        return confStrSplit.join('\\n');\n      };\n      conflict = `\"${id}\": {\n${'<'.repeat(CONFLICT_MARKER_INDENTATION)} ${this.currentLabel}\n${formatConfig(currentConfig)}\n=======\n${formatConfig(otherConfig)}\n${'>'.repeat(CONFLICT_MARKER_INDENTATION)} ${this.otherLabel}\n}`;\n    }\n\n    return conflict;\n  }\n\n  private formatConflict(conflict: string) {\n    return (\n      conflict\n        .split('\\n')\n        // add 2 spaces before each line\n        .map((line) => `  ${line}`)\n        // remove the white spaces before the conflict indicators\n        .map((line) => line.replace(/ *(<<<<<<<|>>>>>>>|=======)/g, '$1'))\n        .join('\\n')\n    );\n  }\n\n  private concatenateConflicts(conflicts: string[]) {\n    const conflictsWithComma = conflicts.map((conflict, index) => {\n      if (index === conflicts.length - 1) return conflict; // last element in the array, no need to add a comma\n      if (conflict.endsWith('}')) return `${conflict},`; // ends normally with a closing brace, add a comma.\n      // if it doesn't end with a closing brace, it means it ends with a conflict indicator.\n      // the comma should be added after the last line with a closing brace.\n      const conflictSplit = conflict.split('\\n');\n      // find the last line with '}' and add a comma after it\n      const lastLineWithClosingBrace = conflictSplit.lastIndexOf('  }');\n      conflictSplit[lastLineWithClosingBrace] += ',';\n      return conflictSplit.join('\\n');\n    });\n    return conflictsWithComma.join('\\n');\n  }\n}\n"],"mappings":"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"}
+{"version":3,"names":["_dependencyResolver","data","require","_lodash","_configMerger","ownKeys","e","r","t","Object","keys","getOwnPropertySymbols","o","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","defineProperty","obj","key","value","_toPropertyKey","configurable","writable","i","_toPrimitive","String","Symbol","toPrimitive","call","TypeError","Number","DEP_RESOLVER_VERSION_INDENTATION","CONFLICT_MARKER_INDENTATION","ConfigMergeResult","constructor","compIdStr","currentLabel","otherLabel","results","hasConflicts","some","result","conflict","generateMergeConflictFile","resultsWithConflict","allConflicts","compact","map","generateConflictStringPerAspect","configMergeFormatted","c","formatConflict","conflictStr","concatenateConflicts","getSuccessfullyMergedConfig","resultsWithMergedConfig","mergedConfig","reduce","acc","curr","currObject","id","getDepsResolverResult","find","DependencyResolverAspect","undefined","depsResolverConfigGenerator","basicConflictGenerator","mergedConfigSplit","JSON","stringify","policy","split","conflictLines","line","includes","conflictIndicator","currentVal","otherVal","parseVersionLineWithConflict","repeat","shift","unshift","join","conflictObj","currentConfig","otherConfig","formatConfig","conf","confStr","confStrSplit","pop","replace","conflicts","conflictsWithComma","index","endsWith","conflictSplit","lastLineWithClosingBrace","lastIndexOf","exports"],"sources":["config-merge-result.ts"],"sourcesContent":["import { DependencyResolverAspect } from '@teambit/dependency-resolver';\nimport { compact } from 'lodash';\nimport { MergeStrategyResult, conflictIndicator, GenericConfigOrRemoved } from './config-merger';\n\nconst DEP_RESOLVER_VERSION_INDENTATION = 8;\nconst CONFLICT_MARKER_INDENTATION = 7;\n\nexport class ConfigMergeResult {\n  constructor(\n    readonly compIdStr: string,\n    private currentLabel: string,\n    private otherLabel: string,\n    private results: MergeStrategyResult[]\n  ) {}\n  hasConflicts(): boolean {\n    return this.results.some((result) => result.conflict);\n  }\n  generateMergeConflictFile(): string | null {\n    const resultsWithConflict = this.results.filter((result) => result.conflict);\n    if (!resultsWithConflict.length) return null;\n    const allConflicts = compact(resultsWithConflict.map((result) => this.generateConflictStringPerAspect(result)));\n    const configMergeFormatted = allConflicts.map((c) => this.formatConflict(c));\n    const conflictStr = `{\n${this.concatenateConflicts(configMergeFormatted)}\n}`;\n    return conflictStr;\n  }\n  getSuccessfullyMergedConfig(): Record<string, any> {\n    const resultsWithMergedConfig = this.results.filter((result) => result.mergedConfig);\n    return resultsWithMergedConfig.reduce((acc, curr) => {\n      const currObject = { [curr.id]: curr.mergedConfig };\n      return { ...acc, ...currObject };\n    }, {});\n  }\n\n  getDepsResolverResult(): MergeStrategyResult | undefined {\n    return this.results.find((result) => result.id === DependencyResolverAspect.id);\n  }\n\n  private generateConflictStringPerAspect(result: MergeStrategyResult): string | undefined {\n    if (!result.conflict) return undefined;\n    if (result.id === DependencyResolverAspect.id) {\n      return this.depsResolverConfigGenerator(result.conflict);\n    }\n    return this.basicConflictGenerator(result.id, result.conflict);\n  }\n\n  private depsResolverConfigGenerator(conflict: Record<string, any>): string {\n    const mergedConfigSplit = JSON.stringify({ policy: conflict }, undefined, 2).split('\\n');\n    const conflictLines = mergedConfigSplit.map((line) => {\n      if (!line.includes(conflictIndicator)) return line;\n      const { currentVal, otherVal } = parseVersionLineWithConflict(line);\n      return `${'<'.repeat(CONFLICT_MARKER_INDENTATION)} ${this.currentLabel}\n${' '.repeat(DEP_RESOLVER_VERSION_INDENTATION)}\"version\": \"${currentVal}\",\n=======\n${' '.repeat(DEP_RESOLVER_VERSION_INDENTATION)}\"version\": \"${otherVal}\",\n${'>'.repeat(CONFLICT_MARKER_INDENTATION)} ${this.otherLabel}`;\n    });\n    // replace the first line with line with the id\n    conflictLines.shift();\n    conflictLines.unshift(`\"${DependencyResolverAspect.id}\": {`);\n    return conflictLines.join('\\n');\n  }\n\n  private basicConflictGenerator(id: string, conflictObj: Record<string, any>): string {\n    const { currentConfig, otherConfig } = conflictObj;\n    let conflict: string;\n    if (currentConfig === '-') {\n      conflict = `${'<'.repeat(CONFLICT_MARKER_INDENTATION)} ${this.currentLabel}\n\"${id}\": \"-\"\n=======\n\"${id}\": ${JSON.stringify(otherConfig, undefined, 2)}\n${'>'.repeat(CONFLICT_MARKER_INDENTATION)} ${this.otherLabel}`;\n    } else if (otherConfig === '-') {\n      conflict = `${'<'.repeat(CONFLICT_MARKER_INDENTATION)} ${this.currentLabel}\n\"${id}\": ${JSON.stringify(currentConfig, undefined, 2)}\n=======\n\"${id}\": \"-\"\n${'>'.repeat(CONFLICT_MARKER_INDENTATION)} ${this.otherLabel}`;\n    } else {\n      const formatConfig = (conf: GenericConfigOrRemoved) => {\n        const confStr = JSON.stringify(conf, undefined, 2);\n        const confStrSplit = confStr.split('\\n');\n        confStrSplit.shift(); // remove first {\n        confStrSplit.pop(); // remove last }\n        return confStrSplit.join('\\n');\n      };\n      conflict = `\"${id}\": {\n${'<'.repeat(CONFLICT_MARKER_INDENTATION)} ${this.currentLabel}\n${formatConfig(currentConfig)}\n=======\n${formatConfig(otherConfig)}\n${'>'.repeat(CONFLICT_MARKER_INDENTATION)} ${this.otherLabel}\n}`;\n    }\n\n    return conflict;\n  }\n\n  private formatConflict(conflict: string) {\n    return (\n      conflict\n        .split('\\n')\n        // add 2 spaces before each line\n        .map((line) => `  ${line}`)\n        // remove the white spaces before the conflict indicators\n        .map((line) => line.replace(/ *(<<<<<<<|>>>>>>>|=======)/g, '$1'))\n        .join('\\n')\n    );\n  }\n\n  private concatenateConflicts(conflicts: string[]) {\n    const conflictsWithComma = conflicts.map((conflict, index) => {\n      if (index === conflicts.length - 1) return conflict; // last element in the array, no need to add a comma\n      if (conflict.endsWith('}')) return `${conflict},`; // ends normally with a closing brace, add a comma.\n      // if it doesn't end with a closing brace, it means it ends with a conflict indicator.\n      // the comma should be added after the last line with a closing brace.\n      const conflictSplit = conflict.split('\\n');\n      // find the last line with '}' and add a comma after it\n      const lastLineWithClosingBrace = conflictSplit.lastIndexOf('  }');\n      conflictSplit[lastLineWithClosingBrace] += ',';\n      return conflictSplit.join('\\n');\n    });\n    return conflictsWithComma.join('\\n');\n  }\n}\n\nexport function parseVersionLineWithConflict(line: string) {\n  const [, currentVal, otherVal] = line.split('::');\n  return { currentVal, otherVal };\n}\n"],"mappings":"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"}

package/dist/merge-cmd.d.ts

@@ -30,7 +30,7 @@ export declare class MergeCmd implements Command {
         skipDependencyInstallation?: boolean;
     }): Promise<string>;
 }
-export declare function mergeReport({ components, failedComponents, removedComponents, version, mergeSnapResults, mergeSnapError, leftUnresolvedConflicts, verbose, configMergeResults, workspaceDepsUpdates, }: ApplyVersionResults & {
+export declare function mergeReport({ components, failedComponents, removedComponents, version, mergeSnapResults, mergeSnapError, leftUnresolvedConflicts, verbose, configMergeResults, workspaceDepsUpdates, workspaceDepsConflicts, workspaceConflictError, }: ApplyVersionResults & {
     configMergeResults?: ConfigMergeResult[];
 }): string;
 /**
@@ -38,7 +38,11 @@ export declare function mergeReport({ components, failedComponents, removedCompo
  * 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[]): 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;

package/dist/merge-cmd.js

@@ -129,7 +129,9 @@ function mergeReport({
   leftUnresolvedConflicts,
   verbose,
   configMergeResults,
-  workspaceDepsUpdates
+  workspaceDepsUpdates,
+  workspaceDepsConflicts,
+  workspaceConflictError
 }) {
   const getSuccessOutput = () => {
     if (!components || !components.length) return '';
@@ -137,12 +139,15 @@ function mergeReport({
     const fileChangesReport = applyVersionReport(components);
     return _chalk().default.bold(title) + fileChangesReport;
   };
+  let componentsWithConflicts = 0;
   const getConflictSummary = () => {
     if (!components || !components.length || !leftUnresolvedConflicts) return '';
     const title = `\n\nfiles 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.`;
-    return _chalk().default.underline(title) + conflictSummaryReport(components) + _chalk().default.yellow(suggestion);
+    const conflictSummary = conflictSummaryReport(components);
+    componentsWithConflicts = conflictSummary.conflictedComponents;
+    return _chalk().default.underline(title) + conflictSummary.conflictStr + _chalk().default.yellow(suggestion);
   };
   const configMergeWithConflicts = configMergeResults?.filter(c => c.hasConflicts()) || [];
   const getConfigMergeConflictSummary = () => {
@@ -187,6 +192,13 @@ ${mergeSnapError.message}
     }).join('\n');
     return `\n${_chalk().default.underline(title)}\n${body}\n\n`;
   };
+  const getWorkspaceConflictsOutput = () => {
+    if (!workspaceDepsConflicts && !workspaceConflictError) return '';
+    if (workspaceConflictError) {
+      return `\n${_chalk().default.red(workspaceConflictError.message)}\n\n`;
+    }
+    return _chalk().default.yellow('\nworkspace.jsonc has conflicts, please edit the file and fix them\n\n');
+  };
   const getFailureOutput = () => {
     if (!failedComponents || !failedComponents.length) return '';
     const title = '\nmerge skipped for the following component(s)';
@@ -205,15 +217,22 @@ ${mergeSnapError.message}
     const merged = components?.length || 0;
     const unchangedLegitimately = failedComponents?.filter(f => f.unchangedLegitimately).length || 0;
     const autoSnapped = (mergeSnapResults?.snappedComponents.length || 0) + (mergeSnapResults?.autoSnappedResults.length || 0);
+    const getConflictStr = () => {
+      const comps = componentsWithConflicts ? `${componentsWithConflicts} components` : '';
+      const ws = workspaceDepsConflicts ? 'workspace.jsonc file' : '';
+      const mergeConfig = configMergeWithConflicts.length ? `${_constants().MergeConfigFilename} file` : '';
+      return (0, _lodash().compact)([comps, ws, mergeConfig]).join(', ');
+    };
     const newLines = '\n\n';
     const title = _chalk().default.bold.underline('Merge Summary');
     const mergedStr = `\nTotal Merged: ${_chalk().default.bold(merged.toString())}`;
     const unchangedLegitimatelyStr = `\nTotal Unchanged: ${_chalk().default.bold(unchangedLegitimately.toString())}`;
     const autoSnappedStr = `\nTotal Snapped: ${_chalk().default.bold(autoSnapped.toString())}`;
     const removedStr = `\nTotal Removed: ${_chalk().default.bold(removedComponents?.length.toString() || '0')}`;
-    return newLines + title + mergedStr + unchangedLegitimatelyStr + autoSnappedStr + removedStr;
+    const conflictStr = `\nConflicts: ${_chalk().default.bold(getConflictStr() || 'none')}`;
+    return newLines + title + mergedStr + unchangedLegitimatelyStr + autoSnappedStr + removedStr + conflictStr;
   };
-  return getSuccessOutput() + getFailureOutput() + getRemovedOutput(removedComponents) + getSnapsOutput() + getWorkspaceDepsOutput() + getConfigMergeConflictSummary() + getConflictSummary() + getSummary();
+  return getSuccessOutput() + getFailureOutput() + getRemovedOutput(removedComponents) + getSnapsOutput() + getWorkspaceDepsOutput() + getConfigMergeConflictSummary() + getWorkspaceConflictsOutput() + getConflictSummary() + getSummary();
 }
 
 /**
@@ -240,17 +259,26 @@ function applyVersionReport(components, addName = true, showVersion = false) {
 }
 function conflictSummaryReport(components) {
   const tab = '\t';
-  return (0, _lodash().compact)(components.map(component => {
+  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 '';

package/dist/merge-cmd.js.map

@@ -1 +1 @@
-{"version":3,"names":["_chalk","data","_interopRequireDefault","require","_lodash","_constants","_mergeVersion","_bitError","obj","__esModule","default","_defineProperty","key","value","_toPropertyKey","Object","defineProperty","enumerable","configurable","writable","t","i","_toPrimitive","String","r","e","Symbol","toPrimitive","call","TypeError","Number","MergeCmd","constructor","merging","globalConfig","WILDCARD_HELP","report","ids","ours","theirs","manual","autoMergeResolve","abort","resolve","build","noSnap","verbose","message","skipDependencyInstallation","getBool","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","workspaceDepsUpdates","getSuccessOutput","length","bold","fileChangesReport","applyVersionReport","getConflictSummary","suggestion","conflictSummaryReport","yellow","configMergeWithConflicts","filter","hasConflicts","getConfigMergeConflictSummary","comps","compIdStr","MergeConfigFilename","getSnapsOutput","snappedComponents","autoSnappedResults","outputComponents","component","componentOutput","toString","autoTag","result","triggeredBy","searchWithoutVersion","autoTagComp","a","AUTO_SNAPPED_MSG","getWorkspaceDepsOutput","body","keys","pkgName","from","to","getFailureOutput","compact","failedComponent","white","unchangedMessage","getSummary","merged","unchangedLegitimately","f","autoSnapped","newLines","mergedStr","unchangedLegitimatelyStr","autoSnappedStr","removedStr","getRemovedOutput","addName","showVersion","tab","fileChanges","name","files","filesStatus","file","FileStatus","unchanged","note","cyan","FILE_CHANGES_CHECKOUT_MSG","installationErrorOutput","installationError","subTitle","red","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  WILDCARD_HELP,\n  AUTO_SNAPPED_MSG,\n  MergeConfigFilename,\n  FILE_CHANGES_CHECKOUT_MSG,\n  CFG_FORCE_LOCAL_BUILD,\n} from '@teambit/legacy/dist/constants';\nimport { FileStatus, MergeStrategy } from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport { GlobalConfigMain } from '@teambit/global-config';\nimport { BitError } from '@teambit/bit-error';\nimport { ApplyVersionResults, MergingMain, ApplyVersionResult } from './merging.main.runtime';\nimport { ConfigMergeResult } from './config-merge-result';\n\nexport class MergeCmd implements Command {\n  name = 'merge [ids...]';\n  description = 'merge changes of the remote head into local - auto-snaps all merged components';\n  helpUrl = 'reference/components/merging-changes';\n  group = 'development';\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${WILDCARD_HELP('merge')}`;\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    ['', 'manual', 'DEPRECATED. use --auto-merge-resolve'],\n    [\n      '',\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(private merging: MergingMain, private globalConfig: GlobalConfigMain) {}\n\n  async report(\n    [ids = []]: [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 = (await this.globalConfig.getBool(CFG_FORCE_LOCAL_BUILD)) || Boolean(build);\n    if (ours || theirs || manual) {\n      throw new BitError(\n        'the \"--ours\", \"--theirs\" and \"--manual\" flags are deprecated. use \"--auto-merge-resolve\" instead'\n      );\n    }\n    if (\n      autoMergeResolve &&\n      autoMergeResolve !== 'ours' &&\n      autoMergeResolve !== 'theirs' &&\n      autoMergeResolve !== 'manual'\n    ) {\n      throw new BitError('--auto-merge-resolve must be one of the following: [ours, theirs, manual]');\n    }\n    if (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      ids,\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  workspaceDepsUpdates,\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  const getConflictSummary = () => {\n    if (!components || !components.length || !leftUnresolvedConflicts) return '';\n    const title = `\\n\\nfiles 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    return chalk.underline(title) + conflictSummaryReport(components) + 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 = `\\n\\ncomponents 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 `\n${chalk.bold('snapping merged components failed with the following error, please fix the issues and snap manually')}\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 `\\n${chalk.underline(\n      'merge-snapped components'\n    )}\\n(${'components snapped as a result of the merge'})\\n${outputComponents(snappedComponents)}\\n`;\n  };\n\n  const getWorkspaceDepsOutput = () => {\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 `\\n${chalk.underline(title)}\\n${body}\\n\\n`;\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 `\\n${chalk.underline(title)}\\n${body}\\n\\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\n    const newLines = '\\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\n    return newLines + title + mergedStr + unchangedLegitimatelyStr + autoSnappedStr + removedStr;\n  };\n\n  return (\n    getSuccessOutput() +\n    getFailureOutput() +\n    getRemovedOutput(removedComponents) +\n    getSnapsOutput() +\n    getWorkspaceDepsOutput() +\n    getConfigMergeConflictSummary() +\n    getConflictSummary() +\n    getSummary()\n  );\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[]): string {\n  const tab = '\\t';\n  return 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            return `${tab}${String(component.filesStatus[file])} ${chalk.bold(file)}`;\n          }\n          return null;\n        })\n      );\n      if (!files.length) return null;\n\n      return `${name}\\n${chalk.cyan(files.join('\\n'))}`;\n    })\n  ).join('\\n');\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, please fix the issue and run \"bit install\"';\n  const body = chalk.red(installationError.message);\n  return `\\n\\n${title}\\n${subTitle}\\n${body}`;\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, please fix the issue and run \"bit compile\"';\n  const body = chalk.red(compilationError.message);\n  return `\\n\\n${title}\\n${subTitle}\\n${body}`;\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 `\\n\\n${chalk.underline(title)}\\n${body}\\n\\n`;\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 `\\n\\n${chalk.underline(title)}\\n${body}\\n\\n`;\n}\n"],"mappings":"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"}
+{"version":3,"names":["_chalk","data","_interopRequireDefault","require","_lodash","_constants","_mergeVersion","_bitError","obj","__esModule","default","_defineProperty","key","value","_toPropertyKey","Object","defineProperty","enumerable","configurable","writable","t","i","_toPrimitive","String","r","e","Symbol","toPrimitive","call","TypeError","Number","MergeCmd","constructor","merging","globalConfig","WILDCARD_HELP","report","ids","ours","theirs","manual","autoMergeResolve","abort","resolve","build","noSnap","verbose","message","skipDependencyInstallation","getBool","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","workspaceDepsUpdates","workspaceDepsConflicts","workspaceConflictError","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","getWorkspaceDepsOutput","body","keys","pkgName","from","to","getWorkspaceConflictsOutput","red","getFailureOutput","compact","failedComponent","white","unchangedMessage","getSummary","merged","unchangedLegitimately","f","autoSnapped","getConflictStr","ws","mergeConfig","newLines","mergedStr","unchangedLegitimatelyStr","autoSnappedStr","removedStr","getRemovedOutput","addName","showVersion","tab","fileChanges","name","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  WILDCARD_HELP,\n  AUTO_SNAPPED_MSG,\n  MergeConfigFilename,\n  FILE_CHANGES_CHECKOUT_MSG,\n  CFG_FORCE_LOCAL_BUILD,\n} from '@teambit/legacy/dist/constants';\nimport { FileStatus, MergeStrategy } from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport { GlobalConfigMain } from '@teambit/global-config';\nimport { BitError } from '@teambit/bit-error';\nimport { ApplyVersionResults, MergingMain, ApplyVersionResult } from './merging.main.runtime';\nimport { ConfigMergeResult } from './config-merge-result';\n\nexport class MergeCmd implements Command {\n  name = 'merge [ids...]';\n  description = 'merge changes of the remote head into local - auto-snaps all merged components';\n  helpUrl = 'reference/components/merging-changes';\n  group = 'development';\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${WILDCARD_HELP('merge')}`;\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    ['', 'manual', 'DEPRECATED. use --auto-merge-resolve'],\n    [\n      '',\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(private merging: MergingMain, private globalConfig: GlobalConfigMain) {}\n\n  async report(\n    [ids = []]: [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 = (await this.globalConfig.getBool(CFG_FORCE_LOCAL_BUILD)) || Boolean(build);\n    if (ours || theirs || manual) {\n      throw new BitError(\n        'the \"--ours\", \"--theirs\" and \"--manual\" flags are deprecated. use \"--auto-merge-resolve\" instead'\n      );\n    }\n    if (\n      autoMergeResolve &&\n      autoMergeResolve !== 'ours' &&\n      autoMergeResolve !== 'theirs' &&\n      autoMergeResolve !== 'manual'\n    ) {\n      throw new BitError('--auto-merge-resolve must be one of the following: [ours, theirs, manual]');\n    }\n    if (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      ids,\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  workspaceDepsUpdates,\n  workspaceDepsConflicts,\n  workspaceConflictError,\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 = `\\n\\nfiles 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 = `\\n\\ncomponents 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 `\n${chalk.bold('snapping merged components failed with the following error, please fix the issues and snap manually')}\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 `\\n${chalk.underline(\n      'merge-snapped components'\n    )}\\n(${'components snapped as a result of the merge'})\\n${outputComponents(snappedComponents)}\\n`;\n  };\n\n  const getWorkspaceDepsOutput = () => {\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 `\\n${chalk.underline(title)}\\n${body}\\n\\n`;\n  };\n\n  const getWorkspaceConflictsOutput = () => {\n    if (!workspaceDepsConflicts && !workspaceConflictError) return '';\n    if (workspaceConflictError) {\n      return `\\n${chalk.red(workspaceConflictError.message)}\\n\\n`;\n    }\n    return chalk.yellow('\\nworkspace.jsonc has conflicts, please edit the file and fix them\\n\\n');\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 `\\n${chalk.underline(title)}\\n${body}\\n\\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 = workspaceDepsConflicts ? 'workspace.jsonc file' : '';\n      const mergeConfig = configMergeWithConflicts.length ? `${MergeConfigFilename} file` : '';\n      return compact([comps, ws, mergeConfig]).join(', ');\n    };\n\n    const newLines = '\\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 newLines + title + mergedStr + unchangedLegitimatelyStr + autoSnappedStr + removedStr + conflictStr;\n  };\n\n  return (\n    getSuccessOutput() +\n    getFailureOutput() +\n    getRemovedOutput(removedComponents) +\n    getSnapsOutput() +\n    getWorkspaceDepsOutput() +\n    getConfigMergeConflictSummary() +\n    getWorkspaceConflictsOutput() +\n    getConflictSummary() +\n    getSummary()\n  );\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, please fix the issue and run \"bit install\"';\n  const body = chalk.red(installationError.message);\n  return `\\n\\n${title}\\n${subTitle}\\n${body}`;\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, please fix the issue and run \"bit compile\"';\n  const body = chalk.red(compilationError.message);\n  return `\\n\\n${title}\\n${subTitle}\\n${body}`;\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 `\\n\\n${chalk.underline(title)}\\n${body}\\n\\n`;\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 `\\n\\n${chalk.underline(title)}\\n${body}\\n\\n`;\n}\n"],"mappings":"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"}

package/dist/merging.main.runtime.d.ts

@@ -83,6 +83,8 @@ export type ApplyVersionResults = {
     installationError?: Error;
     compilationError?: Error;
     workspaceDepsUpdates?: WorkspaceDepsUpdates;
+    workspaceDepsConflicts?: WorkspaceDepsConflicts;
+    workspaceConflictError?: Error;
 };
 export declare class MergingMain {
     private workspace;
@@ -116,6 +118,8 @@ export declare class MergingMain {
         skipDependencyInstallation?: boolean;
     }): Promise<ApplyVersionResults>;
     private generateConfigMergeConflictFileForAll;
+    writeWorkspaceJsoncWithConflictsGracefully(workspaceDepsConflicts: WorkspaceDepsConflicts): Promise<Error | undefined>;
+    private writeWorkspaceJsoncWithConflicts;
     private updateWorkspaceJsoncWithDepsIfNeeded;
     /**
      * this function gets called from two different commands:

package/dist/merging.main.runtime.js

@@ -18,6 +18,20 @@ function _semver() {
   };
   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 _workspace() {
   const data = _interopRequireWildcard(require("@teambit/workspace"));
   _workspace = function () {
@@ -179,6 +193,13 @@ function _deleteComponentFiles() {
   };
   return data;
 }
+function _mergeFiles() {
+  const data = _interopRequireDefault(require("@teambit/legacy/dist/utils/merge-files"));
+  _mergeFiles = function () {
+    return data;
+  };
+  return data;
+}
 function _install() {
   const data = require("@teambit/install");
   _install = function () {
@@ -222,6 +243,8 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : String(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); }
+const WS_DEPS_FIELDS = ['dependencies', 'peerDependencies'];
+
 // from => to
 // the pkg value is in a format of CONFLICT::OURS::THEIRS
 
@@ -312,7 +335,11 @@ class MergingMain {
       workspaceDepsUpdates,
       workspaceDepsConflicts
     } = await this.updateWorkspaceJsoncWithDepsIfNeeded(allConfigMerge);
-    await this.generateConfigMergeConflictFileForAll(allConfigMerge, workspaceDepsConflicts);
+    let workspaceConflictError;
+    if (workspaceDepsConflicts) {
+      workspaceConflictError = await this.writeWorkspaceJsoncWithConflictsGracefully(workspaceDepsConflicts);
+    }
+    await this.generateConfigMergeConflictFileForAll(allConfigMerge);
     if (currentLane) consumer.scope.objects.add(currentLane);
     await consumer.scope.objects.persist(); // persist anyway, if currentLane is null it should save all main heads
 
@@ -375,19 +402,14 @@ class MergingMain {
       removedComponents: [...componentIdsToRemove, ...(mergeSnapResults?.removedComponents || [])],
       mergeSnapResults,
       mergeSnapError,
+      workspaceConflictError,
+      workspaceDepsConflicts,
       leftUnresolvedConflicts,
       workspaceDepsUpdates
     };
   }
-  async generateConfigMergeConflictFileForAll(allConfigMerge, workspaceDepsConflicts) {
+  async generateConfigMergeConflictFileForAll(allConfigMerge) {
     const configMergeFile = this.workspace.getConflictMergeFile();
-    if (workspaceDepsConflicts) {
-      const workspaceConflict = new (_configMergeResult().ConfigMergeResult)('WORKSPACE', 'ours', 'theirs', [{
-        id: _dependencyResolver().DependencyResolverAspect.id,
-        conflict: workspaceDepsConflicts
-      }]);
-      allConfigMerge.unshift(workspaceConflict);
-    }
     allConfigMerge.forEach(configMerge => {
       const conflict = configMerge.generateMergeConflictFile();
       if (!conflict) return;
@@ -397,6 +419,80 @@ class MergingMain {
       await configMergeFile.write();
     }
   }
+  async writeWorkspaceJsoncWithConflictsGracefully(workspaceDepsConflicts) {
+    try {
+      await this.writeWorkspaceJsoncWithConflicts(workspaceDepsConflicts);
+      return undefined;
+    } catch (err) {
+      this.logger.error(`unable to write workspace.jsonc with conflicts`, err);
+      const errTitle = `unable to write workspace.jsonc with conflicts, due to an error: "${err.message}".
+see the conflicts below and edit your workspace.jsonc as you see fit.`;
+      const conflictsStr = WS_DEPS_FIELDS.map(depField => {
+        if (!workspaceDepsConflicts[depField]) return [];
+        return workspaceDepsConflicts[depField].map(({
+          name,
+          version
+        }) => {
+          const {
+            currentVal,
+            otherVal
+          } = (0, _configMergeResult().parseVersionLineWithConflict)(version);
+          return `(${depField}) ${name}: ours: ${currentVal}, theirs: ${otherVal}`;
+        });
+      }).flat().join('\n');
+      return new (_bitError().BitError)(`${errTitle}\n${conflictsStr}`);
+    }
+  }
+  async writeWorkspaceJsoncWithConflicts(workspaceDepsConflicts) {
+    const wsConfig = this.config.workspaceConfig;
+    if (!wsConfig) throw new Error(`unable to get workspace config`);
+    const wsJsoncPath = wsConfig.path;
+    const wsJsoncOriginalContent = await _fsExtra().default.readFile(wsJsoncPath, 'utf8');
+    let wsJsoncContent = wsJsoncOriginalContent;
+    WS_DEPS_FIELDS.forEach(depField => {
+      if (!workspaceDepsConflicts[depField]) return;
+      workspaceDepsConflicts[depField].forEach(({
+        name,
+        version
+      }) => {
+        const {
+          currentVal,
+          otherVal
+        } = (0, _configMergeResult().parseVersionLineWithConflict)(version);
+        // e.g. "@ci/8oypmb6p-remote.bar.foo": "^0.0.3"
+        const originalDep = `"${name}": "${currentVal}"`;
+        if (!wsJsoncContent.includes(originalDep)) {
+          throw new Error(`unable to find the dependency ${originalDep} in the workspace.jsonc`);
+        }
+        wsJsoncContent = wsJsoncContent.replace(originalDep, `"${name}": "${otherVal}"`);
+      });
+    });
+    const baseFilePath = await _tempy().default.write('');
+    const otherFilePath = await _tempy().default.write(wsJsoncContent);
+    const mergeFilesParams = {
+      filePath: wsJsoncPath,
+      currentFile: {
+        label: 'ours',
+        path: wsJsoncPath
+      },
+      baseFile: {
+        path: baseFilePath
+      },
+      otherFile: {
+        label: 'theirs',
+        path: otherFilePath
+      }
+    };
+    const mergeResult = await (0, _mergeFiles().default)(mergeFilesParams);
+    const conflictFile = mergeResult.conflict;
+    if (!conflictFile) {
+      this.logger.debug(`original content:\n${wsJsoncOriginalContent}`);
+      this.logger.debug(`new content:\n${wsJsoncContent}`);
+      throw new Error('unable to generate conflict from the workspace.jsonc file. see debug.log for the file content');
+    }
+    await wsConfig.backupConfigFile('before writing conflicts');
+    await _fsExtra().default.writeFile(wsJsoncPath, conflictFile);
+  }
   async updateWorkspaceJsoncWithDepsIfNeeded(allConfigMerge) {
     const allResults = allConfigMerge.map(c => c.getDepsResolverResult());
 
@@ -472,7 +568,6 @@ class MergingMain {
     });
 
     // calculate the workspace.json conflicts
-    const WS_DEPS_FIELDS = ['dependencies', 'peerDependencies'];
     const workspaceJsonConflicts = {
       dependencies: [],
       peerDependencies: []

package/dist/merging.main.runtime.js.map

@@ -1 +1 @@
-{"version":3,"names":["_cli","data","require","_semver","_interopRequireDefault","_workspace","_interopRequireWildcard","_componentsList","_mergeVersion","_snapping","_hasWildcard","_pMapSeries","_componentId","_bitError","_generalError","_laneId","_chalk","_config","_remove","_utils","_componentWriter","_importer","_logger","_globalConfig","_lodash","_dependencyResolver","_checkout","_constants","_deleteComponentFiles","_install","_mergeCmd","_merging","_configMergeResult","_mergeStatusProvider","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","obj","ownKeys","keys","getOwnPropertySymbols","o","filter","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","key","value","_toPropertyKey","configurable","writable","_toPrimitive","String","Symbol","toPrimitive","TypeError","Number","MergingMain","constructor","workspace","install","snapping","checkout","logger","componentWriter","importer","config","remove","merge","ids","mergeStrategy","abort","resolve","noSnap","message","build","skipDependencyInstallation","OutsideWorkspaceError","consumer","mergeResults","resolveMerge","abortMerge","bitIds","getComponentsToMerge","mergeComponentsFromRemote","onDestroy","snapMessage","currentLaneId","getCurrentLaneId","currentLaneObject","getCurrentLaneObject","allComponentsStatus","getAllComponentsStatus","failedComponents","c","unchangedMessage","unchangedLegitimately","failureMsgs","map","failedComponent","chalk","bold","id","toString","red","join","BitError","mergeSnaps","otherLaneId","currentLane","tag","componentWithConflict","find","component","hasConflicts","getMergeStrategyInteractive","componentStatus","shouldBeRemoved","componentIdsToRemove","changeVersion","undefined","succeededComponents","componentsResults","applyVersionMultiple","allConfigMerge","compact","configMergeResult","workspaceDepsUpdates","workspaceDepsConflicts","updateWorkspaceJsoncWithDepsIfNeeded","generateConfigMergeConflictFileForAll","scope","objects","add","persist","unmergedComponents","write","writeBitMap","compBitIdsToRemove","ComponentIdList","fromArray","deleteComponentsFiles","cleanFromBitMap","componentsHasConfigMergeConflicts","some","leftUnresolvedConflicts","dedupe","updateExisting","import","err","error","consoleError","getSnapOrTagResults","idsToTag","results","tagAllLaneComponent","taggedComponents","autoTaggedResults","removedComponents","snappedComponents","autoSnappedResults","snapResolvedComponents","mergeSnapResults","mergeSnapError","bitMapSnapshot","bitMap","takeSnapshot","restoreFromSnapshot","components","applyVersionResult","configMergeFile","getConflictMergeFile","workspaceConflict","ConfigMergeResult","DependencyResolverAspect","conflict","unshift","configMerge","generateMergeConflictFile","addConflict","compIdStr","hasConflict","allResults","getDepsResolverResult","nonConflictDeps","nonConflictSources","mergedConfig","mergedConfigPolicy","policy","DEPENDENCIES_FIELDS","depField","pkg","force","name","includes","version","conflictDeps","conflictDepsSources","mergedConfigConflict","notConflictedPackages","conflictedPackages","workspaceConfig","Error","depResolver","extensions","findCoreExtension","workspaceJsonUpdates","pkgName","currentVer","newVer","debug","WS_DEPS_FIELDS","workspaceJsonConflicts","dependencies","peerDependencies","conflictPackagesToRemoveFromConfigMerge","conflictRaw","currentVal","otherVal","split","currentVerInWsJson","semver","satisfies","replace","isEmpty","result","dep","reasonForChange","getMergeStatus","otherLane","options","mergeStatusProvider","MergeStatusProvider","getStatus","mapSeries","currentComponent","resolvedUnrelated","modelComponent","getModelComponent","updatedLaneId","isDefault","LaneId","from","applyVersion","remoteHead","getRef","compsToWrite","legacyCompToWrite","manyComponentsWriterOpts","writeConfig","reasonForBitmapChange","writeMany","filesStatus","unmergedComponent","fullName","head","laneId","addToCurrentLane","isPartOfLane","isEqualWithoutVersion","addComponent","handleResolveUnrelated","headOnCurrentLane","unrelated","unrelatedHead","unrelatedLaneId","addEntry","markAllFilesAsUnchanged","files","file","pathNormalizeToLinux","relative","FileStatus","unchanged","MergeOptions","ours","strategy","remoteId","idToLoad","theirs","legacyComponent","loadComponentFromModelImportIfNeeded","updateFileStatus","modifiedStatus","modifiedFiles","applyModifiedVersion","removeFilesIfNeeded","successfullyMergedConfig","getSuccessfullyMergedConfig","manual","unmergedPaths","f","filePath","setHead","markVersionAsLocal","values","getIdsForUnmerged","reset","removeComponent","abortedComponents","snap","legacyBitIds","resolvedComponents","localLaneObject","Promise","all","bitId","remoteScopeName","remoteLaneId","remoteLanes","laneIdStr","toStringWithoutVersion","shouldSquash","getComponents","ComponentID","fromObject","tagMessage","unmodified","idsStr","componentIds","resolveMultipleComponentIds","entry","getEntry","GeneralError","unresolvedComponents","componentsList","ComponentsList","mergePending","listMergePendingComponents","hasWildcard","listComponentsByIdsWithWildcard","getParsedId","provider","cli","loggerMain","compWriter","globalConfig","createLogger","MergingAspect","merging","register","MergeCmd","exports","CLIAspect","WorkspaceAspect","SnappingAspect","CheckoutAspect","InstallAspect","LoggerAspect","ComponentWriterAspect","ImporterAspect","ConfigAspect","RemoveAspect","GlobalConfigAspect","MainRuntime","addRuntime"],"sources":["merging.main.runtime.ts"],"sourcesContent":["import { CLIAspect, CLIMain, MainRuntime } from '@teambit/cli';\nimport semver from 'semver';\nimport WorkspaceAspect, { OutsideWorkspaceError, Workspace } from '@teambit/workspace';\nimport { Consumer } from '@teambit/legacy/dist/consumer';\nimport ComponentsList from '@teambit/legacy/dist/consumer/component/components-list';\nimport {\n  MergeStrategy,\n  FileStatus,\n  getMergeStrategyInteractive,\n  MergeOptions,\n} from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport SnappingAspect, { SnapResults, SnappingMain, TagResults } from '@teambit/snapping';\nimport hasWildcard from '@teambit/legacy/dist/utils/string/has-wildcard';\nimport mapSeries from 'p-map-series';\nimport { ComponentID, ComponentIdList } from '@teambit/component-id';\nimport { BitError } from '@teambit/bit-error';\nimport GeneralError from '@teambit/legacy/dist/error/general-error';\nimport { LaneId } from '@teambit/lane-id';\nimport { AutoTagResult } from '@teambit/legacy/dist/scope/component-ops/auto-tag';\nimport { UnmergedComponent } from '@teambit/legacy/dist/scope/lanes/unmerged-components';\nimport { Lane, ModelComponent } from '@teambit/legacy/dist/scope/models';\nimport { Ref } from '@teambit/legacy/dist/scope/objects';\nimport chalk from 'chalk';\nimport { ConfigAspect, ConfigMain } from '@teambit/config';\nimport RemoveAspect, { RemoveMain } from '@teambit/remove';\nimport { pathNormalizeToLinux } from '@teambit/legacy/dist/utils';\nimport { ComponentWriterAspect, ComponentWriterMain } from '@teambit/component-writer';\nimport ConsumerComponent from '@teambit/legacy/dist/consumer/component/consumer-component';\nimport ImporterAspect, { ImporterMain } from '@teambit/importer';\nimport { Logger, LoggerAspect, LoggerMain } from '@teambit/logger';\nimport GlobalConfigAspect, { GlobalConfigMain } from '@teambit/global-config';\nimport { compact, isEmpty } from 'lodash';\nimport { MergeResultsThreeWay } from '@teambit/legacy/dist/consumer/versions-ops/merge-version/three-way-merge';\nimport { DependencyResolverAspect, WorkspacePolicyConfigKeysNames } from '@teambit/dependency-resolver';\nimport {\n  ApplyVersionWithComps,\n  CheckoutAspect,\n  CheckoutMain,\n  ComponentStatusBase,\n  applyModifiedVersion,\n  removeFilesIfNeeded,\n  updateFileStatus,\n} from '@teambit/checkout';\nimport { DEPENDENCIES_FIELDS } from '@teambit/legacy/dist/constants';\nimport deleteComponentsFiles from '@teambit/legacy/dist/consumer/component-ops/delete-component-files';\nimport { SnapsDistance } from '@teambit/legacy/dist/scope/component-ops/snaps-distance';\nimport { InstallMain, InstallAspect } from '@teambit/install';\nimport { MergeCmd } from './merge-cmd';\nimport { MergingAspect } from './merging.aspect';\nimport { ConfigMergeResult } from './config-merge-result';\nimport { MergeStatusProvider, MergeStatusProviderOptions } from './merge-status-provider';\n\ntype ResolveUnrelatedData = {\n  strategy: MergeStrategy;\n  headOnCurrentLane: Ref;\n  unrelatedHead: Ref;\n  unrelatedLaneId: LaneId;\n};\ntype PkgEntry = { name: string; version: string; force: boolean };\n\nexport type WorkspaceDepsUpdates = { [pkgName: string]: [string, string] }; // from => to\nexport type WorkspaceDepsConflicts = Record<WorkspacePolicyConfigKeysNames, Array<{ name: string; version: string }>>; // the pkg value is in a format of CONFLICT::OURS::THEIRS\n\nexport type ComponentMergeStatus = ComponentStatusBase & {\n  mergeResults?: MergeResultsThreeWay | null;\n  divergeData?: SnapsDistance;\n  resolvedUnrelated?: ResolveUnrelatedData;\n  configMergeResult?: ConfigMergeResult;\n};\n\nexport type ComponentMergeStatusBeforeMergeAttempt = ComponentStatusBase & {\n  divergeData?: SnapsDistance;\n  resolvedUnrelated?: ResolveUnrelatedData;\n  mergeProps?: {\n    otherLaneHead: Ref;\n    currentId: ComponentID;\n    modelComponent: ModelComponent;\n  };\n};\n\nexport type FailedComponents = { id: ComponentID; unchangedMessage: string; unchangedLegitimately?: boolean };\n\n// fileName is PathLinux. TS doesn't let anything else in the keys other than string and number\nexport type FilesStatus = { [fileName: string]: keyof typeof FileStatus };\n\nexport type ApplyVersionResult = { id: ComponentID; filesStatus: FilesStatus };\n\nexport type ApplyVersionResults = {\n  components?: ApplyVersionResult[];\n  version?: string;\n  failedComponents?: FailedComponents[];\n  removedComponents?: ComponentID[];\n  addedComponents?: ComponentID[]; // relevant when restoreMissingComponents is true (e.g. bit lane merge-abort)\n  resolvedComponents?: ConsumerComponent[]; // relevant for bit merge --resolve\n  abortedComponents?: ApplyVersionResult[]; // relevant for bit merge --abort\n  mergeSnapResults?: {\n    snappedComponents: ConsumerComponent[];\n    autoSnappedResults: AutoTagResult[];\n    removedComponents?: ComponentIdList;\n  } | null;\n  mergeSnapError?: Error;\n  leftUnresolvedConflicts?: boolean;\n  verbose?: boolean;\n  newFromLane?: string[];\n  newFromLaneAdded?: boolean;\n  installationError?: Error; // in case the package manager failed, it won't throw, instead, it'll return error here\n  compilationError?: Error; // in case the compiler failed, it won't throw, instead, it'll return error here\n  workspaceDepsUpdates?: WorkspaceDepsUpdates; // in case workspace.jsonc has been updated with dependencies versions\n};\n\nexport class MergingMain {\n  constructor(\n    private workspace: Workspace,\n    private install: InstallMain,\n    private snapping: SnappingMain,\n    private checkout: CheckoutMain,\n    private logger: Logger,\n    private componentWriter: ComponentWriterMain,\n    private importer: ImporterMain,\n    private config: ConfigMain,\n    private remove: RemoveMain\n  ) {}\n\n  async merge(\n    ids: string[],\n    mergeStrategy: MergeStrategy,\n    abort: boolean,\n    resolve: boolean,\n    noSnap: boolean,\n    message: string,\n    build: boolean,\n    skipDependencyInstallation: boolean\n  ): Promise<ApplyVersionResults> {\n    if (!this.workspace) throw new OutsideWorkspaceError();\n    const consumer: Consumer = this.workspace.consumer;\n    let mergeResults;\n    if (resolve) {\n      mergeResults = await this.resolveMerge(ids, message, build);\n    } else if (abort) {\n      mergeResults = await this.abortMerge(ids);\n    } else {\n      const bitIds = await this.getComponentsToMerge(consumer, ids);\n      mergeResults = await this.mergeComponentsFromRemote(\n        consumer,\n        bitIds,\n        mergeStrategy,\n        noSnap,\n        message,\n        build,\n        skipDependencyInstallation\n      );\n    }\n    await consumer.onDestroy('merge');\n    return mergeResults;\n  }\n\n  /**\n   * when user is on main, it merges the remote main components into local.\n   * when user is on a lane, it merges the remote lane components into the local lane.\n   */\n  async mergeComponentsFromRemote(\n    consumer: Consumer,\n    bitIds: ComponentID[],\n    mergeStrategy: MergeStrategy,\n    noSnap: boolean,\n    snapMessage: string,\n    build: boolean,\n    skipDependencyInstallation: boolean\n  ): Promise<ApplyVersionResults> {\n    const currentLaneId = consumer.getCurrentLaneId();\n    const currentLaneObject = await consumer.getCurrentLaneObject();\n    const allComponentsStatus = await this.getAllComponentsStatus(bitIds, currentLaneId, currentLaneObject);\n    const failedComponents = allComponentsStatus.filter((c) => c.unchangedMessage && !c.unchangedLegitimately);\n    if (failedComponents.length) {\n      const failureMsgs = failedComponents\n        .map(\n          (failedComponent) =>\n            `${chalk.bold(failedComponent.id.toString())} - ${chalk.red(failedComponent.unchangedMessage as string)}`\n        )\n        .join('\\n');\n      throw new BitError(`unable to merge due to the following failures:\\n${failureMsgs}`);\n    }\n\n    return this.mergeSnaps({\n      mergeStrategy,\n      allComponentsStatus,\n      otherLaneId: currentLaneId,\n      currentLane: currentLaneObject,\n      noSnap,\n      snapMessage,\n      build,\n      skipDependencyInstallation,\n    });\n  }\n\n  /**\n   * merge multiple components according to the \"allComponentsStatus\".\n   */\n  async mergeSnaps({\n    mergeStrategy,\n    allComponentsStatus,\n    otherLaneId,\n    currentLane,\n    noSnap,\n    tag,\n    snapMessage,\n    build,\n    skipDependencyInstallation,\n  }: {\n    mergeStrategy: MergeStrategy;\n    allComponentsStatus: ComponentMergeStatus[];\n    otherLaneId: LaneId;\n    currentLane: Lane | null;\n    noSnap: boolean;\n    tag?: boolean;\n    snapMessage: string;\n    build: boolean;\n    skipDependencyInstallation?: boolean;\n  }): Promise<ApplyVersionResults> {\n    const consumer = this.workspace.consumer;\n    const componentWithConflict = allComponentsStatus.find(\n      (component) => component.mergeResults && component.mergeResults.hasConflicts\n    );\n    if (componentWithConflict && !mergeStrategy) {\n      mergeStrategy = await getMergeStrategyInteractive();\n    }\n    const failedComponents: FailedComponents[] = allComponentsStatus\n      .filter((componentStatus) => componentStatus.unchangedMessage)\n      .filter((componentStatus) => !componentStatus.shouldBeRemoved)\n      .map((componentStatus) => ({\n        id: componentStatus.id,\n        unchangedMessage: componentStatus.unchangedMessage as string,\n        unchangedLegitimately: componentStatus.unchangedLegitimately,\n      }));\n\n    const componentIdsToRemove = allComponentsStatus\n      .filter((componentStatus) => componentStatus.shouldBeRemoved)\n      .map((c) => c.id.changeVersion(undefined));\n\n    const succeededComponents = allComponentsStatus.filter((componentStatus) => !componentStatus.unchangedMessage);\n\n    const componentsResults = await this.applyVersionMultiple(\n      succeededComponents,\n      otherLaneId,\n      mergeStrategy,\n      currentLane\n    );\n\n    const allConfigMerge = compact(succeededComponents.map((c) => c.configMergeResult));\n\n    const { workspaceDepsUpdates, workspaceDepsConflicts } = await this.updateWorkspaceJsoncWithDepsIfNeeded(\n      allConfigMerge\n    );\n\n    await this.generateConfigMergeConflictFileForAll(allConfigMerge, workspaceDepsConflicts);\n\n    if (currentLane) consumer.scope.objects.add(currentLane);\n\n    await consumer.scope.objects.persist(); // persist anyway, if currentLane is null it should save all main heads\n\n    await consumer.scope.objects.unmergedComponents.write();\n\n    await consumer.writeBitMap(`merge ${otherLaneId.toString()}`);\n\n    if (componentIdsToRemove.length) {\n      const compBitIdsToRemove = ComponentIdList.fromArray(componentIdsToRemove);\n      await deleteComponentsFiles(consumer, compBitIdsToRemove);\n      await consumer.cleanFromBitMap(compBitIdsToRemove);\n    }\n\n    const componentsHasConfigMergeConflicts = allComponentsStatus.some((c) => c.configMergeResult?.hasConflicts());\n    const leftUnresolvedConflicts = componentWithConflict && mergeStrategy === 'manual';\n    if (!skipDependencyInstallation && !leftUnresolvedConflicts && !componentsHasConfigMergeConflicts) {\n      try {\n        await this.install.install(undefined, {\n          dedupe: true,\n          updateExisting: false,\n          import: false,\n        });\n      } catch (err: any) {\n        this.logger.error(`failed installing packages`, err);\n        this.logger.consoleError(`failed installing packages, see the log for full stacktrace. error: ${err.message}`);\n      }\n    }\n\n    const getSnapOrTagResults = async () => {\n      // if one of the component has conflict, don't snap-merge. otherwise, some of the components would be snap-merged\n      // and some not. besides the fact that it could by mistake tag dependent, it's a confusing state. better not snap.\n      if (noSnap || leftUnresolvedConflicts || componentsHasConfigMergeConflicts) {\n        return null;\n      }\n      if (tag) {\n        const idsToTag = allComponentsStatus.map((c) => c.id);\n        const results = await this.tagAllLaneComponent(idsToTag, snapMessage, build);\n        if (!results) return null;\n        const { taggedComponents, autoTaggedResults, removedComponents } = results;\n        return { snappedComponents: taggedComponents, autoSnappedResults: autoTaggedResults, removedComponents };\n      }\n      return this.snapResolvedComponents(consumer, snapMessage, build);\n    };\n    let mergeSnapResults: ApplyVersionResults['mergeSnapResults'] = null;\n    let mergeSnapError: Error | undefined;\n    const bitMapSnapshot = this.workspace.bitMap.takeSnapshot();\n    try {\n      mergeSnapResults = await getSnapOrTagResults();\n    } catch (err: any) {\n      mergeSnapError = err;\n      this.workspace.bitMap.restoreFromSnapshot(bitMapSnapshot);\n    }\n\n    return {\n      components: componentsResults.map((c) => c.applyVersionResult),\n      failedComponents,\n      removedComponents: [...componentIdsToRemove, ...(mergeSnapResults?.removedComponents || [])],\n      mergeSnapResults,\n      mergeSnapError,\n      leftUnresolvedConflicts,\n      workspaceDepsUpdates,\n    };\n  }\n\n  private async generateConfigMergeConflictFileForAll(\n    allConfigMerge: ConfigMergeResult[],\n    workspaceDepsConflicts?: WorkspaceDepsConflicts\n  ) {\n    const configMergeFile = this.workspace.getConflictMergeFile();\n    if (workspaceDepsConflicts) {\n      const workspaceConflict = new ConfigMergeResult('WORKSPACE', 'ours', 'theirs', [\n        {\n          id: DependencyResolverAspect.id,\n          conflict: workspaceDepsConflicts,\n        },\n      ]);\n      allConfigMerge.unshift(workspaceConflict);\n    }\n    allConfigMerge.forEach((configMerge) => {\n      const conflict = configMerge.generateMergeConflictFile();\n      if (!conflict) return;\n      configMergeFile.addConflict(configMerge.compIdStr, conflict);\n    });\n    if (configMergeFile.hasConflict()) {\n      await configMergeFile.write();\n    }\n  }\n\n  private async updateWorkspaceJsoncWithDepsIfNeeded(\n    allConfigMerge: ConfigMergeResult[]\n  ): Promise<{ workspaceDepsUpdates?: WorkspaceDepsUpdates; workspaceDepsConflicts?: WorkspaceDepsConflicts }> {\n    const allResults = allConfigMerge.map((c) => c.getDepsResolverResult());\n\n    // aggregate all dependencies that can be updated (not conflicting)\n    const nonConflictDeps: { [pkgName: string]: string[] } = {};\n    const nonConflictSources: { [pkgName: string]: string[] } = {}; // for logging/debugging purposes\n    allConfigMerge.forEach((configMerge) => {\n      const mergedConfig = configMerge.getDepsResolverResult()?.mergedConfig;\n      if (!mergedConfig || mergedConfig === '-') return;\n      const mergedConfigPolicy = mergedConfig.policy || {};\n      DEPENDENCIES_FIELDS.forEach((depField) => {\n        if (!mergedConfigPolicy[depField]) return;\n        mergedConfigPolicy[depField].forEach((pkg: PkgEntry) => {\n          if (pkg.force) return; // we only care about auto-detected dependencies\n          if (nonConflictDeps[pkg.name]) {\n            if (!nonConflictDeps[pkg.name].includes(pkg.version)) nonConflictDeps[pkg.name].push(pkg.version);\n            nonConflictSources[pkg.name].push(configMerge.compIdStr);\n            return;\n          }\n          nonConflictDeps[pkg.name] = [pkg.version];\n          nonConflictSources[pkg.name] = [configMerge.compIdStr];\n        });\n      });\n    });\n\n    // aggregate all dependencies that have conflicts\n    const conflictDeps: { [pkgName: string]: string[] } = {};\n    const conflictDepsSources: { [pkgName: string]: string[] } = {}; // for logging/debugging purposes\n    allConfigMerge.forEach((configMerge) => {\n      const mergedConfigConflict = configMerge.getDepsResolverResult()?.conflict;\n      if (!mergedConfigConflict) return;\n      DEPENDENCIES_FIELDS.forEach((depField) => {\n        if (!mergedConfigConflict[depField]) return;\n        mergedConfigConflict[depField].forEach((pkg: PkgEntry) => {\n          if (pkg.force) return; // we only care about auto-detected dependencies\n          if (conflictDeps[pkg.name]) {\n            if (!conflictDeps[pkg.name].includes(pkg.version)) conflictDeps[pkg.name].push(pkg.version);\n            conflictDepsSources[pkg.name].push(configMerge.compIdStr);\n            return;\n          }\n          conflictDeps[pkg.name] = [pkg.version];\n          conflictDepsSources[pkg.name] = [configMerge.compIdStr];\n        });\n      });\n    });\n\n    const notConflictedPackages = Object.keys(nonConflictDeps);\n    const conflictedPackages = Object.keys(conflictDeps);\n    if (!notConflictedPackages.length && !conflictedPackages.length) return {};\n\n    const workspaceConfig = this.config.workspaceConfig;\n    if (!workspaceConfig) throw new Error(`updateWorkspaceJsoncWithDepsIfNeeded unable to get workspace config`);\n    const depResolver = workspaceConfig.extensions.findCoreExtension(DependencyResolverAspect.id);\n    const policy = depResolver?.config.policy;\n    if (!policy) {\n      return {};\n    }\n\n    // calculate the workspace.json updates\n    const workspaceJsonUpdates = {};\n    notConflictedPackages.forEach((pkgName) => {\n      if (nonConflictDeps[pkgName].length > 1) {\n        // we only want the deps that the other lane has them in the workspace.json and that all comps use the same dep.\n        return;\n      }\n      DEPENDENCIES_FIELDS.forEach((depField) => {\n        if (!policy[depField]?.[pkgName]) return; // doesn't exists in the workspace.json\n        const currentVer = policy[depField][pkgName];\n        const newVer = nonConflictDeps[pkgName][0];\n        if (currentVer === newVer) return;\n        workspaceJsonUpdates[pkgName] = [currentVer, newVer];\n        policy[depField][pkgName] = newVer;\n        this.logger.debug(\n          `update workspace.jsonc: ${pkgName} from ${currentVer} to ${newVer}. Triggered by: ${nonConflictSources[\n            pkgName\n          ].join(', ')}`\n        );\n      });\n    });\n\n    // calculate the workspace.json conflicts\n    const WS_DEPS_FIELDS = ['dependencies', 'peerDependencies'];\n    const workspaceJsonConflicts = { dependencies: [], peerDependencies: [] };\n    const conflictPackagesToRemoveFromConfigMerge: string[] = [];\n    conflictedPackages.forEach((pkgName) => {\n      if (conflictDeps[pkgName].length > 1) {\n        // we only want the deps that the other lane has them in the workspace.json and that all comps use the same dep.\n        return;\n      }\n      const conflictRaw = conflictDeps[pkgName][0];\n      const [, currentVal, otherVal] = conflictRaw.split('::');\n\n      WS_DEPS_FIELDS.forEach((depField) => {\n        if (!policy[depField]?.[pkgName]) return;\n        const currentVerInWsJson = policy[depField][pkgName];\n        if (!currentVerInWsJson) return;\n        // the version is coming from the workspace.jsonc\n        conflictPackagesToRemoveFromConfigMerge.push(pkgName);\n        if (semver.satisfies(otherVal, currentVerInWsJson)) {\n          // the other version is compatible with the current version in the workspace.json\n          return;\n        }\n        workspaceJsonConflicts[depField].push({\n          name: pkgName,\n          version: conflictRaw.replace(currentVal, currentVerInWsJson),\n          force: false,\n        });\n        conflictPackagesToRemoveFromConfigMerge.push(pkgName);\n        this.logger.debug(\n          `conflict workspace.jsonc: ${pkgName} current: ${currentVerInWsJson}, other: ${otherVal}. Triggered by: ${conflictDepsSources[\n            pkgName\n          ].join(', ')}`\n        );\n      });\n    });\n    WS_DEPS_FIELDS.forEach((depField) => {\n      if (isEmpty(workspaceJsonConflicts[depField])) delete workspaceJsonConflicts[depField];\n    });\n\n    if (conflictPackagesToRemoveFromConfigMerge.length) {\n      allResults.forEach((result) => {\n        if (result?.conflict) {\n          DEPENDENCIES_FIELDS.forEach((depField) => {\n            if (!result.conflict?.[depField]) return;\n            result.conflict[depField] = result.conflict?.[depField].filter(\n              (dep) => !conflictPackagesToRemoveFromConfigMerge.includes(dep.name)\n            );\n            if (!result.conflict[depField].length) delete result.conflict[depField];\n          });\n          if (isEmpty(result.conflict)) result.conflict = undefined;\n        }\n      });\n    }\n\n    if (Object.keys(workspaceJsonUpdates).length) {\n      await workspaceConfig.write({ reasonForChange: 'merge (update dependencies)' });\n    }\n\n    this.logger.debug('final workspace.jsonc updates', workspaceJsonUpdates);\n    this.logger.debug('final workspace.jsonc conflicts', workspaceJsonConflicts);\n\n    return {\n      workspaceDepsUpdates: Object.keys(workspaceJsonUpdates).length ? workspaceJsonUpdates : undefined,\n      workspaceDepsConflicts: Object.keys(workspaceJsonConflicts).length ? workspaceJsonConflicts : undefined,\n    };\n  }\n\n  /**\n   * this function gets called from two different commands:\n   * 1. \"bit merge <ids...>\", when merging a component from a remote to the local.\n   * in this case, the remote and local are on the same lane or both on main.\n   * 2. \"bit lane merge\", when merging from one lane to another.\n   */\n  async getMergeStatus(\n    bitIds: ComponentID[], // the id.version is the version we want to merge to the current component\n    currentLane: Lane | null, // currently checked out lane. if on main, then it's null.\n    otherLane?: Lane | null, // the lane we want to merged to our lane. (null if it's \"main\").\n    options?: MergeStatusProviderOptions\n  ): Promise<ComponentMergeStatus[]> {\n    const mergeStatusProvider = new MergeStatusProvider(\n      this.workspace,\n      this.logger,\n      this.importer,\n      currentLane || undefined,\n      otherLane || undefined,\n      options\n    );\n    return mergeStatusProvider.getStatus(bitIds);\n  }\n\n  private async applyVersionMultiple(\n    succeededComponents: ComponentMergeStatus[],\n    otherLaneId: LaneId,\n    mergeStrategy: MergeStrategy,\n    currentLane: Lane | null\n  ): Promise<ApplyVersionWithComps[]> {\n    const componentsResults = await mapSeries(\n      succeededComponents,\n      async ({ currentComponent, id, mergeResults, resolvedUnrelated, configMergeResult }) => {\n        const modelComponent = await this.workspace.consumer.scope.getModelComponent(id);\n        const updatedLaneId = otherLaneId.isDefault() ? LaneId.from(otherLaneId.name, id.scope as string) : otherLaneId;\n        return this.applyVersion({\n          currentComponent,\n          id,\n          mergeResults,\n          mergeStrategy,\n          remoteHead: modelComponent.getRef(id.version as string) as Ref,\n          otherLaneId: updatedLaneId,\n          currentLane,\n          resolvedUnrelated,\n          configMergeResult,\n        });\n      }\n    );\n\n    const compsToWrite = compact(componentsResults.map((c) => c.legacyCompToWrite));\n\n    const manyComponentsWriterOpts = {\n      consumer: this.workspace.consumer,\n      components: compsToWrite,\n      skipDependencyInstallation: true,\n      writeConfig: false, // @todo: should write if config exists before, needs to figure out how to do it.\n      reasonForBitmapChange: 'merge',\n    };\n    await this.componentWriter.writeMany(manyComponentsWriterOpts);\n\n    return componentsResults;\n  }\n\n  private async applyVersion({\n    currentComponent,\n    id,\n    mergeResults,\n    mergeStrategy,\n    remoteHead,\n    otherLaneId,\n    currentLane,\n    resolvedUnrelated,\n    configMergeResult,\n  }: {\n    currentComponent: ConsumerComponent | null | undefined;\n    id: ComponentID;\n    mergeResults: MergeResultsThreeWay | null | undefined;\n    mergeStrategy: MergeStrategy;\n    remoteHead: Ref;\n    otherLaneId: LaneId;\n    currentLane: Lane | null;\n    resolvedUnrelated?: ResolveUnrelatedData;\n    configMergeResult?: ConfigMergeResult;\n  }): Promise<ApplyVersionWithComps> {\n    const consumer = this.workspace.consumer;\n    let filesStatus = {};\n    const unmergedComponent: UnmergedComponent = {\n      id: { name: id.fullName, scope: id.scope },\n      head: remoteHead,\n      laneId: otherLaneId,\n    };\n    id = currentComponent ? currentComponent.id : id;\n\n    const modelComponent = await consumer.scope.getModelComponent(id);\n\n    const addToCurrentLane = (head: Ref) => {\n      if (!currentLane) throw new Error('currentLane must be defined when adding to the lane');\n      if (otherLaneId.isDefault()) {\n        const isPartOfLane = currentLane.components.find((c) => c.id.isEqualWithoutVersion(id));\n        if (!isPartOfLane) return;\n      }\n      currentLane.addComponent({ id, head });\n    };\n\n    const handleResolveUnrelated = (legacyCompToWrite?: ConsumerComponent) => {\n      if (!currentComponent) throw new Error('currentComponent must be defined when resolvedUnrelated');\n      // because when on a main, we don't allow merging lanes with unrelated. we asks users to switch to the lane\n      // first and then merge with --resolve-unrelated\n      if (!currentLane) throw new Error('currentLane must be defined when resolvedUnrelated');\n      if (!resolvedUnrelated) throw new Error('resolvedUnrelated must be populated');\n      addToCurrentLane(resolvedUnrelated.headOnCurrentLane);\n      unmergedComponent.unrelated = {\n        unrelatedHead: resolvedUnrelated.unrelatedHead,\n        headOnCurrentLane: resolvedUnrelated.headOnCurrentLane,\n        unrelatedLaneId: resolvedUnrelated.unrelatedLaneId,\n      };\n      consumer.scope.objects.unmergedComponents.addEntry(unmergedComponent);\n      return { applyVersionResult: { id, filesStatus }, component: currentComponent, legacyCompToWrite };\n    };\n\n    const markAllFilesAsUnchanged = () => {\n      if (!currentComponent) throw new Error(`applyVersion expect to get currentComponent for ${id.toString()}`);\n      currentComponent.files.forEach((file) => {\n        filesStatus[pathNormalizeToLinux(file.relative)] = FileStatus.unchanged;\n      });\n    };\n    if (mergeResults && mergeResults.hasConflicts && mergeStrategy === MergeOptions.ours) {\n      markAllFilesAsUnchanged();\n      consumer.scope.objects.unmergedComponents.addEntry(unmergedComponent);\n      return { applyVersionResult: { id, filesStatus }, component: currentComponent || undefined };\n    }\n    if (resolvedUnrelated?.strategy === 'ours') {\n      markAllFilesAsUnchanged();\n      return handleResolveUnrelated();\n    }\n    const remoteId = id.changeVersion(remoteHead.toString());\n    const idToLoad = !mergeResults || mergeStrategy === MergeOptions.theirs ? remoteId : id;\n    const legacyComponent = await consumer.loadComponentFromModelImportIfNeeded(idToLoad);\n    if (mergeResults && mergeStrategy === MergeOptions.theirs) {\n      // in this case, we don't want to update .bitmap with the version of the remote. we want to keep the same version\n      legacyComponent.version = id.version;\n    }\n    const files = legacyComponent.files;\n    updateFileStatus(files, filesStatus, currentComponent || undefined);\n\n    if (mergeResults) {\n      // update files according to the merge results\n      const { filesStatus: modifiedStatus, modifiedFiles } = applyModifiedVersion(files, mergeResults, mergeStrategy);\n      legacyComponent.files = modifiedFiles;\n      filesStatus = { ...filesStatus, ...modifiedStatus };\n    }\n\n    await removeFilesIfNeeded(filesStatus, currentComponent || undefined);\n\n    if (configMergeResult) {\n      const successfullyMergedConfig = configMergeResult.getSuccessfullyMergedConfig();\n      if (successfullyMergedConfig) {\n        unmergedComponent.mergedConfig = successfullyMergedConfig;\n        // no need to `unmergedComponents.addEntry` here. it'll be added in the next lines inside `if (mergeResults)`.\n        // because if `configMergeResult` is set, `mergeResults` must be set as well. both happen on diverge.\n      }\n    }\n\n    // if mergeResults, the head snap is going to be updated on a later phase when snapping with two parents\n    // otherwise, update the head of the current lane or main\n    if (mergeResults) {\n      if (mergeResults.hasConflicts && mergeStrategy === MergeOptions.manual) {\n        unmergedComponent.unmergedPaths = mergeResults.modifiedFiles.filter((f) => f.conflict).map((f) => f.filePath);\n      }\n      consumer.scope.objects.unmergedComponents.addEntry(unmergedComponent);\n    } else if (currentLane) {\n      if (resolvedUnrelated) {\n        // must be \"theirs\"\n        return handleResolveUnrelated(legacyComponent);\n      }\n      addToCurrentLane(remoteHead);\n    } else {\n      // this is main\n      modelComponent.setHead(remoteHead);\n      // mark it as local, otherwise, when importing this component from a remote, it'll override it.\n      modelComponent.markVersionAsLocal(remoteHead.toString());\n      consumer.scope.objects.add(modelComponent);\n    }\n\n    return {\n      applyVersionResult: { id, filesStatus },\n      component: currentComponent || undefined,\n      legacyCompToWrite: legacyComponent,\n    };\n  }\n\n  private async abortMerge(values: string[]): Promise<ApplyVersionResults> {\n    const consumer = this.workspace.consumer;\n    const ids = await this.getIdsForUnmerged(values);\n    const results = await this.checkout.checkout({ ids, reset: true });\n    ids.forEach((id) => consumer.scope.objects.unmergedComponents.removeComponent(id));\n    await consumer.scope.objects.unmergedComponents.write();\n    return { abortedComponents: results.components };\n  }\n\n  private async resolveMerge(values: string[], snapMessage: string, build: boolean): Promise<ApplyVersionResults> {\n    const ids = await this.getIdsForUnmerged(values);\n    // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n    const { snappedComponents } = await this.snapping.snap({\n      legacyBitIds: ComponentIdList.fromArray(ids.map((id) => id)),\n      build,\n      message: snapMessage,\n    });\n    return { resolvedComponents: snappedComponents };\n  }\n\n  private async getAllComponentsStatus(\n    bitIds: ComponentID[],\n    laneId: LaneId,\n    localLaneObject: Lane | null\n  ): Promise<ComponentMergeStatus[]> {\n    const ids = await Promise.all(\n      bitIds.map(async (bitId) => {\n        const remoteScopeName = laneId.isDefault() ? bitId.scope : laneId.scope;\n        const remoteLaneId = LaneId.from(laneId.name, remoteScopeName as string);\n        const remoteHead = await this.workspace.consumer.scope.objects.remoteLanes.getRef(remoteLaneId, bitId);\n        const laneIdStr = remoteLaneId.toString();\n        if (!remoteHead) {\n          throw new BitError(`unable to find a remote head of \"${bitId.toStringWithoutVersion()}\" in \"${laneIdStr}\"`);\n        }\n        return bitId.changeVersion(remoteHead.toString());\n      })\n    );\n\n    return this.getMergeStatus(ids, localLaneObject, localLaneObject, { shouldSquash: false });\n  }\n\n  private async snapResolvedComponents(\n    consumer: Consumer,\n    snapMessage: string,\n    build: boolean\n  ): Promise<SnapResults | null> {\n    const unmergedComponents = consumer.scope.objects.unmergedComponents.getComponents();\n    this.logger.debug(`merge-snaps, snapResolvedComponents, total ${unmergedComponents.length.toString()} components`);\n    if (!unmergedComponents.length) return null;\n    const ids = ComponentIdList.fromArray(unmergedComponents.map((r) => ComponentID.fromObject(r.id)));\n    return this.snapping.snap({\n      legacyBitIds: ids,\n      build,\n      message: snapMessage,\n    });\n  }\n\n  private async tagAllLaneComponent(\n    idsToTag: ComponentID[],\n    tagMessage: string,\n    build: boolean\n  ): Promise<TagResults | null> {\n    const ids = idsToTag.map((id) => {\n      return id.toStringWithoutVersion();\n    });\n    this.logger.debug(`merge-snaps, tagResolvedComponents, total ${idsToTag.length.toString()} components`);\n    return this.snapping.tag({\n      ids,\n      build,\n      message: tagMessage,\n      unmodified: true,\n    });\n  }\n\n  private async getIdsForUnmerged(idsStr?: string[]): Promise<ComponentID[]> {\n    if (idsStr && idsStr.length) {\n      const componentIds = await this.workspace.resolveMultipleComponentIds(idsStr);\n      componentIds.forEach((id) => {\n        const entry = this.workspace.consumer.scope.objects.unmergedComponents.getEntry(id);\n        if (!entry) {\n          throw new GeneralError(`unable to merge-resolve ${id.toString()}, it is not marked as unresolved`);\n        }\n      });\n      return componentIds;\n    }\n    const unresolvedComponents = this.workspace.consumer.scope.objects.unmergedComponents.getComponents();\n    if (!unresolvedComponents.length) throw new GeneralError(`all components are resolved already, nothing to do`);\n    return unresolvedComponents.map((u) => ComponentID.fromObject(u.id));\n  }\n\n  private async getComponentsToMerge(consumer: Consumer, ids: string[]): Promise<ComponentID[]> {\n    const componentsList = new ComponentsList(consumer);\n    if (!ids.length) {\n      const mergePending = await componentsList.listMergePendingComponents();\n      return mergePending.map((c) => c.id);\n    }\n    if (hasWildcard(ids)) {\n      return componentsList.listComponentsByIdsWithWildcard(ids);\n    }\n    return ids.map((id) => consumer.getParsedId(id));\n  }\n\n  static slots = [];\n  static dependencies = [\n    CLIAspect,\n    WorkspaceAspect,\n    SnappingAspect,\n    CheckoutAspect,\n    InstallAspect,\n    LoggerAspect,\n    ComponentWriterAspect,\n    ImporterAspect,\n    ConfigAspect,\n    RemoveAspect,\n    GlobalConfigAspect,\n  ];\n  static runtime = MainRuntime;\n  static async provider([\n    cli,\n    workspace,\n    snapping,\n    checkout,\n    install,\n    loggerMain,\n    compWriter,\n    importer,\n    config,\n    remove,\n    globalConfig,\n  ]: [\n    CLIMain,\n    Workspace,\n    SnappingMain,\n    CheckoutMain,\n    InstallMain,\n    LoggerMain,\n    ComponentWriterMain,\n    ImporterMain,\n    ConfigMain,\n    RemoveMain,\n    GlobalConfigMain\n  ]) {\n    const logger = loggerMain.createLogger(MergingAspect.id);\n    const merging = new MergingMain(\n      workspace,\n      install,\n      snapping,\n      checkout,\n      logger,\n      compWriter,\n      importer,\n      config,\n      remove\n    );\n    cli.register(new MergeCmd(merging, globalConfig));\n    return merging;\n  }\n}\n\nMergingAspect.addRuntime(MergingMain);\n"],"mappings":"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"}
+{"version":3,"names":["_cli","data","require","_semver","_interopRequireDefault","_tempy","_fsExtra","_workspace","_interopRequireWildcard","_componentsList","_mergeVersion","_snapping","_hasWildcard","_pMapSeries","_componentId","_bitError","_generalError","_laneId","_chalk","_config","_remove","_utils","_componentWriter","_importer","_logger","_globalConfig","_lodash","_dependencyResolver","_checkout","_constants","_deleteComponentFiles","_mergeFiles","_install","_mergeCmd","_merging","_configMergeResult","_mergeStatusProvider","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","obj","ownKeys","keys","getOwnPropertySymbols","o","filter","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","key","value","_toPropertyKey","configurable","writable","_toPrimitive","String","Symbol","toPrimitive","TypeError","Number","WS_DEPS_FIELDS","MergingMain","constructor","workspace","install","snapping","checkout","logger","componentWriter","importer","config","remove","merge","ids","mergeStrategy","abort","resolve","noSnap","message","build","skipDependencyInstallation","OutsideWorkspaceError","consumer","mergeResults","resolveMerge","abortMerge","bitIds","getComponentsToMerge","mergeComponentsFromRemote","onDestroy","snapMessage","currentLaneId","getCurrentLaneId","currentLaneObject","getCurrentLaneObject","allComponentsStatus","getAllComponentsStatus","failedComponents","c","unchangedMessage","unchangedLegitimately","failureMsgs","map","failedComponent","chalk","bold","id","toString","red","join","BitError","mergeSnaps","otherLaneId","currentLane","tag","componentWithConflict","find","component","hasConflicts","getMergeStrategyInteractive","componentStatus","shouldBeRemoved","componentIdsToRemove","changeVersion","undefined","succeededComponents","componentsResults","applyVersionMultiple","allConfigMerge","compact","configMergeResult","workspaceDepsUpdates","workspaceDepsConflicts","updateWorkspaceJsoncWithDepsIfNeeded","workspaceConflictError","writeWorkspaceJsoncWithConflictsGracefully","generateConfigMergeConflictFileForAll","scope","objects","add","persist","unmergedComponents","write","writeBitMap","compBitIdsToRemove","ComponentIdList","fromArray","deleteComponentsFiles","cleanFromBitMap","componentsHasConfigMergeConflicts","some","leftUnresolvedConflicts","dedupe","updateExisting","import","err","error","consoleError","getSnapOrTagResults","idsToTag","results","tagAllLaneComponent","taggedComponents","autoTaggedResults","removedComponents","snappedComponents","autoSnappedResults","snapResolvedComponents","mergeSnapResults","mergeSnapError","bitMapSnapshot","bitMap","takeSnapshot","restoreFromSnapshot","components","applyVersionResult","configMergeFile","getConflictMergeFile","configMerge","conflict","generateMergeConflictFile","addConflict","compIdStr","hasConflict","writeWorkspaceJsoncWithConflicts","errTitle","conflictsStr","depField","name","version","currentVal","otherVal","parseVersionLineWithConflict","flat","wsConfig","workspaceConfig","Error","wsJsoncPath","path","wsJsoncOriginalContent","fs","readFile","wsJsoncContent","originalDep","includes","replace","baseFilePath","tempy","otherFilePath","mergeFilesParams","filePath","currentFile","label","baseFile","otherFile","mergeResult","mergeFiles","conflictFile","debug","backupConfigFile","writeFile","allResults","getDepsResolverResult","nonConflictDeps","nonConflictSources","mergedConfig","mergedConfigPolicy","policy","DEPENDENCIES_FIELDS","pkg","force","conflictDeps","conflictDepsSources","mergedConfigConflict","notConflictedPackages","conflictedPackages","depResolver","extensions","findCoreExtension","DependencyResolverAspect","workspaceJsonUpdates","pkgName","currentVer","newVer","workspaceJsonConflicts","dependencies","peerDependencies","conflictPackagesToRemoveFromConfigMerge","conflictRaw","split","currentVerInWsJson","semver","satisfies","isEmpty","result","dep","reasonForChange","getMergeStatus","otherLane","options","mergeStatusProvider","MergeStatusProvider","getStatus","mapSeries","currentComponent","resolvedUnrelated","modelComponent","getModelComponent","updatedLaneId","isDefault","LaneId","from","applyVersion","remoteHead","getRef","compsToWrite","legacyCompToWrite","manyComponentsWriterOpts","writeConfig","reasonForBitmapChange","writeMany","filesStatus","unmergedComponent","fullName","head","laneId","addToCurrentLane","isPartOfLane","isEqualWithoutVersion","addComponent","handleResolveUnrelated","headOnCurrentLane","unrelated","unrelatedHead","unrelatedLaneId","addEntry","markAllFilesAsUnchanged","files","file","pathNormalizeToLinux","relative","FileStatus","unchanged","MergeOptions","ours","strategy","remoteId","idToLoad","theirs","legacyComponent","loadComponentFromModelImportIfNeeded","updateFileStatus","modifiedStatus","modifiedFiles","applyModifiedVersion","removeFilesIfNeeded","successfullyMergedConfig","getSuccessfullyMergedConfig","manual","unmergedPaths","f","setHead","markVersionAsLocal","values","getIdsForUnmerged","reset","removeComponent","abortedComponents","snap","legacyBitIds","resolvedComponents","localLaneObject","Promise","all","bitId","remoteScopeName","remoteLaneId","remoteLanes","laneIdStr","toStringWithoutVersion","shouldSquash","getComponents","ComponentID","fromObject","tagMessage","unmodified","idsStr","componentIds","resolveMultipleComponentIds","entry","getEntry","GeneralError","unresolvedComponents","componentsList","ComponentsList","mergePending","listMergePendingComponents","hasWildcard","listComponentsByIdsWithWildcard","getParsedId","provider","cli","loggerMain","compWriter","globalConfig","createLogger","MergingAspect","merging","register","MergeCmd","exports","CLIAspect","WorkspaceAspect","SnappingAspect","CheckoutAspect","InstallAspect","LoggerAspect","ComponentWriterAspect","ImporterAspect","ConfigAspect","RemoveAspect","GlobalConfigAspect","MainRuntime","addRuntime"],"sources":["merging.main.runtime.ts"],"sourcesContent":["import { CLIAspect, CLIMain, MainRuntime } from '@teambit/cli';\nimport semver from 'semver';\nimport tempy from 'tempy';\nimport fs from 'fs-extra';\nimport WorkspaceAspect, { OutsideWorkspaceError, Workspace } from '@teambit/workspace';\nimport { Consumer } from '@teambit/legacy/dist/consumer';\nimport ComponentsList from '@teambit/legacy/dist/consumer/component/components-list';\nimport {\n  MergeStrategy,\n  FileStatus,\n  getMergeStrategyInteractive,\n  MergeOptions,\n} from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport SnappingAspect, { SnapResults, SnappingMain, TagResults } from '@teambit/snapping';\nimport hasWildcard from '@teambit/legacy/dist/utils/string/has-wildcard';\nimport mapSeries from 'p-map-series';\nimport { ComponentID, ComponentIdList } from '@teambit/component-id';\nimport { BitError } from '@teambit/bit-error';\nimport GeneralError from '@teambit/legacy/dist/error/general-error';\nimport { LaneId } from '@teambit/lane-id';\nimport { AutoTagResult } from '@teambit/legacy/dist/scope/component-ops/auto-tag';\nimport { UnmergedComponent } from '@teambit/legacy/dist/scope/lanes/unmerged-components';\nimport { Lane, ModelComponent } from '@teambit/legacy/dist/scope/models';\nimport { Ref } from '@teambit/legacy/dist/scope/objects';\nimport chalk from 'chalk';\nimport { ConfigAspect, ConfigMain } from '@teambit/config';\nimport RemoveAspect, { RemoveMain } from '@teambit/remove';\nimport { pathNormalizeToLinux } from '@teambit/legacy/dist/utils';\nimport { ComponentWriterAspect, ComponentWriterMain } from '@teambit/component-writer';\nimport ConsumerComponent from '@teambit/legacy/dist/consumer/component/consumer-component';\nimport ImporterAspect, { ImporterMain } from '@teambit/importer';\nimport { Logger, LoggerAspect, LoggerMain } from '@teambit/logger';\nimport GlobalConfigAspect, { GlobalConfigMain } from '@teambit/global-config';\nimport { compact, isEmpty } from 'lodash';\nimport { MergeResultsThreeWay } from '@teambit/legacy/dist/consumer/versions-ops/merge-version/three-way-merge';\nimport { DependencyResolverAspect, WorkspacePolicyConfigKeysNames } from '@teambit/dependency-resolver';\nimport {\n  ApplyVersionWithComps,\n  CheckoutAspect,\n  CheckoutMain,\n  ComponentStatusBase,\n  applyModifiedVersion,\n  removeFilesIfNeeded,\n  updateFileStatus,\n} from '@teambit/checkout';\nimport { DEPENDENCIES_FIELDS } from '@teambit/legacy/dist/constants';\nimport deleteComponentsFiles from '@teambit/legacy/dist/consumer/component-ops/delete-component-files';\nimport { SnapsDistance } from '@teambit/legacy/dist/scope/component-ops/snaps-distance';\nimport mergeFiles, { MergeFileParams } from '@teambit/legacy/dist/utils/merge-files';\nimport { InstallMain, InstallAspect } from '@teambit/install';\nimport { MergeCmd } from './merge-cmd';\nimport { MergingAspect } from './merging.aspect';\nimport { ConfigMergeResult, parseVersionLineWithConflict } from './config-merge-result';\nimport { MergeStatusProvider, MergeStatusProviderOptions } from './merge-status-provider';\n\ntype ResolveUnrelatedData = {\n  strategy: MergeStrategy;\n  headOnCurrentLane: Ref;\n  unrelatedHead: Ref;\n  unrelatedLaneId: LaneId;\n};\ntype PkgEntry = { name: string; version: string; force: boolean };\n\nconst WS_DEPS_FIELDS = ['dependencies', 'peerDependencies'];\n\nexport type WorkspaceDepsUpdates = { [pkgName: string]: [string, string] }; // from => to\nexport type WorkspaceDepsConflicts = Record<WorkspacePolicyConfigKeysNames, Array<{ name: string; version: string }>>; // the pkg value is in a format of CONFLICT::OURS::THEIRS\n\nexport type ComponentMergeStatus = ComponentStatusBase & {\n  mergeResults?: MergeResultsThreeWay | null;\n  divergeData?: SnapsDistance;\n  resolvedUnrelated?: ResolveUnrelatedData;\n  configMergeResult?: ConfigMergeResult;\n};\n\nexport type ComponentMergeStatusBeforeMergeAttempt = ComponentStatusBase & {\n  divergeData?: SnapsDistance;\n  resolvedUnrelated?: ResolveUnrelatedData;\n  mergeProps?: {\n    otherLaneHead: Ref;\n    currentId: ComponentID;\n    modelComponent: ModelComponent;\n  };\n};\n\nexport type FailedComponents = { id: ComponentID; unchangedMessage: string; unchangedLegitimately?: boolean };\n\n// fileName is PathLinux. TS doesn't let anything else in the keys other than string and number\nexport type FilesStatus = { [fileName: string]: keyof typeof FileStatus };\n\nexport type ApplyVersionResult = { id: ComponentID; filesStatus: FilesStatus };\n\nexport type ApplyVersionResults = {\n  components?: ApplyVersionResult[];\n  version?: string;\n  failedComponents?: FailedComponents[];\n  removedComponents?: ComponentID[];\n  addedComponents?: ComponentID[]; // relevant when restoreMissingComponents is true (e.g. bit lane merge-abort)\n  resolvedComponents?: ConsumerComponent[]; // relevant for bit merge --resolve\n  abortedComponents?: ApplyVersionResult[]; // relevant for bit merge --abort\n  mergeSnapResults?: {\n    snappedComponents: ConsumerComponent[];\n    autoSnappedResults: AutoTagResult[];\n    removedComponents?: ComponentIdList;\n  } | null;\n  mergeSnapError?: Error;\n  leftUnresolvedConflicts?: boolean;\n  verbose?: boolean;\n  newFromLane?: string[];\n  newFromLaneAdded?: boolean;\n  installationError?: Error; // in case the package manager failed, it won't throw, instead, it'll return error here\n  compilationError?: Error; // in case the compiler failed, it won't throw, instead, it'll return error here\n  workspaceDepsUpdates?: WorkspaceDepsUpdates; // in case workspace.jsonc has been updated with dependencies versions\n  workspaceDepsConflicts?: WorkspaceDepsConflicts; // in case workspace.jsonc has conflicts\n  workspaceConflictError?: Error; // in case workspace.jsonc has conflicts and we failed to write the conflicts to the file\n};\n\nexport class MergingMain {\n  constructor(\n    private workspace: Workspace,\n    private install: InstallMain,\n    private snapping: SnappingMain,\n    private checkout: CheckoutMain,\n    private logger: Logger,\n    private componentWriter: ComponentWriterMain,\n    private importer: ImporterMain,\n    private config: ConfigMain,\n    private remove: RemoveMain\n  ) {}\n\n  async merge(\n    ids: string[],\n    mergeStrategy: MergeStrategy,\n    abort: boolean,\n    resolve: boolean,\n    noSnap: boolean,\n    message: string,\n    build: boolean,\n    skipDependencyInstallation: boolean\n  ): Promise<ApplyVersionResults> {\n    if (!this.workspace) throw new OutsideWorkspaceError();\n    const consumer: Consumer = this.workspace.consumer;\n    let mergeResults;\n    if (resolve) {\n      mergeResults = await this.resolveMerge(ids, message, build);\n    } else if (abort) {\n      mergeResults = await this.abortMerge(ids);\n    } else {\n      const bitIds = await this.getComponentsToMerge(consumer, ids);\n      mergeResults = await this.mergeComponentsFromRemote(\n        consumer,\n        bitIds,\n        mergeStrategy,\n        noSnap,\n        message,\n        build,\n        skipDependencyInstallation\n      );\n    }\n    await consumer.onDestroy('merge');\n    return mergeResults;\n  }\n\n  /**\n   * when user is on main, it merges the remote main components into local.\n   * when user is on a lane, it merges the remote lane components into the local lane.\n   */\n  async mergeComponentsFromRemote(\n    consumer: Consumer,\n    bitIds: ComponentID[],\n    mergeStrategy: MergeStrategy,\n    noSnap: boolean,\n    snapMessage: string,\n    build: boolean,\n    skipDependencyInstallation: boolean\n  ): Promise<ApplyVersionResults> {\n    const currentLaneId = consumer.getCurrentLaneId();\n    const currentLaneObject = await consumer.getCurrentLaneObject();\n    const allComponentsStatus = await this.getAllComponentsStatus(bitIds, currentLaneId, currentLaneObject);\n    const failedComponents = allComponentsStatus.filter((c) => c.unchangedMessage && !c.unchangedLegitimately);\n    if (failedComponents.length) {\n      const failureMsgs = failedComponents\n        .map(\n          (failedComponent) =>\n            `${chalk.bold(failedComponent.id.toString())} - ${chalk.red(failedComponent.unchangedMessage as string)}`\n        )\n        .join('\\n');\n      throw new BitError(`unable to merge due to the following failures:\\n${failureMsgs}`);\n    }\n\n    return this.mergeSnaps({\n      mergeStrategy,\n      allComponentsStatus,\n      otherLaneId: currentLaneId,\n      currentLane: currentLaneObject,\n      noSnap,\n      snapMessage,\n      build,\n      skipDependencyInstallation,\n    });\n  }\n\n  /**\n   * merge multiple components according to the \"allComponentsStatus\".\n   */\n  async mergeSnaps({\n    mergeStrategy,\n    allComponentsStatus,\n    otherLaneId,\n    currentLane,\n    noSnap,\n    tag,\n    snapMessage,\n    build,\n    skipDependencyInstallation,\n  }: {\n    mergeStrategy: MergeStrategy;\n    allComponentsStatus: ComponentMergeStatus[];\n    otherLaneId: LaneId;\n    currentLane: Lane | null;\n    noSnap: boolean;\n    tag?: boolean;\n    snapMessage: string;\n    build: boolean;\n    skipDependencyInstallation?: boolean;\n  }): Promise<ApplyVersionResults> {\n    const consumer = this.workspace.consumer;\n    const componentWithConflict = allComponentsStatus.find(\n      (component) => component.mergeResults && component.mergeResults.hasConflicts\n    );\n    if (componentWithConflict && !mergeStrategy) {\n      mergeStrategy = await getMergeStrategyInteractive();\n    }\n    const failedComponents: FailedComponents[] = allComponentsStatus\n      .filter((componentStatus) => componentStatus.unchangedMessage)\n      .filter((componentStatus) => !componentStatus.shouldBeRemoved)\n      .map((componentStatus) => ({\n        id: componentStatus.id,\n        unchangedMessage: componentStatus.unchangedMessage as string,\n        unchangedLegitimately: componentStatus.unchangedLegitimately,\n      }));\n\n    const componentIdsToRemove = allComponentsStatus\n      .filter((componentStatus) => componentStatus.shouldBeRemoved)\n      .map((c) => c.id.changeVersion(undefined));\n\n    const succeededComponents = allComponentsStatus.filter((componentStatus) => !componentStatus.unchangedMessage);\n\n    const componentsResults = await this.applyVersionMultiple(\n      succeededComponents,\n      otherLaneId,\n      mergeStrategy,\n      currentLane\n    );\n\n    const allConfigMerge = compact(succeededComponents.map((c) => c.configMergeResult));\n\n    const { workspaceDepsUpdates, workspaceDepsConflicts } = await this.updateWorkspaceJsoncWithDepsIfNeeded(\n      allConfigMerge\n    );\n\n    let workspaceConflictError: Error | undefined;\n    if (workspaceDepsConflicts) {\n      workspaceConflictError = await this.writeWorkspaceJsoncWithConflictsGracefully(workspaceDepsConflicts);\n    }\n    await this.generateConfigMergeConflictFileForAll(allConfigMerge);\n\n    if (currentLane) consumer.scope.objects.add(currentLane);\n\n    await consumer.scope.objects.persist(); // persist anyway, if currentLane is null it should save all main heads\n\n    await consumer.scope.objects.unmergedComponents.write();\n\n    await consumer.writeBitMap(`merge ${otherLaneId.toString()}`);\n\n    if (componentIdsToRemove.length) {\n      const compBitIdsToRemove = ComponentIdList.fromArray(componentIdsToRemove);\n      await deleteComponentsFiles(consumer, compBitIdsToRemove);\n      await consumer.cleanFromBitMap(compBitIdsToRemove);\n    }\n\n    const componentsHasConfigMergeConflicts = allComponentsStatus.some((c) => c.configMergeResult?.hasConflicts());\n    const leftUnresolvedConflicts = componentWithConflict && mergeStrategy === 'manual';\n    if (!skipDependencyInstallation && !leftUnresolvedConflicts && !componentsHasConfigMergeConflicts) {\n      try {\n        await this.install.install(undefined, {\n          dedupe: true,\n          updateExisting: false,\n          import: false,\n        });\n      } catch (err: any) {\n        this.logger.error(`failed installing packages`, err);\n        this.logger.consoleError(`failed installing packages, see the log for full stacktrace. error: ${err.message}`);\n      }\n    }\n\n    const getSnapOrTagResults = async () => {\n      // if one of the component has conflict, don't snap-merge. otherwise, some of the components would be snap-merged\n      // and some not. besides the fact that it could by mistake tag dependent, it's a confusing state. better not snap.\n      if (noSnap || leftUnresolvedConflicts || componentsHasConfigMergeConflicts) {\n        return null;\n      }\n      if (tag) {\n        const idsToTag = allComponentsStatus.map((c) => c.id);\n        const results = await this.tagAllLaneComponent(idsToTag, snapMessage, build);\n        if (!results) return null;\n        const { taggedComponents, autoTaggedResults, removedComponents } = results;\n        return { snappedComponents: taggedComponents, autoSnappedResults: autoTaggedResults, removedComponents };\n      }\n      return this.snapResolvedComponents(consumer, snapMessage, build);\n    };\n    let mergeSnapResults: ApplyVersionResults['mergeSnapResults'] = null;\n    let mergeSnapError: Error | undefined;\n    const bitMapSnapshot = this.workspace.bitMap.takeSnapshot();\n    try {\n      mergeSnapResults = await getSnapOrTagResults();\n    } catch (err: any) {\n      mergeSnapError = err;\n      this.workspace.bitMap.restoreFromSnapshot(bitMapSnapshot);\n    }\n\n    return {\n      components: componentsResults.map((c) => c.applyVersionResult),\n      failedComponents,\n      removedComponents: [...componentIdsToRemove, ...(mergeSnapResults?.removedComponents || [])],\n      mergeSnapResults,\n      mergeSnapError,\n      workspaceConflictError,\n      workspaceDepsConflicts,\n      leftUnresolvedConflicts,\n      workspaceDepsUpdates,\n    };\n  }\n\n  private async generateConfigMergeConflictFileForAll(allConfigMerge: ConfigMergeResult[]) {\n    const configMergeFile = this.workspace.getConflictMergeFile();\n    allConfigMerge.forEach((configMerge) => {\n      const conflict = configMerge.generateMergeConflictFile();\n      if (!conflict) return;\n      configMergeFile.addConflict(configMerge.compIdStr, conflict);\n    });\n    if (configMergeFile.hasConflict()) {\n      await configMergeFile.write();\n    }\n  }\n\n  async writeWorkspaceJsoncWithConflictsGracefully(\n    workspaceDepsConflicts: WorkspaceDepsConflicts\n  ): Promise<Error | undefined> {\n    try {\n      await this.writeWorkspaceJsoncWithConflicts(workspaceDepsConflicts);\n      return undefined;\n    } catch (err: any) {\n      this.logger.error(`unable to write workspace.jsonc with conflicts`, err);\n      const errTitle = `unable to write workspace.jsonc with conflicts, due to an error: \"${err.message}\".\nsee the conflicts below and edit your workspace.jsonc as you see fit.`;\n      const conflictsStr = WS_DEPS_FIELDS.map((depField) => {\n        if (!workspaceDepsConflicts[depField]) return [];\n        return workspaceDepsConflicts[depField].map(({ name, version }) => {\n          const { currentVal, otherVal } = parseVersionLineWithConflict(version);\n          return `(${depField}) ${name}: ours: ${currentVal}, theirs: ${otherVal}`;\n        });\n      })\n        .flat()\n        .join('\\n');\n      return new BitError(`${errTitle}\\n${conflictsStr}`);\n    }\n  }\n\n  private async writeWorkspaceJsoncWithConflicts(workspaceDepsConflicts: WorkspaceDepsConflicts) {\n    const wsConfig = this.config.workspaceConfig;\n    if (!wsConfig) throw new Error(`unable to get workspace config`);\n    const wsJsoncPath = wsConfig.path;\n    const wsJsoncOriginalContent = await fs.readFile(wsJsoncPath, 'utf8');\n    let wsJsoncContent = wsJsoncOriginalContent;\n    WS_DEPS_FIELDS.forEach((depField) => {\n      if (!workspaceDepsConflicts[depField]) return;\n      workspaceDepsConflicts[depField].forEach(({ name, version }) => {\n        const { currentVal, otherVal } = parseVersionLineWithConflict(version);\n        // e.g. \"@ci/8oypmb6p-remote.bar.foo\": \"^0.0.3\"\n        const originalDep = `\"${name}\": \"${currentVal}\"`;\n        if (!wsJsoncContent.includes(originalDep)) {\n          throw new Error(`unable to find the dependency ${originalDep} in the workspace.jsonc`);\n        }\n        wsJsoncContent = wsJsoncContent.replace(originalDep, `\"${name}\": \"${otherVal}\"`);\n      });\n    });\n\n    const baseFilePath = await tempy.write('');\n    const otherFilePath = await tempy.write(wsJsoncContent);\n    const mergeFilesParams: MergeFileParams = {\n      filePath: wsJsoncPath,\n      currentFile: {\n        label: 'ours',\n        path: wsJsoncPath,\n      },\n      baseFile: {\n        path: baseFilePath,\n      },\n      otherFile: {\n        label: 'theirs',\n        path: otherFilePath,\n      },\n    };\n    const mergeResult = await mergeFiles(mergeFilesParams);\n    const conflictFile = mergeResult.conflict;\n    if (!conflictFile) {\n      this.logger.debug(`original content:\\n${wsJsoncOriginalContent}`);\n      this.logger.debug(`new content:\\n${wsJsoncContent}`);\n      throw new Error('unable to generate conflict from the workspace.jsonc file. see debug.log for the file content');\n    }\n    await wsConfig.backupConfigFile('before writing conflicts');\n    await fs.writeFile(wsJsoncPath, conflictFile);\n  }\n\n  private async updateWorkspaceJsoncWithDepsIfNeeded(\n    allConfigMerge: ConfigMergeResult[]\n  ): Promise<{ workspaceDepsUpdates?: WorkspaceDepsUpdates; workspaceDepsConflicts?: WorkspaceDepsConflicts }> {\n    const allResults = allConfigMerge.map((c) => c.getDepsResolverResult());\n\n    // aggregate all dependencies that can be updated (not conflicting)\n    const nonConflictDeps: { [pkgName: string]: string[] } = {};\n    const nonConflictSources: { [pkgName: string]: string[] } = {}; // for logging/debugging purposes\n    allConfigMerge.forEach((configMerge) => {\n      const mergedConfig = configMerge.getDepsResolverResult()?.mergedConfig;\n      if (!mergedConfig || mergedConfig === '-') return;\n      const mergedConfigPolicy = mergedConfig.policy || {};\n      DEPENDENCIES_FIELDS.forEach((depField) => {\n        if (!mergedConfigPolicy[depField]) return;\n        mergedConfigPolicy[depField].forEach((pkg: PkgEntry) => {\n          if (pkg.force) return; // we only care about auto-detected dependencies\n          if (nonConflictDeps[pkg.name]) {\n            if (!nonConflictDeps[pkg.name].includes(pkg.version)) nonConflictDeps[pkg.name].push(pkg.version);\n            nonConflictSources[pkg.name].push(configMerge.compIdStr);\n            return;\n          }\n          nonConflictDeps[pkg.name] = [pkg.version];\n          nonConflictSources[pkg.name] = [configMerge.compIdStr];\n        });\n      });\n    });\n\n    // aggregate all dependencies that have conflicts\n    const conflictDeps: { [pkgName: string]: string[] } = {};\n    const conflictDepsSources: { [pkgName: string]: string[] } = {}; // for logging/debugging purposes\n    allConfigMerge.forEach((configMerge) => {\n      const mergedConfigConflict = configMerge.getDepsResolverResult()?.conflict;\n      if (!mergedConfigConflict) return;\n      DEPENDENCIES_FIELDS.forEach((depField) => {\n        if (!mergedConfigConflict[depField]) return;\n        mergedConfigConflict[depField].forEach((pkg: PkgEntry) => {\n          if (pkg.force) return; // we only care about auto-detected dependencies\n          if (conflictDeps[pkg.name]) {\n            if (!conflictDeps[pkg.name].includes(pkg.version)) conflictDeps[pkg.name].push(pkg.version);\n            conflictDepsSources[pkg.name].push(configMerge.compIdStr);\n            return;\n          }\n          conflictDeps[pkg.name] = [pkg.version];\n          conflictDepsSources[pkg.name] = [configMerge.compIdStr];\n        });\n      });\n    });\n\n    const notConflictedPackages = Object.keys(nonConflictDeps);\n    const conflictedPackages = Object.keys(conflictDeps);\n    if (!notConflictedPackages.length && !conflictedPackages.length) return {};\n\n    const workspaceConfig = this.config.workspaceConfig;\n    if (!workspaceConfig) throw new Error(`updateWorkspaceJsoncWithDepsIfNeeded unable to get workspace config`);\n    const depResolver = workspaceConfig.extensions.findCoreExtension(DependencyResolverAspect.id);\n    const policy = depResolver?.config.policy;\n    if (!policy) {\n      return {};\n    }\n\n    // calculate the workspace.json updates\n    const workspaceJsonUpdates = {};\n    notConflictedPackages.forEach((pkgName) => {\n      if (nonConflictDeps[pkgName].length > 1) {\n        // we only want the deps that the other lane has them in the workspace.json and that all comps use the same dep.\n        return;\n      }\n      DEPENDENCIES_FIELDS.forEach((depField) => {\n        if (!policy[depField]?.[pkgName]) return; // doesn't exists in the workspace.json\n        const currentVer = policy[depField][pkgName];\n        const newVer = nonConflictDeps[pkgName][0];\n        if (currentVer === newVer) return;\n        workspaceJsonUpdates[pkgName] = [currentVer, newVer];\n        policy[depField][pkgName] = newVer;\n        this.logger.debug(\n          `update workspace.jsonc: ${pkgName} from ${currentVer} to ${newVer}. Triggered by: ${nonConflictSources[\n            pkgName\n          ].join(', ')}`\n        );\n      });\n    });\n\n    // calculate the workspace.json conflicts\n    const workspaceJsonConflicts = { dependencies: [], peerDependencies: [] };\n    const conflictPackagesToRemoveFromConfigMerge: string[] = [];\n    conflictedPackages.forEach((pkgName) => {\n      if (conflictDeps[pkgName].length > 1) {\n        // we only want the deps that the other lane has them in the workspace.json and that all comps use the same dep.\n        return;\n      }\n      const conflictRaw = conflictDeps[pkgName][0];\n      const [, currentVal, otherVal] = conflictRaw.split('::');\n\n      WS_DEPS_FIELDS.forEach((depField) => {\n        if (!policy[depField]?.[pkgName]) return;\n        const currentVerInWsJson = policy[depField][pkgName];\n        if (!currentVerInWsJson) return;\n        // the version is coming from the workspace.jsonc\n        conflictPackagesToRemoveFromConfigMerge.push(pkgName);\n        if (semver.satisfies(otherVal, currentVerInWsJson)) {\n          // the other version is compatible with the current version in the workspace.json\n          return;\n        }\n        workspaceJsonConflicts[depField].push({\n          name: pkgName,\n          version: conflictRaw.replace(currentVal, currentVerInWsJson),\n          force: false,\n        });\n        conflictPackagesToRemoveFromConfigMerge.push(pkgName);\n        this.logger.debug(\n          `conflict workspace.jsonc: ${pkgName} current: ${currentVerInWsJson}, other: ${otherVal}. Triggered by: ${conflictDepsSources[\n            pkgName\n          ].join(', ')}`\n        );\n      });\n    });\n    WS_DEPS_FIELDS.forEach((depField) => {\n      if (isEmpty(workspaceJsonConflicts[depField])) delete workspaceJsonConflicts[depField];\n    });\n\n    if (conflictPackagesToRemoveFromConfigMerge.length) {\n      allResults.forEach((result) => {\n        if (result?.conflict) {\n          DEPENDENCIES_FIELDS.forEach((depField) => {\n            if (!result.conflict?.[depField]) return;\n            result.conflict[depField] = result.conflict?.[depField].filter(\n              (dep) => !conflictPackagesToRemoveFromConfigMerge.includes(dep.name)\n            );\n            if (!result.conflict[depField].length) delete result.conflict[depField];\n          });\n          if (isEmpty(result.conflict)) result.conflict = undefined;\n        }\n      });\n    }\n\n    if (Object.keys(workspaceJsonUpdates).length) {\n      await workspaceConfig.write({ reasonForChange: 'merge (update dependencies)' });\n    }\n\n    this.logger.debug('final workspace.jsonc updates', workspaceJsonUpdates);\n    this.logger.debug('final workspace.jsonc conflicts', workspaceJsonConflicts);\n\n    return {\n      workspaceDepsUpdates: Object.keys(workspaceJsonUpdates).length ? workspaceJsonUpdates : undefined,\n      workspaceDepsConflicts: Object.keys(workspaceJsonConflicts).length ? workspaceJsonConflicts : undefined,\n    };\n  }\n\n  /**\n   * this function gets called from two different commands:\n   * 1. \"bit merge <ids...>\", when merging a component from a remote to the local.\n   * in this case, the remote and local are on the same lane or both on main.\n   * 2. \"bit lane merge\", when merging from one lane to another.\n   */\n  async getMergeStatus(\n    bitIds: ComponentID[], // the id.version is the version we want to merge to the current component\n    currentLane: Lane | null, // currently checked out lane. if on main, then it's null.\n    otherLane?: Lane | null, // the lane we want to merged to our lane. (null if it's \"main\").\n    options?: MergeStatusProviderOptions\n  ): Promise<ComponentMergeStatus[]> {\n    const mergeStatusProvider = new MergeStatusProvider(\n      this.workspace,\n      this.logger,\n      this.importer,\n      currentLane || undefined,\n      otherLane || undefined,\n      options\n    );\n    return mergeStatusProvider.getStatus(bitIds);\n  }\n\n  private async applyVersionMultiple(\n    succeededComponents: ComponentMergeStatus[],\n    otherLaneId: LaneId,\n    mergeStrategy: MergeStrategy,\n    currentLane: Lane | null\n  ): Promise<ApplyVersionWithComps[]> {\n    const componentsResults = await mapSeries(\n      succeededComponents,\n      async ({ currentComponent, id, mergeResults, resolvedUnrelated, configMergeResult }) => {\n        const modelComponent = await this.workspace.consumer.scope.getModelComponent(id);\n        const updatedLaneId = otherLaneId.isDefault() ? LaneId.from(otherLaneId.name, id.scope as string) : otherLaneId;\n        return this.applyVersion({\n          currentComponent,\n          id,\n          mergeResults,\n          mergeStrategy,\n          remoteHead: modelComponent.getRef(id.version as string) as Ref,\n          otherLaneId: updatedLaneId,\n          currentLane,\n          resolvedUnrelated,\n          configMergeResult,\n        });\n      }\n    );\n\n    const compsToWrite = compact(componentsResults.map((c) => c.legacyCompToWrite));\n\n    const manyComponentsWriterOpts = {\n      consumer: this.workspace.consumer,\n      components: compsToWrite,\n      skipDependencyInstallation: true,\n      writeConfig: false, // @todo: should write if config exists before, needs to figure out how to do it.\n      reasonForBitmapChange: 'merge',\n    };\n    await this.componentWriter.writeMany(manyComponentsWriterOpts);\n\n    return componentsResults;\n  }\n\n  private async applyVersion({\n    currentComponent,\n    id,\n    mergeResults,\n    mergeStrategy,\n    remoteHead,\n    otherLaneId,\n    currentLane,\n    resolvedUnrelated,\n    configMergeResult,\n  }: {\n    currentComponent: ConsumerComponent | null | undefined;\n    id: ComponentID;\n    mergeResults: MergeResultsThreeWay | null | undefined;\n    mergeStrategy: MergeStrategy;\n    remoteHead: Ref;\n    otherLaneId: LaneId;\n    currentLane: Lane | null;\n    resolvedUnrelated?: ResolveUnrelatedData;\n    configMergeResult?: ConfigMergeResult;\n  }): Promise<ApplyVersionWithComps> {\n    const consumer = this.workspace.consumer;\n    let filesStatus = {};\n    const unmergedComponent: UnmergedComponent = {\n      id: { name: id.fullName, scope: id.scope },\n      head: remoteHead,\n      laneId: otherLaneId,\n    };\n    id = currentComponent ? currentComponent.id : id;\n\n    const modelComponent = await consumer.scope.getModelComponent(id);\n\n    const addToCurrentLane = (head: Ref) => {\n      if (!currentLane) throw new Error('currentLane must be defined when adding to the lane');\n      if (otherLaneId.isDefault()) {\n        const isPartOfLane = currentLane.components.find((c) => c.id.isEqualWithoutVersion(id));\n        if (!isPartOfLane) return;\n      }\n      currentLane.addComponent({ id, head });\n    };\n\n    const handleResolveUnrelated = (legacyCompToWrite?: ConsumerComponent) => {\n      if (!currentComponent) throw new Error('currentComponent must be defined when resolvedUnrelated');\n      // because when on a main, we don't allow merging lanes with unrelated. we asks users to switch to the lane\n      // first and then merge with --resolve-unrelated\n      if (!currentLane) throw new Error('currentLane must be defined when resolvedUnrelated');\n      if (!resolvedUnrelated) throw new Error('resolvedUnrelated must be populated');\n      addToCurrentLane(resolvedUnrelated.headOnCurrentLane);\n      unmergedComponent.unrelated = {\n        unrelatedHead: resolvedUnrelated.unrelatedHead,\n        headOnCurrentLane: resolvedUnrelated.headOnCurrentLane,\n        unrelatedLaneId: resolvedUnrelated.unrelatedLaneId,\n      };\n      consumer.scope.objects.unmergedComponents.addEntry(unmergedComponent);\n      return { applyVersionResult: { id, filesStatus }, component: currentComponent, legacyCompToWrite };\n    };\n\n    const markAllFilesAsUnchanged = () => {\n      if (!currentComponent) throw new Error(`applyVersion expect to get currentComponent for ${id.toString()}`);\n      currentComponent.files.forEach((file) => {\n        filesStatus[pathNormalizeToLinux(file.relative)] = FileStatus.unchanged;\n      });\n    };\n    if (mergeResults && mergeResults.hasConflicts && mergeStrategy === MergeOptions.ours) {\n      markAllFilesAsUnchanged();\n      consumer.scope.objects.unmergedComponents.addEntry(unmergedComponent);\n      return { applyVersionResult: { id, filesStatus }, component: currentComponent || undefined };\n    }\n    if (resolvedUnrelated?.strategy === 'ours') {\n      markAllFilesAsUnchanged();\n      return handleResolveUnrelated();\n    }\n    const remoteId = id.changeVersion(remoteHead.toString());\n    const idToLoad = !mergeResults || mergeStrategy === MergeOptions.theirs ? remoteId : id;\n    const legacyComponent = await consumer.loadComponentFromModelImportIfNeeded(idToLoad);\n    if (mergeResults && mergeStrategy === MergeOptions.theirs) {\n      // in this case, we don't want to update .bitmap with the version of the remote. we want to keep the same version\n      legacyComponent.version = id.version;\n    }\n    const files = legacyComponent.files;\n    updateFileStatus(files, filesStatus, currentComponent || undefined);\n\n    if (mergeResults) {\n      // update files according to the merge results\n      const { filesStatus: modifiedStatus, modifiedFiles } = applyModifiedVersion(files, mergeResults, mergeStrategy);\n      legacyComponent.files = modifiedFiles;\n      filesStatus = { ...filesStatus, ...modifiedStatus };\n    }\n\n    await removeFilesIfNeeded(filesStatus, currentComponent || undefined);\n\n    if (configMergeResult) {\n      const successfullyMergedConfig = configMergeResult.getSuccessfullyMergedConfig();\n      if (successfullyMergedConfig) {\n        unmergedComponent.mergedConfig = successfullyMergedConfig;\n        // no need to `unmergedComponents.addEntry` here. it'll be added in the next lines inside `if (mergeResults)`.\n        // because if `configMergeResult` is set, `mergeResults` must be set as well. both happen on diverge.\n      }\n    }\n\n    // if mergeResults, the head snap is going to be updated on a later phase when snapping with two parents\n    // otherwise, update the head of the current lane or main\n    if (mergeResults) {\n      if (mergeResults.hasConflicts && mergeStrategy === MergeOptions.manual) {\n        unmergedComponent.unmergedPaths = mergeResults.modifiedFiles.filter((f) => f.conflict).map((f) => f.filePath);\n      }\n      consumer.scope.objects.unmergedComponents.addEntry(unmergedComponent);\n    } else if (currentLane) {\n      if (resolvedUnrelated) {\n        // must be \"theirs\"\n        return handleResolveUnrelated(legacyComponent);\n      }\n      addToCurrentLane(remoteHead);\n    } else {\n      // this is main\n      modelComponent.setHead(remoteHead);\n      // mark it as local, otherwise, when importing this component from a remote, it'll override it.\n      modelComponent.markVersionAsLocal(remoteHead.toString());\n      consumer.scope.objects.add(modelComponent);\n    }\n\n    return {\n      applyVersionResult: { id, filesStatus },\n      component: currentComponent || undefined,\n      legacyCompToWrite: legacyComponent,\n    };\n  }\n\n  private async abortMerge(values: string[]): Promise<ApplyVersionResults> {\n    const consumer = this.workspace.consumer;\n    const ids = await this.getIdsForUnmerged(values);\n    const results = await this.checkout.checkout({ ids, reset: true });\n    ids.forEach((id) => consumer.scope.objects.unmergedComponents.removeComponent(id));\n    await consumer.scope.objects.unmergedComponents.write();\n    return { abortedComponents: results.components };\n  }\n\n  private async resolveMerge(values: string[], snapMessage: string, build: boolean): Promise<ApplyVersionResults> {\n    const ids = await this.getIdsForUnmerged(values);\n    // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n    const { snappedComponents } = await this.snapping.snap({\n      legacyBitIds: ComponentIdList.fromArray(ids.map((id) => id)),\n      build,\n      message: snapMessage,\n    });\n    return { resolvedComponents: snappedComponents };\n  }\n\n  private async getAllComponentsStatus(\n    bitIds: ComponentID[],\n    laneId: LaneId,\n    localLaneObject: Lane | null\n  ): Promise<ComponentMergeStatus[]> {\n    const ids = await Promise.all(\n      bitIds.map(async (bitId) => {\n        const remoteScopeName = laneId.isDefault() ? bitId.scope : laneId.scope;\n        const remoteLaneId = LaneId.from(laneId.name, remoteScopeName as string);\n        const remoteHead = await this.workspace.consumer.scope.objects.remoteLanes.getRef(remoteLaneId, bitId);\n        const laneIdStr = remoteLaneId.toString();\n        if (!remoteHead) {\n          throw new BitError(`unable to find a remote head of \"${bitId.toStringWithoutVersion()}\" in \"${laneIdStr}\"`);\n        }\n        return bitId.changeVersion(remoteHead.toString());\n      })\n    );\n\n    return this.getMergeStatus(ids, localLaneObject, localLaneObject, { shouldSquash: false });\n  }\n\n  private async snapResolvedComponents(\n    consumer: Consumer,\n    snapMessage: string,\n    build: boolean\n  ): Promise<SnapResults | null> {\n    const unmergedComponents = consumer.scope.objects.unmergedComponents.getComponents();\n    this.logger.debug(`merge-snaps, snapResolvedComponents, total ${unmergedComponents.length.toString()} components`);\n    if (!unmergedComponents.length) return null;\n    const ids = ComponentIdList.fromArray(unmergedComponents.map((r) => ComponentID.fromObject(r.id)));\n    return this.snapping.snap({\n      legacyBitIds: ids,\n      build,\n      message: snapMessage,\n    });\n  }\n\n  private async tagAllLaneComponent(\n    idsToTag: ComponentID[],\n    tagMessage: string,\n    build: boolean\n  ): Promise<TagResults | null> {\n    const ids = idsToTag.map((id) => {\n      return id.toStringWithoutVersion();\n    });\n    this.logger.debug(`merge-snaps, tagResolvedComponents, total ${idsToTag.length.toString()} components`);\n    return this.snapping.tag({\n      ids,\n      build,\n      message: tagMessage,\n      unmodified: true,\n    });\n  }\n\n  private async getIdsForUnmerged(idsStr?: string[]): Promise<ComponentID[]> {\n    if (idsStr && idsStr.length) {\n      const componentIds = await this.workspace.resolveMultipleComponentIds(idsStr);\n      componentIds.forEach((id) => {\n        const entry = this.workspace.consumer.scope.objects.unmergedComponents.getEntry(id);\n        if (!entry) {\n          throw new GeneralError(`unable to merge-resolve ${id.toString()}, it is not marked as unresolved`);\n        }\n      });\n      return componentIds;\n    }\n    const unresolvedComponents = this.workspace.consumer.scope.objects.unmergedComponents.getComponents();\n    if (!unresolvedComponents.length) throw new GeneralError(`all components are resolved already, nothing to do`);\n    return unresolvedComponents.map((u) => ComponentID.fromObject(u.id));\n  }\n\n  private async getComponentsToMerge(consumer: Consumer, ids: string[]): Promise<ComponentID[]> {\n    const componentsList = new ComponentsList(consumer);\n    if (!ids.length) {\n      const mergePending = await componentsList.listMergePendingComponents();\n      return mergePending.map((c) => c.id);\n    }\n    if (hasWildcard(ids)) {\n      return componentsList.listComponentsByIdsWithWildcard(ids);\n    }\n    return ids.map((id) => consumer.getParsedId(id));\n  }\n\n  static slots = [];\n  static dependencies = [\n    CLIAspect,\n    WorkspaceAspect,\n    SnappingAspect,\n    CheckoutAspect,\n    InstallAspect,\n    LoggerAspect,\n    ComponentWriterAspect,\n    ImporterAspect,\n    ConfigAspect,\n    RemoveAspect,\n    GlobalConfigAspect,\n  ];\n  static runtime = MainRuntime;\n  static async provider([\n    cli,\n    workspace,\n    snapping,\n    checkout,\n    install,\n    loggerMain,\n    compWriter,\n    importer,\n    config,\n    remove,\n    globalConfig,\n  ]: [\n    CLIMain,\n    Workspace,\n    SnappingMain,\n    CheckoutMain,\n    InstallMain,\n    LoggerMain,\n    ComponentWriterMain,\n    ImporterMain,\n    ConfigMain,\n    RemoveMain,\n    GlobalConfigMain\n  ]) {\n    const logger = loggerMain.createLogger(MergingAspect.id);\n    const merging = new MergingMain(\n      workspace,\n      install,\n      snapping,\n      checkout,\n      logger,\n      compWriter,\n      importer,\n      config,\n      remove\n    );\n    cli.register(new MergeCmd(merging, globalConfig));\n    return merging;\n  }\n}\n\nMergingAspect.addRuntime(MergingMain);\n"],"mappings":"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"}

package/package.json

@@ -1,41 +1,44 @@
 {
   "name": "@teambit/merging",
-  "version": "1.0.130",
+  "version": "1.0.132",
   "homepage": "https://bit.cloud/teambit/component/merging",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.component",
     "name": "merging",
-    "version": "1.0.130"
+    "version": "1.0.132"
   },
   "dependencies": {
     "lodash": "4.17.21",
     "semver": "7.5.2",
     "chalk": "2.4.2",
     "p-map-series": "2.1.0",
+    "fs-extra": "10.0.0",
+    "tempy": "1.0.1",
     "@teambit/component-id": "1.2.0",
     "@teambit/component-version": "1.0.3",
     "@teambit/bit-error": "0.0.404",
     "@teambit/lane-id": "0.0.311",
     "@teambit/harmony": "0.4.6",
-    "@teambit/dependency-resolver": "1.0.130",
-    "@teambit/builder": "1.0.130",
-    "@teambit/envs": "1.0.130",
-    "@teambit/logger": "0.0.939",
-    "@teambit/cli": "0.0.846",
-    "@teambit/global-config": "0.0.849",
-    "@teambit/importer": "1.0.130",
-    "@teambit/workspace": "1.0.130",
-    "@teambit/checkout": "1.0.130",
-    "@teambit/component-writer": "1.0.130",
-    "@teambit/config": "0.0.881",
-    "@teambit/install": "1.0.130",
-    "@teambit/remove": "1.0.130",
-    "@teambit/snapping": "1.0.130"
+    "@teambit/dependency-resolver": "1.0.132",
+    "@teambit/builder": "1.0.132",
+    "@teambit/envs": "1.0.132",
+    "@teambit/logger": "0.0.941",
+    "@teambit/cli": "0.0.848",
+    "@teambit/global-config": "0.0.851",
+    "@teambit/importer": "1.0.132",
+    "@teambit/workspace": "1.0.132",
+    "@teambit/checkout": "1.0.132",
+    "@teambit/component-writer": "1.0.132",
+    "@teambit/config": "0.0.883",
+    "@teambit/install": "1.0.132",
+    "@teambit/remove": "1.0.132",
+    "@teambit/snapping": "1.0.132"
   },
   "devDependencies": {
     "@types/lodash": "4.14.165",
     "@types/semver": "7.3.4",
+    "@types/fs-extra": "9.0.7",
     "@types/mocha": "9.1.0",
     "@types/jest": "^29.2.2",
     "@types/testing-library__jest-dom": "^5.9.5",