@teambit/merging 1.0.132 → 1.0.134

package/dist/index.d.ts

@@ -1,6 +1,5 @@
 import { MergingAspect } from './merging.aspect';
 export { mergeReport, applyVersionReport, conflictSummaryReport, installationErrorOutput, compilationErrorOutput, getRemovedOutput, getAddedOutput, } from './merge-cmd';
 export type { MergingMain, ComponentMergeStatus, ApplyVersionResults, ApplyVersionResult, FilesStatus, FailedComponents, } from './merging.main.runtime';
-export { ConfigMergeResult } from './config-merge-result';
 export default MergingAspect;
 export { MergingAspect };

package/dist/index.js

@@ -3,12 +3,6 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-Object.defineProperty(exports, "ConfigMergeResult", {
-  enumerable: true,
-  get: function () {
-    return _configMergeResult().ConfigMergeResult;
-  }
-});
 Object.defineProperty(exports, "MergingAspect", {
   enumerable: true,
   get: function () {
@@ -72,13 +66,6 @@ function _mergeCmd() {
   };
   return data;
 }
-function _configMergeResult() {
-  const data = require("./config-merge-result");
-  _configMergeResult = function () {
-    return data;
-  };
-  return data;
-}
 var _default = exports.default = _merging().MergingAspect;
 
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["_merging","data","require","_mergeCmd","_configMergeResult","_default","exports","default","MergingAspect"],"sources":["index.ts"],"sourcesContent":["import { MergingAspect } from './merging.aspect';\n\nexport {\n  mergeReport,\n  applyVersionReport,\n  conflictSummaryReport,\n  installationErrorOutput,\n  compilationErrorOutput,\n  getRemovedOutput,\n  getAddedOutput,\n} from './merge-cmd';\nexport type {\n  MergingMain,\n  ComponentMergeStatus,\n  ApplyVersionResults,\n  ApplyVersionResult,\n  FilesStatus,\n  FailedComponents,\n} from './merging.main.runtime';\nexport { ConfigMergeResult } from './config-merge-result';\nexport default MergingAspect;\nexport { MergingAspect };\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,SAAAA,SAAA;EAAA,MAAAC,IAAA,GAAAC,OAAA;EAAAF,QAAA,YAAAA,CAAA;IAAA,OAAAC,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAEA,SAAAE,UAAA;EAAA,MAAAF,IAAA,GAAAC,OAAA;EAAAC,SAAA,YAAAA,CAAA;IAAA,OAAAF,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAiBA,SAAAG,mBAAA;EAAA,MAAAH,IAAA,GAAAC,OAAA;EAAAE,kBAAA,YAAAA,CAAA;IAAA,OAAAH,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAA0D,IAAAI,QAAA,GAAAC,OAAA,CAAAC,OAAA,GAC3CC,wBAAa"}
+{"version":3,"names":["_merging","data","require","_mergeCmd","_default","exports","default","MergingAspect"],"sources":["index.ts"],"sourcesContent":["import { MergingAspect } from './merging.aspect';\n\nexport {\n  mergeReport,\n  applyVersionReport,\n  conflictSummaryReport,\n  installationErrorOutput,\n  compilationErrorOutput,\n  getRemovedOutput,\n  getAddedOutput,\n} from './merge-cmd';\nexport type {\n  MergingMain,\n  ComponentMergeStatus,\n  ApplyVersionResults,\n  ApplyVersionResult,\n  FilesStatus,\n  FailedComponents,\n} from './merging.main.runtime';\nexport default MergingAspect;\nexport { MergingAspect };\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,SAAAA,SAAA;EAAA,MAAAC,IAAA,GAAAC,OAAA;EAAAF,QAAA,YAAAA,CAAA;IAAA,OAAAC,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAEA,SAAAE,UAAA;EAAA,MAAAF,IAAA,GAAAC,OAAA;EAAAC,SAAA,YAAAA,CAAA;IAAA,OAAAF,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAQqB,IAAAG,QAAA,GAAAC,OAAA,CAAAC,OAAA,GASNC,wBAAa"}

package/dist/merge-cmd.d.ts

@@ -2,8 +2,8 @@ import { Command, CommandOptions } from '@teambit/cli';
 import { ComponentID } from '@teambit/component-id';
 import { MergeStrategy } from '@teambit/legacy/dist/consumer/versions-ops/merge-version';
 import { GlobalConfigMain } from '@teambit/global-config';
+import { ConfigMergeResult } from '@teambit/config-merger';
 import { ApplyVersionResults, MergingMain, ApplyVersionResult } from './merging.main.runtime';
-import { ConfigMergeResult } from './config-merge-result';
 export declare class MergeCmd implements Command {
     private merging;
     private globalConfig;

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","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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"}
+{"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 { ConfigMergeResult } from '@teambit/config-merger';\nimport { BitError } from '@teambit/bit-error';\nimport { ApplyVersionResults, MergingMain, ApplyVersionResult } from './merging.main.runtime';\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/merge-status-provider.js

@@ -61,7 +61,7 @@ function _noCommonSnap() {
   return data;
 }
 function _configMerger() {
-  const data = require("./config-merger");
+  const data = require("@teambit/config-merger");
   _configMerger = function () {
     return data;
   };
@@ -159,7 +159,7 @@ other:   ${otherLaneHead.toString()}`);
     const currentLabel = `${currentId.version} (${currentLaneName === otherLaneName ? 'current' : currentLaneName})`;
     const otherLabel = `${otherLaneHead.toString()} (${otherLaneName === currentLaneName ? 'incoming' : otherLaneName})`;
     const workspaceIds = await this.workspace.listIds();
-    const configMerger = new (_configMerger().ConfigMerger)(id.toStringWithoutVersion(), workspaceIds, this.otherLane, currentComponent.extensions, baseComponent.extensions, otherComponent.extensions, currentLabel, otherLabel, this.logger);
+    const configMerger = new (_configMerger().ComponentConfigMerger)(id.toStringWithoutVersion(), workspaceIds, this.otherLane, currentComponent.extensions, baseComponent.extensions, otherComponent.extensions, currentLabel, otherLabel, this.logger);
     const configMergeResult = configMerger.merge();
     const mergeResults = await (0, _threeWayMerge().default)({
       consumer: this.workspace.consumer,

package/dist/merge-status-provider.js.map

@@ -1 +1 @@
-{"version":3,"names":["_pMapSeries","data","_interopRequireDefault","require","_componentId","_laneId","_getDivergeData","_repositories","_lodash","_threeWayMerge","_noCommonSnap","_configMerger","obj","__esModule","default","ownKeys","e","r","t","Object","keys","getOwnPropertySymbols","o","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","defineProperty","key","value","_toPropertyKey","configurable","writable","i","_toPrimitive","String","Symbol","toPrimitive","call","TypeError","Number","MergeStatusProvider","constructor","workspace","logger","importer","currentLane","otherLane","options","getStatus","bitIds","importObjectsFromMainIfExist","toBitIds","toVersionLatest","componentStatusBeforeMergeAttempt","mapSeries","id","getComponentStatusBeforeMergeAttempt","shouldImportHistoryOfOtherLane","shouldSquash","scope","toImport","map","compStatus","divergeData","versionsToImport","commonSnapBeforeDiverge","snapsOnTargetOnly","compact","v","changeVersion","toString","flat","reason","consumer","scopeImporter","importWithoutDeps","ComponentIdList","fromArray","lane","cache","includeVersionHistory","compStatusNotNeedMerge","c","mergeProps","compStatusNeedMerge","getComponentsStatusNeedMerge","tmp","Tmp","componentsStatus","Promise","all","getComponentMergeStatus","clear","err","results","componentMergeStatusBeforeMergeAttempt","currentComponent","Error","otherLaneHead","currentId","modelComponent","repo","objects","baseSnap","debug","toStringWithoutVersion","version","baseComponent","loadVersion","otherComponent","currentLaneName","toLaneId","otherLaneName","DEFAULT_LANE","currentLabel","otherLabel","workspaceIds","listIds","configMerger","ConfigMerger","extensions","configMergeResult","merge","mergeResults","threeWayMerge","returnUnmerged","msg","unmergedLegitimately","componentStatus","unchangedMessage","unchangedLegitimately","getModelComponentIfExist","unmerged","unmergedComponents","getEntry","getRef","existingBitMapId","bitMap","getComponentIdIfExist","ignoreVersion","componentOnOther","idOnCurrentLane","getComponent","isRemoved","shouldMerge","shouldRemoveFromMain","shouldBeRemoved","getCurrentId","head","getHeadAsTagIfExist","getDivergeData","targetHead","throws","componentFromModel","getCurrentComponent","loadComponent","getConsumerComponent","isTargetNotAhead","isTargetAhead","shouldIgnore","isModified","componentModificationStatus","getComponentStatusById","modified","undefined","isSourceCodeModified","isComponentSourceCodeModified","modifiedType","ignoreConfigChanges","NoCommonSnap","resolveUnrelated","message","handleNoCommonSnap","isDiverged","isSourceAhead","mainHead","returnAccordingToOurs","headToSaveInLane","unrelatedHead","unrelatedLaneId","resolvedUnrelated","strategy","headOnCurrentLane","returnAccordingToTheirs","resolvedRef","unrelatedHeadRef","currentVersionRef","otherVersionRef","hasResolvedFromMain","hashToCompare","divergeDataFromMain","sourceHead","hasResolvedLocally","getHeadRegardlessOfLane","hasResolvedRemotely","refToSaveInLane","exports"],"sources":["merge-status-provider.ts"],"sourcesContent":["import { Workspace } from '@teambit/workspace';\nimport { MergeStrategy } from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport mapSeries from 'p-map-series';\nimport { ComponentID, ComponentIdList } from '@teambit/component-id';\nimport { DEFAULT_LANE, LaneId } from '@teambit/lane-id';\nimport { getDivergeData } from '@teambit/legacy/dist/scope/component-ops/get-diverge-data';\nimport { Lane, ModelComponent, Version } from '@teambit/legacy/dist/scope/models';\nimport { Ref } from '@teambit/legacy/dist/scope/objects';\nimport { Tmp } from '@teambit/legacy/dist/scope/repositories';\nimport ConsumerComponent from '@teambit/legacy/dist/consumer/component/consumer-component';\nimport { ImporterMain } from '@teambit/importer';\nimport { Logger } from '@teambit/logger';\nimport { compact } from 'lodash';\nimport threeWayMerge from '@teambit/legacy/dist/consumer/versions-ops/merge-version/three-way-merge';\nimport { SnapsDistance } from '@teambit/legacy/dist/scope/component-ops/snaps-distance';\nimport { NoCommonSnap } from '@teambit/legacy/dist/scope/exceptions/no-common-snap';\nimport { ConfigMerger } from './config-merger';\nimport { ComponentMergeStatus, ComponentMergeStatusBeforeMergeAttempt } from './merging.main.runtime';\n\nexport type MergeStatusProviderOptions = {\n  resolveUnrelated?: MergeStrategy;\n  ignoreConfigChanges?: boolean;\n  shouldSquash?: boolean;\n};\n\nexport class MergeStatusProvider {\n  constructor(\n    private workspace: Workspace,\n    private logger: Logger,\n    private importer: ImporterMain,\n    private currentLane?: Lane, // currently checked out lane. if on main, then it's undefined.\n    private otherLane?: Lane, // the lane we want to merged to our lane. (undefined if it's \"main\").\n    private options?: MergeStatusProviderOptions\n  ) {}\n\n  async getStatus(\n    bitIds: ComponentID[] // the id.version is the version we want to merge to the current component\n  ): Promise<ComponentMergeStatus[]> {\n    if (!this.currentLane && this.otherLane) {\n      await this.importer.importObjectsFromMainIfExist(this.otherLane.toBitIds().toVersionLatest());\n    }\n    const componentStatusBeforeMergeAttempt = await mapSeries(bitIds, (id) =>\n      this.getComponentStatusBeforeMergeAttempt(id)\n    );\n    // whether or not we need to import the gap between the common-snap and the other lane.\n    // the common-snap itself we need anyway in order to get the files hash/content for checking conflicts.\n    const shouldImportHistoryOfOtherLane =\n      !this.options?.shouldSquash && // when squashing, no need for all history, only the head is going to be pushed\n      (!this.currentLane || // on main. we need all history in order to push each component to its remote\n        this.currentLane.scope !== this.otherLane?.scope); // on lane, but the other lane is from a different scope. we need all history in order to push to the current lane's scope\n    const toImport = componentStatusBeforeMergeAttempt\n      .map((compStatus) => {\n        if (!compStatus.divergeData) return [];\n        const versionsToImport = [compStatus.divergeData.commonSnapBeforeDiverge];\n        if (shouldImportHistoryOfOtherLane) {\n          versionsToImport.push(...compStatus.divergeData.snapsOnTargetOnly);\n        }\n        return compact(versionsToImport).map((v) => compStatus.id.changeVersion(v.toString()));\n      })\n      .flat();\n    const reason = shouldImportHistoryOfOtherLane\n      ? `for filling the gap between the common-snap and the head of ${this.otherLane?.id() || 'main'}`\n      : `for getting the common-snap between ${this.currentLane?.id() || 'main'} and ${this.otherLane?.id() || 'main'}`;\n    await this.workspace.consumer.scope.scopeImporter.importWithoutDeps(ComponentIdList.fromArray(toImport), {\n      lane: this.otherLane,\n      cache: true,\n      includeVersionHistory: false,\n      reason,\n    });\n\n    const compStatusNotNeedMerge = componentStatusBeforeMergeAttempt.filter(\n      (c) => !c.mergeProps\n    ) as ComponentMergeStatus[];\n    const compStatusNeedMerge = componentStatusBeforeMergeAttempt.filter((c) => c.mergeProps);\n\n    const getComponentsStatusNeedMerge = async (): Promise<ComponentMergeStatus[]> => {\n      const tmp = new Tmp(this.workspace.consumer.scope);\n      try {\n        const componentsStatus = await Promise.all(\n          compStatusNeedMerge.map((compStatus) => this.getComponentMergeStatus(compStatus))\n        );\n        await tmp.clear();\n        return componentsStatus;\n      } catch (err: any) {\n        await tmp.clear();\n        throw err;\n      }\n    };\n    const results = await getComponentsStatusNeedMerge();\n\n    results.push(...compStatusNotNeedMerge);\n    return results;\n  }\n\n  private async getComponentMergeStatus(\n    componentMergeStatusBeforeMergeAttempt: ComponentMergeStatusBeforeMergeAttempt\n  ) {\n    const { id, divergeData, currentComponent, mergeProps } = componentMergeStatusBeforeMergeAttempt;\n    if (!mergeProps) throw new Error(`getDivergedMergeStatus, mergeProps is missing for ${id.toString()}`);\n    const { otherLaneHead, currentId, modelComponent } = mergeProps;\n    const repo = this.workspace.consumer.scope.objects;\n    if (!divergeData) throw new Error(`getDivergedMergeStatus, divergeData is missing for ${id.toString()}`);\n    if (!currentComponent) throw new Error(`getDivergedMergeStatus, currentComponent is missing for ${id.toString()}`);\n\n    const baseSnap = divergeData.commonSnapBeforeDiverge as Ref; // must be set when isTrueMerge\n    this.logger.debug(`merging snaps details:\nid:      ${id.toStringWithoutVersion()}\nbase:    ${baseSnap.toString()}\ncurrent: ${currentId.version}\nother:   ${otherLaneHead.toString()}`);\n    const baseComponent: Version = await modelComponent.loadVersion(baseSnap.toString(), repo);\n    const otherComponent: Version = await modelComponent.loadVersion(otherLaneHead.toString(), repo);\n\n    const currentLaneName = this.currentLane?.toLaneId().toString() || 'main';\n    const otherLaneName = this.otherLane ? this.otherLane.toLaneId().toString() : DEFAULT_LANE;\n    const currentLabel = `${currentId.version} (${currentLaneName === otherLaneName ? 'current' : currentLaneName})`;\n    const otherLabel = `${otherLaneHead.toString()} (${\n      otherLaneName === currentLaneName ? 'incoming' : otherLaneName\n    })`;\n    const workspaceIds = await this.workspace.listIds();\n    const configMerger = new ConfigMerger(\n      id.toStringWithoutVersion(),\n      workspaceIds,\n      this.otherLane,\n      currentComponent.extensions,\n      baseComponent.extensions,\n      otherComponent.extensions,\n      currentLabel,\n      otherLabel,\n      this.logger\n    );\n    const configMergeResult = configMerger.merge();\n\n    const mergeResults = await threeWayMerge({\n      consumer: this.workspace.consumer,\n      otherComponent,\n      otherLabel,\n      currentComponent,\n      currentLabel,\n      baseComponent,\n    });\n    return { currentComponent, id, mergeResults, divergeData, configMergeResult };\n  }\n\n  private returnUnmerged(\n    id: ComponentID,\n    msg: string,\n    unmergedLegitimately = false\n  ): ComponentMergeStatusBeforeMergeAttempt {\n    const componentStatus: ComponentMergeStatusBeforeMergeAttempt = { id };\n    componentStatus.unchangedMessage = msg;\n    componentStatus.unchangedLegitimately = unmergedLegitimately;\n    return componentStatus;\n  }\n\n  private async getComponentStatusBeforeMergeAttempt(\n    id: ComponentID // the id.version is the version we want to merge to the current component\n  ): Promise<ComponentMergeStatusBeforeMergeAttempt> {\n    const consumer = this.workspace.consumer;\n    const componentStatus: ComponentMergeStatusBeforeMergeAttempt = { id };\n    const modelComponent = await consumer.scope.getModelComponentIfExist(id);\n    if (!modelComponent) {\n      return this.returnUnmerged(\n        id,\n        `component ${id.toString()} is on the lane/main but its objects were not found, please re-import the lane`\n      );\n    }\n    const unmerged = consumer.scope.objects.unmergedComponents.getEntry(id);\n    if (unmerged) {\n      return this.returnUnmerged(\n        id,\n        `component ${id.toStringWithoutVersion()} is in during-merge state a previous merge, please snap/tag it first (or use bit merge --resolve/--abort/ bit lane merge-abort)`\n      );\n    }\n    const repo = consumer.scope.objects;\n    const version = id.version as string;\n    const otherLaneHead = modelComponent.getRef(version);\n    const existingBitMapId = consumer.bitMap.getComponentIdIfExist(id, { ignoreVersion: true });\n    const componentOnOther: Version = await modelComponent.loadVersion(version, consumer.scope.objects);\n    const idOnCurrentLane = this.currentLane?.getComponent(id);\n\n    if (componentOnOther.isRemoved()) {\n      // if exist in current lane, we want the current lane to get the soft-remove update.\n      // or if it was removed with --update-main, we want to merge it so then main will get the update.\n      const shouldMerge = idOnCurrentLane || componentOnOther.shouldRemoveFromMain();\n      if (shouldMerge) {\n        // remove the component from the workspace if exist.\n        componentStatus.shouldBeRemoved = true;\n      } else {\n        // on main, don't merge soft-removed components unless it's marked with removeOnMain.\n        // on lane, if it's not part of the current lane, don't merge it.\n        return this.returnUnmerged(id, `component has been removed`, true);\n      }\n    }\n    const getCurrentId = () => {\n      if (existingBitMapId) return existingBitMapId;\n      if (this.currentLane) {\n        if (!idOnCurrentLane) return null;\n        return idOnCurrentLane.id.changeVersion(idOnCurrentLane.head.toString());\n      }\n      // it's on main\n      const head = modelComponent.getHeadAsTagIfExist();\n      if (head) {\n        return id.changeVersion(head);\n      }\n      return null;\n    };\n    const currentId = getCurrentId();\n    if (!currentId) {\n      const divergeData = await getDivergeData({ repo, modelComponent, targetHead: otherLaneHead, throws: false });\n      return { ...componentStatus, componentFromModel: componentOnOther, divergeData };\n    }\n    const getCurrentComponent = () => {\n      if (existingBitMapId) return consumer.loadComponent(existingBitMapId);\n      return consumer.scope.getConsumerComponent(currentId);\n    };\n    const currentComponent = await getCurrentComponent();\n    if (currentComponent.isRemoved()) {\n      // we have a few options:\n      // 1. \"other\" is main. in this case, we don't care what happens on main, we want the component to stay deleted on\n      // this lane. (even when main is ahead, we don't want to merge it).\n      // 2. other is ahead. in this case, other recovered the component. so we can continue with the merge.\n      // it is possible that it is diverged, in which case, still continue with the merge, and later on, the\n      // merge-config will show a config conflict of the remove aspect.\n      // 3. other is not ahead. in this case, just ignore this component, no point to merge it, we want it removed.\n      const divergeData = await getDivergeData({ repo, modelComponent, targetHead: otherLaneHead, throws: false });\n      const isTargetNotAhead = !divergeData.err && !divergeData.isTargetAhead();\n      const shouldIgnore = this.otherLane\n        ? isTargetNotAhead // option #2 and #3 above\n        : true; // it's main. option #1 above.\n      if (shouldIgnore) {\n        return this.returnUnmerged(id, `component has been removed`, true);\n      }\n    }\n\n    const isModified = async (): Promise<undefined | 'code' | 'config'> => {\n      const componentModificationStatus = await this.workspace.getComponentStatusById(currentComponent.id);\n      if (!componentModificationStatus.modified) return undefined;\n      if (!existingBitMapId) return undefined;\n      const baseComponent = await modelComponent.loadVersion(\n        existingBitMapId.version as string,\n        consumer.scope.objects\n      );\n      const isSourceCodeModified = await consumer.isComponentSourceCodeModified(baseComponent, currentComponent);\n      if (isSourceCodeModified) return 'code';\n      return 'config';\n    };\n\n    const modifiedType = await isModified();\n    if (modifiedType === 'config' && !this.options?.ignoreConfigChanges) {\n      return this.returnUnmerged(\n        id,\n        `component has config changes, please snap/tag it first. alternatively, use --ignore-config-changes flag to bypass`\n      );\n    }\n    if (modifiedType === 'code') {\n      return this.returnUnmerged(id, `component is modified, please snap/tag it first`);\n    }\n\n    if (!otherLaneHead) {\n      throw new Error(`merging: unable finding a hash for the version ${version} of ${id.toString()}`);\n    }\n    const divergeData = await getDivergeData({\n      repo,\n      modelComponent,\n      targetHead: otherLaneHead,\n      throws: false,\n    });\n    if (divergeData.err) {\n      if (!(divergeData.err instanceof NoCommonSnap) || !this.options?.resolveUnrelated) {\n        return this.returnUnmerged(\n          id,\n          `unable to traverse ${currentComponent.id.toString()} history. error: ${divergeData.err.message}`\n        );\n      }\n      return this.handleNoCommonSnap(\n        modelComponent,\n        id,\n        otherLaneHead,\n        currentComponent,\n        componentOnOther,\n        divergeData\n      );\n    }\n    if (!divergeData.isDiverged()) {\n      if (divergeData.isSourceAhead()) {\n        // do nothing!\n        return this.returnUnmerged(id, `component ${currentComponent.id.toString()} is ahead, nothing to merge`, true);\n      }\n      if (divergeData.isTargetAhead()) {\n        // just override with the model data\n        return {\n          ...componentStatus,\n          currentComponent,\n          componentFromModel: componentOnOther,\n          divergeData,\n        };\n      }\n      // we know that localHead and remoteHead are set, so if none of them is ahead they must be equal\n      return this.returnUnmerged(id, `component ${currentComponent.id.toString()} is already merged`, true);\n    }\n\n    // it's diverged and needs merge operation\n    const mergeProps = {\n      otherLaneHead,\n      currentId,\n      modelComponent,\n    };\n\n    return { ...componentStatus, currentComponent, mergeProps, divergeData };\n  }\n\n  private async handleNoCommonSnap(\n    modelComponent: ModelComponent,\n    id: ComponentID,\n    otherLaneHead: Ref,\n    currentComponent: ConsumerComponent,\n    componentOnOther?: Version,\n    divergeData?: SnapsDistance\n  ): Promise<ComponentMergeStatusBeforeMergeAttempt> {\n    let { resolveUnrelated } = this.options || {};\n    if (currentComponent.isRemoved()) {\n      resolveUnrelated = 'theirs';\n    }\n    if (!resolveUnrelated) throw new Error(`handleNoCommonSnap expects resolveUnrelated to be set`);\n    const consumer = this.workspace.consumer;\n    const repo = consumer.scope.objects;\n    const mainHead = modelComponent.head;\n\n    const returnAccordingToOurs = (\n      headToSaveInLane: Ref,\n      unrelatedHead: Ref,\n      unrelatedLaneId: LaneId\n    ): ComponentMergeStatusBeforeMergeAttempt => {\n      return {\n        currentComponent,\n        id,\n        divergeData,\n        resolvedUnrelated: {\n          strategy: 'ours',\n          headOnCurrentLane: headToSaveInLane,\n          unrelatedHead,\n          unrelatedLaneId,\n        },\n      };\n    };\n    const returnAccordingToTheirs = (\n      resolvedRef: Ref,\n      unrelatedHeadRef: Ref,\n      unrelatedLaneId: LaneId\n    ): ComponentMergeStatusBeforeMergeAttempt => {\n      // just override with the model data\n      return {\n        currentComponent,\n        componentFromModel: componentOnOther,\n        id,\n        divergeData,\n        resolvedUnrelated: {\n          strategy: 'theirs',\n          headOnCurrentLane: resolvedRef,\n          unrelatedHead: unrelatedHeadRef,\n          unrelatedLaneId,\n        },\n      };\n    };\n\n    const currentVersionRef = modelComponent.getRef(currentComponent.id.version as string);\n    if (!currentVersionRef)\n      throw new Error(\n        `handleNoCommonSnap, unable to get ref of current version \"${\n          currentComponent.id.version\n        }\" for \"${id.toString()}\"`\n      );\n    const otherVersionRef = modelComponent.getRef(id.version as string);\n    if (!otherVersionRef)\n      throw new Error(`handleNoCommonSnap, unable to get ref of other version \"${id.version}\" for \"${id.toString()}\"`);\n\n    if (mainHead) {\n      const hasResolvedFromMain = async (hashToCompare: Ref | null) => {\n        const divergeDataFromMain = await getDivergeData({\n          repo,\n          modelComponent,\n          sourceHead: hashToCompare,\n          targetHead: mainHead,\n          throws: false,\n        });\n        if (!divergeDataFromMain.err) return true;\n        return !(divergeDataFromMain.err instanceof NoCommonSnap);\n      };\n      const hasResolvedLocally = await hasResolvedFromMain(modelComponent.getHeadRegardlessOfLane() as Ref);\n      const hasResolvedRemotely = await hasResolvedFromMain(otherLaneHead);\n      if (!hasResolvedLocally && !hasResolvedRemotely) {\n        return this.returnUnmerged(\n          id,\n          `unable to traverse ${currentComponent.id.toString()} history. the main-head ${mainHead.toString()} doesn't appear in both lanes.\nit was probably created in each lane separately and it also exists on main. please merge main first to one of these lanes`\n        );\n      }\n      const refToSaveInLane = hasResolvedLocally ? currentVersionRef : otherVersionRef;\n      const unrelatedHeadRef = hasResolvedLocally ? otherVersionRef : currentVersionRef;\n      if (resolveUnrelated === 'ours') {\n        return returnAccordingToOurs(refToSaveInLane, unrelatedHeadRef, this.currentLane?.toLaneId() as LaneId);\n      }\n      if (resolveUnrelated === 'theirs') {\n        return returnAccordingToTheirs(refToSaveInLane, unrelatedHeadRef, this.currentLane?.toLaneId() as LaneId);\n      }\n      throw new Error(\n        `unsupported strategy \"${resolveUnrelated}\" of resolve-unrelated. supported strategies are: [ours, theirs]`\n      );\n    }\n\n    const refToSaveInLane = resolveUnrelated === 'ours' ? currentVersionRef : otherVersionRef;\n    const unrelatedHeadRef = resolveUnrelated === 'ours' ? otherVersionRef : currentVersionRef;\n    if (resolveUnrelated === 'ours') {\n      return returnAccordingToOurs(refToSaveInLane, unrelatedHeadRef, this.otherLane?.toLaneId() as LaneId);\n    }\n    if (resolveUnrelated === 'theirs') {\n      return returnAccordingToTheirs(refToSaveInLane, unrelatedHeadRef, this.currentLane?.toLaneId() as LaneId);\n    }\n    throw new Error(\n      `unsupported strategy \"${resolveUnrelated}\" of resolve-unrelated. supported strategies are: [ours, theirs]`\n    );\n  }\n}\n"],"mappings":"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"}
+{"version":3,"names":["_pMapSeries","data","_interopRequireDefault","require","_componentId","_laneId","_getDivergeData","_repositories","_lodash","_threeWayMerge","_noCommonSnap","_configMerger","obj","__esModule","default","ownKeys","e","r","t","Object","keys","getOwnPropertySymbols","o","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","defineProperty","key","value","_toPropertyKey","configurable","writable","i","_toPrimitive","String","Symbol","toPrimitive","call","TypeError","Number","MergeStatusProvider","constructor","workspace","logger","importer","currentLane","otherLane","options","getStatus","bitIds","importObjectsFromMainIfExist","toBitIds","toVersionLatest","componentStatusBeforeMergeAttempt","mapSeries","id","getComponentStatusBeforeMergeAttempt","shouldImportHistoryOfOtherLane","shouldSquash","scope","toImport","map","compStatus","divergeData","versionsToImport","commonSnapBeforeDiverge","snapsOnTargetOnly","compact","v","changeVersion","toString","flat","reason","consumer","scopeImporter","importWithoutDeps","ComponentIdList","fromArray","lane","cache","includeVersionHistory","compStatusNotNeedMerge","c","mergeProps","compStatusNeedMerge","getComponentsStatusNeedMerge","tmp","Tmp","componentsStatus","Promise","all","getComponentMergeStatus","clear","err","results","componentMergeStatusBeforeMergeAttempt","currentComponent","Error","otherLaneHead","currentId","modelComponent","repo","objects","baseSnap","debug","toStringWithoutVersion","version","baseComponent","loadVersion","otherComponent","currentLaneName","toLaneId","otherLaneName","DEFAULT_LANE","currentLabel","otherLabel","workspaceIds","listIds","configMerger","ComponentConfigMerger","extensions","configMergeResult","merge","mergeResults","threeWayMerge","returnUnmerged","msg","unmergedLegitimately","componentStatus","unchangedMessage","unchangedLegitimately","getModelComponentIfExist","unmerged","unmergedComponents","getEntry","getRef","existingBitMapId","bitMap","getComponentIdIfExist","ignoreVersion","componentOnOther","idOnCurrentLane","getComponent","isRemoved","shouldMerge","shouldRemoveFromMain","shouldBeRemoved","getCurrentId","head","getHeadAsTagIfExist","getDivergeData","targetHead","throws","componentFromModel","getCurrentComponent","loadComponent","getConsumerComponent","isTargetNotAhead","isTargetAhead","shouldIgnore","isModified","componentModificationStatus","getComponentStatusById","modified","undefined","isSourceCodeModified","isComponentSourceCodeModified","modifiedType","ignoreConfigChanges","NoCommonSnap","resolveUnrelated","message","handleNoCommonSnap","isDiverged","isSourceAhead","mainHead","returnAccordingToOurs","headToSaveInLane","unrelatedHead","unrelatedLaneId","resolvedUnrelated","strategy","headOnCurrentLane","returnAccordingToTheirs","resolvedRef","unrelatedHeadRef","currentVersionRef","otherVersionRef","hasResolvedFromMain","hashToCompare","divergeDataFromMain","sourceHead","hasResolvedLocally","getHeadRegardlessOfLane","hasResolvedRemotely","refToSaveInLane","exports"],"sources":["merge-status-provider.ts"],"sourcesContent":["import { Workspace } from '@teambit/workspace';\nimport { MergeStrategy } from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport mapSeries from 'p-map-series';\nimport { ComponentID, ComponentIdList } from '@teambit/component-id';\nimport { DEFAULT_LANE, LaneId } from '@teambit/lane-id';\nimport { getDivergeData } from '@teambit/legacy/dist/scope/component-ops/get-diverge-data';\nimport { Lane, ModelComponent, Version } from '@teambit/legacy/dist/scope/models';\nimport { Ref } from '@teambit/legacy/dist/scope/objects';\nimport { Tmp } from '@teambit/legacy/dist/scope/repositories';\nimport ConsumerComponent from '@teambit/legacy/dist/consumer/component/consumer-component';\nimport { ImporterMain } from '@teambit/importer';\nimport { Logger } from '@teambit/logger';\nimport { compact } from 'lodash';\nimport threeWayMerge from '@teambit/legacy/dist/consumer/versions-ops/merge-version/three-way-merge';\nimport { SnapsDistance } from '@teambit/legacy/dist/scope/component-ops/snaps-distance';\nimport { NoCommonSnap } from '@teambit/legacy/dist/scope/exceptions/no-common-snap';\nimport { ComponentConfigMerger } from '@teambit/config-merger';\nimport { ComponentMergeStatus, ComponentMergeStatusBeforeMergeAttempt } from './merging.main.runtime';\n\nexport type MergeStatusProviderOptions = {\n  resolveUnrelated?: MergeStrategy;\n  ignoreConfigChanges?: boolean;\n  shouldSquash?: boolean;\n};\n\nexport class MergeStatusProvider {\n  constructor(\n    private workspace: Workspace,\n    private logger: Logger,\n    private importer: ImporterMain,\n    private currentLane?: Lane, // currently checked out lane. if on main, then it's undefined.\n    private otherLane?: Lane, // the lane we want to merged to our lane. (undefined if it's \"main\").\n    private options?: MergeStatusProviderOptions\n  ) {}\n\n  async getStatus(\n    bitIds: ComponentID[] // the id.version is the version we want to merge to the current component\n  ): Promise<ComponentMergeStatus[]> {\n    if (!this.currentLane && this.otherLane) {\n      await this.importer.importObjectsFromMainIfExist(this.otherLane.toBitIds().toVersionLatest());\n    }\n    const componentStatusBeforeMergeAttempt = await mapSeries(bitIds, (id) =>\n      this.getComponentStatusBeforeMergeAttempt(id)\n    );\n    // whether or not we need to import the gap between the common-snap and the other lane.\n    // the common-snap itself we need anyway in order to get the files hash/content for checking conflicts.\n    const shouldImportHistoryOfOtherLane =\n      !this.options?.shouldSquash && // when squashing, no need for all history, only the head is going to be pushed\n      (!this.currentLane || // on main. we need all history in order to push each component to its remote\n        this.currentLane.scope !== this.otherLane?.scope); // on lane, but the other lane is from a different scope. we need all history in order to push to the current lane's scope\n    const toImport = componentStatusBeforeMergeAttempt\n      .map((compStatus) => {\n        if (!compStatus.divergeData) return [];\n        const versionsToImport = [compStatus.divergeData.commonSnapBeforeDiverge];\n        if (shouldImportHistoryOfOtherLane) {\n          versionsToImport.push(...compStatus.divergeData.snapsOnTargetOnly);\n        }\n        return compact(versionsToImport).map((v) => compStatus.id.changeVersion(v.toString()));\n      })\n      .flat();\n    const reason = shouldImportHistoryOfOtherLane\n      ? `for filling the gap between the common-snap and the head of ${this.otherLane?.id() || 'main'}`\n      : `for getting the common-snap between ${this.currentLane?.id() || 'main'} and ${this.otherLane?.id() || 'main'}`;\n    await this.workspace.consumer.scope.scopeImporter.importWithoutDeps(ComponentIdList.fromArray(toImport), {\n      lane: this.otherLane,\n      cache: true,\n      includeVersionHistory: false,\n      reason,\n    });\n\n    const compStatusNotNeedMerge = componentStatusBeforeMergeAttempt.filter(\n      (c) => !c.mergeProps\n    ) as ComponentMergeStatus[];\n    const compStatusNeedMerge = componentStatusBeforeMergeAttempt.filter((c) => c.mergeProps);\n\n    const getComponentsStatusNeedMerge = async (): Promise<ComponentMergeStatus[]> => {\n      const tmp = new Tmp(this.workspace.consumer.scope);\n      try {\n        const componentsStatus = await Promise.all(\n          compStatusNeedMerge.map((compStatus) => this.getComponentMergeStatus(compStatus))\n        );\n        await tmp.clear();\n        return componentsStatus;\n      } catch (err: any) {\n        await tmp.clear();\n        throw err;\n      }\n    };\n    const results = await getComponentsStatusNeedMerge();\n\n    results.push(...compStatusNotNeedMerge);\n    return results;\n  }\n\n  private async getComponentMergeStatus(\n    componentMergeStatusBeforeMergeAttempt: ComponentMergeStatusBeforeMergeAttempt\n  ) {\n    const { id, divergeData, currentComponent, mergeProps } = componentMergeStatusBeforeMergeAttempt;\n    if (!mergeProps) throw new Error(`getDivergedMergeStatus, mergeProps is missing for ${id.toString()}`);\n    const { otherLaneHead, currentId, modelComponent } = mergeProps;\n    const repo = this.workspace.consumer.scope.objects;\n    if (!divergeData) throw new Error(`getDivergedMergeStatus, divergeData is missing for ${id.toString()}`);\n    if (!currentComponent) throw new Error(`getDivergedMergeStatus, currentComponent is missing for ${id.toString()}`);\n\n    const baseSnap = divergeData.commonSnapBeforeDiverge as Ref; // must be set when isTrueMerge\n    this.logger.debug(`merging snaps details:\nid:      ${id.toStringWithoutVersion()}\nbase:    ${baseSnap.toString()}\ncurrent: ${currentId.version}\nother:   ${otherLaneHead.toString()}`);\n    const baseComponent: Version = await modelComponent.loadVersion(baseSnap.toString(), repo);\n    const otherComponent: Version = await modelComponent.loadVersion(otherLaneHead.toString(), repo);\n\n    const currentLaneName = this.currentLane?.toLaneId().toString() || 'main';\n    const otherLaneName = this.otherLane ? this.otherLane.toLaneId().toString() : DEFAULT_LANE;\n    const currentLabel = `${currentId.version} (${currentLaneName === otherLaneName ? 'current' : currentLaneName})`;\n    const otherLabel = `${otherLaneHead.toString()} (${\n      otherLaneName === currentLaneName ? 'incoming' : otherLaneName\n    })`;\n    const workspaceIds = await this.workspace.listIds();\n    const configMerger = new ComponentConfigMerger(\n      id.toStringWithoutVersion(),\n      workspaceIds,\n      this.otherLane,\n      currentComponent.extensions,\n      baseComponent.extensions,\n      otherComponent.extensions,\n      currentLabel,\n      otherLabel,\n      this.logger\n    );\n    const configMergeResult = configMerger.merge();\n\n    const mergeResults = await threeWayMerge({\n      consumer: this.workspace.consumer,\n      otherComponent,\n      otherLabel,\n      currentComponent,\n      currentLabel,\n      baseComponent,\n    });\n    return { currentComponent, id, mergeResults, divergeData, configMergeResult };\n  }\n\n  private returnUnmerged(\n    id: ComponentID,\n    msg: string,\n    unmergedLegitimately = false\n  ): ComponentMergeStatusBeforeMergeAttempt {\n    const componentStatus: ComponentMergeStatusBeforeMergeAttempt = { id };\n    componentStatus.unchangedMessage = msg;\n    componentStatus.unchangedLegitimately = unmergedLegitimately;\n    return componentStatus;\n  }\n\n  private async getComponentStatusBeforeMergeAttempt(\n    id: ComponentID // the id.version is the version we want to merge to the current component\n  ): Promise<ComponentMergeStatusBeforeMergeAttempt> {\n    const consumer = this.workspace.consumer;\n    const componentStatus: ComponentMergeStatusBeforeMergeAttempt = { id };\n    const modelComponent = await consumer.scope.getModelComponentIfExist(id);\n    if (!modelComponent) {\n      return this.returnUnmerged(\n        id,\n        `component ${id.toString()} is on the lane/main but its objects were not found, please re-import the lane`\n      );\n    }\n    const unmerged = consumer.scope.objects.unmergedComponents.getEntry(id);\n    if (unmerged) {\n      return this.returnUnmerged(\n        id,\n        `component ${id.toStringWithoutVersion()} is in during-merge state a previous merge, please snap/tag it first (or use bit merge --resolve/--abort/ bit lane merge-abort)`\n      );\n    }\n    const repo = consumer.scope.objects;\n    const version = id.version as string;\n    const otherLaneHead = modelComponent.getRef(version);\n    const existingBitMapId = consumer.bitMap.getComponentIdIfExist(id, { ignoreVersion: true });\n    const componentOnOther: Version = await modelComponent.loadVersion(version, consumer.scope.objects);\n    const idOnCurrentLane = this.currentLane?.getComponent(id);\n\n    if (componentOnOther.isRemoved()) {\n      // if exist in current lane, we want the current lane to get the soft-remove update.\n      // or if it was removed with --update-main, we want to merge it so then main will get the update.\n      const shouldMerge = idOnCurrentLane || componentOnOther.shouldRemoveFromMain();\n      if (shouldMerge) {\n        // remove the component from the workspace if exist.\n        componentStatus.shouldBeRemoved = true;\n      } else {\n        // on main, don't merge soft-removed components unless it's marked with removeOnMain.\n        // on lane, if it's not part of the current lane, don't merge it.\n        return this.returnUnmerged(id, `component has been removed`, true);\n      }\n    }\n    const getCurrentId = () => {\n      if (existingBitMapId) return existingBitMapId;\n      if (this.currentLane) {\n        if (!idOnCurrentLane) return null;\n        return idOnCurrentLane.id.changeVersion(idOnCurrentLane.head.toString());\n      }\n      // it's on main\n      const head = modelComponent.getHeadAsTagIfExist();\n      if (head) {\n        return id.changeVersion(head);\n      }\n      return null;\n    };\n    const currentId = getCurrentId();\n    if (!currentId) {\n      const divergeData = await getDivergeData({ repo, modelComponent, targetHead: otherLaneHead, throws: false });\n      return { ...componentStatus, componentFromModel: componentOnOther, divergeData };\n    }\n    const getCurrentComponent = () => {\n      if (existingBitMapId) return consumer.loadComponent(existingBitMapId);\n      return consumer.scope.getConsumerComponent(currentId);\n    };\n    const currentComponent = await getCurrentComponent();\n    if (currentComponent.isRemoved()) {\n      // we have a few options:\n      // 1. \"other\" is main. in this case, we don't care what happens on main, we want the component to stay deleted on\n      // this lane. (even when main is ahead, we don't want to merge it).\n      // 2. other is ahead. in this case, other recovered the component. so we can continue with the merge.\n      // it is possible that it is diverged, in which case, still continue with the merge, and later on, the\n      // merge-config will show a config conflict of the remove aspect.\n      // 3. other is not ahead. in this case, just ignore this component, no point to merge it, we want it removed.\n      const divergeData = await getDivergeData({ repo, modelComponent, targetHead: otherLaneHead, throws: false });\n      const isTargetNotAhead = !divergeData.err && !divergeData.isTargetAhead();\n      const shouldIgnore = this.otherLane\n        ? isTargetNotAhead // option #2 and #3 above\n        : true; // it's main. option #1 above.\n      if (shouldIgnore) {\n        return this.returnUnmerged(id, `component has been removed`, true);\n      }\n    }\n\n    const isModified = async (): Promise<undefined | 'code' | 'config'> => {\n      const componentModificationStatus = await this.workspace.getComponentStatusById(currentComponent.id);\n      if (!componentModificationStatus.modified) return undefined;\n      if (!existingBitMapId) return undefined;\n      const baseComponent = await modelComponent.loadVersion(\n        existingBitMapId.version as string,\n        consumer.scope.objects\n      );\n      const isSourceCodeModified = await consumer.isComponentSourceCodeModified(baseComponent, currentComponent);\n      if (isSourceCodeModified) return 'code';\n      return 'config';\n    };\n\n    const modifiedType = await isModified();\n    if (modifiedType === 'config' && !this.options?.ignoreConfigChanges) {\n      return this.returnUnmerged(\n        id,\n        `component has config changes, please snap/tag it first. alternatively, use --ignore-config-changes flag to bypass`\n      );\n    }\n    if (modifiedType === 'code') {\n      return this.returnUnmerged(id, `component is modified, please snap/tag it first`);\n    }\n\n    if (!otherLaneHead) {\n      throw new Error(`merging: unable finding a hash for the version ${version} of ${id.toString()}`);\n    }\n    const divergeData = await getDivergeData({\n      repo,\n      modelComponent,\n      targetHead: otherLaneHead,\n      throws: false,\n    });\n    if (divergeData.err) {\n      if (!(divergeData.err instanceof NoCommonSnap) || !this.options?.resolveUnrelated) {\n        return this.returnUnmerged(\n          id,\n          `unable to traverse ${currentComponent.id.toString()} history. error: ${divergeData.err.message}`\n        );\n      }\n      return this.handleNoCommonSnap(\n        modelComponent,\n        id,\n        otherLaneHead,\n        currentComponent,\n        componentOnOther,\n        divergeData\n      );\n    }\n    if (!divergeData.isDiverged()) {\n      if (divergeData.isSourceAhead()) {\n        // do nothing!\n        return this.returnUnmerged(id, `component ${currentComponent.id.toString()} is ahead, nothing to merge`, true);\n      }\n      if (divergeData.isTargetAhead()) {\n        // just override with the model data\n        return {\n          ...componentStatus,\n          currentComponent,\n          componentFromModel: componentOnOther,\n          divergeData,\n        };\n      }\n      // we know that localHead and remoteHead are set, so if none of them is ahead they must be equal\n      return this.returnUnmerged(id, `component ${currentComponent.id.toString()} is already merged`, true);\n    }\n\n    // it's diverged and needs merge operation\n    const mergeProps = {\n      otherLaneHead,\n      currentId,\n      modelComponent,\n    };\n\n    return { ...componentStatus, currentComponent, mergeProps, divergeData };\n  }\n\n  private async handleNoCommonSnap(\n    modelComponent: ModelComponent,\n    id: ComponentID,\n    otherLaneHead: Ref,\n    currentComponent: ConsumerComponent,\n    componentOnOther?: Version,\n    divergeData?: SnapsDistance\n  ): Promise<ComponentMergeStatusBeforeMergeAttempt> {\n    let { resolveUnrelated } = this.options || {};\n    if (currentComponent.isRemoved()) {\n      resolveUnrelated = 'theirs';\n    }\n    if (!resolveUnrelated) throw new Error(`handleNoCommonSnap expects resolveUnrelated to be set`);\n    const consumer = this.workspace.consumer;\n    const repo = consumer.scope.objects;\n    const mainHead = modelComponent.head;\n\n    const returnAccordingToOurs = (\n      headToSaveInLane: Ref,\n      unrelatedHead: Ref,\n      unrelatedLaneId: LaneId\n    ): ComponentMergeStatusBeforeMergeAttempt => {\n      return {\n        currentComponent,\n        id,\n        divergeData,\n        resolvedUnrelated: {\n          strategy: 'ours',\n          headOnCurrentLane: headToSaveInLane,\n          unrelatedHead,\n          unrelatedLaneId,\n        },\n      };\n    };\n    const returnAccordingToTheirs = (\n      resolvedRef: Ref,\n      unrelatedHeadRef: Ref,\n      unrelatedLaneId: LaneId\n    ): ComponentMergeStatusBeforeMergeAttempt => {\n      // just override with the model data\n      return {\n        currentComponent,\n        componentFromModel: componentOnOther,\n        id,\n        divergeData,\n        resolvedUnrelated: {\n          strategy: 'theirs',\n          headOnCurrentLane: resolvedRef,\n          unrelatedHead: unrelatedHeadRef,\n          unrelatedLaneId,\n        },\n      };\n    };\n\n    const currentVersionRef = modelComponent.getRef(currentComponent.id.version as string);\n    if (!currentVersionRef)\n      throw new Error(\n        `handleNoCommonSnap, unable to get ref of current version \"${\n          currentComponent.id.version\n        }\" for \"${id.toString()}\"`\n      );\n    const otherVersionRef = modelComponent.getRef(id.version as string);\n    if (!otherVersionRef)\n      throw new Error(`handleNoCommonSnap, unable to get ref of other version \"${id.version}\" for \"${id.toString()}\"`);\n\n    if (mainHead) {\n      const hasResolvedFromMain = async (hashToCompare: Ref | null) => {\n        const divergeDataFromMain = await getDivergeData({\n          repo,\n          modelComponent,\n          sourceHead: hashToCompare,\n          targetHead: mainHead,\n          throws: false,\n        });\n        if (!divergeDataFromMain.err) return true;\n        return !(divergeDataFromMain.err instanceof NoCommonSnap);\n      };\n      const hasResolvedLocally = await hasResolvedFromMain(modelComponent.getHeadRegardlessOfLane() as Ref);\n      const hasResolvedRemotely = await hasResolvedFromMain(otherLaneHead);\n      if (!hasResolvedLocally && !hasResolvedRemotely) {\n        return this.returnUnmerged(\n          id,\n          `unable to traverse ${currentComponent.id.toString()} history. the main-head ${mainHead.toString()} doesn't appear in both lanes.\nit was probably created in each lane separately and it also exists on main. please merge main first to one of these lanes`\n        );\n      }\n      const refToSaveInLane = hasResolvedLocally ? currentVersionRef : otherVersionRef;\n      const unrelatedHeadRef = hasResolvedLocally ? otherVersionRef : currentVersionRef;\n      if (resolveUnrelated === 'ours') {\n        return returnAccordingToOurs(refToSaveInLane, unrelatedHeadRef, this.currentLane?.toLaneId() as LaneId);\n      }\n      if (resolveUnrelated === 'theirs') {\n        return returnAccordingToTheirs(refToSaveInLane, unrelatedHeadRef, this.currentLane?.toLaneId() as LaneId);\n      }\n      throw new Error(\n        `unsupported strategy \"${resolveUnrelated}\" of resolve-unrelated. supported strategies are: [ours, theirs]`\n      );\n    }\n\n    const refToSaveInLane = resolveUnrelated === 'ours' ? currentVersionRef : otherVersionRef;\n    const unrelatedHeadRef = resolveUnrelated === 'ours' ? otherVersionRef : currentVersionRef;\n    if (resolveUnrelated === 'ours') {\n      return returnAccordingToOurs(refToSaveInLane, unrelatedHeadRef, this.otherLane?.toLaneId() as LaneId);\n    }\n    if (resolveUnrelated === 'theirs') {\n      return returnAccordingToTheirs(refToSaveInLane, unrelatedHeadRef, this.currentLane?.toLaneId() as LaneId);\n    }\n    throw new Error(\n      `unsupported strategy \"${resolveUnrelated}\" of resolve-unrelated. supported strategies are: [ours, theirs]`\n    );\n  }\n}\n"],"mappings":";;;;;;AAEA,SAAAA,YAAA;EAAA,MAAAC,IAAA,GAAAC,sBAAA,CAAAC,OAAA;EAAAH,WAAA,YAAAA,CAAA;IAAA,OAAAC,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAG,aAAA;EAAA,MAAAH,IAAA,GAAAE,OAAA;EAAAC,YAAA,YAAAA,CAAA;IAAA,OAAAH,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAI,QAAA;EAAA,MAAAJ,IAAA,GAAAE,OAAA;EAAAE,OAAA,YAAAA,CAAA;IAAA,OAAAJ,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAK,gBAAA;EAAA,MAAAL,IAAA,GAAAE,OAAA;EAAAG,eAAA,YAAAA,CAAA;IAAA,OAAAL,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAGA,SAAAM,cAAA;EAAA,MAAAN,IAAA,GAAAE,OAAA;EAAAI,aAAA,YAAAA,CAAA;IAAA,OAAAN,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAIA,SAAAO,QAAA;EAAA,MAAAP,IAAA,GAAAE,OAAA;EAAAK,OAAA,YAAAA,CAAA;IAAA,OAAAP,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAQ,eAAA;EAAA,MAAAR,IAAA,GAAAC,sBAAA,CAAAC,OAAA;EAAAM,cAAA,YAAAA,CAAA;IAAA,OAAAR,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAEA,SAAAS,cAAA;EAAA,MAAAT,IAAA,GAAAE,OAAA;EAAAO,aAAA,YAAAA,CAAA;IAAA,OAAAT,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAU,cAAA;EAAA,MAAAV,IAAA,GAAAE,OAAA;EAAAQ,aAAA,YAAAA,CAAA;IAAA,OAAAV,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAA+D,SAAAC,uBAAAU,GAAA,WAAAA,GAAA,IAAAA,GAAA,CAAAC,UAAA,GAAAD,GAAA,KAAAE,OAAA,EAAAF,GAAA;AAAA,SAAAG,QAAAC,CAAA,EAAAC,CAAA,QAAAC,CAAA,GAAAC,MAAA,CAAAC,IAAA,CAAAJ,CAAA,OAAAG,MAAA,CAAAE,qBAAA,QAAAC,CAAA,GAAAH,MAAA,CAAAE,qBAAA,CAAAL,CAAA,GAAAC,CAAA,KAAAK,CAAA,GAAAA,CAAA,CAAAC,MAAA,WAAAN,CAAA,WAAAE,MAAA,CAAAK,wBAAA,CAAAR,CAAA,EAAAC,CAAA,EAAAQ,UAAA,OAAAP,CAAA,CAAAQ,IAAA,CAAAC,KAAA,CAAAT,CAAA,EAAAI,CAAA,YAAAJ,CAAA;AAAA,SAAAU,cAAAZ,CAAA,aAAAC,CAAA,MAAAA,CAAA,GAAAY,SAAA,CAAAC,MAAA,EAAAb,CAAA,UAAAC,CAAA,WAAAW,SAAA,CAAAZ,CAAA,IAAAY,SAAA,CAAAZ,CAAA,QAAAA,CAAA,OAAAF,OAAA,CAAAI,MAAA,CAAAD,CAAA,OAAAa,OAAA,WAAAd,CAAA,IAAAe,eAAA,CAAAhB,CAAA,EAAAC,CAAA,EAAAC,CAAA,CAAAD,CAAA,SAAAE,MAAA,CAAAc,yBAAA,GAAAd,MAAA,CAAAe,gBAAA,CAAAlB,CAAA,EAAAG,MAAA,CAAAc,yBAAA,CAAAf,CAAA,KAAAH,OAAA,CAAAI,MAAA,CAAAD,CAAA,GAAAa,OAAA,WAAAd,CAAA,IAAAE,MAAA,CAAAgB,cAAA,CAAAnB,CAAA,EAAAC,CAAA,EAAAE,MAAA,CAAAK,wBAAA,CAAAN,CAAA,EAAAD,CAAA,iBAAAD,CAAA;AAAA,SAAAgB,gBAAApB,GAAA,EAAAwB,GAAA,EAAAC,KAAA,IAAAD,GAAA,GAAAE,cAAA,CAAAF,GAAA,OAAAA,GAAA,IAAAxB,GAAA,IAAAO,MAAA,CAAAgB,cAAA,CAAAvB,GAAA,EAAAwB,GAAA,IAAAC,KAAA,EAAAA,KAAA,EAAAZ,UAAA,QAAAc,YAAA,QAAAC,QAAA,oBAAA5B,GAAA,CAAAwB,GAAA,IAAAC,KAAA,WAAAzB,GAAA;AAAA,SAAA0B,eAAApB,CAAA,QAAAuB,CAAA,GAAAC,YAAA,CAAAxB,CAAA,uCAAAuB,CAAA,GAAAA,CAAA,GAAAE,MAAA,CAAAF,CAAA;AAAA,SAAAC,aAAAxB,CAAA,EAAAD,CAAA,2BAAAC,CAAA,KAAAA,CAAA,SAAAA,CAAA,MAAAF,CAAA,GAAAE,CAAA,CAAA0B,MAAA,CAAAC,WAAA,kBAAA7B,CAAA,QAAAyB,CAAA,GAAAzB,CAAA,CAAA8B,IAAA,CAAA5B,CAAA,EAAAD,CAAA,uCAAAwB,CAAA,SAAAA,CAAA,YAAAM,SAAA,yEAAA9B,CAAA,GAAA0B,MAAA,GAAAK,MAAA,EAAA9B,CAAA;AASxD,MAAM+B,mBAAmB,CAAC;EAC/BC,WAAWA,CACDC,SAAoB,EACpBC,MAAc,EACdC,QAAsB,EACtBC,WAAkB;EAAE;EACpBC,SAAgB;EAAE;EAClBC,OAAoC,EAC5C;IAAA,KANQL,SAAoB,GAApBA,SAAoB;IAAA,KACpBC,MAAc,GAAdA,MAAc;IAAA,KACdC,QAAsB,GAAtBA,QAAsB;IAAA,KACtBC,WAAkB,GAAlBA,WAAkB;IAAA,KAClBC,SAAgB,GAAhBA,SAAgB;IAAA,KAChBC,OAAoC,GAApCA,OAAoC;EAC3C;EAEH,MAAMC,SAASA,CACbC,MAAqB,EACY;IACjC,IAAI,CAAC,IAAI,CAACJ,WAAW,IAAI,IAAI,CAACC,SAAS,EAAE;MACvC,MAAM,IAAI,CAACF,QAAQ,CAACM,4BAA4B,CAAC,IAAI,CAACJ,SAAS,CAACK,QAAQ,CAAC,CAAC,CAACC,eAAe,CAAC,CAAC,CAAC;IAC/F;IACA,MAAMC,iCAAiC,GAAG,MAAM,IAAAC,qBAAS,EAACL,MAAM,EAAGM,EAAE,IACnE,IAAI,CAACC,oCAAoC,CAACD,EAAE,CAC9C,CAAC;IACD;IACA;IACA,MAAME,8BAA8B,GAClC,CAAC,IAAI,CAACV,OAAO,EAAEW,YAAY;IAAI;IAC9B,CAAC,IAAI,CAACb,WAAW;IAAI;IACpB,IAAI,CAACA,WAAW,CAACc,KAAK,KAAK,IAAI,CAACb,SAAS,EAAEa,KAAK,CAAC,CAAC,CAAC;IACvD,MAAMC,QAAQ,GAAGP,iCAAiC,CAC/CQ,GAAG,CAAEC,UAAU,IAAK;MACnB,IAAI,CAACA,UAAU,CAACC,WAAW,EAAE,OAAO,EAAE;MACtC,MAAMC,gBAAgB,GAAG,CAACF,UAAU,CAACC,WAAW,CAACE,uBAAuB,CAAC;MACzE,IAAIR,8BAA8B,EAAE;QAClCO,gBAAgB,CAAC/C,IAAI,CAAC,GAAG6C,UAAU,CAACC,WAAW,CAACG,iBAAiB,CAAC;MACpE;MACA,OAAO,IAAAC,iBAAO,EAACH,gBAAgB,CAAC,CAACH,GAAG,CAAEO,CAAC,IAAKN,UAAU,CAACP,EAAE,CAACc,aAAa,CAACD,CAAC,CAACE,QAAQ,CAAC,CAAC,CAAC,CAAC;IACxF,CAAC,CAAC,CACDC,IAAI,CAAC,CAAC;IACT,MAAMC,MAAM,GAAGf,8BAA8B,GACxC,+DAA8D,IAAI,CAACX,SAAS,EAAES,EAAE,CAAC,CAAC,IAAI,MAAO,EAAC,GAC9F,uCAAsC,IAAI,CAACV,WAAW,EAAEU,EAAE,CAAC,CAAC,IAAI,MAAO,QAAO,IAAI,CAACT,SAAS,EAAES,EAAE,CAAC,CAAC,IAAI,MAAO,EAAC;IACnH,MAAM,IAAI,CAACb,SAAS,CAAC+B,QAAQ,CAACd,KAAK,CAACe,aAAa,CAACC,iBAAiB,CAACC,8BAAe,CAACC,SAAS,CAACjB,QAAQ,CAAC,EAAE;MACvGkB,IAAI,EAAE,IAAI,CAAChC,SAAS;MACpBiC,KAAK,EAAE,IAAI;MACXC,qBAAqB,EAAE,KAAK;MAC5BR;IACF,CAAC,CAAC;IAEF,MAAMS,sBAAsB,GAAG5B,iCAAiC,CAACvC,MAAM,CACpEoE,CAAC,IAAK,CAACA,CAAC,CAACC,UACZ,CAA2B;IAC3B,MAAMC,mBAAmB,GAAG/B,iCAAiC,CAACvC,MAAM,CAAEoE,CAAC,IAAKA,CAAC,CAACC,UAAU,CAAC;IAEzF,MAAME,4BAA4B,GAAG,MAAAA,CAAA,KAA6C;MAChF,MAAMC,GAAG,GAAG,KAAIC,mBAAG,EAAC,IAAI,CAAC7C,SAAS,CAAC+B,QAAQ,CAACd,KAAK,CAAC;MAClD,IAAI;QACF,MAAM6B,gBAAgB,GAAG,MAAMC,OAAO,CAACC,GAAG,CACxCN,mBAAmB,CAACvB,GAAG,CAAEC,UAAU,IAAK,IAAI,CAAC6B,uBAAuB,CAAC7B,UAAU,CAAC,CAClF,CAAC;QACD,MAAMwB,GAAG,CAACM,KAAK,CAAC,CAAC;QACjB,OAAOJ,gBAAgB;MACzB,CAAC,CAAC,OAAOK,GAAQ,EAAE;QACjB,MAAMP,GAAG,CAACM,KAAK,CAAC,CAAC;QACjB,MAAMC,GAAG;MACX;IACF,CAAC;IACD,MAAMC,OAAO,GAAG,MAAMT,4BAA4B,CAAC,CAAC;IAEpDS,OAAO,CAAC7E,IAAI,CAAC,GAAGgE,sBAAsB,CAAC;IACvC,OAAOa,OAAO;EAChB;EAEA,MAAcH,uBAAuBA,CACnCI,sCAA8E,EAC9E;IACA,MAAM;MAAExC,EAAE;MAAEQ,WAAW;MAAEiC,gBAAgB;MAAEb;IAAW,CAAC,GAAGY,sCAAsC;IAChG,IAAI,CAACZ,UAAU,EAAE,MAAM,IAAIc,KAAK,CAAE,qDAAoD1C,EAAE,CAACe,QAAQ,CAAC,CAAE,EAAC,CAAC;IACtG,MAAM;MAAE4B,aAAa;MAAEC,SAAS;MAAEC;IAAe,CAAC,GAAGjB,UAAU;IAC/D,MAAMkB,IAAI,GAAG,IAAI,CAAC3D,SAAS,CAAC+B,QAAQ,CAACd,KAAK,CAAC2C,OAAO;IAClD,IAAI,CAACvC,WAAW,EAAE,MAAM,IAAIkC,KAAK,CAAE,sDAAqD1C,EAAE,CAACe,QAAQ,CAAC,CAAE,EAAC,CAAC;IACxG,IAAI,CAAC0B,gBAAgB,EAAE,MAAM,IAAIC,KAAK,CAAE,2DAA0D1C,EAAE,CAACe,QAAQ,CAAC,CAAE,EAAC,CAAC;IAElH,MAAMiC,QAAQ,GAAGxC,WAAW,CAACE,uBAA8B,CAAC,CAAC;IAC7D,IAAI,CAACtB,MAAM,CAAC6D,KAAK,CAAE;AACvB,WAAWjD,EAAE,CAACkD,sBAAsB,CAAC,CAAE;AACvC,WAAWF,QAAQ,CAACjC,QAAQ,CAAC,CAAE;AAC/B,WAAW6B,SAAS,CAACO,OAAQ;AAC7B,WAAWR,aAAa,CAAC5B,QAAQ,CAAC,CAAE,EAAC,CAAC;IAClC,MAAMqC,aAAsB,GAAG,MAAMP,cAAc,CAACQ,WAAW,CAACL,QAAQ,CAACjC,QAAQ,CAAC,CAAC,EAAE+B,IAAI,CAAC;IAC1F,MAAMQ,cAAuB,GAAG,MAAMT,cAAc,CAACQ,WAAW,CAACV,aAAa,CAAC5B,QAAQ,CAAC,CAAC,EAAE+B,IAAI,CAAC;IAEhG,MAAMS,eAAe,GAAG,IAAI,CAACjE,WAAW,EAAEkE,QAAQ,CAAC,CAAC,CAACzC,QAAQ,CAAC,CAAC,IAAI,MAAM;IACzE,MAAM0C,aAAa,GAAG,IAAI,CAAClE,SAAS,GAAG,IAAI,CAACA,SAAS,CAACiE,QAAQ,CAAC,CAAC,CAACzC,QAAQ,CAAC,CAAC,GAAG2C,sBAAY;IAC1F,MAAMC,YAAY,GAAI,GAAEf,SAAS,CAACO,OAAQ,KAAII,eAAe,KAAKE,aAAa,GAAG,SAAS,GAAGF,eAAgB,GAAE;IAChH,MAAMK,UAAU,GAAI,GAAEjB,aAAa,CAAC5B,QAAQ,CAAC,CAAE,KAC7C0C,aAAa,KAAKF,eAAe,GAAG,UAAU,GAAGE,aAClD,GAAE;IACH,MAAMI,YAAY,GAAG,MAAM,IAAI,CAAC1E,SAAS,CAAC2E,OAAO,CAAC,CAAC;IACnD,MAAMC,YAAY,GAAG,KAAIC,qCAAqB,EAC5ChE,EAAE,CAACkD,sBAAsB,CAAC,CAAC,EAC3BW,YAAY,EACZ,IAAI,CAACtE,SAAS,EACdkD,gBAAgB,CAACwB,UAAU,EAC3Bb,aAAa,CAACa,UAAU,EACxBX,cAAc,CAACW,UAAU,EACzBN,YAAY,EACZC,UAAU,EACV,IAAI,CAACxE,MACP,CAAC;IACD,MAAM8E,iBAAiB,GAAGH,YAAY,CAACI,KAAK,CAAC,CAAC;IAE9C,MAAMC,YAAY,GAAG,MAAM,IAAAC,wBAAa,EAAC;MACvCnD,QAAQ,EAAE,IAAI,CAAC/B,SAAS,CAAC+B,QAAQ;MACjCoC,cAAc;MACdM,UAAU;MACVnB,gBAAgB;MAChBkB,YAAY;MACZP;IACF,CAAC,CAAC;IACF,OAAO;MAAEX,gBAAgB;MAAEzC,EAAE;MAAEoE,YAAY;MAAE5D,WAAW;MAAE0D;IAAkB,CAAC;EAC/E;EAEQI,cAAcA,CACpBtE,EAAe,EACfuE,GAAW,EACXC,oBAAoB,GAAG,KAAK,EACY;IACxC,MAAMC,eAAuD,GAAG;MAAEzE;IAAG,CAAC;IACtEyE,eAAe,CAACC,gBAAgB,GAAGH,GAAG;IACtCE,eAAe,CAACE,qBAAqB,GAAGH,oBAAoB;IAC5D,OAAOC,eAAe;EACxB;EAEA,MAAcxE,oCAAoCA,CAChDD,EAAe,EACkC;IACjD,MAAMkB,QAAQ,GAAG,IAAI,CAAC/B,SAAS,CAAC+B,QAAQ;IACxC,MAAMuD,eAAuD,GAAG;MAAEzE;IAAG,CAAC;IACtE,MAAM6C,cAAc,GAAG,MAAM3B,QAAQ,CAACd,KAAK,CAACwE,wBAAwB,CAAC5E,EAAE,CAAC;IACxE,IAAI,CAAC6C,cAAc,EAAE;MACnB,OAAO,IAAI,CAACyB,cAAc,CACxBtE,EAAE,EACD,aAAYA,EAAE,CAACe,QAAQ,CAAC,CAAE,gFAC7B,CAAC;IACH;IACA,MAAM8D,QAAQ,GAAG3D,QAAQ,CAACd,KAAK,CAAC2C,OAAO,CAAC+B,kBAAkB,CAACC,QAAQ,CAAC/E,EAAE,CAAC;IACvE,IAAI6E,QAAQ,EAAE;MACZ,OAAO,IAAI,CAACP,cAAc,CACxBtE,EAAE,EACD,aAAYA,EAAE,CAACkD,sBAAsB,CAAC,CAAE,iIAC3C,CAAC;IACH;IACA,MAAMJ,IAAI,GAAG5B,QAAQ,CAACd,KAAK,CAAC2C,OAAO;IACnC,MAAMI,OAAO,GAAGnD,EAAE,CAACmD,OAAiB;IACpC,MAAMR,aAAa,GAAGE,cAAc,CAACmC,MAAM,CAAC7B,OAAO,CAAC;IACpD,MAAM8B,gBAAgB,GAAG/D,QAAQ,CAACgE,MAAM,CAACC,qBAAqB,CAACnF,EAAE,EAAE;MAAEoF,aAAa,EAAE;IAAK,CAAC,CAAC;IAC3F,MAAMC,gBAAyB,GAAG,MAAMxC,cAAc,CAACQ,WAAW,CAACF,OAAO,EAAEjC,QAAQ,CAACd,KAAK,CAAC2C,OAAO,CAAC;IACnG,MAAMuC,eAAe,GAAG,IAAI,CAAChG,WAAW,EAAEiG,YAAY,CAACvF,EAAE,CAAC;IAE1D,IAAIqF,gBAAgB,CAACG,SAAS,CAAC,CAAC,EAAE;MAChC;MACA;MACA,MAAMC,WAAW,GAAGH,eAAe,IAAID,gBAAgB,CAACK,oBAAoB,CAAC,CAAC;MAC9E,IAAID,WAAW,EAAE;QACf;QACAhB,eAAe,CAACkB,eAAe,GAAG,IAAI;MACxC,CAAC,MAAM;QACL;QACA;QACA,OAAO,IAAI,CAACrB,cAAc,CAACtE,EAAE,EAAG,4BAA2B,EAAE,IAAI,CAAC;MACpE;IACF;IACA,MAAM4F,YAAY,GAAGA,CAAA,KAAM;MACzB,IAAIX,gBAAgB,EAAE,OAAOA,gBAAgB;MAC7C,IAAI,IAAI,CAAC3F,WAAW,EAAE;QACpB,IAAI,CAACgG,eAAe,EAAE,OAAO,IAAI;QACjC,OAAOA,eAAe,CAACtF,EAAE,CAACc,aAAa,CAACwE,eAAe,CAACO,IAAI,CAAC9E,QAAQ,CAAC,CAAC,CAAC;MAC1E;MACA;MACA,MAAM8E,IAAI,GAAGhD,cAAc,CAACiD,mBAAmB,CAAC,CAAC;MACjD,IAAID,IAAI,EAAE;QACR,OAAO7F,EAAE,CAACc,aAAa,CAAC+E,IAAI,CAAC;MAC/B;MACA,OAAO,IAAI;IACb,CAAC;IACD,MAAMjD,SAAS,GAAGgD,YAAY,CAAC,CAAC;IAChC,IAAI,CAAChD,SAAS,EAAE;MACd,MAAMpC,WAAW,GAAG,MAAM,IAAAuF,gCAAc,EAAC;QAAEjD,IAAI;QAAED,cAAc;QAAEmD,UAAU,EAAErD,aAAa;QAAEsD,MAAM,EAAE;MAAM,CAAC,CAAC;MAC5G,OAAArI,aAAA,CAAAA,aAAA,KAAY6G,eAAe;QAAEyB,kBAAkB,EAAEb,gBAAgB;QAAE7E;MAAW;IAChF;IACA,MAAM2F,mBAAmB,GAAGA,CAAA,KAAM;MAChC,IAAIlB,gBAAgB,EAAE,OAAO/D,QAAQ,CAACkF,aAAa,CAACnB,gBAAgB,CAAC;MACrE,OAAO/D,QAAQ,CAACd,KAAK,CAACiG,oBAAoB,CAACzD,SAAS,CAAC;IACvD,CAAC;IACD,MAAMH,gBAAgB,GAAG,MAAM0D,mBAAmB,CAAC,CAAC;IACpD,IAAI1D,gBAAgB,CAAC+C,SAAS,CAAC,CAAC,EAAE;MAChC;MACA;MACA;MACA;MACA;MACA;MACA;MACA,MAAMhF,WAAW,GAAG,MAAM,IAAAuF,gCAAc,EAAC;QAAEjD,IAAI;QAAED,cAAc;QAAEmD,UAAU,EAAErD,aAAa;QAAEsD,MAAM,EAAE;MAAM,CAAC,CAAC;MAC5G,MAAMK,gBAAgB,GAAG,CAAC9F,WAAW,CAAC8B,GAAG,IAAI,CAAC9B,WAAW,CAAC+F,aAAa,CAAC,CAAC;MACzE,MAAMC,YAAY,GAAG,IAAI,CAACjH,SAAS,GAC/B+G,gBAAgB,CAAC;MAAA,EACjB,IAAI,CAAC,CAAC;MACV,IAAIE,YAAY,EAAE;QAChB,OAAO,IAAI,CAAClC,cAAc,CAACtE,EAAE,EAAG,4BAA2B,EAAE,IAAI,CAAC;MACpE;IACF;IAEA,MAAMyG,UAAU,GAAG,MAAAA,CAAA,KAAoD;MACrE,MAAMC,2BAA2B,GAAG,MAAM,IAAI,CAACvH,SAAS,CAACwH,sBAAsB,CAAClE,gBAAgB,CAACzC,EAAE,CAAC;MACpG,IAAI,CAAC0G,2BAA2B,CAACE,QAAQ,EAAE,OAAOC,SAAS;MAC3D,IAAI,CAAC5B,gBAAgB,EAAE,OAAO4B,SAAS;MACvC,MAAMzD,aAAa,GAAG,MAAMP,cAAc,CAACQ,WAAW,CACpD4B,gBAAgB,CAAC9B,OAAO,EACxBjC,QAAQ,CAACd,KAAK,CAAC2C,OACjB,CAAC;MACD,MAAM+D,oBAAoB,GAAG,MAAM5F,QAAQ,CAAC6F,6BAA6B,CAAC3D,aAAa,EAAEX,gBAAgB,CAAC;MAC1G,IAAIqE,oBAAoB,EAAE,OAAO,MAAM;MACvC,OAAO,QAAQ;IACjB,CAAC;IAED,MAAME,YAAY,GAAG,MAAMP,UAAU,CAAC,CAAC;IACvC,IAAIO,YAAY,KAAK,QAAQ,IAAI,CAAC,IAAI,CAACxH,OAAO,EAAEyH,mBAAmB,EAAE;MACnE,OAAO,IAAI,CAAC3C,cAAc,CACxBtE,EAAE,EACD,mHACH,CAAC;IACH;IACA,IAAIgH,YAAY,KAAK,MAAM,EAAE;MAC3B,OAAO,IAAI,CAAC1C,cAAc,CAACtE,EAAE,EAAG,iDAAgD,CAAC;IACnF;IAEA,IAAI,CAAC2C,aAAa,EAAE;MAClB,MAAM,IAAID,KAAK,CAAE,kDAAiDS,OAAQ,OAAMnD,EAAE,CAACe,QAAQ,CAAC,CAAE,EAAC,CAAC;IAClG;IACA,MAAMP,WAAW,GAAG,MAAM,IAAAuF,gCAAc,EAAC;MACvCjD,IAAI;MACJD,cAAc;MACdmD,UAAU,EAAErD,aAAa;MACzBsD,MAAM,EAAE;IACV,CAAC,CAAC;IACF,IAAIzF,WAAW,CAAC8B,GAAG,EAAE;MACnB,IAAI,EAAE9B,WAAW,CAAC8B,GAAG,YAAY4E,4BAAY,CAAC,IAAI,CAAC,IAAI,CAAC1H,OAAO,EAAE2H,gBAAgB,EAAE;QACjF,OAAO,IAAI,CAAC7C,cAAc,CACxBtE,EAAE,EACD,sBAAqByC,gBAAgB,CAACzC,EAAE,CAACe,QAAQ,CAAC,CAAE,oBAAmBP,WAAW,CAAC8B,GAAG,CAAC8E,OAAQ,EAClG,CAAC;MACH;MACA,OAAO,IAAI,CAACC,kBAAkB,CAC5BxE,cAAc,EACd7C,EAAE,EACF2C,aAAa,EACbF,gBAAgB,EAChB4C,gBAAgB,EAChB7E,WACF,CAAC;IACH;IACA,IAAI,CAACA,WAAW,CAAC8G,UAAU,CAAC,CAAC,EAAE;MAC7B,IAAI9G,WAAW,CAAC+G,aAAa,CAAC,CAAC,EAAE;QAC/B;QACA,OAAO,IAAI,CAACjD,cAAc,CAACtE,EAAE,EAAG,aAAYyC,gBAAgB,CAACzC,EAAE,CAACe,QAAQ,CAAC,CAAE,6BAA4B,EAAE,IAAI,CAAC;MAChH;MACA,IAAIP,WAAW,CAAC+F,aAAa,CAAC,CAAC,EAAE;QAC/B;QACA,OAAA3I,aAAA,CAAAA,aAAA,KACK6G,eAAe;UAClBhC,gBAAgB;UAChByD,kBAAkB,EAAEb,gBAAgB;UACpC7E;QAAW;MAEf;MACA;MACA,OAAO,IAAI,CAAC8D,cAAc,CAACtE,EAAE,EAAG,aAAYyC,gBAAgB,CAACzC,EAAE,CAACe,QAAQ,CAAC,CAAE,oBAAmB,EAAE,IAAI,CAAC;IACvG;;IAEA;IACA,MAAMa,UAAU,GAAG;MACjBe,aAAa;MACbC,SAAS;MACTC;IACF,CAAC;IAED,OAAAjF,aAAA,CAAAA,aAAA,KAAY6G,eAAe;MAAEhC,gBAAgB;MAAEb,UAAU;MAAEpB;IAAW;EACxE;EAEA,MAAc6G,kBAAkBA,CAC9BxE,cAA8B,EAC9B7C,EAAe,EACf2C,aAAkB,EAClBF,gBAAmC,EACnC4C,gBAA0B,EAC1B7E,WAA2B,EACsB;IACjD,IAAI;MAAE2G;IAAiB,CAAC,GAAG,IAAI,CAAC3H,OAAO,IAAI,CAAC,CAAC;IAC7C,IAAIiD,gBAAgB,CAAC+C,SAAS,CAAC,CAAC,EAAE;MAChC2B,gBAAgB,GAAG,QAAQ;IAC7B;IACA,IAAI,CAACA,gBAAgB,EAAE,MAAM,IAAIzE,KAAK,CAAE,uDAAsD,CAAC;IAC/F,MAAMxB,QAAQ,GAAG,IAAI,CAAC/B,SAAS,CAAC+B,QAAQ;IACxC,MAAM4B,IAAI,GAAG5B,QAAQ,CAACd,KAAK,CAAC2C,OAAO;IACnC,MAAMyE,QAAQ,GAAG3E,cAAc,CAACgD,IAAI;IAEpC,MAAM4B,qBAAqB,GAAGA,CAC5BC,gBAAqB,EACrBC,aAAkB,EAClBC,eAAuB,KACoB;MAC3C,OAAO;QACLnF,gBAAgB;QAChBzC,EAAE;QACFQ,WAAW;QACXqH,iBAAiB,EAAE;UACjBC,QAAQ,EAAE,MAAM;UAChBC,iBAAiB,EAAEL,gBAAgB;UACnCC,aAAa;UACbC;QACF;MACF,CAAC;IACH,CAAC;IACD,MAAMI,uBAAuB,GAAGA,CAC9BC,WAAgB,EAChBC,gBAAqB,EACrBN,eAAuB,KACoB;MAC3C;MACA,OAAO;QACLnF,gBAAgB;QAChByD,kBAAkB,EAAEb,gBAAgB;QACpCrF,EAAE;QACFQ,WAAW;QACXqH,iBAAiB,EAAE;UACjBC,QAAQ,EAAE,QAAQ;UAClBC,iBAAiB,EAAEE,WAAW;UAC9BN,aAAa,EAAEO,gBAAgB;UAC/BN;QACF;MACF,CAAC;IACH,CAAC;IAED,MAAMO,iBAAiB,GAAGtF,cAAc,CAACmC,MAAM,CAACvC,gBAAgB,CAACzC,EAAE,CAACmD,OAAiB,CAAC;IACtF,IAAI,CAACgF,iBAAiB,EACpB,MAAM,IAAIzF,KAAK,CACZ,6DACCD,gBAAgB,CAACzC,EAAE,CAACmD,OACrB,UAASnD,EAAE,CAACe,QAAQ,CAAC,CAAE,GAC1B,CAAC;IACH,MAAMqH,eAAe,GAAGvF,cAAc,CAACmC,MAAM,CAAChF,EAAE,CAACmD,OAAiB,CAAC;IACnE,IAAI,CAACiF,eAAe,EAClB,MAAM,IAAI1F,KAAK,CAAE,2DAA0D1C,EAAE,CAACmD,OAAQ,UAASnD,EAAE,CAACe,QAAQ,CAAC,CAAE,GAAE,CAAC;IAElH,IAAIyG,QAAQ,EAAE;MACZ,MAAMa,mBAAmB,GAAG,MAAOC,aAAyB,IAAK;QAC/D,MAAMC,mBAAmB,GAAG,MAAM,IAAAxC,gCAAc,EAAC;UAC/CjD,IAAI;UACJD,cAAc;UACd2F,UAAU,EAAEF,aAAa;UACzBtC,UAAU,EAAEwB,QAAQ;UACpBvB,MAAM,EAAE;QACV,CAAC,CAAC;QACF,IAAI,CAACsC,mBAAmB,CAACjG,GAAG,EAAE,OAAO,IAAI;QACzC,OAAO,EAAEiG,mBAAmB,CAACjG,GAAG,YAAY4E,4BAAY,CAAC;MAC3D,CAAC;MACD,MAAMuB,kBAAkB,GAAG,MAAMJ,mBAAmB,CAACxF,cAAc,CAAC6F,uBAAuB,CAAC,CAAQ,CAAC;MACrG,MAAMC,mBAAmB,GAAG,MAAMN,mBAAmB,CAAC1F,aAAa,CAAC;MACpE,IAAI,CAAC8F,kBAAkB,IAAI,CAACE,mBAAmB,EAAE;QAC/C,OAAO,IAAI,CAACrE,cAAc,CACxBtE,EAAE,EACD,sBAAqByC,gBAAgB,CAACzC,EAAE,CAACe,QAAQ,CAAC,CAAE,2BAA0ByG,QAAQ,CAACzG,QAAQ,CAAC,CAAE;AAC7G,0HACQ,CAAC;MACH;MACA,MAAM6H,eAAe,GAAGH,kBAAkB,GAAGN,iBAAiB,GAAGC,eAAe;MAChF,MAAMF,gBAAgB,GAAGO,kBAAkB,GAAGL,eAAe,GAAGD,iBAAiB;MACjF,IAAIhB,gBAAgB,KAAK,MAAM,EAAE;QAC/B,OAAOM,qBAAqB,CAACmB,eAAe,EAAEV,gBAAgB,EAAE,IAAI,CAAC5I,WAAW,EAAEkE,QAAQ,CAAC,CAAW,CAAC;MACzG;MACA,IAAI2D,gBAAgB,KAAK,QAAQ,EAAE;QACjC,OAAOa,uBAAuB,CAACY,eAAe,EAAEV,gBAAgB,EAAE,IAAI,CAAC5I,WAAW,EAAEkE,QAAQ,CAAC,CAAW,CAAC;MAC3G;MACA,MAAM,IAAId,KAAK,CACZ,yBAAwByE,gBAAiB,kEAC5C,CAAC;IACH;IAEA,MAAMyB,eAAe,GAAGzB,gBAAgB,KAAK,MAAM,GAAGgB,iBAAiB,GAAGC,eAAe;IACzF,MAAMF,gBAAgB,GAAGf,gBAAgB,KAAK,MAAM,GAAGiB,eAAe,GAAGD,iBAAiB;IAC1F,IAAIhB,gBAAgB,KAAK,MAAM,EAAE;MAC/B,OAAOM,qBAAqB,CAACmB,eAAe,EAAEV,gBAAgB,EAAE,IAAI,CAAC3I,SAAS,EAAEiE,QAAQ,CAAC,CAAW,CAAC;IACvG;IACA,IAAI2D,gBAAgB,KAAK,QAAQ,EAAE;MACjC,OAAOa,uBAAuB,CAACY,eAAe,EAAEV,gBAAgB,EAAE,IAAI,CAAC5I,WAAW,EAAEkE,QAAQ,CAAC,CAAW,CAAC;IAC3G;IACA,MAAM,IAAId,KAAK,CACZ,yBAAwByE,gBAAiB,kEAC5C,CAAC;EACH;AACF;AAAC0B,OAAA,CAAA5J,mBAAA,GAAAA,mBAAA"}

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

@@ -16,11 +16,10 @@ import { ImporterMain } from '@teambit/importer';
 import { Logger, LoggerMain } from '@teambit/logger';
 import { GlobalConfigMain } from '@teambit/global-config';
 import { MergeResultsThreeWay } from '@teambit/legacy/dist/consumer/versions-ops/merge-version/three-way-merge';
-import { WorkspacePolicyConfigKeysNames } from '@teambit/dependency-resolver';
 import { CheckoutMain, ComponentStatusBase } from '@teambit/checkout';
+import { ConfigMergerMain, ConfigMergeResult, WorkspaceDepsUpdates, WorkspaceDepsConflicts } from '@teambit/config-merger';
 import { SnapsDistance } from '@teambit/legacy/dist/scope/component-ops/snaps-distance';
 import { InstallMain } from '@teambit/install';
-import { ConfigMergeResult } from './config-merge-result';
 import { MergeStatusProviderOptions } from './merge-status-provider';
 type ResolveUnrelatedData = {
     strategy: MergeStrategy;
@@ -28,13 +27,6 @@ type ResolveUnrelatedData = {
     unrelatedHead: Ref;
     unrelatedLaneId: LaneId;
 };
-export type WorkspaceDepsUpdates = {
-    [pkgName: string]: [string, string];
-};
-export type WorkspaceDepsConflicts = Record<WorkspacePolicyConfigKeysNames, Array<{
-    name: string;
-    version: string;
-}>>;
 export type ComponentMergeStatus = ComponentStatusBase & {
     mergeResults?: MergeResultsThreeWay | null;
     divergeData?: SnapsDistance;
@@ -96,7 +88,8 @@ export declare class MergingMain {
     private importer;
     private config;
     private remove;
-    constructor(workspace: Workspace, install: InstallMain, snapping: SnappingMain, checkout: CheckoutMain, logger: Logger, componentWriter: ComponentWriterMain, importer: ImporterMain, config: ConfigMain, remove: RemoveMain);
+    private configMerger;
+    constructor(workspace: Workspace, install: InstallMain, snapping: SnappingMain, checkout: CheckoutMain, logger: Logger, componentWriter: ComponentWriterMain, importer: ImporterMain, config: ConfigMain, remove: RemoveMain, configMerger: ConfigMergerMain);
     merge(ids: string[], mergeStrategy: MergeStrategy, abort: boolean, resolve: boolean, noSnap: boolean, message: string, build: boolean, skipDependencyInstallation: boolean): Promise<ApplyVersionResults>;
     /**
      * when user is on main, it merges the remote main components into local.
@@ -117,10 +110,6 @@ export declare class MergingMain {
         build: boolean;
         skipDependencyInstallation?: boolean;
     }): Promise<ApplyVersionResults>;
-    private generateConfigMergeConflictFileForAll;
-    writeWorkspaceJsoncWithConflictsGracefully(workspaceDepsConflicts: WorkspaceDepsConflicts): Promise<Error | undefined>;
-    private writeWorkspaceJsoncWithConflicts;
-    private updateWorkspaceJsoncWithDepsIfNeeded;
     /**
      * this function gets called from two different commands:
      * 1. "bit merge <ids...>", when merging a component from a remote to the local.
@@ -143,7 +132,7 @@ export declare class MergingMain {
     static slots: any[];
     static dependencies: import("@teambit/harmony").Aspect[];
     static runtime: import("@teambit/harmony").RuntimeDefinition;
-    static provider([cli, workspace, snapping, checkout, install, loggerMain, compWriter, importer, config, remove, globalConfig,]: [
+    static provider([cli, workspace, snapping, checkout, install, loggerMain, compWriter, importer, config, remove, globalConfig, configMerger,]: [
         CLIMain,
         Workspace,
         SnappingMain,
@@ -154,7 +143,8 @@ export declare class MergingMain {
         ImporterMain,
         ConfigMain,
         RemoveMain,
-        GlobalConfigMain
+        GlobalConfigMain,
+        ConfigMergerMain
     ]): Promise<MergingMain>;
 }
 export {};