@teambit/merging 0.0.292 → 0.0.293

package/dist/index.d.ts

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

package/dist/index.js

@@ -21,6 +21,12 @@ Object.defineProperty(exports, "applyVersionReport", {
     return _mergeCmd().applyVersionReport;
   }
 });
+Object.defineProperty(exports, "compilationErrorOutput", {
+  enumerable: true,
+  get: function () {
+    return _mergeCmd().compilationErrorOutput;
+  }
+});
 Object.defineProperty(exports, "conflictSummaryReport", {
   enumerable: true,
   get: function () {

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["MergingAspect"],"sources":["index.ts"],"sourcesContent":["import { MergingAspect } from './merging.aspect';\n\nexport { mergeReport, applyVersionReport, conflictSummaryReport, installationErrorOutput } from './merge-cmd';\nexport type { MergingMain, ComponentMergeStatus, ApplyVersionResults } from './merging.main.runtime';\nexport { ConfigMergeResult } from './config-merge-result';\nexport default MergingAspect;\nexport { MergingAspect };\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AAEA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AAEA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AAA0D,eAC3CA,wBAAa;AAAA"}
+{"version":3,"names":["MergingAspect"],"sources":["index.ts"],"sourcesContent":["import { MergingAspect } from './merging.aspect';\n\nexport {\n  mergeReport,\n  applyVersionReport,\n  conflictSummaryReport,\n  installationErrorOutput,\n  compilationErrorOutput,\n} from './merge-cmd';\nexport type { MergingMain, ComponentMergeStatus, ApplyVersionResults } from './merging.main.runtime';\nexport { ConfigMergeResult } from './config-merge-result';\nexport default MergingAspect;\nexport { MergingAspect };\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AAEA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AAQA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AAA0D,eAC3CA,wBAAa;AAAA"}

package/dist/merge-cmd.d.ts

@@ -32,3 +32,4 @@ export declare function mergeReport({ components, failedComponents, version, mer
 export declare function applyVersionReport(components: ApplyVersionResult[], addName?: boolean, showVersion?: boolean): string;
 export declare function conflictSummaryReport(components: ApplyVersionResult[]): string;
 export declare function installationErrorOutput(installationError?: Error): string;
+export declare function compilationErrorOutput(compilationError?: Error): string;

package/dist/merge-cmd.js

@@ -8,6 +8,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.MergeCmd = void 0;
 exports.applyVersionReport = applyVersionReport;
+exports.compilationErrorOutput = compilationErrorOutput;
 exports.conflictSummaryReport = conflictSummaryReport;
 exports.installationErrorOutput = installationErrorOutput;
 exports.mergeReport = mergeReport;
@@ -238,5 +239,12 @@ function installationErrorOutput(installationError) {
   const body = _chalk().default.red(installationError.message);
   return `\n\n${title}\n${subTitle}\n${body}`;
 }
+function compilationErrorOutput(compilationError) {
+  if (!compilationError) return '';
+  const title = _chalk().default.underline('Compilation Error');
+  const subTitle = 'The following error had been caught from the compiler, please fix the issue and run "bit compile"';
+  const body = _chalk().default.red(compilationError.message);
+  return `\n\n${title}\n${subTitle}\n${body}`;
+}
 
 //# sourceMappingURL=merge-cmd.js.map

package/dist/merge-cmd.js.map

@@ -1 +1 @@
-{"version":3,"names":["MergeCmd","constructor","merging","WILDCARD_HELP","report","ids","ours","theirs","manual","abort","resolve","build","noSnap","verbose","message","skipDependencyInstallation","isFeatureEnabled","BUILD_ON_CI","Boolean","mergeStrategy","getMergeStrategy","BitError","components","failedComponents","version","resolvedComponents","abortedComponents","mergeSnapResults","mergeSnapError","merge","title","componentsStr","map","c","id","toStringWithoutVersion","join","chalk","underline","green","mergeReport","leftUnresolvedConflicts","configMergeResults","getSuccessOutput","length","bold","applyVersionReport","getConflictSummary","suggestion","conflictSummaryReport","yellow","configMergeWithConflicts","filter","hasConflicts","getConfigMergeConflictSummary","comps","compIdStr","MergeConfigFilename","getSnapsOutput","snappedComponents","autoSnappedResults","outputComponents","component","componentOutput","toString","autoTag","result","triggeredBy","searchWithoutScopeAndVersion","autoTagComp","a","AUTO_SNAPPED_MSG","getFailureOutput","body","compact","failedComponent","unchangedLegitimately","color","failureMessage","getSummary","merged","f","failedToMerge","autoSnapped","newLines","mergedStr","unchangedLegitimatelyStr","failedToMergeStr","autoSnappedStr","addName","showVersion","tab","name","files","Object","keys","filesStatus","file","note","FileStatus","white","cyan","installationErrorOutput","installationError","subTitle","red"],"sources":["merge-cmd.ts"],"sourcesContent":["import chalk from 'chalk';\nimport { Command, CommandOptions } from '@teambit/cli';\nimport { compact } from 'lodash';\nimport { WILDCARD_HELP, AUTO_SNAPPED_MSG, MergeConfigFilename } from '@teambit/legacy/dist/constants';\nimport {\n  getMergeStrategy,\n  FileStatus,\n  ApplyVersionResult,\n} from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport { isFeatureEnabled, BUILD_ON_CI } from '@teambit/legacy/dist/api/consumer/lib/feature-toggle';\nimport { BitError } from '@teambit/bit-error';\nimport { ApplyVersionResults, MergingMain } 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';\n  helpUrl = 'docs/components/merging-changes';\n  group = 'development';\n  extendedDescription = `merge changes of the remote head into local, optionally use '--abort' or '--resolve\n${WILDCARD_HELP('merge')}`;\n  alias = '';\n  options = [\n    ['', 'ours', 'in case of a conflict, override the used version with the current modification'],\n    ['', 'theirs', 'in case of a conflict, override the current modification with the specified version'],\n    ['', 'manual', 'in case of a conflict, leave the files with a conflict state to resolve them manually later'],\n    ['', 'abort', 'EXPERIMENTAL. in case of an unresolved merge, revert to the state before the merge began'],\n    ['', 'resolve', 'EXPERIMENTAL. mark an unresolved merge as resolved and create a new snap with the changes'],\n    ['', 'no-snap', 'EXPERIMENTAL. do not auto snap in case 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 legitimately'],\n    ['', 'skip-dependency-installation', 'do not install packages of the imported components'],\n    ['m', 'message <message>', 'EXPERIMENTAL. override the default message for the auto snap'],\n  ] as CommandOptions;\n  loader = true;\n\n  constructor(private merging: MergingMain) {}\n\n  async report(\n    [ids = []]: [string[]],\n    {\n      ours = false,\n      theirs = false,\n      manual = false,\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      abort?: boolean;\n      resolve?: boolean;\n      build?: boolean;\n      noSnap?: boolean;\n      verbose?: boolean;\n      message: string;\n      skipDependencyInstallation?: boolean;\n    }\n  ) {\n    build = isFeatureEnabled(BUILD_ON_CI) ? Boolean(build) : true;\n    const mergeStrategy = getMergeStrategy(ours, theirs, manual);\n    if (abort && resolve) throw new BitError('unable to use \"abort\" and \"resolve\" flags together');\n    if (noSnap && message) throw new BitError('unable to use \"noSnap\" and \"message\" flags together');\n    const {\n      components,\n      failedComponents,\n      version,\n      resolvedComponents,\n      abortedComponents,\n      mergeSnapResults,\n      mergeSnapError,\n    }: ApplyVersionResults = await this.merging.merge(\n      ids,\n      mergeStrategy 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  version,\n  mergeSnapResults,\n  mergeSnapError,\n  leftUnresolvedConflicts,\n  verbose,\n  configMergeResults,\n}: ApplyVersionResults & { configMergeResults?: ConfigMergeResult[] }): string {\n  const getSuccessOutput = () => {\n    if (!components || !components.length) return '';\n    // @ts-ignore version is set in case of merge command\n    const title = `successfully merged components${version ? `from version ${chalk.bold(version)}` : ''}\\n`;\n    // @ts-ignore components is set in case of merge command\n    return chalk.underline(title) + chalk.green(applyVersionReport(components));\n  };\n\n  const getConflictSummary = () => {\n    if (!components || !components.length || !leftUnresolvedConflicts) return '';\n    const title = `\\n\\nfiles with conflicts summary\\n`;\n    const suggestion = `\\n\\nthe merge process wasn't completed due to the conflicts above. fix them manually and then run \"bit install\".\nonce ready, snap/tag the components to complete the merge.`;\n    return chalk.underline(title) + conflictSummaryReport(components) + chalk.yellow(suggestion);\n  };\n\n  const configMergeWithConflicts = configMergeResults?.filter((c) => c.hasConflicts()) || [];\n  const getConfigMergeConflictSummary = () => {\n    if (!configMergeWithConflicts.length) return '';\n    const comps = configMergeWithConflicts.map((c) => c.compIdStr).join('\\n');\n    const title = `\\n\\ncomponents with config-merge conflicts\\n`;\n    const suggestion = `\\nconflicts were found while trying to merge the config. fix them manually by editing the ${MergeConfigFilename} file in the workspace root.\nonce ready, snap/tag the components to complete the merge.`;\n    return chalk.underline(title) + comps + chalk.yellow(suggestion);\n  };\n\n  const getSnapsOutput = () => {\n    if (mergeSnapError) {\n      return `\n${chalk.bold(\n  'snapping the merged components had failed with the following error, please fix the issues and snap manually'\n)}\n${mergeSnapError.message}\n`;\n    }\n    if (!mergeSnapResults || !mergeSnapResults.snappedComponents) return '';\n    const { snappedComponents, autoSnappedResults } = mergeSnapResults;\n    const outputComponents = (comps) => {\n      return comps\n        .map((component) => {\n          let componentOutput = `     > ${component.id.toString()}`;\n          const autoTag = autoSnappedResults.filter((result) =>\n            result.triggeredBy.searchWithoutScopeAndVersion(component.id)\n          );\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 that snapped as a result of the merge'})\\n${outputComponents(snappedComponents)}\\n`;\n  };\n\n  const getFailureOutput = () => {\n    if (!failedComponents || !failedComponents.length) return '';\n    const title = '\\nthe merge has been skipped on the following component(s)';\n    const body = compact(\n      failedComponents.map((failedComponent) => {\n        if (!verbose && failedComponent.unchangedLegitimately) return null;\n        const color = failedComponent.unchangedLegitimately ? 'white' : 'red';\n        return `${chalk.bold(failedComponent.id.toString())} - ${chalk[color](failedComponent.failureMessage)}`;\n      })\n    ).join('\\n');\n    if (!body) {\n      return `${chalk.bold(`\\nthe merge has been skipped on ${failedComponents.length} component(s) legitimately`)}\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 failedToMerge = failedComponents?.filter((f) => !f.unchangedLegitimately).length || 0;\n    const autoSnapped =\n      (mergeSnapResults?.snappedComponents.length || 0) + (mergeSnapResults?.autoSnappedResults.length || 0);\n\n    const newLines = '\\n\\n';\n    const title = chalk.bold.underline('Merge Summary');\n    const mergedStr = `\\nTotal Merged: ${chalk.bold(merged.toString())}`;\n    const unchangedLegitimatelyStr = `\\nTotal Unchanged: ${chalk.bold(unchangedLegitimately.toString())}`;\n    const failedToMergeStr = `\\nTotal Failed: ${chalk.bold(failedToMerge.toString())}`;\n    const autoSnappedStr = `\\nTotal Snapped: ${chalk.bold(autoSnapped.toString())}`;\n\n    return newLines + title + mergedStr + unchangedLegitimatelyStr + failedToMergeStr + autoSnappedStr;\n  };\n\n  return (\n    getSuccessOutput() +\n    getFailureOutput() +\n    getSnapsOutput() +\n    getConfigMergeConflictSummary() +\n    getConflictSummary() +\n    getSummary()\n  );\n}\n\nexport function applyVersionReport(components: ApplyVersionResult[], addName = true, showVersion = false): string {\n  const tab = addName ? '\\t' : '';\n  return components\n    .map((component: ApplyVersionResult) => {\n      const name = showVersion ? component.id.toString() : component.id.toStringWithoutVersion();\n      const files = Object.keys(component.filesStatus)\n        .map((file) => {\n          const note =\n            component.filesStatus[file] === FileStatus.manual\n              ? chalk.white(\n                  'automatic merge failed. please fix conflicts manually and then run \"bit install\" and \"bit compile\"'\n                )\n              : '';\n          return `${tab}${component.filesStatus[file]} ${chalk.bold(file)} ${note}`;\n        })\n        .join('\\n');\n      return `${addName ? name : ''}\\n${chalk.cyan(files)}`;\n    })\n    .join('\\n\\n');\n}\n\nexport function conflictSummaryReport(components: ApplyVersionResult[]): string {\n  const tab = '\\t';\n  return compact(\n    components.map((component: ApplyVersionResult) => {\n      const name = component.id.toStringWithoutVersion();\n      const files = compact(\n        Object.keys(component.filesStatus).map((file) => {\n          if (component.filesStatus[file] === FileStatus.manual) {\n            return `${tab}${component.filesStatus[file]} ${chalk.bold(file)}`;\n          }\n          return null;\n        })\n      );\n      if (!files.length) return null;\n\n      return `${name}\\n${chalk.cyan(files.join('\\n'))}`;\n    })\n  ).join('\\n');\n}\n\nexport function installationErrorOutput(installationError?: Error) {\n  if (!installationError) return '';\n  const title = chalk.underline('Installation Error');\n  const subTitle =\n    'The following error had been caught from 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"],"mappings":"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"}
+{"version":3,"names":["MergeCmd","constructor","merging","WILDCARD_HELP","report","ids","ours","theirs","manual","abort","resolve","build","noSnap","verbose","message","skipDependencyInstallation","isFeatureEnabled","BUILD_ON_CI","Boolean","mergeStrategy","getMergeStrategy","BitError","components","failedComponents","version","resolvedComponents","abortedComponents","mergeSnapResults","mergeSnapError","merge","title","componentsStr","map","c","id","toStringWithoutVersion","join","chalk","underline","green","mergeReport","leftUnresolvedConflicts","configMergeResults","getSuccessOutput","length","bold","applyVersionReport","getConflictSummary","suggestion","conflictSummaryReport","yellow","configMergeWithConflicts","filter","hasConflicts","getConfigMergeConflictSummary","comps","compIdStr","MergeConfigFilename","getSnapsOutput","snappedComponents","autoSnappedResults","outputComponents","component","componentOutput","toString","autoTag","result","triggeredBy","searchWithoutScopeAndVersion","autoTagComp","a","AUTO_SNAPPED_MSG","getFailureOutput","body","compact","failedComponent","unchangedLegitimately","color","failureMessage","getSummary","merged","f","failedToMerge","autoSnapped","newLines","mergedStr","unchangedLegitimatelyStr","failedToMergeStr","autoSnappedStr","addName","showVersion","tab","name","files","Object","keys","filesStatus","file","note","FileStatus","white","cyan","installationErrorOutput","installationError","subTitle","red","compilationErrorOutput","compilationError"],"sources":["merge-cmd.ts"],"sourcesContent":["import chalk from 'chalk';\nimport { Command, CommandOptions } from '@teambit/cli';\nimport { compact } from 'lodash';\nimport { WILDCARD_HELP, AUTO_SNAPPED_MSG, MergeConfigFilename } from '@teambit/legacy/dist/constants';\nimport {\n  getMergeStrategy,\n  FileStatus,\n  ApplyVersionResult,\n} from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport { isFeatureEnabled, BUILD_ON_CI } from '@teambit/legacy/dist/api/consumer/lib/feature-toggle';\nimport { BitError } from '@teambit/bit-error';\nimport { ApplyVersionResults, MergingMain } 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';\n  helpUrl = 'docs/components/merging-changes';\n  group = 'development';\n  extendedDescription = `merge changes of the remote head into local, optionally use '--abort' or '--resolve\n${WILDCARD_HELP('merge')}`;\n  alias = '';\n  options = [\n    ['', 'ours', 'in case of a conflict, override the used version with the current modification'],\n    ['', 'theirs', 'in case of a conflict, override the current modification with the specified version'],\n    ['', 'manual', 'in case of a conflict, leave the files with a conflict state to resolve them manually later'],\n    ['', 'abort', 'EXPERIMENTAL. in case of an unresolved merge, revert to the state before the merge began'],\n    ['', 'resolve', 'EXPERIMENTAL. mark an unresolved merge as resolved and create a new snap with the changes'],\n    ['', 'no-snap', 'EXPERIMENTAL. do not auto snap in case 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 legitimately'],\n    ['', 'skip-dependency-installation', 'do not install packages of the imported components'],\n    ['m', 'message <message>', 'EXPERIMENTAL. override the default message for the auto snap'],\n  ] as CommandOptions;\n  loader = true;\n\n  constructor(private merging: MergingMain) {}\n\n  async report(\n    [ids = []]: [string[]],\n    {\n      ours = false,\n      theirs = false,\n      manual = false,\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      abort?: boolean;\n      resolve?: boolean;\n      build?: boolean;\n      noSnap?: boolean;\n      verbose?: boolean;\n      message: string;\n      skipDependencyInstallation?: boolean;\n    }\n  ) {\n    build = isFeatureEnabled(BUILD_ON_CI) ? Boolean(build) : true;\n    const mergeStrategy = getMergeStrategy(ours, theirs, manual);\n    if (abort && resolve) throw new BitError('unable to use \"abort\" and \"resolve\" flags together');\n    if (noSnap && message) throw new BitError('unable to use \"noSnap\" and \"message\" flags together');\n    const {\n      components,\n      failedComponents,\n      version,\n      resolvedComponents,\n      abortedComponents,\n      mergeSnapResults,\n      mergeSnapError,\n    }: ApplyVersionResults = await this.merging.merge(\n      ids,\n      mergeStrategy 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  version,\n  mergeSnapResults,\n  mergeSnapError,\n  leftUnresolvedConflicts,\n  verbose,\n  configMergeResults,\n}: ApplyVersionResults & { configMergeResults?: ConfigMergeResult[] }): string {\n  const getSuccessOutput = () => {\n    if (!components || !components.length) return '';\n    // @ts-ignore version is set in case of merge command\n    const title = `successfully merged components${version ? `from version ${chalk.bold(version)}` : ''}\\n`;\n    // @ts-ignore components is set in case of merge command\n    return chalk.underline(title) + chalk.green(applyVersionReport(components));\n  };\n\n  const getConflictSummary = () => {\n    if (!components || !components.length || !leftUnresolvedConflicts) return '';\n    const title = `\\n\\nfiles with conflicts summary\\n`;\n    const suggestion = `\\n\\nthe merge process wasn't completed due to the conflicts above. fix them manually and then run \"bit install\".\nonce ready, snap/tag the components to complete the merge.`;\n    return chalk.underline(title) + conflictSummaryReport(components) + chalk.yellow(suggestion);\n  };\n\n  const configMergeWithConflicts = configMergeResults?.filter((c) => c.hasConflicts()) || [];\n  const getConfigMergeConflictSummary = () => {\n    if (!configMergeWithConflicts.length) return '';\n    const comps = configMergeWithConflicts.map((c) => c.compIdStr).join('\\n');\n    const title = `\\n\\ncomponents with config-merge conflicts\\n`;\n    const suggestion = `\\nconflicts were found while trying to merge the config. fix them manually by editing the ${MergeConfigFilename} file in the workspace root.\nonce ready, snap/tag the components to complete the merge.`;\n    return chalk.underline(title) + comps + chalk.yellow(suggestion);\n  };\n\n  const getSnapsOutput = () => {\n    if (mergeSnapError) {\n      return `\n${chalk.bold(\n  'snapping the merged components had failed with the following error, please fix the issues and snap manually'\n)}\n${mergeSnapError.message}\n`;\n    }\n    if (!mergeSnapResults || !mergeSnapResults.snappedComponents) return '';\n    const { snappedComponents, autoSnappedResults } = mergeSnapResults;\n    const outputComponents = (comps) => {\n      return comps\n        .map((component) => {\n          let componentOutput = `     > ${component.id.toString()}`;\n          const autoTag = autoSnappedResults.filter((result) =>\n            result.triggeredBy.searchWithoutScopeAndVersion(component.id)\n          );\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 that snapped as a result of the merge'})\\n${outputComponents(snappedComponents)}\\n`;\n  };\n\n  const getFailureOutput = () => {\n    if (!failedComponents || !failedComponents.length) return '';\n    const title = '\\nthe merge has been skipped on the following component(s)';\n    const body = compact(\n      failedComponents.map((failedComponent) => {\n        if (!verbose && failedComponent.unchangedLegitimately) return null;\n        const color = failedComponent.unchangedLegitimately ? 'white' : 'red';\n        return `${chalk.bold(failedComponent.id.toString())} - ${chalk[color](failedComponent.failureMessage)}`;\n      })\n    ).join('\\n');\n    if (!body) {\n      return `${chalk.bold(`\\nthe merge has been skipped on ${failedComponents.length} component(s) legitimately`)}\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 failedToMerge = failedComponents?.filter((f) => !f.unchangedLegitimately).length || 0;\n    const autoSnapped =\n      (mergeSnapResults?.snappedComponents.length || 0) + (mergeSnapResults?.autoSnappedResults.length || 0);\n\n    const newLines = '\\n\\n';\n    const title = chalk.bold.underline('Merge Summary');\n    const mergedStr = `\\nTotal Merged: ${chalk.bold(merged.toString())}`;\n    const unchangedLegitimatelyStr = `\\nTotal Unchanged: ${chalk.bold(unchangedLegitimately.toString())}`;\n    const failedToMergeStr = `\\nTotal Failed: ${chalk.bold(failedToMerge.toString())}`;\n    const autoSnappedStr = `\\nTotal Snapped: ${chalk.bold(autoSnapped.toString())}`;\n\n    return newLines + title + mergedStr + unchangedLegitimatelyStr + failedToMergeStr + autoSnappedStr;\n  };\n\n  return (\n    getSuccessOutput() +\n    getFailureOutput() +\n    getSnapsOutput() +\n    getConfigMergeConflictSummary() +\n    getConflictSummary() +\n    getSummary()\n  );\n}\n\nexport function applyVersionReport(components: ApplyVersionResult[], addName = true, showVersion = false): string {\n  const tab = addName ? '\\t' : '';\n  return components\n    .map((component: ApplyVersionResult) => {\n      const name = showVersion ? component.id.toString() : component.id.toStringWithoutVersion();\n      const files = Object.keys(component.filesStatus)\n        .map((file) => {\n          const note =\n            component.filesStatus[file] === FileStatus.manual\n              ? chalk.white(\n                  'automatic merge failed. please fix conflicts manually and then run \"bit install\" and \"bit compile\"'\n                )\n              : '';\n          return `${tab}${component.filesStatus[file]} ${chalk.bold(file)} ${note}`;\n        })\n        .join('\\n');\n      return `${addName ? name : ''}\\n${chalk.cyan(files)}`;\n    })\n    .join('\\n\\n');\n}\n\nexport function conflictSummaryReport(components: ApplyVersionResult[]): string {\n  const tab = '\\t';\n  return compact(\n    components.map((component: ApplyVersionResult) => {\n      const name = component.id.toStringWithoutVersion();\n      const files = compact(\n        Object.keys(component.filesStatus).map((file) => {\n          if (component.filesStatus[file] === FileStatus.manual) {\n            return `${tab}${component.filesStatus[file]} ${chalk.bold(file)}`;\n          }\n          return null;\n        })\n      );\n      if (!files.length) return null;\n\n      return `${name}\\n${chalk.cyan(files.join('\\n'))}`;\n    })\n  ).join('\\n');\n}\n\nexport function installationErrorOutput(installationError?: Error) {\n  if (!installationError) return '';\n  const title = chalk.underline('Installation Error');\n  const subTitle =\n    'The following error had been caught from 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 had been caught from 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"],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AAEA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AACA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AACA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AAKA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AACA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AAIO,MAAMA,QAAQ,CAAoB;EAsBvCC,WAAW,CAASC,OAAoB,EAAE;IAAA,KAAtBA,OAAoB,GAApBA,OAAoB;IAAA,8CArBjC,gBAAgB;IAAA,qDACT,6CAA6C;IAAA,iDACjD,iCAAiC;IAAA,+CACnC,aAAa;IAAA,6DACE;AACzB,EAAE,IAAAC,0BAAa,EAAC,OAAO,CAAE,EAAC;IAAA,+CAChB,EAAE;IAAA,iDACA,CACR,CAAC,EAAE,EAAE,MAAM,EAAE,gFAAgF,CAAC,EAC9F,CAAC,EAAE,EAAE,QAAQ,EAAE,qFAAqF,CAAC,EACrG,CAAC,EAAE,EAAE,QAAQ,EAAE,6FAA6F,CAAC,EAC7G,CAAC,EAAE,EAAE,OAAO,EAAE,0FAA0F,CAAC,EACzG,CAAC,EAAE,EAAE,SAAS,EAAE,2FAA2F,CAAC,EAC5G,CAAC,EAAE,EAAE,SAAS,EAAE,8EAA8E,CAAC,EAC/F,CAAC,EAAE,EAAE,OAAO,EAAE,wFAAwF,CAAC,EACvG,CAAC,EAAE,EAAE,SAAS,EAAE,8DAA8D,CAAC,EAC/E,CAAC,EAAE,EAAE,8BAA8B,EAAE,oDAAoD,CAAC,EAC1F,CAAC,GAAG,EAAE,mBAAmB,EAAE,8DAA8D,CAAC,CAC3F;IAAA,gDACQ,IAAI;EAE8B;EAE3C,MAAMC,MAAM,CACV,CAACC,GAAG,GAAG,EAAE,CAAa,EACtB;IACEC,IAAI,GAAG,KAAK;IACZC,MAAM,GAAG,KAAK;IACdC,MAAM,GAAG,KAAK;IACdC,KAAK,GAAG,KAAK;IACbC,OAAO,GAAG,KAAK;IACfC,KAAK,GAAG,KAAK;IACbC,MAAM,GAAG,KAAK;IACdC,OAAO,GAAG,KAAK;IACfC,OAAO;IACPC,0BAA0B,GAAG;EAY/B,CAAC,EACD;IACAJ,KAAK,GAAG,IAAAK,iCAAgB,EAACC,4BAAW,CAAC,GAAGC,OAAO,CAACP,KAAK,CAAC,GAAG,IAAI;IAC7D,MAAMQ,aAAa,GAAG,IAAAC,gCAAgB,EAACd,IAAI,EAAEC,MAAM,EAAEC,MAAM,CAAC;IAC5D,IAAIC,KAAK,IAAIC,OAAO,EAAE,MAAM,KAAIW,oBAAQ,EAAC,oDAAoD,CAAC;IAC9F,IAAIT,MAAM,IAAIE,OAAO,EAAE,MAAM,KAAIO,oBAAQ,EAAC,qDAAqD,CAAC;IAChG,MAAM;MACJC,UAAU;MACVC,gBAAgB;MAChBC,OAAO;MACPC,kBAAkB;MAClBC,iBAAiB;MACjBC,gBAAgB;MAChBC;IACmB,CAAC,GAAG,MAAM,IAAI,CAAC1B,OAAO,CAAC2B,KAAK,CAC/CxB,GAAG,EACHc,aAAa,EACbV,KAAK,EACLC,OAAO,EACPE,MAAM,EACNE,OAAO,EACPH,KAAK,EACLI,0BAA0B,CAC3B;IACD,IAAIU,kBAAkB,EAAE;MACtB,MAAMK,KAAK,GAAG,sCAAsC;MACpD,MAAMC,aAAa,GAAGN,kBAAkB,CAACO,GAAG,CAAEC,CAAC,IAAKA,CAAC,CAACC,EAAE,CAACC,sBAAsB,EAAE,CAAC,CAACC,IAAI,CAAC,IAAI,CAAC;MAC7F,OAAOC,gBAAK,CAACC,SAAS,CAACR,KAAK,CAAC,GAAGO,gBAAK,CAACE,KAAK,CAACR,aAAa,CAAC;IAC5D;IACA,IAAIL,iBAAiB,EAAE;MACrB,MAAMI,KAAK,GAAG,gEAAgE;MAC9E,MAAMC,aAAa,GAAGL,iBAAiB,CAACM,GAAG,CAAEC,CAAC,IAAKA,CAAC,CAACC,EAAE,CAACC,sBAAsB,EAAE,CAAC,CAACC,IAAI,CAAC,IAAI,CAAC;MAC5F,OAAOC,gBAAK,CAACC,SAAS,CAACR,KAAK,CAAC,GAAGO,gBAAK,CAACE,KAAK,CAACR,aAAa,CAAC;IAC5D;IAEA,OAAOS,WAAW,CAAC;MACjBlB,UAAU;MACVC,gBAAgB;MAChBC,OAAO;MACPG,gBAAgB;MAChBC,cAAc;MACdf;IACF,CAAC,CAAC;EACJ;AACF;AAAC;AAEM,SAAS2B,WAAW,CAAC;EAC1BlB,UAAU;EACVC,gBAAgB;EAChBC,OAAO;EACPG,gBAAgB;EAChBC,cAAc;EACda,uBAAuB;EACvB5B,OAAO;EACP6B;AACkE,CAAC,EAAU;EAC7E,MAAMC,gBAAgB,GAAG,MAAM;IAC7B,IAAI,CAACrB,UAAU,IAAI,CAACA,UAAU,CAACsB,MAAM,EAAE,OAAO,EAAE;IAChD;IACA,MAAMd,KAAK,GAAI,iCAAgCN,OAAO,GAAI,gBAAea,gBAAK,CAACQ,IAAI,CAACrB,OAAO,CAAE,EAAC,GAAG,EAAG,IAAG;IACvG;IACA,OAAOa,gBAAK,CAACC,SAAS,CAACR,KAAK,CAAC,GAAGO,gBAAK,CAACE,KAAK,CAACO,kBAAkB,CAACxB,UAAU,CAAC,CAAC;EAC7E,CAAC;EAED,MAAMyB,kBAAkB,GAAG,MAAM;IAC/B,IAAI,CAACzB,UAAU,IAAI,CAACA,UAAU,CAACsB,MAAM,IAAI,CAACH,uBAAuB,EAAE,OAAO,EAAE;IAC5E,MAAMX,KAAK,GAAI,oCAAmC;IAClD,MAAMkB,UAAU,GAAI;AACxB,2DAA2D;IACvD,OAAOX,gBAAK,CAACC,SAAS,CAACR,KAAK,CAAC,GAAGmB,qBAAqB,CAAC3B,UAAU,CAAC,GAAGe,gBAAK,CAACa,MAAM,CAACF,UAAU,CAAC;EAC9F,CAAC;EAED,MAAMG,wBAAwB,GAAG,CAAAT,kBAAkB,aAAlBA,kBAAkB,uBAAlBA,kBAAkB,CAAEU,MAAM,CAAEnB,CAAC,IAAKA,CAAC,CAACoB,YAAY,EAAE,CAAC,KAAI,EAAE;EAC1F,MAAMC,6BAA6B,GAAG,MAAM;IAC1C,IAAI,CAACH,wBAAwB,CAACP,MAAM,EAAE,OAAO,EAAE;IAC/C,MAAMW,KAAK,GAAGJ,wBAAwB,CAACnB,GAAG,CAAEC,CAAC,IAAKA,CAAC,CAACuB,SAAS,CAAC,CAACpB,IAAI,CAAC,IAAI,CAAC;IACzE,MAAMN,KAAK,GAAI,8CAA6C;IAC5D,MAAMkB,UAAU,GAAI,6FAA4FS,gCAAoB;AACxI,2DAA2D;IACvD,OAAOpB,gBAAK,CAACC,SAAS,CAACR,KAAK,CAAC,GAAGyB,KAAK,GAAGlB,gBAAK,CAACa,MAAM,CAACF,UAAU,CAAC;EAClE,CAAC;EAED,MAAMU,cAAc,GAAG,MAAM;IAC3B,IAAI9B,cAAc,EAAE;MAClB,OAAQ;AACd,EAAES,gBAAK,CAACQ,IAAI,CACV,6GAA6G,CAC7G;AACF,EAAEjB,cAAc,CAACd,OAAQ;AACzB,CAAC;IACG;IACA,IAAI,CAACa,gBAAgB,IAAI,CAACA,gBAAgB,CAACgC,iBAAiB,EAAE,OAAO,EAAE;IACvE,MAAM;MAAEA,iBAAiB;MAAEC;IAAmB,CAAC,GAAGjC,gBAAgB;IAClE,MAAMkC,gBAAgB,GAAIN,KAAK,IAAK;MAClC,OAAOA,KAAK,CACTvB,GAAG,CAAE8B,SAAS,IAAK;QAClB,IAAIC,eAAe,GAAI,UAASD,SAAS,CAAC5B,EAAE,CAAC8B,QAAQ,EAAG,EAAC;QACzD,MAAMC,OAAO,GAAGL,kBAAkB,CAACR,MAAM,CAAEc,MAAM,IAC/CA,MAAM,CAACC,WAAW,CAACC,4BAA4B,CAACN,SAAS,CAAC5B,EAAE,CAAC,CAC9D;QACD,IAAI+B,OAAO,CAACrB,MAAM,EAAE;UAClB,MAAMyB,WAAW,GAAGJ,OAAO,CAACjC,GAAG,CAAEsC,CAAC,IAAKA,CAAC,CAACR,SAAS,CAAC5B,EAAE,CAAC8B,QAAQ,EAAE,CAAC;UACjED,eAAe,IAAK,YAAWQ,6BAAiB,KAAIF,WAAW,CAACjC,IAAI,CAAC,IAAI,CAAE,EAAC;QAC9E;QACA,OAAO2B,eAAe;MACxB,CAAC,CAAC,CACD3B,IAAI,CAAC,IAAI,CAAC;IACf,CAAC;IAED,OAAQ,KAAIC,gBAAK,CAACC,SAAS,CACzB,0BAA0B,CAC1B,MAAK,kDAAmD,MAAKuB,gBAAgB,CAACF,iBAAiB,CAAE,IAAG;EACxG,CAAC;EAED,MAAMa,gBAAgB,GAAG,MAAM;IAC7B,IAAI,CAACjD,gBAAgB,IAAI,CAACA,gBAAgB,CAACqB,MAAM,EAAE,OAAO,EAAE;IAC5D,MAAMd,KAAK,GAAG,4DAA4D;IAC1E,MAAM2C,IAAI,GAAG,IAAAC,iBAAO,EAClBnD,gBAAgB,CAACS,GAAG,CAAE2C,eAAe,IAAK;MACxC,IAAI,CAAC9D,OAAO,IAAI8D,eAAe,CAACC,qBAAqB,EAAE,OAAO,IAAI;MAClE,MAAMC,KAAK,GAAGF,eAAe,CAACC,qBAAqB,GAAG,OAAO,GAAG,KAAK;MACrE,OAAQ,GAAEvC,gBAAK,CAACQ,IAAI,CAAC8B,eAAe,CAACzC,EAAE,CAAC8B,QAAQ,EAAE,CAAE,MAAK3B,gBAAK,CAACwC,KAAK,CAAC,CAACF,eAAe,CAACG,cAAc,CAAE,EAAC;IACzG,CAAC,CAAC,CACH,CAAC1C,IAAI,CAAC,IAAI,CAAC;IACZ,IAAI,CAACqC,IAAI,EAAE;MACT,OAAQ,GAAEpC,gBAAK,CAACQ,IAAI,CAAE,mCAAkCtB,gBAAgB,CAACqB,MAAO,4BAA2B,CAAE;AACnH,uCAAuC;IACnC;IACA,OAAQ,KAAIP,gBAAK,CAACC,SAAS,CAACR,KAAK,CAAE,KAAI2C,IAAK,MAAK;EACnD,CAAC;EAED,MAAMM,UAAU,GAAG,MAAM;IACvB,MAAMC,MAAM,GAAG,CAAA1D,UAAU,aAAVA,UAAU,uBAAVA,UAAU,CAAEsB,MAAM,KAAI,CAAC;IACtC,MAAMgC,qBAAqB,GAAG,CAAArD,gBAAgB,aAAhBA,gBAAgB,uBAAhBA,gBAAgB,CAAE6B,MAAM,CAAE6B,CAAC,IAAKA,CAAC,CAACL,qBAAqB,CAAC,CAAChC,MAAM,KAAI,CAAC;IAClG,MAAMsC,aAAa,GAAG,CAAA3D,gBAAgB,aAAhBA,gBAAgB,uBAAhBA,gBAAgB,CAAE6B,MAAM,CAAE6B,CAAC,IAAK,CAACA,CAAC,CAACL,qBAAqB,CAAC,CAAChC,MAAM,KAAI,CAAC;IAC3F,MAAMuC,WAAW,GACf,CAAC,CAAAxD,gBAAgB,aAAhBA,gBAAgB,uBAAhBA,gBAAgB,CAAEgC,iBAAiB,CAACf,MAAM,KAAI,CAAC,KAAK,CAAAjB,gBAAgB,aAAhBA,gBAAgB,uBAAhBA,gBAAgB,CAAEiC,kBAAkB,CAAChB,MAAM,KAAI,CAAC,CAAC;IAExG,MAAMwC,QAAQ,GAAG,MAAM;IACvB,MAAMtD,KAAK,GAAGO,gBAAK,CAACQ,IAAI,CAACP,SAAS,CAAC,eAAe,CAAC;IACnD,MAAM+C,SAAS,GAAI,mBAAkBhD,gBAAK,CAACQ,IAAI,CAACmC,MAAM,CAAChB,QAAQ,EAAE,CAAE,EAAC;IACpE,MAAMsB,wBAAwB,GAAI,sBAAqBjD,gBAAK,CAACQ,IAAI,CAAC+B,qBAAqB,CAACZ,QAAQ,EAAE,CAAE,EAAC;IACrG,MAAMuB,gBAAgB,GAAI,mBAAkBlD,gBAAK,CAACQ,IAAI,CAACqC,aAAa,CAAClB,QAAQ,EAAE,CAAE,EAAC;IAClF,MAAMwB,cAAc,GAAI,oBAAmBnD,gBAAK,CAACQ,IAAI,CAACsC,WAAW,CAACnB,QAAQ,EAAE,CAAE,EAAC;IAE/E,OAAOoB,QAAQ,GAAGtD,KAAK,GAAGuD,SAAS,GAAGC,wBAAwB,GAAGC,gBAAgB,GAAGC,cAAc;EACpG,CAAC;EAED,OACE7C,gBAAgB,EAAE,GAClB6B,gBAAgB,EAAE,GAClBd,cAAc,EAAE,GAChBJ,6BAA6B,EAAE,GAC/BP,kBAAkB,EAAE,GACpBgC,UAAU,EAAE;AAEhB;AAEO,SAASjC,kBAAkB,CAACxB,UAAgC,EAAEmE,OAAO,GAAG,IAAI,EAAEC,WAAW,GAAG,KAAK,EAAU;EAChH,MAAMC,GAAG,GAAGF,OAAO,GAAG,IAAI,GAAG,EAAE;EAC/B,OAAOnE,UAAU,CACdU,GAAG,CAAE8B,SAA6B,IAAK;IACtC,MAAM8B,IAAI,GAAGF,WAAW,GAAG5B,SAAS,CAAC5B,EAAE,CAAC8B,QAAQ,EAAE,GAAGF,SAAS,CAAC5B,EAAE,CAACC,sBAAsB,EAAE;IAC1F,MAAM0D,KAAK,GAAGC,MAAM,CAACC,IAAI,CAACjC,SAAS,CAACkC,WAAW,CAAC,CAC7ChE,GAAG,CAAEiE,IAAI,IAAK;MACb,MAAMC,IAAI,GACRpC,SAAS,CAACkC,WAAW,CAACC,IAAI,CAAC,KAAKE,0BAAU,CAAC3F,MAAM,GAC7C6B,gBAAK,CAAC+D,KAAK,CACT,oGAAoG,CACrG,GACD,EAAE;MACR,OAAQ,GAAET,GAAI,GAAE7B,SAAS,CAACkC,WAAW,CAACC,IAAI,CAAE,IAAG5D,gBAAK,CAACQ,IAAI,CAACoD,IAAI,CAAE,IAAGC,IAAK,EAAC;IAC3E,CAAC,CAAC,CACD9D,IAAI,CAAC,IAAI,CAAC;IACb,OAAQ,GAAEqD,OAAO,GAAGG,IAAI,GAAG,EAAG,KAAIvD,gBAAK,CAACgE,IAAI,CAACR,KAAK,CAAE,EAAC;EACvD,CAAC,CAAC,CACDzD,IAAI,CAAC,MAAM,CAAC;AACjB;AAEO,SAASa,qBAAqB,CAAC3B,UAAgC,EAAU;EAC9E,MAAMqE,GAAG,GAAG,IAAI;EAChB,OAAO,IAAAjB,iBAAO,EACZpD,UAAU,CAACU,GAAG,CAAE8B,SAA6B,IAAK;IAChD,MAAM8B,IAAI,GAAG9B,SAAS,CAAC5B,EAAE,CAACC,sBAAsB,EAAE;IAClD,MAAM0D,KAAK,GAAG,IAAAnB,iBAAO,EACnBoB,MAAM,CAACC,IAAI,CAACjC,SAAS,CAACkC,WAAW,CAAC,CAAChE,GAAG,CAAEiE,IAAI,IAAK;MAC/C,IAAInC,SAAS,CAACkC,WAAW,CAACC,IAAI,CAAC,KAAKE,0BAAU,CAAC3F,MAAM,EAAE;QACrD,OAAQ,GAAEmF,GAAI,GAAE7B,SAAS,CAACkC,WAAW,CAACC,IAAI,CAAE,IAAG5D,gBAAK,CAACQ,IAAI,CAACoD,IAAI,CAAE,EAAC;MACnE;MACA,OAAO,IAAI;IACb,CAAC,CAAC,CACH;IACD,IAAI,CAACJ,KAAK,CAACjD,MAAM,EAAE,OAAO,IAAI;IAE9B,OAAQ,GAAEgD,IAAK,KAAIvD,gBAAK,CAACgE,IAAI,CAACR,KAAK,CAACzD,IAAI,CAAC,IAAI,CAAC,CAAE,EAAC;EACnD,CAAC,CAAC,CACH,CAACA,IAAI,CAAC,IAAI,CAAC;AACd;AAEO,SAASkE,uBAAuB,CAACC,iBAAyB,EAAE;EACjE,IAAI,CAACA,iBAAiB,EAAE,OAAO,EAAE;EACjC,MAAMzE,KAAK,GAAGO,gBAAK,CAACC,SAAS,CAAC,oBAAoB,CAAC;EACnD,MAAMkE,QAAQ,GACZ,0GAA0G;EAC5G,MAAM/B,IAAI,GAAGpC,gBAAK,CAACoE,GAAG,CAACF,iBAAiB,CAACzF,OAAO,CAAC;EACjD,OAAQ,OAAMgB,KAAM,KAAI0E,QAAS,KAAI/B,IAAK,EAAC;AAC7C;AAEO,SAASiC,sBAAsB,CAACC,gBAAwB,EAAE;EAC/D,IAAI,CAACA,gBAAgB,EAAE,OAAO,EAAE;EAChC,MAAM7E,KAAK,GAAGO,gBAAK,CAACC,SAAS,CAAC,mBAAmB,CAAC;EAClD,MAAMkE,QAAQ,GAAG,mGAAmG;EACpH,MAAM/B,IAAI,GAAGpC,gBAAK,CAACoE,GAAG,CAACE,gBAAgB,CAAC7F,OAAO,CAAC;EAChD,OAAQ,OAAMgB,KAAM,KAAI0E,QAAS,KAAI/B,IAAK,EAAC;AAC7C"}

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

@@ -10,6 +10,7 @@ import { Lane, ModelComponent, Version } from '@teambit/legacy/dist/scope/models
 import { Ref } from '@teambit/legacy/dist/scope/objects';
 import { ComponentWriterMain } from '@teambit/component-writer';
 import ConsumerComponent from '@teambit/legacy/dist/consumer/component/consumer-component';
+import { ImporterMain } from '@teambit/importer';
 import { Logger, LoggerMain } from '@teambit/logger';
 import { MergeResultsThreeWay } from '@teambit/legacy/dist/consumer/versions-ops/merge-version/three-way-merge';
 import { CheckoutMain } from '@teambit/checkout';
@@ -61,6 +62,7 @@ export declare type ApplyVersionResults = {
     newFromLane?: string[];
     newFromLaneAdded?: boolean;
     installationError?: Error;
+    compilationError?: Error;
 };
 export declare class MergingMain {
     private workspace;
@@ -69,8 +71,9 @@ export declare class MergingMain {
     private checkout;
     private logger;
     private componentWriter;
+    private importer;
     private consumer;
-    constructor(workspace: Workspace, install: InstallMain, snapping: SnappingMain, checkout: CheckoutMain, logger: Logger, componentWriter: ComponentWriterMain);
+    constructor(workspace: Workspace, install: InstallMain, snapping: SnappingMain, checkout: CheckoutMain, logger: Logger, componentWriter: ComponentWriterMain, importer: ImporterMain);
     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.
@@ -118,14 +121,15 @@ export declare class MergingMain {
     static slots: never[];
     static dependencies: import("@teambit/harmony").Aspect[];
     static runtime: import("@teambit/harmony").RuntimeDefinition;
-    static provider([cli, workspace, snapping, checkout, install, loggerMain, compWriter]: [
+    static provider([cli, workspace, snapping, checkout, install, loggerMain, compWriter, importer]: [
         CLIMain,
         Workspace,
         SnappingMain,
         CheckoutMain,
         InstallMain,
         LoggerMain,
-        ComponentWriterMain
+        ComponentWriterMain,
+        ImporterMain
     ]): Promise<MergingMain>;
 }
 export {};

package/dist/merging.main.runtime.js

@@ -128,6 +128,13 @@ function _componentWriter() {
   };
   return data;
 }
+function _importer() {
+  const data = _interopRequireDefault(require("@teambit/importer"));
+  _importer = function () {
+    return data;
+  };
+  return data;
+}
 function _logger() {
   const data = require("@teambit/logger");
   _logger = function () {
@@ -210,7 +217,7 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2().default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 class MergingMain {
-  constructor(workspace, install, snapping, checkout, logger, componentWriter) {
+  constructor(workspace, install, snapping, checkout, logger, componentWriter, importer) {
     var _this$workspace;
     this.workspace = workspace;
     this.install = install;
@@ -218,6 +225,7 @@ class MergingMain {
     this.checkout = checkout;
     this.logger = logger;
     this.componentWriter = componentWriter;
+    this.importer = importer;
     (0, _defineProperty2().default)(this, "consumer", void 0);
     this.consumer = (_this$workspace = this.workspace) === null || _this$workspace === void 0 ? void 0 : _this$workspace.consumer;
   }
@@ -396,6 +404,9 @@ class MergingMain {
   otherLane,
   // the lane we want to merged to our lane. (null if it's "main").
   options) {
+    if (!currentLane && otherLane) {
+      await this.importer.importObjectsFromMainIfExist(otherLane.toBitIds().toVersionLatest());
+    }
     const componentStatusBeforeMergeAttempt = await Promise.all(bitIds.map(id => this.getComponentStatusBeforeMergeAttempt(id, currentLane, options)));
     const toImport = componentStatusBeforeMergeAttempt.map(compStatus => {
       if (!compStatus.divergeData || !compStatus.divergeData.commonSnapBeforeDiverge) return [];
@@ -859,16 +870,16 @@ other:   ${otherLaneHead.toString()}`);
     }
     return ids.map(id => consumer.getParsedId(id));
   }
-  static async provider([cli, workspace, snapping, checkout, install, loggerMain, compWriter]) {
+  static async provider([cli, workspace, snapping, checkout, install, loggerMain, compWriter, importer]) {
     const logger = loggerMain.createLogger(_merging().MergingAspect.id);
-    const merging = new MergingMain(workspace, install, snapping, checkout, logger, compWriter);
+    const merging = new MergingMain(workspace, install, snapping, checkout, logger, compWriter, importer);
     cli.register(new (_mergeCmd().MergeCmd)(merging));
     return merging;
   }
 }
 exports.MergingMain = MergingMain;
 (0, _defineProperty2().default)(MergingMain, "slots", []);
-(0, _defineProperty2().default)(MergingMain, "dependencies", [_cli().CLIAspect, _workspace().default, _snapping().default, _checkout().CheckoutAspect, _install().InstallAspect, _logger().LoggerAspect, _componentWriter().ComponentWriterAspect]);
+(0, _defineProperty2().default)(MergingMain, "dependencies", [_cli().CLIAspect, _workspace().default, _snapping().default, _checkout().CheckoutAspect, _install().InstallAspect, _logger().LoggerAspect, _componentWriter().ComponentWriterAspect, _importer().default]);
 (0, _defineProperty2().default)(MergingMain, "runtime", _cli().MainRuntime);
 _merging().MergingAspect.addRuntime(MergingMain);
 

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

@@ -1 +1 @@
-{"version":3,"names":["MergingMain","constructor","workspace","install","snapping","checkout","logger","componentWriter","consumer","merge","ids","mergeStrategy","abort","resolve","noSnap","message","build","skipDependencyInstallation","OutsideWorkspaceError","mergeResults","resolveMerge","abortMerge","bitIds","getComponentsToMerge","mergeComponentsFromRemote","onDestroy","snapMessage","currentLaneId","getCurrentLaneId","currentLaneObject","getCurrentLaneObject","allComponentsStatus","getAllComponentsStatus","failedComponents","filter","c","unmergedMessage","unmergedLegitimately","length","failureMsgs","map","failedComponent","chalk","bold","id","toString","red","join","BitError","mergeSnaps","laneId","localLane","tag","componentWithConflict","find","component","hasConflicts","getMergeStrategyInteractive","componentStatus","failureMessage","unchangedLegitimately","succeededComponents","componentsResults","mapSeries","currentComponent","resolvedUnrelated","configMergeResult","modelComponent","scope","getModelComponent","updatedLaneId","isDefault","LaneId","from","name","applyVersion","remoteHead","getRef","version","allConfigMerge","generateConfigMergeConflictFileForAll","compact","objects","add","persist","unmergedComponents","write","writeBitMap","componentsHasConfigMergeConflicts","some","leftUnresolvedConflicts","undefined","dedupe","updateExisting","import","err","error","consoleError","getSnapOrTagResults","idsToTag","results","tagAllLaneComponent","taggedComponents","autoTaggedResults","snappedComponents","autoSnappedResults","snapResolvedComponents","mergeSnapResults","mergeSnapError","components","configMergeFile","getConflictMergeFile","forEach","configMerge","conflict","generateMergeConflictFile","addConflict","compIdStr","hasConflict","getMergeStatus","currentLane","otherLane","options","componentStatusBeforeMergeAttempt","Promise","all","getComponentStatusBeforeMergeAttempt","toImport","compStatus","divergeData","commonSnapBeforeDiverge","changeVersion","flat","scopeImporter","importManyIfMissingWithoutDeps","BitIds","fromArray","lane","compStatusNotNeedMerge","mergeProps","compStatusNeedMerge","getComponentsStatusNeedMerge","tmp","Tmp","componentsStatus","getComponentMergeStatus","clear","push","returnUnmerged","msg","getModelComponentIfExist","unmerged","getEntry","toStringWithoutVersion","repo","otherLaneHead","existingBitMapId","bitMap","getBitIdIfExist","ignoreVersion","componentOnOther","loadVersion","isRemoved","getCurrentId","idOnLane","getComponent","head","getHeadAsTagIfExist","currentId","getDivergeData","targetHead","throws","componentFromModel","getCurrentComponent","loadComponent","getConsumerComponent","removed","isModified","componentModificationStatus","getComponentStatusById","modified","baseComponent","ignoreConfigChanges","isComponentSourceCodeModified","isComponentModified","Error","mainHead","NoCommonSnap","resolveUnrelated","hasResolvedFromMain","hashToCompare","divergeDataFromMain","sourceHead","hasResolvedLocally","getHeadRegardlessOfLane","hasResolvedRemotely","versionToSaveInLane","resolvedRef","strategy","isDiverged","isSourceAhead","isTargetAhead","componentMergeStatusBeforeMergeAttempt","baseSnap","debug","otherComponent","currentLaneName","toLaneId","otherLaneName","DEFAULT_LANE","currentLabel","otherLabel","workspaceIds","listIds","configMerger","ConfigMerger","extensions","threeWayMerge","filesStatus","unmergedComponent","remote","handleResolveUnrelated","addComponent","unrelated","addEntry","markAllFilesAsUnchanged","files","file","pathNormalizeToLinux","relative","FileStatus","unchanged","MergeOptions","ours","remoteId","idToLoad","theirs","componentWithDependencies","loadComponentWithDependenciesFromModel","updated","modifiedStatus","modifiedFiles","applyModifiedVersion","manyComponentsWriterOpts","componentsWithDependencies","writeConfig","writeMany","writtenPath","successfullyMergedConfig","getSuccessfullyMergedConfig","mergedConfig","manual","unmergedPaths","f","filePath","setHead","markVersionAsLocal","values","getIdsForUnmerged","reset","removeComponent","fullName","abortedComponents","snap","legacyBitIds","_legacy","resolvedComponents","localLaneObject","bitId","remoteScopeName","remoteLaneId","remoteLanes","laneIdStr","getComponents","r","BitId","tagMessage","unmodified","idsStr","componentIds","resolveMultipleComponentIds","entry","GeneralError","unresolvedComponents","u","ComponentID","fromLegacy","hasWildcard","componentsList","ComponentsList","listComponentsByIdsWithWildcard","getParsedId","provider","cli","loggerMain","compWriter","createLogger","MergingAspect","merging","register","MergeCmd","CLIAspect","WorkspaceAspect","SnappingAspect","CheckoutAspect","InstallAspect","LoggerAspect","ComponentWriterAspect","MainRuntime","addRuntime"],"sources":["merging.main.runtime.ts"],"sourcesContent":["import { CLIAspect, CLIMain, MainRuntime } from '@teambit/cli';\nimport WorkspaceAspect, { OutsideWorkspaceError, Workspace } from '@teambit/workspace';\nimport { Consumer } from '@teambit/legacy/dist/consumer';\nimport ComponentsList from '@teambit/legacy/dist/consumer/component/components-list';\nimport {\n  MergeStrategy,\n  FailedComponents,\n  FileStatus,\n  ApplyVersionResult,\n  getMergeStrategyInteractive,\n  MergeOptions,\n} from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport SnappingAspect, { SnappingMain, TagResults } from '@teambit/snapping';\nimport hasWildcard from '@teambit/legacy/dist/utils/string/has-wildcard';\nimport mapSeries from 'p-map-series';\nimport { BitId, BitIds } from '@teambit/legacy/dist/bit-id';\nimport { BitError } from '@teambit/bit-error';\nimport GeneralError from '@teambit/legacy/dist/error/general-error';\nimport { DEFAULT_LANE, LaneId } from '@teambit/lane-id';\nimport { AutoTagResult } from '@teambit/legacy/dist/scope/component-ops/auto-tag';\nimport { getDivergeData } from '@teambit/legacy/dist/scope/component-ops/get-diverge-data';\nimport { UnmergedComponent } from '@teambit/legacy/dist/scope/lanes/unmerged-components';\nimport { Lane, ModelComponent, Version } from '@teambit/legacy/dist/scope/models';\nimport { Ref } from '@teambit/legacy/dist/scope/objects';\nimport chalk from 'chalk';\nimport { Tmp } from '@teambit/legacy/dist/scope/repositories';\nimport { pathNormalizeToLinux } from '@teambit/legacy/dist/utils';\nimport { ComponentWriterAspect, ComponentWriterMain } from '@teambit/component-writer';\nimport ConsumerComponent from '@teambit/legacy/dist/consumer/component/consumer-component';\nimport { Logger, LoggerAspect, LoggerMain } from '@teambit/logger';\nimport { compact } from 'lodash';\nimport { applyModifiedVersion } from '@teambit/legacy/dist/consumer/versions-ops/checkout-version';\nimport threeWayMerge, {\n  MergeResultsThreeWay,\n} from '@teambit/legacy/dist/consumer/versions-ops/merge-version/three-way-merge';\nimport { NoCommonSnap } from '@teambit/legacy/dist/scope/exceptions/no-common-snap';\nimport { CheckoutAspect, CheckoutMain } from '@teambit/checkout';\nimport { ComponentID } from '@teambit/component-id';\nimport { SnapsDistance } from '@teambit/legacy/dist/scope/component-ops/snaps-distance';\nimport { InstallMain, InstallAspect } from '@teambit/install';\nimport { MergeCmd } from './merge-cmd';\nimport { MergingAspect } from './merging.aspect';\nimport { ConfigMerger } from './config-merger';\nimport { ConfigMergeResult } from './config-merge-result';\n\ntype ResolveUnrelatedData = { strategy: MergeStrategy; head: Ref };\n\nexport type ComponentMergeStatus = {\n  currentComponent?: ConsumerComponent | null;\n  componentFromModel?: Version;\n  id: BitId;\n  unmergedMessage?: string;\n  unmergedLegitimately?: boolean; // failed to merge but for a legitimate reason, such as, up-to-date\n  mergeResults?: MergeResultsThreeWay | null;\n  divergeData?: SnapsDistance;\n  resolvedUnrelated?: ResolveUnrelatedData;\n  configMergeResult?: ConfigMergeResult;\n};\n\nexport type ComponentMergeStatusBeforeMergeAttempt = {\n  currentComponent?: ConsumerComponent | null;\n  componentFromModel?: Version;\n  id: BitId;\n  unmergedMessage?: string;\n  unmergedLegitimately?: boolean; // failed to merge but for a legitimate reason, such as, up-to-date\n  divergeData?: SnapsDistance;\n  resolvedUnrelated?: ResolveUnrelatedData;\n  mergeProps?: {\n    otherLaneHead: Ref;\n    currentId: BitId;\n    modelComponent: ModelComponent;\n  };\n};\n\nexport type ApplyVersionResults = {\n  components?: ApplyVersionResult[];\n  version?: string;\n  failedComponents?: FailedComponents[];\n  resolvedComponents?: ConsumerComponent[]; // relevant for bit merge --resolve\n  abortedComponents?: ApplyVersionResult[]; // relevant for bit merge --abort\n  mergeSnapResults?: { snappedComponents: ConsumerComponent[]; autoSnappedResults: AutoTagResult[] } | null;\n  mergeSnapError?: Error;\n  leftUnresolvedConflicts?: boolean;\n  verbose?: boolean;\n  newFromLane?: string[];\n  newFromLaneAdded?: boolean;\n  installationError?: Error; // in case the package manager failed, it won't throw, instead, it'll return error here\n};\n\nexport class MergingMain {\n  private consumer: Consumer;\n  constructor(\n    private workspace: Workspace,\n    private install: InstallMain,\n    private snapping: SnappingMain,\n    private checkout: CheckoutMain,\n    private logger: Logger,\n    private componentWriter: ComponentWriterMain\n  ) {\n    this.consumer = this.workspace?.consumer;\n  }\n\n  async merge(\n    ids: string[],\n    mergeStrategy: MergeStrategy,\n    abort: boolean,\n    resolve: boolean,\n    noSnap: boolean,\n    message: string,\n    build: boolean,\n    skipDependencyInstallation: boolean\n  ): Promise<ApplyVersionResults> {\n    if (!this.workspace) throw new OutsideWorkspaceError();\n    const consumer: Consumer = this.workspace.consumer;\n    let mergeResults;\n    if (resolve) {\n      mergeResults = await this.resolveMerge(ids, message, build);\n    } else if (abort) {\n      mergeResults = await this.abortMerge(ids);\n    } else {\n      const bitIds = this.getComponentsToMerge(consumer, ids);\n      // @todo: version could be the lane only or remote/lane\n      mergeResults = await this.mergeComponentsFromRemote(\n        consumer,\n        bitIds,\n        mergeStrategy,\n        noSnap,\n        message,\n        build,\n        skipDependencyInstallation\n      );\n    }\n    await consumer.onDestroy();\n    return mergeResults;\n  }\n\n  /**\n   * when user is on main, it merges the remote main components into local.\n   * when user is on a lane, it merges the remote lane components into the local lane.\n   */\n  async mergeComponentsFromRemote(\n    consumer: Consumer,\n    bitIds: BitId[],\n    mergeStrategy: MergeStrategy,\n    noSnap: boolean,\n    snapMessage: string,\n    build: boolean,\n    skipDependencyInstallation: boolean\n  ): Promise<ApplyVersionResults> {\n    const currentLaneId = consumer.getCurrentLaneId();\n    const currentLaneObject = await consumer.getCurrentLaneObject();\n    const allComponentsStatus = await this.getAllComponentsStatus(bitIds, currentLaneId, currentLaneObject);\n    const failedComponents = allComponentsStatus.filter((c) => c.unmergedMessage && !c.unmergedLegitimately);\n    if (failedComponents.length) {\n      const failureMsgs = failedComponents\n        .map(\n          (failedComponent) =>\n            `${chalk.bold(failedComponent.id.toString())} - ${chalk.red(failedComponent.unmergedMessage as string)}`\n        )\n        .join('\\n');\n      throw new BitError(`unable to merge due to the following failures:\\n${failureMsgs}`);\n    }\n\n    return this.mergeSnaps({\n      mergeStrategy,\n      allComponentsStatus,\n      laneId: currentLaneId,\n      localLane: currentLaneObject,\n      noSnap,\n      snapMessage,\n      build,\n      skipDependencyInstallation,\n    });\n  }\n\n  /**\n   * merge multiple components according to the \"allComponentsStatus\".\n   */\n  async mergeSnaps({\n    mergeStrategy,\n    allComponentsStatus,\n    laneId,\n    localLane,\n    noSnap,\n    tag,\n    snapMessage,\n    build,\n    skipDependencyInstallation,\n  }: {\n    mergeStrategy: MergeStrategy;\n    allComponentsStatus: ComponentMergeStatus[];\n    laneId: LaneId;\n    localLane: Lane | null;\n    noSnap: boolean;\n    tag?: boolean;\n    snapMessage: string;\n    build: boolean;\n    skipDependencyInstallation?: boolean;\n  }): Promise<ApplyVersionResults> {\n    const consumer = this.workspace.consumer;\n    const componentWithConflict = allComponentsStatus.find(\n      (component) => component.mergeResults && component.mergeResults.hasConflicts\n    );\n    if (componentWithConflict && !mergeStrategy) {\n      mergeStrategy = await getMergeStrategyInteractive();\n    }\n    const failedComponents: FailedComponents[] = allComponentsStatus\n      .filter((componentStatus) => componentStatus.unmergedMessage)\n      .map((componentStatus) => ({\n        id: componentStatus.id,\n        failureMessage: componentStatus.unmergedMessage as string,\n        unchangedLegitimately: componentStatus.unmergedLegitimately,\n      }));\n    const succeededComponents = allComponentsStatus.filter((componentStatus) => !componentStatus.unmergedMessage);\n    // do not use Promise.all for applyVersion. otherwise, it'll write all components in parallel,\n    // which can be an issue when some components are also dependencies of others\n    const componentsResults = await mapSeries(\n      succeededComponents,\n      async ({ currentComponent, id, mergeResults, resolvedUnrelated, configMergeResult }) => {\n        const modelComponent = await consumer.scope.getModelComponent(id);\n        const updatedLaneId = laneId.isDefault() ? LaneId.from(laneId.name, id.scope as string) : laneId;\n        return this.applyVersion({\n          currentComponent,\n          id,\n          mergeResults,\n          mergeStrategy,\n          remoteHead: modelComponent.getRef(id.version as string) as Ref,\n          laneId: updatedLaneId,\n          localLane,\n          resolvedUnrelated,\n          configMergeResult,\n        });\n      }\n    );\n\n    const allConfigMerge = succeededComponents.map((c) => c.configMergeResult);\n    await this.generateConfigMergeConflictFileForAll(compact(allConfigMerge));\n\n    if (localLane) consumer.scope.objects.add(localLane);\n\n    await consumer.scope.objects.persist(); // persist anyway, if localLane is null it should save all main heads\n\n    await consumer.scope.objects.unmergedComponents.write();\n\n    await consumer.writeBitMap();\n\n    const componentsHasConfigMergeConflicts = allComponentsStatus.some((c) => c.configMergeResult?.hasConflicts());\n    const leftUnresolvedConflicts = componentWithConflict && mergeStrategy === 'manual';\n    if (!skipDependencyInstallation && !leftUnresolvedConflicts && !componentsHasConfigMergeConflicts) {\n      try {\n        await this.install.install(undefined, {\n          dedupe: true,\n          updateExisting: false,\n          import: false,\n        });\n      } catch (err: any) {\n        this.logger.error(`failed installing packages`, err);\n        this.logger.consoleError(`failed installing packages, see the log for full stacktrace. error: ${err.message}`);\n      }\n    }\n\n    const getSnapOrTagResults = async () => {\n      // if one of the component has conflict, don't snap-merge. otherwise, some of the components would be snap-merged\n      // and some not. besides the fact that it could by mistake tag dependent, it's a confusing state. better not snap.\n      if (noSnap || leftUnresolvedConflicts || componentsHasConfigMergeConflicts) {\n        return null;\n      }\n      if (tag) {\n        const idsToTag = allComponentsStatus.map((c) => c.id);\n        const results = await this.tagAllLaneComponent(idsToTag, snapMessage, build);\n        if (!results) return null;\n        const { taggedComponents, autoTaggedResults } = results;\n        return { snappedComponents: taggedComponents, autoSnappedResults: autoTaggedResults };\n      }\n      return this.snapResolvedComponents(consumer, snapMessage, build);\n    };\n    let mergeSnapResults: ApplyVersionResults['mergeSnapResults'] = null;\n    let mergeSnapError: Error | undefined;\n    try {\n      mergeSnapResults = await getSnapOrTagResults();\n    } catch (err: any) {\n      mergeSnapError = err;\n    }\n\n    return {\n      components: componentsResults,\n      failedComponents,\n      mergeSnapResults,\n      mergeSnapError,\n      leftUnresolvedConflicts,\n    };\n  }\n\n  private async generateConfigMergeConflictFileForAll(allConfigMerge: ConfigMergeResult[]) {\n    const configMergeFile = this.workspace.getConflictMergeFile();\n    allConfigMerge.forEach((configMerge) => {\n      const conflict = configMerge.generateMergeConflictFile();\n      if (!conflict) return;\n      configMergeFile.addConflict(configMerge.compIdStr, conflict);\n    });\n    if (configMergeFile.hasConflict()) {\n      await configMergeFile.write();\n    }\n  }\n\n  /**\n   * this function gets called from two different commands:\n   * 1. \"bit merge <ids...>\", when merging a component from a remote to the local.\n   * in this case, the remote and local are on the same lane or both on main.\n   * 2. \"bit lane merge\", when merging from one lane to another.\n   */\n  async getMergeStatus(\n    bitIds: BitId[], // the id.version is the version we want to merge to the current component\n    currentLane: Lane | null, // currently checked out lane. if on main, then it's null.\n    otherLane?: Lane | null, // the lane we want to merged to our lane. (null if it's \"main\").\n    options?: { resolveUnrelated?: MergeStrategy; ignoreConfigChanges?: boolean }\n  ): Promise<ComponentMergeStatus[]> {\n    const componentStatusBeforeMergeAttempt = await Promise.all(\n      bitIds.map((id) => this.getComponentStatusBeforeMergeAttempt(id, currentLane, options))\n    );\n\n    const toImport = componentStatusBeforeMergeAttempt\n      .map((compStatus) => {\n        if (!compStatus.divergeData || !compStatus.divergeData.commonSnapBeforeDiverge) return [];\n        return [compStatus.id.changeVersion(compStatus.divergeData.commonSnapBeforeDiverge.toString())];\n      })\n      .flat();\n\n    await this.consumer.scope.scopeImporter.importManyIfMissingWithoutDeps({\n      ids: BitIds.fromArray(toImport),\n      lane: otherLane || undefined,\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.consumer.scope);\n      try {\n        const componentsStatus = await Promise.all(\n          compStatusNeedMerge.map((compStatus) =>\n            this.getComponentMergeStatus(currentLane, otherLane || undefined, compStatus)\n          )\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 getComponentStatusBeforeMergeAttempt(\n    id: BitId, // the id.version is the version we want to merge to the current component\n    localLane: Lane | null, // currently checked out lane. if on main, then it's null.\n    options?: { resolveUnrelated?: MergeStrategy; ignoreConfigChanges?: boolean }\n  ): Promise<ComponentMergeStatusBeforeMergeAttempt> {\n    const consumer = this.workspace.consumer;\n    const componentStatus: ComponentMergeStatus = { id };\n    const returnUnmerged = (msg: string, unmergedLegitimately = false) => {\n      componentStatus.unmergedMessage = msg;\n      componentStatus.unmergedLegitimately = unmergedLegitimately;\n      return componentStatus;\n    };\n    const modelComponent = await consumer.scope.getModelComponentIfExist(id);\n    if (!modelComponent) {\n      return returnUnmerged(\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.name);\n    if (unmerged) {\n      return returnUnmerged(\n        `component ${id.toStringWithoutVersion()} is in during-merge state a previous merge, please snap/tag it first (or use bit merge --resolve/--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.getBitIdIfExist(id, { ignoreVersion: true });\n    const componentOnOther: Version = await modelComponent.loadVersion(version, consumer.scope.objects);\n    if (componentOnOther.isRemoved()) {\n      return returnUnmerged(`component has been removed`, true);\n    }\n    const getCurrentId = () => {\n      if (existingBitMapId) return existingBitMapId;\n      if (localLane) {\n        const idOnLane = localLane.getComponent(id);\n        if (!idOnLane) return null;\n        return idOnLane.id.changeVersion(idOnLane.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 { currentComponent: null, componentFromModel: componentOnOther, id, 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.removed) {\n      return returnUnmerged(`component has been removed`, true);\n    }\n    const isModified = async () => {\n      const componentModificationStatus = await consumer.getComponentStatusById(currentComponent.id);\n      if (!componentModificationStatus.modified) return false;\n      if (!existingBitMapId) return false;\n      const baseComponent = await modelComponent.loadVersion(\n        existingBitMapId.version as string,\n        consumer.scope.objects\n      );\n      return options?.ignoreConfigChanges\n        ? consumer.isComponentSourceCodeModified(baseComponent, currentComponent)\n        : true;\n    };\n\n    const isComponentModified = await isModified();\n\n    if (isComponentModified) {\n      return returnUnmerged(`component is modified, please snap/tag it first`);\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      const mainHead = modelComponent.head;\n      if (divergeData.err instanceof NoCommonSnap && options?.resolveUnrelated && 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 returnUnmerged(\n            `unable to traverse ${currentComponent.id.toString()} history. the main-head ${mainHead.toString()} doesn't appear in both lanes, it was probably created in each lane separately`\n          );\n        }\n        const versionToSaveInLane = hasResolvedLocally ? currentComponent.id.version : id.version;\n        const resolvedRef = modelComponent.getRef(versionToSaveInLane as string);\n        if (!resolvedRef) throw new Error(`unable to get ref of \"${versionToSaveInLane}\" for \"${id.toString()}\"`);\n        if (options?.resolveUnrelated === 'theirs') {\n          // just override with the model data\n          return {\n            currentComponent,\n            componentFromModel: componentOnOther,\n            id,\n            divergeData,\n            resolvedUnrelated: { strategy: 'theirs', head: resolvedRef },\n          };\n        }\n        if (options?.resolveUnrelated === 'ours') {\n          return {\n            currentComponent,\n            id,\n            divergeData,\n            resolvedUnrelated: { strategy: 'ours', head: resolvedRef },\n          };\n        }\n        throw new Error(\n          `unsupported strategy \"${options?.resolveUnrelated}\" of resolve-unrelated. supported strategies are: [ours, theirs]`\n        );\n      }\n      return returnUnmerged(\n        `unable to traverse ${currentComponent.id.toString()} history. error: ${divergeData.err.message}`\n      );\n    }\n    if (!divergeData.isDiverged()) {\n      if (divergeData.isSourceAhead()) {\n        // do nothing!\n        return returnUnmerged(`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          currentComponent,\n          componentFromModel: componentOnOther,\n          id,\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 returnUnmerged(`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    return { currentComponent, id, divergeData, mergeProps };\n  }\n\n  private async getComponentMergeStatus(\n    localLane: Lane | null, // currently checked out lane. if on main, then it's null.\n    otherLane: Lane | undefined, // the lane name we want to merged to our lane. (can be also \"main\").\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 consumer = this.workspace.consumer;\n    const repo = 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 = localLane?.toLaneId().toString() || 'main';\n    const otherLaneName = otherLane ? 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      otherLane,\n      currentComponent.extensions,\n      baseComponent.extensions,\n      otherComponent.extensions,\n      currentLabel,\n      otherLabel\n    );\n    const configMergeResult = configMerger.merge();\n\n    const mergeResults = await threeWayMerge({\n      consumer,\n      otherComponent,\n      otherLabel,\n      currentComponent,\n      currentLabel,\n      baseComponent,\n    });\n    return { currentComponent, id, mergeResults, divergeData, configMergeResult };\n  }\n\n  private async applyVersion({\n    currentComponent,\n    id,\n    mergeResults,\n    mergeStrategy,\n    remoteHead,\n    laneId,\n    localLane,\n    resolvedUnrelated,\n    configMergeResult,\n  }: {\n    currentComponent: ConsumerComponent | null | undefined;\n    id: BitId;\n    mergeResults: MergeResultsThreeWay | null | undefined;\n    mergeStrategy: MergeStrategy;\n    remoteHead: Ref;\n    laneId: LaneId;\n    localLane: Lane | null;\n    resolvedUnrelated?: ResolveUnrelatedData;\n    configMergeResult?: ConfigMergeResult;\n  }): Promise<ApplyVersionResult> {\n    const consumer = this.workspace.consumer;\n    let filesStatus = {};\n    const unmergedComponent: UnmergedComponent = {\n      // @ts-ignore\n      id: { name: id.name, scope: id.scope },\n      head: remoteHead,\n      remote: laneId.scope, // @todo: remove. it has been deprecated around 0.0.832\n      lane: laneId.name, // @todo: remove. it has been deprecated around 0.0.832\n      laneId,\n    };\n    id = currentComponent ? currentComponent.id : id;\n\n    const modelComponent = await consumer.scope.getModelComponent(id);\n    const handleResolveUnrelated = () => {\n      if (!currentComponent) throw new Error('currentComponent must be defined when resolvedUnrelated');\n      if (!localLane) throw new Error('localLane must be defined when resolvedUnrelated');\n      if (!resolvedUnrelated?.head) throw new Error('resolvedUnrelated must have head prop');\n      localLane.addComponent({ id, head: resolvedUnrelated.head });\n      const head = modelComponent.getRef(currentComponent.id.version as string);\n      if (!head) throw new Error(`unable to get the head for resolved-unrelated ${id.toString()}`);\n      unmergedComponent.laneId = localLane.toLaneId();\n      unmergedComponent.head = head;\n      unmergedComponent.unrelated = true;\n      consumer.scope.objects.unmergedComponents.addEntry(unmergedComponent);\n      return { id, filesStatus };\n    };\n\n    const markAllFilesAsUnchanged = () => {\n      if (!currentComponent) throw new Error(`applyVersion expect to get currentComponent for ${id.toString()}`);\n      currentComponent.files.forEach((file) => {\n        filesStatus[pathNormalizeToLinux(file.relative)] = FileStatus.unchanged;\n      });\n    };\n    if (mergeResults && mergeResults.hasConflicts && mergeStrategy === MergeOptions.ours) {\n      markAllFilesAsUnchanged();\n      consumer.scope.objects.unmergedComponents.addEntry(unmergedComponent);\n      return { id, filesStatus };\n    }\n    if (resolvedUnrelated?.strategy === 'ours') {\n      markAllFilesAsUnchanged();\n      return handleResolveUnrelated();\n    }\n    const remoteId = id.changeVersion(remoteHead.toString());\n    const idToLoad = !mergeResults || mergeStrategy === MergeOptions.theirs ? remoteId : id;\n    const componentWithDependencies = await consumer.loadComponentWithDependenciesFromModel(idToLoad);\n    const files = componentWithDependencies.component.files;\n    files.forEach((file) => {\n      // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n      filesStatus[pathNormalizeToLinux(file.relative)] = FileStatus.updated;\n    });\n\n    if (mergeResults) {\n      // update files according to the merge results\n      const { filesStatus: modifiedStatus, modifiedFiles } = applyModifiedVersion(files, mergeResults, mergeStrategy);\n      componentWithDependencies.component.files = modifiedFiles;\n      filesStatus = { ...filesStatus, ...modifiedStatus };\n    }\n\n    const manyComponentsWriterOpts = {\n      consumer,\n      componentsWithDependencies: [componentWithDependencies],\n      skipDependencyInstallation: true,\n      writeConfig: false, // @todo: should write if config exists before, needs to figure out how to do it.\n    };\n    await this.componentWriter.writeMany(manyComponentsWriterOpts);\n\n    if (configMergeResult) {\n      if (!componentWithDependencies.component.writtenPath) {\n        throw new Error(`componentWithDependencies.component.writtenPath is missing for ${id.toString()}`);\n      }\n      const successfullyMergedConfig = configMergeResult.getSuccessfullyMergedConfig();\n      if (successfullyMergedConfig) {\n        unmergedComponent.mergedConfig = successfullyMergedConfig;\n        // no need to `unmergedComponents.addEntry` here. it'll be added in the next lines inside `if (mergeResults)`.\n        // because if `configMergeResult` is set, `mergeResults` must be set as well. both happen on diverge.\n      }\n    }\n\n    // if mergeResults, the head snap is going to be updated on a later phase when snapping with two parents\n    // otherwise, update the head of the current lane or main\n    if (mergeResults) {\n      if (mergeResults.hasConflicts && mergeStrategy === MergeOptions.manual) {\n        unmergedComponent.unmergedPaths = mergeResults.modifiedFiles.filter((f) => f.conflict).map((f) => f.filePath);\n      }\n      consumer.scope.objects.unmergedComponents.addEntry(unmergedComponent);\n    } else if (localLane) {\n      if (resolvedUnrelated) {\n        // must be \"theirs\"\n        return handleResolveUnrelated();\n      }\n      localLane.addComponent({ id, head: remoteHead });\n    } else {\n      // this is main\n      modelComponent.setHead(remoteHead);\n      // mark it as local, otherwise, when importing this component from a remote, it'll override it.\n      modelComponent.markVersionAsLocal(remoteHead.toString());\n      consumer.scope.objects.add(modelComponent);\n    }\n\n    return { id, filesStatus };\n  }\n\n  private async abortMerge(values: string[]): Promise<ApplyVersionResults> {\n    const consumer = this.workspace.consumer;\n    const ids = await this.getIdsForUnmerged(values);\n    const results = await this.checkout.checkout({ ids, reset: true });\n    ids.forEach((id) => consumer.scope.objects.unmergedComponents.removeComponent(id.fullName));\n    await consumer.scope.objects.unmergedComponents.write();\n    return { abortedComponents: results.components };\n  }\n\n  private async resolveMerge(values: string[], snapMessage: string, build: boolean): Promise<ApplyVersionResults> {\n    const ids = await this.getIdsForUnmerged(values);\n    // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n    const { snappedComponents } = await this.snapping.snap({\n      legacyBitIds: BitIds.fromArray(ids.map((id) => id._legacy)),\n      build,\n      message: snapMessage,\n    });\n    return { resolvedComponents: snappedComponents };\n  }\n\n  private async getAllComponentsStatus(\n    bitIds: BitId[],\n    laneId: LaneId,\n    localLaneObject: Lane | null\n  ): Promise<ComponentMergeStatus[]> {\n    const ids = await Promise.all(\n      bitIds.map(async (bitId) => {\n        const remoteScopeName = laneId.isDefault() ? bitId.scope : laneId.scope;\n        const remoteLaneId = LaneId.from(laneId.name, remoteScopeName as string);\n        const remoteHead = await this.consumer.scope.objects.remoteLanes.getRef(remoteLaneId, bitId);\n        const laneIdStr = remoteLaneId.toString();\n        if (!remoteHead) {\n          throw new BitError(`unable to find a remote head of \"${bitId.toStringWithoutVersion()}\" in \"${laneIdStr}\"`);\n        }\n        return bitId.changeVersion(remoteHead.toString());\n      })\n    );\n\n    return this.getMergeStatus(ids, localLaneObject, localLaneObject);\n  }\n\n  private async snapResolvedComponents(\n    consumer: Consumer,\n    snapMessage: string,\n    build: boolean\n  ): Promise<null | { snappedComponents: ConsumerComponent[]; autoSnappedResults: AutoTagResult[] }> {\n    const unmergedComponents = consumer.scope.objects.unmergedComponents.getComponents();\n    this.logger.debug(`merge-snaps, snapResolvedComponents, total ${unmergedComponents.length.toString()} components`);\n    if (!unmergedComponents.length) return null;\n    const ids = BitIds.fromArray(unmergedComponents.map((r) => new BitId(r.id)));\n    return this.snapping.snap({\n      legacyBitIds: ids,\n      build,\n      message: snapMessage,\n    });\n  }\n\n  private async tagAllLaneComponent(idsToTag: BitId[], tagMessage: string, build: boolean): Promise<TagResults | null> {\n    const ids = idsToTag.map((id) => {\n      return id.toStringWithoutVersion();\n    });\n    this.logger.debug(`merge-snaps, tagResolvedComponents, total ${idsToTag.length.toString()} components`);\n    return this.snapping.tag({\n      ids,\n      build,\n      message: tagMessage,\n      unmodified: true,\n    });\n  }\n\n  private async getIdsForUnmerged(idsStr?: string[]): Promise<ComponentID[]> {\n    if (idsStr && idsStr.length) {\n      const componentIds = await this.workspace.resolveMultipleComponentIds(idsStr);\n      componentIds.forEach((id) => {\n        const entry = this.workspace.consumer.scope.objects.unmergedComponents.getEntry(id.fullName);\n        if (!entry) {\n          throw new GeneralError(`unable to merge-resolve ${id.toString()}, it is not marked as unresolved`);\n        }\n      });\n      return componentIds;\n    }\n    const unresolvedComponents = this.workspace.consumer.scope.objects.unmergedComponents.getComponents();\n    if (!unresolvedComponents.length) throw new GeneralError(`all components are resolved already, nothing to do`);\n    return unresolvedComponents.map((u) => ComponentID.fromLegacy(new BitId(u.id)));\n  }\n\n  private getComponentsToMerge(consumer: Consumer, ids: string[]): BitId[] {\n    if (hasWildcard(ids)) {\n      const componentsList = new ComponentsList(consumer);\n      return componentsList.listComponentsByIdsWithWildcard(ids);\n    }\n    return ids.map((id) => consumer.getParsedId(id));\n  }\n\n  static slots = [];\n  static dependencies = [\n    CLIAspect,\n    WorkspaceAspect,\n    SnappingAspect,\n    CheckoutAspect,\n    InstallAspect,\n    LoggerAspect,\n    ComponentWriterAspect,\n  ];\n  static runtime = MainRuntime;\n  static async provider([cli, workspace, snapping, checkout, install, loggerMain, compWriter]: [\n    CLIMain,\n    Workspace,\n    SnappingMain,\n    CheckoutMain,\n    InstallMain,\n    LoggerMain,\n    ComponentWriterMain\n  ]) {\n    const logger = loggerMain.createLogger(MergingAspect.id);\n    const merging = new MergingMain(workspace, install, snapping, checkout, logger, compWriter);\n    cli.register(new MergeCmd(merging));\n    return merging;\n  }\n}\n\nMergingAspect.addRuntime(MergingMain);\n"],"mappings":"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"}
+{"version":3,"names":["MergingMain","constructor","workspace","install","snapping","checkout","logger","componentWriter","importer","consumer","merge","ids","mergeStrategy","abort","resolve","noSnap","message","build","skipDependencyInstallation","OutsideWorkspaceError","mergeResults","resolveMerge","abortMerge","bitIds","getComponentsToMerge","mergeComponentsFromRemote","onDestroy","snapMessage","currentLaneId","getCurrentLaneId","currentLaneObject","getCurrentLaneObject","allComponentsStatus","getAllComponentsStatus","failedComponents","filter","c","unmergedMessage","unmergedLegitimately","length","failureMsgs","map","failedComponent","chalk","bold","id","toString","red","join","BitError","mergeSnaps","laneId","localLane","tag","componentWithConflict","find","component","hasConflicts","getMergeStrategyInteractive","componentStatus","failureMessage","unchangedLegitimately","succeededComponents","componentsResults","mapSeries","currentComponent","resolvedUnrelated","configMergeResult","modelComponent","scope","getModelComponent","updatedLaneId","isDefault","LaneId","from","name","applyVersion","remoteHead","getRef","version","allConfigMerge","generateConfigMergeConflictFileForAll","compact","objects","add","persist","unmergedComponents","write","writeBitMap","componentsHasConfigMergeConflicts","some","leftUnresolvedConflicts","undefined","dedupe","updateExisting","import","err","error","consoleError","getSnapOrTagResults","idsToTag","results","tagAllLaneComponent","taggedComponents","autoTaggedResults","snappedComponents","autoSnappedResults","snapResolvedComponents","mergeSnapResults","mergeSnapError","components","configMergeFile","getConflictMergeFile","forEach","configMerge","conflict","generateMergeConflictFile","addConflict","compIdStr","hasConflict","getMergeStatus","currentLane","otherLane","options","importObjectsFromMainIfExist","toBitIds","toVersionLatest","componentStatusBeforeMergeAttempt","Promise","all","getComponentStatusBeforeMergeAttempt","toImport","compStatus","divergeData","commonSnapBeforeDiverge","changeVersion","flat","scopeImporter","importManyIfMissingWithoutDeps","BitIds","fromArray","lane","compStatusNotNeedMerge","mergeProps","compStatusNeedMerge","getComponentsStatusNeedMerge","tmp","Tmp","componentsStatus","getComponentMergeStatus","clear","push","returnUnmerged","msg","getModelComponentIfExist","unmerged","getEntry","toStringWithoutVersion","repo","otherLaneHead","existingBitMapId","bitMap","getBitIdIfExist","ignoreVersion","componentOnOther","loadVersion","isRemoved","getCurrentId","idOnLane","getComponent","head","getHeadAsTagIfExist","currentId","getDivergeData","targetHead","throws","componentFromModel","getCurrentComponent","loadComponent","getConsumerComponent","removed","isModified","componentModificationStatus","getComponentStatusById","modified","baseComponent","ignoreConfigChanges","isComponentSourceCodeModified","isComponentModified","Error","mainHead","NoCommonSnap","resolveUnrelated","hasResolvedFromMain","hashToCompare","divergeDataFromMain","sourceHead","hasResolvedLocally","getHeadRegardlessOfLane","hasResolvedRemotely","versionToSaveInLane","resolvedRef","strategy","isDiverged","isSourceAhead","isTargetAhead","componentMergeStatusBeforeMergeAttempt","baseSnap","debug","otherComponent","currentLaneName","toLaneId","otherLaneName","DEFAULT_LANE","currentLabel","otherLabel","workspaceIds","listIds","configMerger","ConfigMerger","extensions","threeWayMerge","filesStatus","unmergedComponent","remote","handleResolveUnrelated","addComponent","unrelated","addEntry","markAllFilesAsUnchanged","files","file","pathNormalizeToLinux","relative","FileStatus","unchanged","MergeOptions","ours","remoteId","idToLoad","theirs","componentWithDependencies","loadComponentWithDependenciesFromModel","updated","modifiedStatus","modifiedFiles","applyModifiedVersion","manyComponentsWriterOpts","componentsWithDependencies","writeConfig","writeMany","writtenPath","successfullyMergedConfig","getSuccessfullyMergedConfig","mergedConfig","manual","unmergedPaths","f","filePath","setHead","markVersionAsLocal","values","getIdsForUnmerged","reset","removeComponent","fullName","abortedComponents","snap","legacyBitIds","_legacy","resolvedComponents","localLaneObject","bitId","remoteScopeName","remoteLaneId","remoteLanes","laneIdStr","getComponents","r","BitId","tagMessage","unmodified","idsStr","componentIds","resolveMultipleComponentIds","entry","GeneralError","unresolvedComponents","u","ComponentID","fromLegacy","hasWildcard","componentsList","ComponentsList","listComponentsByIdsWithWildcard","getParsedId","provider","cli","loggerMain","compWriter","createLogger","MergingAspect","merging","register","MergeCmd","CLIAspect","WorkspaceAspect","SnappingAspect","CheckoutAspect","InstallAspect","LoggerAspect","ComponentWriterAspect","ImporterAspect","MainRuntime","addRuntime"],"sources":["merging.main.runtime.ts"],"sourcesContent":["import { CLIAspect, CLIMain, MainRuntime } from '@teambit/cli';\nimport WorkspaceAspect, { OutsideWorkspaceError, Workspace } from '@teambit/workspace';\nimport { Consumer } from '@teambit/legacy/dist/consumer';\nimport ComponentsList from '@teambit/legacy/dist/consumer/component/components-list';\nimport {\n  MergeStrategy,\n  FailedComponents,\n  FileStatus,\n  ApplyVersionResult,\n  getMergeStrategyInteractive,\n  MergeOptions,\n} from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport SnappingAspect, { SnappingMain, TagResults } from '@teambit/snapping';\nimport hasWildcard from '@teambit/legacy/dist/utils/string/has-wildcard';\nimport mapSeries from 'p-map-series';\nimport { BitId, BitIds } from '@teambit/legacy/dist/bit-id';\nimport { BitError } from '@teambit/bit-error';\nimport GeneralError from '@teambit/legacy/dist/error/general-error';\nimport { DEFAULT_LANE, LaneId } from '@teambit/lane-id';\nimport { AutoTagResult } from '@teambit/legacy/dist/scope/component-ops/auto-tag';\nimport { getDivergeData } from '@teambit/legacy/dist/scope/component-ops/get-diverge-data';\nimport { UnmergedComponent } from '@teambit/legacy/dist/scope/lanes/unmerged-components';\nimport { Lane, ModelComponent, Version } from '@teambit/legacy/dist/scope/models';\nimport { Ref } from '@teambit/legacy/dist/scope/objects';\nimport chalk from 'chalk';\nimport { Tmp } from '@teambit/legacy/dist/scope/repositories';\nimport { pathNormalizeToLinux } from '@teambit/legacy/dist/utils';\nimport { ComponentWriterAspect, ComponentWriterMain } from '@teambit/component-writer';\nimport ConsumerComponent from '@teambit/legacy/dist/consumer/component/consumer-component';\nimport ImporterAspect, { ImporterMain } from '@teambit/importer';\nimport { Logger, LoggerAspect, LoggerMain } from '@teambit/logger';\nimport { compact } from 'lodash';\nimport { applyModifiedVersion } from '@teambit/legacy/dist/consumer/versions-ops/checkout-version';\nimport threeWayMerge, {\n  MergeResultsThreeWay,\n} from '@teambit/legacy/dist/consumer/versions-ops/merge-version/three-way-merge';\nimport { NoCommonSnap } from '@teambit/legacy/dist/scope/exceptions/no-common-snap';\nimport { CheckoutAspect, CheckoutMain } from '@teambit/checkout';\nimport { ComponentID } from '@teambit/component-id';\nimport { SnapsDistance } from '@teambit/legacy/dist/scope/component-ops/snaps-distance';\nimport { InstallMain, InstallAspect } from '@teambit/install';\nimport { MergeCmd } from './merge-cmd';\nimport { MergingAspect } from './merging.aspect';\nimport { ConfigMerger } from './config-merger';\nimport { ConfigMergeResult } from './config-merge-result';\n\ntype ResolveUnrelatedData = { strategy: MergeStrategy; head: Ref };\n\nexport type ComponentMergeStatus = {\n  currentComponent?: ConsumerComponent | null;\n  componentFromModel?: Version;\n  id: BitId;\n  unmergedMessage?: string;\n  unmergedLegitimately?: boolean; // failed to merge but for a legitimate reason, such as, up-to-date\n  mergeResults?: MergeResultsThreeWay | null;\n  divergeData?: SnapsDistance;\n  resolvedUnrelated?: ResolveUnrelatedData;\n  configMergeResult?: ConfigMergeResult;\n};\n\nexport type ComponentMergeStatusBeforeMergeAttempt = {\n  currentComponent?: ConsumerComponent | null;\n  componentFromModel?: Version;\n  id: BitId;\n  unmergedMessage?: string;\n  unmergedLegitimately?: boolean; // failed to merge but for a legitimate reason, such as, up-to-date\n  divergeData?: SnapsDistance;\n  resolvedUnrelated?: ResolveUnrelatedData;\n  mergeProps?: {\n    otherLaneHead: Ref;\n    currentId: BitId;\n    modelComponent: ModelComponent;\n  };\n};\n\nexport type ApplyVersionResults = {\n  components?: ApplyVersionResult[];\n  version?: string;\n  failedComponents?: FailedComponents[];\n  resolvedComponents?: ConsumerComponent[]; // relevant for bit merge --resolve\n  abortedComponents?: ApplyVersionResult[]; // relevant for bit merge --abort\n  mergeSnapResults?: { snappedComponents: ConsumerComponent[]; autoSnappedResults: AutoTagResult[] } | null;\n  mergeSnapError?: Error;\n  leftUnresolvedConflicts?: boolean;\n  verbose?: boolean;\n  newFromLane?: string[];\n  newFromLaneAdded?: boolean;\n  installationError?: Error; // in case the package manager failed, it won't throw, instead, it'll return error here\n  compilationError?: Error; // in case the compiler failed, it won't throw, instead, it'll return error here\n};\n\nexport class MergingMain {\n  private consumer: Consumer;\n  constructor(\n    private workspace: Workspace,\n    private install: InstallMain,\n    private snapping: SnappingMain,\n    private checkout: CheckoutMain,\n    private logger: Logger,\n    private componentWriter: ComponentWriterMain,\n    private importer: ImporterMain\n  ) {\n    this.consumer = this.workspace?.consumer;\n  }\n\n  async merge(\n    ids: string[],\n    mergeStrategy: MergeStrategy,\n    abort: boolean,\n    resolve: boolean,\n    noSnap: boolean,\n    message: string,\n    build: boolean,\n    skipDependencyInstallation: boolean\n  ): Promise<ApplyVersionResults> {\n    if (!this.workspace) throw new OutsideWorkspaceError();\n    const consumer: Consumer = this.workspace.consumer;\n    let mergeResults;\n    if (resolve) {\n      mergeResults = await this.resolveMerge(ids, message, build);\n    } else if (abort) {\n      mergeResults = await this.abortMerge(ids);\n    } else {\n      const bitIds = this.getComponentsToMerge(consumer, ids);\n      // @todo: version could be the lane only or remote/lane\n      mergeResults = await this.mergeComponentsFromRemote(\n        consumer,\n        bitIds,\n        mergeStrategy,\n        noSnap,\n        message,\n        build,\n        skipDependencyInstallation\n      );\n    }\n    await consumer.onDestroy();\n    return mergeResults;\n  }\n\n  /**\n   * when user is on main, it merges the remote main components into local.\n   * when user is on a lane, it merges the remote lane components into the local lane.\n   */\n  async mergeComponentsFromRemote(\n    consumer: Consumer,\n    bitIds: BitId[],\n    mergeStrategy: MergeStrategy,\n    noSnap: boolean,\n    snapMessage: string,\n    build: boolean,\n    skipDependencyInstallation: boolean\n  ): Promise<ApplyVersionResults> {\n    const currentLaneId = consumer.getCurrentLaneId();\n    const currentLaneObject = await consumer.getCurrentLaneObject();\n    const allComponentsStatus = await this.getAllComponentsStatus(bitIds, currentLaneId, currentLaneObject);\n    const failedComponents = allComponentsStatus.filter((c) => c.unmergedMessage && !c.unmergedLegitimately);\n    if (failedComponents.length) {\n      const failureMsgs = failedComponents\n        .map(\n          (failedComponent) =>\n            `${chalk.bold(failedComponent.id.toString())} - ${chalk.red(failedComponent.unmergedMessage as string)}`\n        )\n        .join('\\n');\n      throw new BitError(`unable to merge due to the following failures:\\n${failureMsgs}`);\n    }\n\n    return this.mergeSnaps({\n      mergeStrategy,\n      allComponentsStatus,\n      laneId: currentLaneId,\n      localLane: currentLaneObject,\n      noSnap,\n      snapMessage,\n      build,\n      skipDependencyInstallation,\n    });\n  }\n\n  /**\n   * merge multiple components according to the \"allComponentsStatus\".\n   */\n  async mergeSnaps({\n    mergeStrategy,\n    allComponentsStatus,\n    laneId,\n    localLane,\n    noSnap,\n    tag,\n    snapMessage,\n    build,\n    skipDependencyInstallation,\n  }: {\n    mergeStrategy: MergeStrategy;\n    allComponentsStatus: ComponentMergeStatus[];\n    laneId: LaneId;\n    localLane: Lane | null;\n    noSnap: boolean;\n    tag?: boolean;\n    snapMessage: string;\n    build: boolean;\n    skipDependencyInstallation?: boolean;\n  }): Promise<ApplyVersionResults> {\n    const consumer = this.workspace.consumer;\n    const componentWithConflict = allComponentsStatus.find(\n      (component) => component.mergeResults && component.mergeResults.hasConflicts\n    );\n    if (componentWithConflict && !mergeStrategy) {\n      mergeStrategy = await getMergeStrategyInteractive();\n    }\n    const failedComponents: FailedComponents[] = allComponentsStatus\n      .filter((componentStatus) => componentStatus.unmergedMessage)\n      .map((componentStatus) => ({\n        id: componentStatus.id,\n        failureMessage: componentStatus.unmergedMessage as string,\n        unchangedLegitimately: componentStatus.unmergedLegitimately,\n      }));\n    const succeededComponents = allComponentsStatus.filter((componentStatus) => !componentStatus.unmergedMessage);\n    // do not use Promise.all for applyVersion. otherwise, it'll write all components in parallel,\n    // which can be an issue when some components are also dependencies of others\n    const componentsResults = await mapSeries(\n      succeededComponents,\n      async ({ currentComponent, id, mergeResults, resolvedUnrelated, configMergeResult }) => {\n        const modelComponent = await consumer.scope.getModelComponent(id);\n        const updatedLaneId = laneId.isDefault() ? LaneId.from(laneId.name, id.scope as string) : laneId;\n        return this.applyVersion({\n          currentComponent,\n          id,\n          mergeResults,\n          mergeStrategy,\n          remoteHead: modelComponent.getRef(id.version as string) as Ref,\n          laneId: updatedLaneId,\n          localLane,\n          resolvedUnrelated,\n          configMergeResult,\n        });\n      }\n    );\n\n    const allConfigMerge = succeededComponents.map((c) => c.configMergeResult);\n    await this.generateConfigMergeConflictFileForAll(compact(allConfigMerge));\n\n    if (localLane) consumer.scope.objects.add(localLane);\n\n    await consumer.scope.objects.persist(); // persist anyway, if localLane is null it should save all main heads\n\n    await consumer.scope.objects.unmergedComponents.write();\n\n    await consumer.writeBitMap();\n\n    const componentsHasConfigMergeConflicts = allComponentsStatus.some((c) => c.configMergeResult?.hasConflicts());\n    const leftUnresolvedConflicts = componentWithConflict && mergeStrategy === 'manual';\n    if (!skipDependencyInstallation && !leftUnresolvedConflicts && !componentsHasConfigMergeConflicts) {\n      try {\n        await this.install.install(undefined, {\n          dedupe: true,\n          updateExisting: false,\n          import: false,\n        });\n      } catch (err: any) {\n        this.logger.error(`failed installing packages`, err);\n        this.logger.consoleError(`failed installing packages, see the log for full stacktrace. error: ${err.message}`);\n      }\n    }\n\n    const getSnapOrTagResults = async () => {\n      // if one of the component has conflict, don't snap-merge. otherwise, some of the components would be snap-merged\n      // and some not. besides the fact that it could by mistake tag dependent, it's a confusing state. better not snap.\n      if (noSnap || leftUnresolvedConflicts || componentsHasConfigMergeConflicts) {\n        return null;\n      }\n      if (tag) {\n        const idsToTag = allComponentsStatus.map((c) => c.id);\n        const results = await this.tagAllLaneComponent(idsToTag, snapMessage, build);\n        if (!results) return null;\n        const { taggedComponents, autoTaggedResults } = results;\n        return { snappedComponents: taggedComponents, autoSnappedResults: autoTaggedResults };\n      }\n      return this.snapResolvedComponents(consumer, snapMessage, build);\n    };\n    let mergeSnapResults: ApplyVersionResults['mergeSnapResults'] = null;\n    let mergeSnapError: Error | undefined;\n    try {\n      mergeSnapResults = await getSnapOrTagResults();\n    } catch (err: any) {\n      mergeSnapError = err;\n    }\n\n    return {\n      components: componentsResults,\n      failedComponents,\n      mergeSnapResults,\n      mergeSnapError,\n      leftUnresolvedConflicts,\n    };\n  }\n\n  private async generateConfigMergeConflictFileForAll(allConfigMerge: ConfigMergeResult[]) {\n    const configMergeFile = this.workspace.getConflictMergeFile();\n    allConfigMerge.forEach((configMerge) => {\n      const conflict = configMerge.generateMergeConflictFile();\n      if (!conflict) return;\n      configMergeFile.addConflict(configMerge.compIdStr, conflict);\n    });\n    if (configMergeFile.hasConflict()) {\n      await configMergeFile.write();\n    }\n  }\n\n  /**\n   * this function gets called from two different commands:\n   * 1. \"bit merge <ids...>\", when merging a component from a remote to the local.\n   * in this case, the remote and local are on the same lane or both on main.\n   * 2. \"bit lane merge\", when merging from one lane to another.\n   */\n  async getMergeStatus(\n    bitIds: BitId[], // the id.version is the version we want to merge to the current component\n    currentLane: Lane | null, // currently checked out lane. if on main, then it's null.\n    otherLane?: Lane | null, // the lane we want to merged to our lane. (null if it's \"main\").\n    options?: { resolveUnrelated?: MergeStrategy; ignoreConfigChanges?: boolean }\n  ): Promise<ComponentMergeStatus[]> {\n    if (!currentLane && otherLane) {\n      await this.importer.importObjectsFromMainIfExist(otherLane.toBitIds().toVersionLatest());\n    }\n    const componentStatusBeforeMergeAttempt = await Promise.all(\n      bitIds.map((id) => this.getComponentStatusBeforeMergeAttempt(id, currentLane, options))\n    );\n    const toImport = componentStatusBeforeMergeAttempt\n      .map((compStatus) => {\n        if (!compStatus.divergeData || !compStatus.divergeData.commonSnapBeforeDiverge) return [];\n        return [compStatus.id.changeVersion(compStatus.divergeData.commonSnapBeforeDiverge.toString())];\n      })\n      .flat();\n\n    await this.consumer.scope.scopeImporter.importManyIfMissingWithoutDeps({\n      ids: BitIds.fromArray(toImport),\n      lane: otherLane || undefined,\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.consumer.scope);\n      try {\n        const componentsStatus = await Promise.all(\n          compStatusNeedMerge.map((compStatus) =>\n            this.getComponentMergeStatus(currentLane, otherLane || undefined, compStatus)\n          )\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 getComponentStatusBeforeMergeAttempt(\n    id: BitId, // the id.version is the version we want to merge to the current component\n    localLane: Lane | null, // currently checked out lane. if on main, then it's null.\n    options?: { resolveUnrelated?: MergeStrategy; ignoreConfigChanges?: boolean }\n  ): Promise<ComponentMergeStatusBeforeMergeAttempt> {\n    const consumer = this.workspace.consumer;\n    const componentStatus: ComponentMergeStatus = { id };\n    const returnUnmerged = (msg: string, unmergedLegitimately = false) => {\n      componentStatus.unmergedMessage = msg;\n      componentStatus.unmergedLegitimately = unmergedLegitimately;\n      return componentStatus;\n    };\n    const modelComponent = await consumer.scope.getModelComponentIfExist(id);\n    if (!modelComponent) {\n      return returnUnmerged(\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.name);\n    if (unmerged) {\n      return returnUnmerged(\n        `component ${id.toStringWithoutVersion()} is in during-merge state a previous merge, please snap/tag it first (or use bit merge --resolve/--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.getBitIdIfExist(id, { ignoreVersion: true });\n    const componentOnOther: Version = await modelComponent.loadVersion(version, consumer.scope.objects);\n    if (componentOnOther.isRemoved()) {\n      return returnUnmerged(`component has been removed`, true);\n    }\n    const getCurrentId = () => {\n      if (existingBitMapId) return existingBitMapId;\n      if (localLane) {\n        const idOnLane = localLane.getComponent(id);\n        if (!idOnLane) return null;\n        return idOnLane.id.changeVersion(idOnLane.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 { currentComponent: null, componentFromModel: componentOnOther, id, 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.removed) {\n      return returnUnmerged(`component has been removed`, true);\n    }\n    const isModified = async () => {\n      const componentModificationStatus = await consumer.getComponentStatusById(currentComponent.id);\n      if (!componentModificationStatus.modified) return false;\n      if (!existingBitMapId) return false;\n      const baseComponent = await modelComponent.loadVersion(\n        existingBitMapId.version as string,\n        consumer.scope.objects\n      );\n      return options?.ignoreConfigChanges\n        ? consumer.isComponentSourceCodeModified(baseComponent, currentComponent)\n        : true;\n    };\n\n    const isComponentModified = await isModified();\n\n    if (isComponentModified) {\n      return returnUnmerged(`component is modified, please snap/tag it first`);\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      const mainHead = modelComponent.head;\n      if (divergeData.err instanceof NoCommonSnap && options?.resolveUnrelated && 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 returnUnmerged(\n            `unable to traverse ${currentComponent.id.toString()} history. the main-head ${mainHead.toString()} doesn't appear in both lanes, it was probably created in each lane separately`\n          );\n        }\n        const versionToSaveInLane = hasResolvedLocally ? currentComponent.id.version : id.version;\n        const resolvedRef = modelComponent.getRef(versionToSaveInLane as string);\n        if (!resolvedRef) throw new Error(`unable to get ref of \"${versionToSaveInLane}\" for \"${id.toString()}\"`);\n        if (options?.resolveUnrelated === 'theirs') {\n          // just override with the model data\n          return {\n            currentComponent,\n            componentFromModel: componentOnOther,\n            id,\n            divergeData,\n            resolvedUnrelated: { strategy: 'theirs', head: resolvedRef },\n          };\n        }\n        if (options?.resolveUnrelated === 'ours') {\n          return {\n            currentComponent,\n            id,\n            divergeData,\n            resolvedUnrelated: { strategy: 'ours', head: resolvedRef },\n          };\n        }\n        throw new Error(\n          `unsupported strategy \"${options?.resolveUnrelated}\" of resolve-unrelated. supported strategies are: [ours, theirs]`\n        );\n      }\n      return returnUnmerged(\n        `unable to traverse ${currentComponent.id.toString()} history. error: ${divergeData.err.message}`\n      );\n    }\n    if (!divergeData.isDiverged()) {\n      if (divergeData.isSourceAhead()) {\n        // do nothing!\n        return returnUnmerged(`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          currentComponent,\n          componentFromModel: componentOnOther,\n          id,\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 returnUnmerged(`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    return { currentComponent, id, divergeData, mergeProps };\n  }\n\n  private async getComponentMergeStatus(\n    localLane: Lane | null, // currently checked out lane. if on main, then it's null.\n    otherLane: Lane | undefined, // the lane name we want to merged to our lane. (can be also \"main\").\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 consumer = this.workspace.consumer;\n    const repo = 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 = localLane?.toLaneId().toString() || 'main';\n    const otherLaneName = otherLane ? 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      otherLane,\n      currentComponent.extensions,\n      baseComponent.extensions,\n      otherComponent.extensions,\n      currentLabel,\n      otherLabel\n    );\n    const configMergeResult = configMerger.merge();\n\n    const mergeResults = await threeWayMerge({\n      consumer,\n      otherComponent,\n      otherLabel,\n      currentComponent,\n      currentLabel,\n      baseComponent,\n    });\n    return { currentComponent, id, mergeResults, divergeData, configMergeResult };\n  }\n\n  private async applyVersion({\n    currentComponent,\n    id,\n    mergeResults,\n    mergeStrategy,\n    remoteHead,\n    laneId,\n    localLane,\n    resolvedUnrelated,\n    configMergeResult,\n  }: {\n    currentComponent: ConsumerComponent | null | undefined;\n    id: BitId;\n    mergeResults: MergeResultsThreeWay | null | undefined;\n    mergeStrategy: MergeStrategy;\n    remoteHead: Ref;\n    laneId: LaneId;\n    localLane: Lane | null;\n    resolvedUnrelated?: ResolveUnrelatedData;\n    configMergeResult?: ConfigMergeResult;\n  }): Promise<ApplyVersionResult> {\n    const consumer = this.workspace.consumer;\n    let filesStatus = {};\n    const unmergedComponent: UnmergedComponent = {\n      // @ts-ignore\n      id: { name: id.name, scope: id.scope },\n      head: remoteHead,\n      remote: laneId.scope, // @todo: remove. it has been deprecated around 0.0.832\n      lane: laneId.name, // @todo: remove. it has been deprecated around 0.0.832\n      laneId,\n    };\n    id = currentComponent ? currentComponent.id : id;\n\n    const modelComponent = await consumer.scope.getModelComponent(id);\n    const handleResolveUnrelated = () => {\n      if (!currentComponent) throw new Error('currentComponent must be defined when resolvedUnrelated');\n      if (!localLane) throw new Error('localLane must be defined when resolvedUnrelated');\n      if (!resolvedUnrelated?.head) throw new Error('resolvedUnrelated must have head prop');\n      localLane.addComponent({ id, head: resolvedUnrelated.head });\n      const head = modelComponent.getRef(currentComponent.id.version as string);\n      if (!head) throw new Error(`unable to get the head for resolved-unrelated ${id.toString()}`);\n      unmergedComponent.laneId = localLane.toLaneId();\n      unmergedComponent.head = head;\n      unmergedComponent.unrelated = true;\n      consumer.scope.objects.unmergedComponents.addEntry(unmergedComponent);\n      return { id, filesStatus };\n    };\n\n    const markAllFilesAsUnchanged = () => {\n      if (!currentComponent) throw new Error(`applyVersion expect to get currentComponent for ${id.toString()}`);\n      currentComponent.files.forEach((file) => {\n        filesStatus[pathNormalizeToLinux(file.relative)] = FileStatus.unchanged;\n      });\n    };\n    if (mergeResults && mergeResults.hasConflicts && mergeStrategy === MergeOptions.ours) {\n      markAllFilesAsUnchanged();\n      consumer.scope.objects.unmergedComponents.addEntry(unmergedComponent);\n      return { id, filesStatus };\n    }\n    if (resolvedUnrelated?.strategy === 'ours') {\n      markAllFilesAsUnchanged();\n      return handleResolveUnrelated();\n    }\n    const remoteId = id.changeVersion(remoteHead.toString());\n    const idToLoad = !mergeResults || mergeStrategy === MergeOptions.theirs ? remoteId : id;\n    const componentWithDependencies = await consumer.loadComponentWithDependenciesFromModel(idToLoad);\n    const files = componentWithDependencies.component.files;\n    files.forEach((file) => {\n      // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n      filesStatus[pathNormalizeToLinux(file.relative)] = FileStatus.updated;\n    });\n\n    if (mergeResults) {\n      // update files according to the merge results\n      const { filesStatus: modifiedStatus, modifiedFiles } = applyModifiedVersion(files, mergeResults, mergeStrategy);\n      componentWithDependencies.component.files = modifiedFiles;\n      filesStatus = { ...filesStatus, ...modifiedStatus };\n    }\n\n    const manyComponentsWriterOpts = {\n      consumer,\n      componentsWithDependencies: [componentWithDependencies],\n      skipDependencyInstallation: true,\n      writeConfig: false, // @todo: should write if config exists before, needs to figure out how to do it.\n    };\n    await this.componentWriter.writeMany(manyComponentsWriterOpts);\n\n    if (configMergeResult) {\n      if (!componentWithDependencies.component.writtenPath) {\n        throw new Error(`componentWithDependencies.component.writtenPath is missing for ${id.toString()}`);\n      }\n      const successfullyMergedConfig = configMergeResult.getSuccessfullyMergedConfig();\n      if (successfullyMergedConfig) {\n        unmergedComponent.mergedConfig = successfullyMergedConfig;\n        // no need to `unmergedComponents.addEntry` here. it'll be added in the next lines inside `if (mergeResults)`.\n        // because if `configMergeResult` is set, `mergeResults` must be set as well. both happen on diverge.\n      }\n    }\n\n    // if mergeResults, the head snap is going to be updated on a later phase when snapping with two parents\n    // otherwise, update the head of the current lane or main\n    if (mergeResults) {\n      if (mergeResults.hasConflicts && mergeStrategy === MergeOptions.manual) {\n        unmergedComponent.unmergedPaths = mergeResults.modifiedFiles.filter((f) => f.conflict).map((f) => f.filePath);\n      }\n      consumer.scope.objects.unmergedComponents.addEntry(unmergedComponent);\n    } else if (localLane) {\n      if (resolvedUnrelated) {\n        // must be \"theirs\"\n        return handleResolveUnrelated();\n      }\n      localLane.addComponent({ id, head: remoteHead });\n    } else {\n      // this is main\n      modelComponent.setHead(remoteHead);\n      // mark it as local, otherwise, when importing this component from a remote, it'll override it.\n      modelComponent.markVersionAsLocal(remoteHead.toString());\n      consumer.scope.objects.add(modelComponent);\n    }\n\n    return { id, filesStatus };\n  }\n\n  private async abortMerge(values: string[]): Promise<ApplyVersionResults> {\n    const consumer = this.workspace.consumer;\n    const ids = await this.getIdsForUnmerged(values);\n    const results = await this.checkout.checkout({ ids, reset: true });\n    ids.forEach((id) => consumer.scope.objects.unmergedComponents.removeComponent(id.fullName));\n    await consumer.scope.objects.unmergedComponents.write();\n    return { abortedComponents: results.components };\n  }\n\n  private async resolveMerge(values: string[], snapMessage: string, build: boolean): Promise<ApplyVersionResults> {\n    const ids = await this.getIdsForUnmerged(values);\n    // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n    const { snappedComponents } = await this.snapping.snap({\n      legacyBitIds: BitIds.fromArray(ids.map((id) => id._legacy)),\n      build,\n      message: snapMessage,\n    });\n    return { resolvedComponents: snappedComponents };\n  }\n\n  private async getAllComponentsStatus(\n    bitIds: BitId[],\n    laneId: LaneId,\n    localLaneObject: Lane | null\n  ): Promise<ComponentMergeStatus[]> {\n    const ids = await Promise.all(\n      bitIds.map(async (bitId) => {\n        const remoteScopeName = laneId.isDefault() ? bitId.scope : laneId.scope;\n        const remoteLaneId = LaneId.from(laneId.name, remoteScopeName as string);\n        const remoteHead = await this.consumer.scope.objects.remoteLanes.getRef(remoteLaneId, bitId);\n        const laneIdStr = remoteLaneId.toString();\n        if (!remoteHead) {\n          throw new BitError(`unable to find a remote head of \"${bitId.toStringWithoutVersion()}\" in \"${laneIdStr}\"`);\n        }\n        return bitId.changeVersion(remoteHead.toString());\n      })\n    );\n\n    return this.getMergeStatus(ids, localLaneObject, localLaneObject);\n  }\n\n  private async snapResolvedComponents(\n    consumer: Consumer,\n    snapMessage: string,\n    build: boolean\n  ): Promise<null | { snappedComponents: ConsumerComponent[]; autoSnappedResults: AutoTagResult[] }> {\n    const unmergedComponents = consumer.scope.objects.unmergedComponents.getComponents();\n    this.logger.debug(`merge-snaps, snapResolvedComponents, total ${unmergedComponents.length.toString()} components`);\n    if (!unmergedComponents.length) return null;\n    const ids = BitIds.fromArray(unmergedComponents.map((r) => new BitId(r.id)));\n    return this.snapping.snap({\n      legacyBitIds: ids,\n      build,\n      message: snapMessage,\n    });\n  }\n\n  private async tagAllLaneComponent(idsToTag: BitId[], tagMessage: string, build: boolean): Promise<TagResults | null> {\n    const ids = idsToTag.map((id) => {\n      return id.toStringWithoutVersion();\n    });\n    this.logger.debug(`merge-snaps, tagResolvedComponents, total ${idsToTag.length.toString()} components`);\n    return this.snapping.tag({\n      ids,\n      build,\n      message: tagMessage,\n      unmodified: true,\n    });\n  }\n\n  private async getIdsForUnmerged(idsStr?: string[]): Promise<ComponentID[]> {\n    if (idsStr && idsStr.length) {\n      const componentIds = await this.workspace.resolveMultipleComponentIds(idsStr);\n      componentIds.forEach((id) => {\n        const entry = this.workspace.consumer.scope.objects.unmergedComponents.getEntry(id.fullName);\n        if (!entry) {\n          throw new GeneralError(`unable to merge-resolve ${id.toString()}, it is not marked as unresolved`);\n        }\n      });\n      return componentIds;\n    }\n    const unresolvedComponents = this.workspace.consumer.scope.objects.unmergedComponents.getComponents();\n    if (!unresolvedComponents.length) throw new GeneralError(`all components are resolved already, nothing to do`);\n    return unresolvedComponents.map((u) => ComponentID.fromLegacy(new BitId(u.id)));\n  }\n\n  private getComponentsToMerge(consumer: Consumer, ids: string[]): BitId[] {\n    if (hasWildcard(ids)) {\n      const componentsList = new ComponentsList(consumer);\n      return componentsList.listComponentsByIdsWithWildcard(ids);\n    }\n    return ids.map((id) => consumer.getParsedId(id));\n  }\n\n  static slots = [];\n  static dependencies = [\n    CLIAspect,\n    WorkspaceAspect,\n    SnappingAspect,\n    CheckoutAspect,\n    InstallAspect,\n    LoggerAspect,\n    ComponentWriterAspect,\n    ImporterAspect,\n  ];\n  static runtime = MainRuntime;\n  static async provider([cli, workspace, snapping, checkout, install, loggerMain, compWriter, importer]: [\n    CLIMain,\n    Workspace,\n    SnappingMain,\n    CheckoutMain,\n    InstallMain,\n    LoggerMain,\n    ComponentWriterMain,\n    ImporterMain\n  ]) {\n    const logger = loggerMain.createLogger(MergingAspect.id);\n    const merging = new MergingMain(workspace, install, snapping, checkout, logger, compWriter, importer);\n    cli.register(new MergeCmd(merging));\n    return merging;\n  }\n}\n\nMergingAspect.addRuntime(MergingMain);\n"],"mappings":"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"}

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@teambit/merging",
-  "version": "0.0.292",
+  "version": "0.0.293",
   "homepage": "https://bit.dev/teambit/component/merging",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.component",
     "name": "merging",
-    "version": "0.0.292"
+    "version": "0.0.293"
   },
   "dependencies": {
     "lodash": "4.17.21",
@@ -18,17 +18,18 @@
     "@teambit/component-version": "0.0.406",
     "@teambit/harmony": "0.4.6",
     "@teambit/component-id": "0.0.425",
-    "@teambit/dependency-resolver": "0.0.977",
-    "@teambit/envs": "0.0.977",
+    "@teambit/dependency-resolver": "0.0.978",
+    "@teambit/envs": "0.0.978",
     "@teambit/bit-error": "0.0.402",
-    "@teambit/cli": "0.0.656",
-    "@teambit/checkout": "0.0.146",
-    "@teambit/component-writer": "0.0.13",
-    "@teambit/install": "0.0.103",
-    "@teambit/lane-id": "0.0.173",
-    "@teambit/logger": "0.0.749",
-    "@teambit/snapping": "0.0.292",
-    "@teambit/workspace": "0.0.977"
+    "@teambit/cli": "0.0.657",
+    "@teambit/checkout": "0.0.147",
+    "@teambit/component-writer": "0.0.14",
+    "@teambit/importer": "0.0.407",
+    "@teambit/install": "0.0.104",
+    "@teambit/lane-id": "0.0.174",
+    "@teambit/logger": "0.0.750",
+    "@teambit/snapping": "0.0.293",
+    "@teambit/workspace": "0.0.978"
   },
   "devDependencies": {
     "chai": "4.3.0",
@@ -43,7 +44,7 @@
     "@types/testing-library__jest-dom": "5.9.5"
   },
   "peerDependencies": {
-    "@teambit/legacy": "1.0.438",
+    "@teambit/legacy": "1.0.439",
     "react": "^16.8.0 || ^17.0.0",
     "react-dom": "^16.8.0 || ^17.0.0"
   },