@teambit/merging 0.0.473 → 0.0.475

package/dist/merge-cmd.js.map

@@ -1 +1 @@
-{"version":3,"names":["_chalk","data","_interopRequireDefault","require","_lodash","_constants","_mergeVersion","_featureToggle","_bitError","MergeCmd","constructor","merging","_defineProperty2","default","WILDCARD_HELP","report","ids","ours","theirs","manual","autoMergeResolve","abort","resolve","build","noSnap","verbose","message","skipDependencyInstallation","isFeatureEnabled","BUILD_ON_CI","Boolean","BitError","components","failedComponents","version","resolvedComponents","abortedComponents","mergeSnapResults","mergeSnapError","merge","title","componentsStr","map","c","id","toStringWithoutVersion","join","chalk","underline","green","mergeReport","exports","removedComponents","leftUnresolvedConflicts","configMergeResults","workspaceDepsUpdates","getSuccessOutput","length","bold","fileChangesReport","applyVersionReport","getConflictSummary","suggestion","conflictSummaryReport","yellow","configMergeWithConflicts","filter","hasConflicts","getConfigMergeConflictSummary","comps","compIdStr","MergeConfigFilename","getSnapsOutput","snappedComponents","autoSnappedResults","outputComponents","component","componentOutput","toString","autoTag","result","triggeredBy","searchWithoutScopeAndVersion","autoTagComp","a","AUTO_SNAPPED_MSG","getWorkspaceDepsOutput","body","Object","keys","pkgName","from","to","getFailureOutput","compact","failedComponent","unchangedLegitimately","color","failureMessage","getSummary","merged","f","failedToMerge","autoSnapped","newLines","mergedStr","unchangedLegitimatelyStr","failedToMergeStr","autoSnappedStr","removedStr","getRemovedOutput","addName","showVersion","tab","fileChanges","name","files","filesStatus","file","FileStatus","unchanged","note","white","cyan","FILE_CHANGES_CHECKOUT_MSG","installationErrorOutput","installationError","subTitle","red","compilationErrorOutput","compilationError","getAddedOutput","addedComponents"],"sources":["merge-cmd.ts"],"sourcesContent":["import chalk from 'chalk';\nimport { Command, CommandOptions } from '@teambit/cli';\nimport { BitId } from '@teambit/legacy-bit-id';\nimport { ComponentID } from '@teambit/component-id';\nimport { compact } from 'lodash';\nimport {\n  WILDCARD_HELP,\n  AUTO_SNAPPED_MSG,\n  MergeConfigFilename,\n  FILE_CHANGES_CHECKOUT_MSG,\n} from '@teambit/legacy/dist/constants';\nimport {\n  FileStatus,\n  ApplyVersionResult,\n  MergeStrategy,\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 - auto-snaps all merged components';\n  helpUrl = 'reference/components/merging-changes';\n  group = 'development';\n  extendedDescription = `merge changes of the remote head into local when they are diverged. when on a lane, merge the remote head of the lane into the local\nand creates snaps for merged components that have diverged, on the lane.\nif no ids are specified, all pending-merge components will be merged. (run \"bit status\" to list them).\noptionally use '--abort' to revert the last merge. to revert a lane merge, use \"bit lane merge-abort\" command.\n${WILDCARD_HELP('merge')}`;\n  alias = '';\n  options = [\n    ['', 'ours', 'DEPRECATED. use --auto-merge-resolve. in case of a conflict, keep the local modification'],\n    [\n      '',\n      'theirs',\n      'DEPRECATED. use --auto-merge-resolve. in case of a conflict, override the local modification with the specified version',\n    ],\n    ['', 'manual', 'DEPRECATED. use --auto-merge-resolve'],\n    [\n      '',\n      'auto-merge-resolve <merge-strategy>',\n      'in case of a conflict, resolve according to the strategy: [ours, theirs, manual]',\n    ],\n    ['', 'abort', 'in case of an unresolved merge, revert to pre-merge state'],\n    ['', 'resolve', 'mark an unresolved merge as resolved and create a new snap with the changes'],\n    ['', 'no-snap', 'do not auto snap even if the merge completed without conflicts'],\n    ['', 'build', 'in case of snap during the merge, run the build-pipeline (similar to bit snap --build)'],\n    ['', 'verbose', 'show details of components that were not merged successfully'],\n    ['x', 'skip-dependency-installation', 'do not install new dependencies resulting from the merge'],\n    ['m', 'message <message>', 'override the default message for the auto snap'],\n  ] as CommandOptions;\n  loader = true;\n\n  constructor(private merging: MergingMain) {}\n\n  async report(\n    [ids = []]: [string[]],\n    {\n      ours = false,\n      theirs = false,\n      manual = false,\n      autoMergeResolve,\n      abort = false,\n      resolve = false,\n      build = false,\n      noSnap = false,\n      verbose = false,\n      message,\n      skipDependencyInstallation = false,\n    }: {\n      ours?: boolean;\n      theirs?: boolean;\n      manual?: boolean;\n      autoMergeResolve?: MergeStrategy;\n      abort?: boolean;\n      resolve?: boolean;\n      build?: boolean;\n      noSnap?: boolean;\n      verbose?: boolean;\n      message: string;\n      skipDependencyInstallation?: boolean;\n    }\n  ) {\n    build = isFeatureEnabled(BUILD_ON_CI) ? Boolean(build) : true;\n    if (ours || theirs || manual) {\n      throw new BitError(\n        'the \"--ours\", \"--theirs\" and \"--manual\" flags are deprecated. use \"--auto-merge-resolve\" instead'\n      );\n    }\n    if (\n      autoMergeResolve &&\n      autoMergeResolve !== 'ours' &&\n      autoMergeResolve !== 'theirs' &&\n      autoMergeResolve !== 'manual'\n    ) {\n      throw new BitError('--auto-merge-resolve must be one of the following: [ours, theirs, manual]');\n    }\n    if (abort && resolve) throw new BitError('unable to use \"abort\" and \"resolve\" flags together');\n    if (noSnap && message) throw new BitError('unable to use \"noSnap\" and \"message\" flags together');\n    const {\n      components,\n      failedComponents,\n      version,\n      resolvedComponents,\n      abortedComponents,\n      mergeSnapResults,\n      mergeSnapError,\n    }: ApplyVersionResults = await this.merging.merge(\n      ids,\n      autoMergeResolve as any,\n      abort,\n      resolve,\n      noSnap,\n      message,\n      build,\n      skipDependencyInstallation\n    );\n    if (resolvedComponents) {\n      const title = 'successfully resolved component(s)\\n';\n      const componentsStr = resolvedComponents.map((c) => c.id.toStringWithoutVersion()).join('\\n');\n      return chalk.underline(title) + chalk.green(componentsStr);\n    }\n    if (abortedComponents) {\n      const title = 'successfully aborted the merge of the following component(s)\\n';\n      const componentsStr = abortedComponents.map((c) => c.id.toStringWithoutVersion()).join('\\n');\n      return chalk.underline(title) + chalk.green(componentsStr);\n    }\n\n    return mergeReport({\n      components,\n      failedComponents,\n      version,\n      mergeSnapResults,\n      mergeSnapError,\n      verbose,\n    });\n  }\n}\n\nexport function mergeReport({\n  components,\n  failedComponents,\n  removedComponents,\n  version,\n  mergeSnapResults,\n  mergeSnapError,\n  leftUnresolvedConflicts,\n  verbose,\n  configMergeResults,\n  workspaceDepsUpdates,\n}: ApplyVersionResults & { configMergeResults?: ConfigMergeResult[] }): string {\n  const getSuccessOutput = () => {\n    if (!components || !components.length) return '';\n    const title = `successfully merged ${components.length} components${\n      version ? `from version ${chalk.bold(version)}` : ''\n    }\\n`;\n    const fileChangesReport = applyVersionReport(components);\n\n    return chalk.bold(title) + fileChangesReport;\n  };\n\n  const getConflictSummary = () => {\n    if (!components || !components.length || !leftUnresolvedConflicts) return '';\n    const title = `\\n\\nfiles with conflicts summary\\n`;\n    const suggestion = `\\n\\nmerge process not completed due to the conflicts above. fix conflicts manually and then run \"bit install\".\nonce ready, snap/tag the components to complete the merge.`;\n    return chalk.underline(title) + conflictSummaryReport(components) + chalk.yellow(suggestion);\n  };\n\n  const configMergeWithConflicts = configMergeResults?.filter((c) => c.hasConflicts()) || [];\n  const getConfigMergeConflictSummary = () => {\n    if (!configMergeWithConflicts.length) return '';\n    const comps = configMergeWithConflicts.map((c) => c.compIdStr).join('\\n');\n    const title = `\\n\\ncomponents with config-merge conflicts\\n`;\n    const suggestion = `\\nconflicts were found while trying to merge the config. fix them manually by editing the ${MergeConfigFilename} file in the workspace root.\nonce ready, snap/tag the components to complete the merge.`;\n    return chalk.underline(title) + comps + chalk.yellow(suggestion);\n  };\n\n  const getSnapsOutput = () => {\n    if (mergeSnapError) {\n      return `\n${chalk.bold('snapping merged components failed with the following error, please fix the issues and snap manually')}\n${mergeSnapError.message}\n`;\n    }\n    if (!mergeSnapResults || !mergeSnapResults.snappedComponents) return '';\n    const { snappedComponents, autoSnappedResults } = mergeSnapResults;\n    const outputComponents = (comps) => {\n      return comps\n        .map((component) => {\n          let componentOutput = `     > ${component.id.toString()}`;\n          const autoTag = autoSnappedResults.filter((result) =>\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 snapped as a result of the merge'})\\n${outputComponents(snappedComponents)}\\n`;\n  };\n\n  const getWorkspaceDepsOutput = () => {\n    if (!workspaceDepsUpdates) return '';\n\n    const title = '\\nworkspace.jsonc has been updated with the following dependencies';\n    const body = Object.keys(workspaceDepsUpdates)\n      .map((pkgName) => {\n        const [from, to] = workspaceDepsUpdates[pkgName];\n        return `  ${pkgName}: ${from} => ${to}`;\n      })\n      .join('\\n');\n\n    return `\\n${chalk.underline(title)}\\n${body}\\n\\n`;\n  };\n\n  const getFailureOutput = () => {\n    if (!failedComponents || !failedComponents.length) return '';\n    const title = '\\nmerge skipped for the following component(s)';\n    const body = compact(\n      failedComponents.map((failedComponent) => {\n        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(`\\nmerge skipped legitimately for ${failedComponents.length} component(s)`)}\n(use --verbose to list them next time)`;\n    }\n    return `\\n${chalk.underline(title)}\\n${body}\\n\\n`;\n  };\n\n  const getSummary = () => {\n    const merged = components?.length || 0;\n    const unchangedLegitimately = failedComponents?.filter((f) => f.unchangedLegitimately).length || 0;\n    const 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    const removedStr = `\\nTotal Removed: ${chalk.bold(removedComponents?.length.toString() || '0')}`;\n\n    return newLines + title + mergedStr + unchangedLegitimatelyStr + failedToMergeStr + autoSnappedStr + removedStr;\n  };\n\n  return (\n    getSuccessOutput() +\n    getFailureOutput() +\n    getRemovedOutput(removedComponents) +\n    getSnapsOutput() +\n    getWorkspaceDepsOutput() +\n    getConfigMergeConflictSummary() +\n    getConflictSummary() +\n    getSummary()\n  );\n}\n\n/**\n * shows only the file-changes section.\n * if all files are \"unchanged\", it returns an empty string\n */\nexport function applyVersionReport(components: ApplyVersionResult[], addName = true, showVersion = false): string {\n  const tab = addName ? '\\t' : '';\n  const fileChanges = compact(\n    components.map((component: ApplyVersionResult) => {\n      const name = showVersion ? component.id.toString() : component.id.toStringWithoutVersion();\n      const files = compact(\n        Object.keys(component.filesStatus).map((file) => {\n          if (component.filesStatus[file] === FileStatus.unchanged) return null;\n          const note =\n            component.filesStatus[file] === FileStatus.manual\n              ? chalk.white(\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      if (!files) return null;\n      return `${addName ? name : ''}\\n${chalk.cyan(files)}`;\n    })\n  ).join('\\n\\n');\n  if (!fileChanges) {\n    return '';\n  }\n  const title = `\\n${FILE_CHANGES_CHECKOUT_MSG}\\n`;\n  return chalk.underline(title) + fileChanges;\n}\n\nexport function conflictSummaryReport(components: ApplyVersionResult[]): string {\n  const tab = '\\t';\n  return compact(\n    components.map((component: ApplyVersionResult) => {\n      const name = component.id.toStringWithoutVersion();\n      const files = compact(\n        Object.keys(component.filesStatus).map((file) => {\n          if (component.filesStatus[file] === FileStatus.manual) {\n            return `${tab}${component.filesStatus[file]} ${chalk.bold(file)}`;\n          }\n          return null;\n        })\n      );\n      if (!files.length) return null;\n\n      return `${name}\\n${chalk.cyan(files.join('\\n'))}`;\n    })\n  ).join('\\n');\n}\n\nexport function installationErrorOutput(installationError?: Error) {\n  if (!installationError) return '';\n  const title = chalk.underline('Installation Error');\n  const subTitle = 'The following error was thrown by the package manager, please fix the issue and run \"bit install\"';\n  const body = chalk.red(installationError.message);\n  return `\\n\\n${title}\\n${subTitle}\\n${body}`;\n}\n\nexport function compilationErrorOutput(compilationError?: Error) {\n  if (!compilationError) return '';\n  const title = chalk.underline('Compilation Error');\n  const subTitle = 'The following error was thrown by the compiler, please fix the issue and run \"bit compile\"';\n  const body = chalk.red(compilationError.message);\n  return `\\n\\n${title}\\n${subTitle}\\n${body}`;\n}\n\nexport function getRemovedOutput(removedComponents?: BitId[]) {\n  if (!removedComponents?.length) return '';\n  const title = `the following ${removedComponents.length} component(s) have been removed`;\n  const body = removedComponents.join('\\n');\n  return `\\n\\n${chalk.underline(title)}\\n${body}\\n\\n`;\n}\n\nexport function getAddedOutput(addedComponents?: ComponentID[]) {\n  if (!addedComponents?.length) return '';\n  const title = `the following ${addedComponents.length} component(s) have been added`;\n  const body = addedComponents.join('\\n');\n  return `\\n\\n${chalk.underline(title)}\\n${body}\\n\\n`;\n}\n"],"mappings":"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"}
+{"version":3,"names":["_chalk","data","_interopRequireDefault","require","_lodash","_constants","_mergeVersion","_featureToggle","_bitError","obj","__esModule","default","_defineProperty","key","value","_toPropertyKey","Object","defineProperty","enumerable","configurable","writable","arg","_toPrimitive","String","input","hint","prim","Symbol","toPrimitive","undefined","res","call","TypeError","Number","MergeCmd","constructor","merging","WILDCARD_HELP","report","ids","ours","theirs","manual","autoMergeResolve","abort","resolve","build","noSnap","verbose","message","skipDependencyInstallation","isFeatureEnabled","BUILD_ON_CI","Boolean","BitError","components","failedComponents","version","resolvedComponents","abortedComponents","mergeSnapResults","mergeSnapError","merge","title","componentsStr","map","c","id","toStringWithoutVersion","join","chalk","underline","green","mergeReport","exports","removedComponents","leftUnresolvedConflicts","configMergeResults","workspaceDepsUpdates","getSuccessOutput","length","bold","fileChangesReport","applyVersionReport","getConflictSummary","suggestion","conflictSummaryReport","yellow","configMergeWithConflicts","filter","hasConflicts","getConfigMergeConflictSummary","comps","compIdStr","MergeConfigFilename","getSnapsOutput","snappedComponents","autoSnappedResults","outputComponents","component","componentOutput","toString","autoTag","result","triggeredBy","searchWithoutScopeAndVersion","autoTagComp","a","AUTO_SNAPPED_MSG","getWorkspaceDepsOutput","body","keys","pkgName","from","to","getFailureOutput","compact","failedComponent","unchangedLegitimately","color","unchangedMessage","getSummary","merged","f","failedToMerge","autoSnapped","newLines","mergedStr","unchangedLegitimatelyStr","failedToMergeStr","autoSnappedStr","removedStr","getRemovedOutput","addName","showVersion","tab","fileChanges","name","files","filesStatus","file","FileStatus","unchanged","note","white","cyan","FILE_CHANGES_CHECKOUT_MSG","installationErrorOutput","installationError","subTitle","red","compilationErrorOutput","compilationError","getAddedOutput","addedComponents"],"sources":["merge-cmd.ts"],"sourcesContent":["import chalk from 'chalk';\nimport { Command, CommandOptions } from '@teambit/cli';\nimport { BitId } from '@teambit/legacy-bit-id';\nimport { ComponentID } from '@teambit/component-id';\nimport { compact } from 'lodash';\nimport {\n  WILDCARD_HELP,\n  AUTO_SNAPPED_MSG,\n  MergeConfigFilename,\n  FILE_CHANGES_CHECKOUT_MSG,\n} from '@teambit/legacy/dist/constants';\nimport {\n  FileStatus,\n  ApplyVersionResult,\n  MergeStrategy,\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 - auto-snaps all merged components';\n  helpUrl = 'reference/components/merging-changes';\n  group = 'development';\n  extendedDescription = `merge changes of the remote head into local when they are diverged. when on a lane, merge the remote head of the lane into the local\nand creates snaps for merged components that have diverged, on the lane.\nif no ids are specified, all pending-merge components will be merged. (run \"bit status\" to list them).\noptionally use '--abort' to revert the last merge. to revert a lane merge, use \"bit lane merge-abort\" command.\n${WILDCARD_HELP('merge')}`;\n  alias = '';\n  options = [\n    ['', 'ours', 'DEPRECATED. use --auto-merge-resolve. in case of a conflict, keep the local modification'],\n    [\n      '',\n      'theirs',\n      'DEPRECATED. use --auto-merge-resolve. in case of a conflict, override the local modification with the specified version',\n    ],\n    ['', 'manual', 'DEPRECATED. use --auto-merge-resolve'],\n    [\n      '',\n      'auto-merge-resolve <merge-strategy>',\n      'in case of a conflict, resolve according to the strategy: [ours, theirs, manual]',\n    ],\n    ['', 'abort', 'in case of an unresolved merge, revert to pre-merge state'],\n    ['', 'resolve', 'mark an unresolved merge as resolved and create a new snap with the changes'],\n    ['', 'no-snap', 'do not auto snap even if the merge completed without conflicts'],\n    ['', 'build', 'in case of snap during the merge, run the build-pipeline (similar to bit snap --build)'],\n    ['', 'verbose', 'show details of components that were not merged successfully'],\n    ['x', 'skip-dependency-installation', 'do not install new dependencies resulting from the merge'],\n    ['m', 'message <message>', 'override the default message for the auto snap'],\n  ] as CommandOptions;\n  loader = true;\n\n  constructor(private merging: MergingMain) {}\n\n  async report(\n    [ids = []]: [string[]],\n    {\n      ours = false,\n      theirs = false,\n      manual = false,\n      autoMergeResolve,\n      abort = false,\n      resolve = false,\n      build = false,\n      noSnap = false,\n      verbose = false,\n      message,\n      skipDependencyInstallation = false,\n    }: {\n      ours?: boolean;\n      theirs?: boolean;\n      manual?: boolean;\n      autoMergeResolve?: MergeStrategy;\n      abort?: boolean;\n      resolve?: boolean;\n      build?: boolean;\n      noSnap?: boolean;\n      verbose?: boolean;\n      message: string;\n      skipDependencyInstallation?: boolean;\n    }\n  ) {\n    build = isFeatureEnabled(BUILD_ON_CI) ? Boolean(build) : true;\n    if (ours || theirs || manual) {\n      throw new BitError(\n        'the \"--ours\", \"--theirs\" and \"--manual\" flags are deprecated. use \"--auto-merge-resolve\" instead'\n      );\n    }\n    if (\n      autoMergeResolve &&\n      autoMergeResolve !== 'ours' &&\n      autoMergeResolve !== 'theirs' &&\n      autoMergeResolve !== 'manual'\n    ) {\n      throw new BitError('--auto-merge-resolve must be one of the following: [ours, theirs, manual]');\n    }\n    if (abort && resolve) throw new BitError('unable to use \"abort\" and \"resolve\" flags together');\n    if (noSnap && message) throw new BitError('unable to use \"noSnap\" and \"message\" flags together');\n    const {\n      components,\n      failedComponents,\n      version,\n      resolvedComponents,\n      abortedComponents,\n      mergeSnapResults,\n      mergeSnapError,\n    }: ApplyVersionResults = await this.merging.merge(\n      ids,\n      autoMergeResolve as any,\n      abort,\n      resolve,\n      noSnap,\n      message,\n      build,\n      skipDependencyInstallation\n    );\n    if (resolvedComponents) {\n      const title = 'successfully resolved component(s)\\n';\n      const componentsStr = resolvedComponents.map((c) => c.id.toStringWithoutVersion()).join('\\n');\n      return chalk.underline(title) + chalk.green(componentsStr);\n    }\n    if (abortedComponents) {\n      const title = 'successfully aborted the merge of the following component(s)\\n';\n      const componentsStr = abortedComponents.map((c) => c.id.toStringWithoutVersion()).join('\\n');\n      return chalk.underline(title) + chalk.green(componentsStr);\n    }\n\n    return mergeReport({\n      components,\n      failedComponents,\n      version,\n      mergeSnapResults,\n      mergeSnapError,\n      verbose,\n    });\n  }\n}\n\nexport function mergeReport({\n  components,\n  failedComponents,\n  removedComponents,\n  version,\n  mergeSnapResults,\n  mergeSnapError,\n  leftUnresolvedConflicts,\n  verbose,\n  configMergeResults,\n  workspaceDepsUpdates,\n}: ApplyVersionResults & { configMergeResults?: ConfigMergeResult[] }): string {\n  const getSuccessOutput = () => {\n    if (!components || !components.length) return '';\n    const title = `successfully merged ${components.length} components${\n      version ? `from version ${chalk.bold(version)}` : ''\n    }\\n`;\n    const fileChangesReport = applyVersionReport(components);\n\n    return chalk.bold(title) + fileChangesReport;\n  };\n\n  const getConflictSummary = () => {\n    if (!components || !components.length || !leftUnresolvedConflicts) return '';\n    const title = `\\n\\nfiles with conflicts summary\\n`;\n    const suggestion = `\\n\\nmerge process not completed due to the conflicts above. fix conflicts manually and then run \"bit install\".\nonce ready, snap/tag the components to complete the merge.`;\n    return chalk.underline(title) + conflictSummaryReport(components) + chalk.yellow(suggestion);\n  };\n\n  const configMergeWithConflicts = configMergeResults?.filter((c) => c.hasConflicts()) || [];\n  const getConfigMergeConflictSummary = () => {\n    if (!configMergeWithConflicts.length) return '';\n    const comps = configMergeWithConflicts.map((c) => c.compIdStr).join('\\n');\n    const title = `\\n\\ncomponents with config-merge conflicts\\n`;\n    const suggestion = `\\nconflicts were found while trying to merge the config. fix them manually by editing the ${MergeConfigFilename} file in the workspace root.\nonce ready, snap/tag the components to complete the merge.`;\n    return chalk.underline(title) + comps + chalk.yellow(suggestion);\n  };\n\n  const getSnapsOutput = () => {\n    if (mergeSnapError) {\n      return `\n${chalk.bold('snapping merged components failed with the following error, please fix the issues and snap manually')}\n${mergeSnapError.message}\n`;\n    }\n    if (!mergeSnapResults || !mergeSnapResults.snappedComponents) return '';\n    const { snappedComponents, autoSnappedResults } = mergeSnapResults;\n    const outputComponents = (comps) => {\n      return comps\n        .map((component) => {\n          let componentOutput = `     > ${component.id.toString()}`;\n          const autoTag = autoSnappedResults.filter((result) =>\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 snapped as a result of the merge'})\\n${outputComponents(snappedComponents)}\\n`;\n  };\n\n  const getWorkspaceDepsOutput = () => {\n    if (!workspaceDepsUpdates) return '';\n\n    const title = '\\nworkspace.jsonc has been updated with the following dependencies';\n    const body = Object.keys(workspaceDepsUpdates)\n      .map((pkgName) => {\n        const [from, to] = workspaceDepsUpdates[pkgName];\n        return `  ${pkgName}: ${from} => ${to}`;\n      })\n      .join('\\n');\n\n    return `\\n${chalk.underline(title)}\\n${body}\\n\\n`;\n  };\n\n  const getFailureOutput = () => {\n    if (!failedComponents || !failedComponents.length) return '';\n    const title = '\\nmerge skipped for the following component(s)';\n    const body = compact(\n      failedComponents.map((failedComponent) => {\n        if (!verbose && failedComponent.unchangedLegitimately) return null;\n        const color = failedComponent.unchangedLegitimately ? 'white' : 'red';\n        return `${chalk.bold(failedComponent.id.toString())} - ${chalk[color](failedComponent.unchangedMessage)}`;\n      })\n    ).join('\\n');\n    if (!body) {\n      return `${chalk.bold(`\\nmerge skipped legitimately for ${failedComponents.length} component(s)`)}\n(use --verbose to list them next time)`;\n    }\n    return `\\n${chalk.underline(title)}\\n${body}\\n\\n`;\n  };\n\n  const getSummary = () => {\n    const merged = components?.length || 0;\n    const unchangedLegitimately = failedComponents?.filter((f) => f.unchangedLegitimately).length || 0;\n    const 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    const removedStr = `\\nTotal Removed: ${chalk.bold(removedComponents?.length.toString() || '0')}`;\n\n    return newLines + title + mergedStr + unchangedLegitimatelyStr + failedToMergeStr + autoSnappedStr + removedStr;\n  };\n\n  return (\n    getSuccessOutput() +\n    getFailureOutput() +\n    getRemovedOutput(removedComponents) +\n    getSnapsOutput() +\n    getWorkspaceDepsOutput() +\n    getConfigMergeConflictSummary() +\n    getConflictSummary() +\n    getSummary()\n  );\n}\n\n/**\n * shows only the file-changes section.\n * if all files are \"unchanged\", it returns an empty string\n */\nexport function applyVersionReport(components: ApplyVersionResult[], addName = true, showVersion = false): string {\n  const tab = addName ? '\\t' : '';\n  const fileChanges = compact(\n    components.map((component: ApplyVersionResult) => {\n      const name = showVersion ? component.id.toString() : component.id.toStringWithoutVersion();\n      const files = compact(\n        Object.keys(component.filesStatus).map((file) => {\n          if (component.filesStatus[file] === FileStatus.unchanged) return null;\n          const note =\n            component.filesStatus[file] === FileStatus.manual\n              ? chalk.white(\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      if (!files) return null;\n      return `${addName ? name : ''}\\n${chalk.cyan(files)}`;\n    })\n  ).join('\\n\\n');\n  if (!fileChanges) {\n    return '';\n  }\n  const title = `\\n${FILE_CHANGES_CHECKOUT_MSG}\\n`;\n  return chalk.underline(title) + fileChanges;\n}\n\nexport function conflictSummaryReport(components: ApplyVersionResult[]): string {\n  const tab = '\\t';\n  return compact(\n    components.map((component: ApplyVersionResult) => {\n      const name = component.id.toStringWithoutVersion();\n      const files = compact(\n        Object.keys(component.filesStatus).map((file) => {\n          if (component.filesStatus[file] === FileStatus.manual) {\n            return `${tab}${component.filesStatus[file]} ${chalk.bold(file)}`;\n          }\n          return null;\n        })\n      );\n      if (!files.length) return null;\n\n      return `${name}\\n${chalk.cyan(files.join('\\n'))}`;\n    })\n  ).join('\\n');\n}\n\nexport function installationErrorOutput(installationError?: Error) {\n  if (!installationError) return '';\n  const title = chalk.underline('Installation Error');\n  const subTitle = 'The following error was thrown by the package manager, please fix the issue and run \"bit install\"';\n  const body = chalk.red(installationError.message);\n  return `\\n\\n${title}\\n${subTitle}\\n${body}`;\n}\n\nexport function compilationErrorOutput(compilationError?: Error) {\n  if (!compilationError) return '';\n  const title = chalk.underline('Compilation Error');\n  const subTitle = 'The following error was thrown by the compiler, please fix the issue and run \"bit compile\"';\n  const body = chalk.red(compilationError.message);\n  return `\\n\\n${title}\\n${subTitle}\\n${body}`;\n}\n\nexport function getRemovedOutput(removedComponents?: BitId[]) {\n  if (!removedComponents?.length) return '';\n  const title = `the following ${removedComponents.length} component(s) have been removed`;\n  const body = removedComponents.join('\\n');\n  return `\\n\\n${chalk.underline(title)}\\n${body}\\n\\n`;\n}\n\nexport function getAddedOutput(addedComponents?: ComponentID[]) {\n  if (!addedComponents?.length) return '';\n  const title = `the following ${addedComponents.length} component(s) have been added`;\n  const body = addedComponents.join('\\n');\n  return `\\n\\n${chalk.underline(title)}\\n${body}\\n\\n`;\n}\n"],"mappings":"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"}

package/dist/merge-status-provider.js

@@ -1,21 +1,9 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-require("core-js/modules/es.array.flat.js");
-require("core-js/modules/es.array.iterator.js");
-require("core-js/modules/es.array.unscopables.flat.js");
-require("core-js/modules/es.promise.js");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.MergeStatusProvider = void 0;
-function _defineProperty2() {
-  const data = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-  _defineProperty2 = function () {
-    return data;
-  };
-  return data;
-}
 function _pMapSeries() {
   const data = _interopRequireDefault(require("p-map-series"));
   _pMapSeries = function () {
@@ -79,8 +67,12 @@ function _configMerger() {
   };
   return data;
 }
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: 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; }
+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) { _defineProperty(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; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 class MergeStatusProvider {
   constructor(workspace, logger, importer, currentLane,
   // currently checked out lane. if on main, then it's undefined.
@@ -189,8 +181,8 @@ other:   ${otherLaneHead.toString()}`);
     const componentStatus = {
       id
     };
-    componentStatus.unmergedMessage = msg;
-    componentStatus.unmergedLegitimately = unmergedLegitimately;
+    componentStatus.unchangedMessage = msg;
+    componentStatus.unchangedLegitimately = unmergedLegitimately;
     return componentStatus;
   }
   async getComponentStatusBeforeMergeAttempt(id) {

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

@@ -1 +1 @@
-{"version":3,"names":["_pMapSeries","data","_interopRequireDefault","require","_bitId","_laneId","_getDivergeData","_repositories","_lodash","_threeWayMerge","_noCommonSnap","_configMerger","ownKeys","object","enumerableOnly","keys","Object","getOwnPropertySymbols","symbols","filter","sym","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","target","i","arguments","length","source","forEach","key","_defineProperty2","default","getOwnPropertyDescriptors","defineProperties","defineProperty","MergeStatusProvider","constructor","workspace","logger","importer","currentLane","otherLane","options","getStatus","bitIds","_this$otherLane","_this$otherLane2","_this$currentLane","_this$otherLane3","importObjectsFromMainIfExist","toBitIds","toVersionLatest","componentStatusBeforeMergeAttempt","mapSeries","id","getComponentStatusBeforeMergeAttempt","shouldImportHistoryOfOtherLane","scope","toImport","map","compStatus","divergeData","versionsToImport","commonSnapBeforeDiverge","snapsOnTargetOnly","compact","v","changeVersion","toString","flat","reason","consumer","scopeImporter","importWithoutDeps","BitIds","fromArray","lane","cache","includeVersionHistory","compStatusNotNeedMerge","c","mergeProps","compStatusNeedMerge","getComponentsStatusNeedMerge","tmp","Tmp","componentsStatus","Promise","all","getComponentMergeStatus","clear","err","results","componentMergeStatusBeforeMergeAttempt","_this$currentLane2","currentComponent","Error","otherLaneHead","currentId","modelComponent","repo","objects","baseSnap","debug","toStringWithoutVersion","version","baseComponent","loadVersion","otherComponent","currentLaneName","toLaneId","otherLaneName","DEFAULT_LANE","currentLabel","otherLabel","workspaceIds","listIds","configMerger","ConfigMerger","extensions","configMergeResult","merge","mergeResults","threeWayMerge","returnUnmerged","msg","unmergedLegitimately","componentStatus","unmergedMessage","_this$currentLane3","_this$options","getModelComponentIfExist","unmerged","unmergedComponents","getEntry","name","getRef","existingBitMapId","bitMap","getBitIdIfExist","ignoreVersion","componentOnOther","idOnCurrentLane","getComponent","isRemoved","shouldMerge","shouldRemoveFromMain","shouldBeRemoved","getCurrentId","head","getHeadAsTagIfExist","getDivergeData","targetHead","throws","componentFromModel","getCurrentComponent","loadComponent","getConsumerComponent","isTargetNotAhead","isTargetAhead","shouldIgnore","isModified","componentModificationStatus","getComponentStatusById","modified","undefined","isSourceCodeModified","isComponentSourceCodeModified","modifiedType","ignoreConfigChanges","_this$options2","NoCommonSnap","resolveUnrelated","message","handleNoCommonSnap","isDiverged","isSourceAhead","mainHead","returnAccordingToOurs","headToSaveInLane","unrelatedHead","unrelatedLaneId","resolvedUnrelated","strategy","headOnCurrentLane","returnAccordingToTheirs","resolvedRef","unrelatedHeadRef","currentVersionRef","otherVersionRef","hasResolvedFromMain","hashToCompare","divergeDataFromMain","sourceHead","hasResolvedLocally","getHeadRegardlessOfLane","hasResolvedRemotely","refToSaveInLane","_this$currentLane4","_this$currentLane5","_this$otherLane4","_this$currentLane6","exports"],"sources":["merge-status-provider.ts"],"sourcesContent":["import { Workspace } from '@teambit/workspace';\nimport { MergeStrategy } from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport mapSeries from 'p-map-series';\nimport { BitId, BitIds } from '@teambit/legacy/dist/bit-id';\nimport { DEFAULT_LANE, LaneId } from '@teambit/lane-id';\nimport { getDivergeData } from '@teambit/legacy/dist/scope/component-ops/get-diverge-data';\nimport { Lane, ModelComponent, Version } from '@teambit/legacy/dist/scope/models';\nimport { Ref } from '@teambit/legacy/dist/scope/objects';\nimport { Tmp } from '@teambit/legacy/dist/scope/repositories';\nimport ConsumerComponent from '@teambit/legacy/dist/consumer/component/consumer-component';\nimport { ImporterMain } from '@teambit/importer';\nimport { Logger } from '@teambit/logger';\nimport { compact } from 'lodash';\nimport threeWayMerge from '@teambit/legacy/dist/consumer/versions-ops/merge-version/three-way-merge';\nimport { SnapsDistance } from '@teambit/legacy/dist/scope/component-ops/snaps-distance';\nimport { NoCommonSnap } from '@teambit/legacy/dist/scope/exceptions/no-common-snap';\nimport { ConfigMerger } from './config-merger';\nimport { ComponentMergeStatus, ComponentMergeStatusBeforeMergeAttempt } from './merging.main.runtime';\n\nexport class MergeStatusProvider {\n  constructor(\n    private workspace: Workspace,\n    private logger: Logger,\n    private importer: ImporterMain,\n    private currentLane?: Lane, // currently checked out lane. if on main, then it's undefined.\n    private otherLane?: Lane, // the lane we want to merged to our lane. (undefined if it's \"main\").\n    private options?: { resolveUnrelated?: MergeStrategy; ignoreConfigChanges?: boolean }\n  ) {}\n\n  async getStatus(\n    bitIds: BitId[] // the id.version is the version we want to merge to the current component\n  ): Promise<ComponentMergeStatus[]> {\n    if (!this.currentLane && this.otherLane) {\n      await this.importer.importObjectsFromMainIfExist(this.otherLane.toBitIds().toVersionLatest());\n    }\n    const componentStatusBeforeMergeAttempt = await mapSeries(bitIds, (id) =>\n      this.getComponentStatusBeforeMergeAttempt(id)\n    );\n    // whether or not we need to import the gap between the common-snap and the other lane.\n    // the common-snap itself we need anyway in order to get the files hash/content for checking conflicts.\n    const shouldImportHistoryOfOtherLane =\n      !this.currentLane || // on main. we need all history in order to push each component to its remote\n      this.currentLane.scope !== this.otherLane?.scope; // on lane, but the other lane is from a different scope. we need all history in order to push to the current lane's scope\n    const toImport = componentStatusBeforeMergeAttempt\n      .map((compStatus) => {\n        if (!compStatus.divergeData) return [];\n        const versionsToImport = [compStatus.divergeData.commonSnapBeforeDiverge];\n        if (shouldImportHistoryOfOtherLane) {\n          versionsToImport.push(...compStatus.divergeData.snapsOnTargetOnly);\n        }\n        return compact(versionsToImport).map((v) => compStatus.id.changeVersion(v.toString()));\n      })\n      .flat();\n    const reason = shouldImportHistoryOfOtherLane\n      ? `for filling the gap between the common-snap and the head of ${this.otherLane?.id() || 'main'}`\n      : `for getting the common-snap between ${this.currentLane?.id() || 'main'} and ${this.otherLane?.id() || 'main'}`;\n    await this.workspace.consumer.scope.scopeImporter.importWithoutDeps(BitIds.fromArray(toImport), {\n      lane: this.otherLane,\n      cache: true,\n      includeVersionHistory: false,\n      reason,\n    });\n\n    const compStatusNotNeedMerge = componentStatusBeforeMergeAttempt.filter(\n      (c) => !c.mergeProps\n    ) as ComponentMergeStatus[];\n    const compStatusNeedMerge = componentStatusBeforeMergeAttempt.filter((c) => c.mergeProps);\n\n    const getComponentsStatusNeedMerge = async (): Promise<ComponentMergeStatus[]> => {\n      const tmp = new Tmp(this.workspace.consumer.scope);\n      try {\n        const componentsStatus = await Promise.all(\n          compStatusNeedMerge.map((compStatus) => this.getComponentMergeStatus(compStatus))\n        );\n        await tmp.clear();\n        return componentsStatus;\n      } catch (err: any) {\n        await tmp.clear();\n        throw err;\n      }\n    };\n    const results = await getComponentsStatusNeedMerge();\n\n    results.push(...compStatusNotNeedMerge);\n    return results;\n  }\n\n  private async getComponentMergeStatus(\n    componentMergeStatusBeforeMergeAttempt: ComponentMergeStatusBeforeMergeAttempt\n  ) {\n    const { id, divergeData, currentComponent, mergeProps } = componentMergeStatusBeforeMergeAttempt;\n    if (!mergeProps) throw new Error(`getDivergedMergeStatus, mergeProps is missing for ${id.toString()}`);\n    const { otherLaneHead, currentId, modelComponent } = mergeProps;\n    const repo = this.workspace.consumer.scope.objects;\n    if (!divergeData) throw new Error(`getDivergedMergeStatus, divergeData is missing for ${id.toString()}`);\n    if (!currentComponent) throw new Error(`getDivergedMergeStatus, currentComponent is missing for ${id.toString()}`);\n\n    const baseSnap = divergeData.commonSnapBeforeDiverge as Ref; // must be set when isTrueMerge\n    this.logger.debug(`merging snaps details:\nid:      ${id.toStringWithoutVersion()}\nbase:    ${baseSnap.toString()}\ncurrent: ${currentId.version}\nother:   ${otherLaneHead.toString()}`);\n    const baseComponent: Version = await modelComponent.loadVersion(baseSnap.toString(), repo);\n    const otherComponent: Version = await modelComponent.loadVersion(otherLaneHead.toString(), repo);\n\n    const currentLaneName = this.currentLane?.toLaneId().toString() || 'main';\n    const otherLaneName = this.otherLane ? this.otherLane.toLaneId().toString() : DEFAULT_LANE;\n    const currentLabel = `${currentId.version} (${currentLaneName === otherLaneName ? 'current' : currentLaneName})`;\n    const otherLabel = `${otherLaneHead.toString()} (${\n      otherLaneName === currentLaneName ? 'incoming' : otherLaneName\n    })`;\n    const workspaceIds = await this.workspace.listIds();\n    const configMerger = new ConfigMerger(\n      id.toStringWithoutVersion(),\n      workspaceIds,\n      this.otherLane,\n      currentComponent.extensions,\n      baseComponent.extensions,\n      otherComponent.extensions,\n      currentLabel,\n      otherLabel,\n      this.logger\n    );\n    const configMergeResult = configMerger.merge();\n\n    const mergeResults = await threeWayMerge({\n      consumer: this.workspace.consumer,\n      otherComponent,\n      otherLabel,\n      currentComponent,\n      currentLabel,\n      baseComponent,\n    });\n    return { currentComponent, id, mergeResults, divergeData, configMergeResult };\n  }\n\n  private returnUnmerged(id: BitId, msg: string, unmergedLegitimately = false): ComponentMergeStatusBeforeMergeAttempt {\n    const componentStatus: ComponentMergeStatusBeforeMergeAttempt = { id };\n    componentStatus.unmergedMessage = msg;\n    componentStatus.unmergedLegitimately = unmergedLegitimately;\n    return componentStatus;\n  }\n\n  private async getComponentStatusBeforeMergeAttempt(\n    id: BitId // the id.version is the version we want to merge to the current component\n  ): Promise<ComponentMergeStatusBeforeMergeAttempt> {\n    const consumer = this.workspace.consumer;\n    const componentStatus: ComponentMergeStatusBeforeMergeAttempt = { id };\n    const modelComponent = await consumer.scope.getModelComponentIfExist(id);\n    if (!modelComponent) {\n      return this.returnUnmerged(\n        id,\n        `component ${id.toString()} is on the lane/main but its objects were not found, please re-import the lane`\n      );\n    }\n    const unmerged = consumer.scope.objects.unmergedComponents.getEntry(id.name);\n    if (unmerged) {\n      return this.returnUnmerged(\n        id,\n        `component ${id.toStringWithoutVersion()} is in during-merge state a previous merge, please snap/tag it first (or use bit merge --resolve/--abort/ bit lane merge-abort)`\n      );\n    }\n    const repo = consumer.scope.objects;\n    const version = id.version as string;\n    const otherLaneHead = modelComponent.getRef(version);\n    const existingBitMapId = consumer.bitMap.getBitIdIfExist(id, { ignoreVersion: true });\n    const componentOnOther: Version = await modelComponent.loadVersion(version, consumer.scope.objects);\n    const idOnCurrentLane = this.currentLane?.getComponent(id);\n\n    if (componentOnOther.isRemoved()) {\n      // if exist in current lane, we want the current lane to get the soft-remove update.\n      // or if it was removed with --update-main, we want to merge it so then main will get the update.\n      const shouldMerge = idOnCurrentLane || componentOnOther.shouldRemoveFromMain();\n      if (shouldMerge) {\n        // remove the component from the workspace if exist.\n        componentStatus.shouldBeRemoved = true;\n      } else {\n        // on main, don't merge soft-removed components unless it's marked with removeOnMain.\n        // on lane, if it's not part of the current lane, don't merge it.\n        return this.returnUnmerged(id, `component has been removed`, true);\n      }\n    }\n    const getCurrentId = () => {\n      if (existingBitMapId) return existingBitMapId;\n      if (this.currentLane) {\n        if (!idOnCurrentLane) return null;\n        return idOnCurrentLane.id.changeVersion(idOnCurrentLane.head.toString());\n      }\n      // it's on main\n      const head = modelComponent.getHeadAsTagIfExist();\n      if (head) {\n        return id.changeVersion(head);\n      }\n      return null;\n    };\n    const currentId = getCurrentId();\n    if (!currentId) {\n      const divergeData = await getDivergeData({ repo, modelComponent, targetHead: otherLaneHead, throws: false });\n      return { ...componentStatus, componentFromModel: componentOnOther, divergeData };\n    }\n    const getCurrentComponent = () => {\n      if (existingBitMapId) return consumer.loadComponent(existingBitMapId);\n      return consumer.scope.getConsumerComponent(currentId);\n    };\n    const currentComponent = await getCurrentComponent();\n    if (currentComponent.isRemoved()) {\n      // we have a few options:\n      // 1. other is ahead. in this case, other recovered the component. so we can continue with the merge.\n      // it is possible that it is diverged, in which case, still continue with the merge, and later on, the\n      // merge-config will show a config conflict of the remove aspect.\n      // 2. other is not ahead. in this case, just ignore this component, no point to merge it, we want it removed.\n      // 3. there are errors when calculating the divergeData, e.g. no snap in common.\n      // here we need to differentiate between two cases:\n      // 3.1. the \"otherLane\" is main. in this case, we probably noticed that our component by accident got created\n      // with the same name of an existing component on main and therefore we removed it. so we want to keep this\n      // component removed during merges and we don't care about merging it.\n      // 3.2. the \"otherLane\" is a lane. in this case, it's possible that although it was removed in this lane, it's\n      // needed and is used by other components of the other other lane, so in order for this merge to work\n      // (and not throw error about deps from other lane), it needs the option to merge (user can decide whether to\n      // exclude it or to use --resolve-unrelated)\n      const divergeData = await getDivergeData({ repo, modelComponent, targetHead: otherLaneHead, throws: false });\n      const isTargetNotAhead = !divergeData.err && !divergeData.isTargetAhead();\n      const shouldIgnore = this.otherLane\n        ? isTargetNotAhead // options 3.2 above. if they're not related - don't ignore.\n        : isTargetNotAhead || divergeData.err; // it's main. options 3.1 above. even if they're not related - still ignore.\n      if (shouldIgnore) {\n        return this.returnUnmerged(id, `component has been removed`, true);\n      }\n    }\n\n    const isModified = async (): Promise<undefined | 'code' | 'config'> => {\n      const componentModificationStatus = await consumer.getComponentStatusById(currentComponent.id);\n      if (!componentModificationStatus.modified) return undefined;\n      if (!existingBitMapId) return undefined;\n      const baseComponent = await modelComponent.loadVersion(\n        existingBitMapId.version as string,\n        consumer.scope.objects\n      );\n      const isSourceCodeModified = await consumer.isComponentSourceCodeModified(baseComponent, currentComponent);\n      if (isSourceCodeModified) return 'code';\n      return 'config';\n    };\n\n    const modifiedType = await isModified();\n    if (modifiedType === 'config' && !this.options?.ignoreConfigChanges) {\n      return this.returnUnmerged(\n        id,\n        `component has config changes, please snap/tag it first. alternatively, use --ignore-config-changes flag to bypass`\n      );\n    }\n    if (modifiedType === 'code') {\n      return this.returnUnmerged(id, `component is modified, please snap/tag it first`);\n    }\n\n    if (!otherLaneHead) {\n      throw new Error(`merging: unable finding a hash for the version ${version} of ${id.toString()}`);\n    }\n    const divergeData = await getDivergeData({\n      repo,\n      modelComponent,\n      targetHead: otherLaneHead,\n      throws: false,\n    });\n    if (divergeData.err) {\n      if (!(divergeData.err instanceof NoCommonSnap) || !this.options?.resolveUnrelated) {\n        return this.returnUnmerged(\n          id,\n          `unable to traverse ${currentComponent.id.toString()} history. error: ${divergeData.err.message}`\n        );\n      }\n      return this.handleNoCommonSnap(\n        modelComponent,\n        id,\n        otherLaneHead,\n        currentComponent,\n        componentOnOther,\n        divergeData\n      );\n    }\n    if (!divergeData.isDiverged()) {\n      if (divergeData.isSourceAhead()) {\n        // do nothing!\n        return this.returnUnmerged(id, `component ${currentComponent.id.toString()} is ahead, nothing to merge`, true);\n      }\n      if (divergeData.isTargetAhead()) {\n        // just override with the model data\n        return {\n          ...componentStatus,\n          currentComponent,\n          componentFromModel: componentOnOther,\n          divergeData,\n        };\n      }\n      // we know that localHead and remoteHead are set, so if none of them is ahead they must be equal\n      return this.returnUnmerged(id, `component ${currentComponent.id.toString()} is already merged`, true);\n    }\n\n    // it's diverged and needs merge operation\n    const mergeProps = {\n      otherLaneHead,\n      currentId,\n      modelComponent,\n    };\n\n    return { ...componentStatus, currentComponent, mergeProps, divergeData };\n  }\n\n  private async handleNoCommonSnap(\n    modelComponent: ModelComponent,\n    id: BitId,\n    otherLaneHead: Ref,\n    currentComponent: ConsumerComponent,\n    componentOnOther?: Version,\n    divergeData?: SnapsDistance\n  ): Promise<ComponentMergeStatusBeforeMergeAttempt> {\n    let { resolveUnrelated } = this.options || {};\n    if (currentComponent.isRemoved()) {\n      resolveUnrelated = 'theirs';\n    }\n    if (!resolveUnrelated) throw new Error(`handleNoCommonSnap expects resolveUnrelated to be set`);\n    const consumer = this.workspace.consumer;\n    const repo = consumer.scope.objects;\n    const mainHead = modelComponent.head;\n\n    const returnAccordingToOurs = (\n      headToSaveInLane: Ref,\n      unrelatedHead: Ref,\n      unrelatedLaneId: LaneId\n    ): ComponentMergeStatusBeforeMergeAttempt => {\n      return {\n        currentComponent,\n        id,\n        divergeData,\n        resolvedUnrelated: {\n          strategy: 'ours',\n          headOnCurrentLane: headToSaveInLane,\n          unrelatedHead,\n          unrelatedLaneId,\n        },\n      };\n    };\n    const returnAccordingToTheirs = (\n      resolvedRef: Ref,\n      unrelatedHeadRef: Ref,\n      unrelatedLaneId: LaneId\n    ): ComponentMergeStatusBeforeMergeAttempt => {\n      // just override with the model data\n      return {\n        currentComponent,\n        componentFromModel: componentOnOther,\n        id,\n        divergeData,\n        resolvedUnrelated: {\n          strategy: 'theirs',\n          headOnCurrentLane: resolvedRef,\n          unrelatedHead: unrelatedHeadRef,\n          unrelatedLaneId,\n        },\n      };\n    };\n\n    const currentVersionRef = modelComponent.getRef(currentComponent.id.version as string);\n    if (!currentVersionRef)\n      throw new Error(\n        `handleNoCommonSnap, unable to get ref of current version \"${\n          currentComponent.id.version\n        }\" for \"${id.toString()}\"`\n      );\n    const otherVersionRef = modelComponent.getRef(id.version as string);\n    if (!otherVersionRef)\n      throw new Error(`handleNoCommonSnap, unable to get ref of other version \"${id.version}\" for \"${id.toString()}\"`);\n\n    if (mainHead) {\n      const hasResolvedFromMain = async (hashToCompare: Ref | null) => {\n        const divergeDataFromMain = await getDivergeData({\n          repo,\n          modelComponent,\n          sourceHead: hashToCompare,\n          targetHead: mainHead,\n          throws: false,\n        });\n        if (!divergeDataFromMain.err) return true;\n        return !(divergeDataFromMain.err instanceof NoCommonSnap);\n      };\n      const hasResolvedLocally = await hasResolvedFromMain(modelComponent.getHeadRegardlessOfLane() as Ref);\n      const hasResolvedRemotely = await hasResolvedFromMain(otherLaneHead);\n      if (!hasResolvedLocally && !hasResolvedRemotely) {\n        return this.returnUnmerged(\n          id,\n          `unable to traverse ${currentComponent.id.toString()} history. the main-head ${mainHead.toString()} doesn't appear in both lanes.\nit was probably created in each lane separately and it also exists on main. please merge main first to one of these lanes`\n        );\n      }\n      const refToSaveInLane = hasResolvedLocally ? currentVersionRef : otherVersionRef;\n      const unrelatedHeadRef = hasResolvedLocally ? otherVersionRef : currentVersionRef;\n      if (resolveUnrelated === 'ours') {\n        return returnAccordingToOurs(refToSaveInLane, unrelatedHeadRef, this.currentLane?.toLaneId() as LaneId);\n      }\n      if (resolveUnrelated === 'theirs') {\n        return returnAccordingToTheirs(refToSaveInLane, unrelatedHeadRef, this.currentLane?.toLaneId() as LaneId);\n      }\n      throw new Error(\n        `unsupported strategy \"${resolveUnrelated}\" of resolve-unrelated. supported strategies are: [ours, theirs]`\n      );\n    }\n\n    const refToSaveInLane = resolveUnrelated === 'ours' ? currentVersionRef : otherVersionRef;\n    const unrelatedHeadRef = resolveUnrelated === 'ours' ? otherVersionRef : currentVersionRef;\n    if (resolveUnrelated === 'ours') {\n      return returnAccordingToOurs(refToSaveInLane, unrelatedHeadRef, this.otherLane?.toLaneId() as LaneId);\n    }\n    if (resolveUnrelated === 'theirs') {\n      return returnAccordingToTheirs(refToSaveInLane, unrelatedHeadRef, this.currentLane?.toLaneId() as LaneId);\n    }\n    throw new Error(\n      `unsupported strategy \"${resolveUnrelated}\" of resolve-unrelated. supported strategies are: [ours, theirs]`\n    );\n  }\n}\n"],"mappings":"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"}
+{"version":3,"names":["_pMapSeries","data","_interopRequireDefault","require","_bitId","_laneId","_getDivergeData","_repositories","_lodash","_threeWayMerge","_noCommonSnap","_configMerger","obj","__esModule","default","ownKeys","object","enumerableOnly","keys","Object","getOwnPropertySymbols","symbols","filter","sym","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","target","i","arguments","length","source","forEach","key","_defineProperty","getOwnPropertyDescriptors","defineProperties","defineProperty","value","_toPropertyKey","configurable","writable","arg","_toPrimitive","String","input","hint","prim","Symbol","toPrimitive","undefined","res","call","TypeError","Number","MergeStatusProvider","constructor","workspace","logger","importer","currentLane","otherLane","options","getStatus","bitIds","_this$otherLane","_this$otherLane2","_this$currentLane","_this$otherLane3","importObjectsFromMainIfExist","toBitIds","toVersionLatest","componentStatusBeforeMergeAttempt","mapSeries","id","getComponentStatusBeforeMergeAttempt","shouldImportHistoryOfOtherLane","scope","toImport","map","compStatus","divergeData","versionsToImport","commonSnapBeforeDiverge","snapsOnTargetOnly","compact","v","changeVersion","toString","flat","reason","consumer","scopeImporter","importWithoutDeps","BitIds","fromArray","lane","cache","includeVersionHistory","compStatusNotNeedMerge","c","mergeProps","compStatusNeedMerge","getComponentsStatusNeedMerge","tmp","Tmp","componentsStatus","Promise","all","getComponentMergeStatus","clear","err","results","componentMergeStatusBeforeMergeAttempt","_this$currentLane2","currentComponent","Error","otherLaneHead","currentId","modelComponent","repo","objects","baseSnap","debug","toStringWithoutVersion","version","baseComponent","loadVersion","otherComponent","currentLaneName","toLaneId","otherLaneName","DEFAULT_LANE","currentLabel","otherLabel","workspaceIds","listIds","configMerger","ConfigMerger","extensions","configMergeResult","merge","mergeResults","threeWayMerge","returnUnmerged","msg","unmergedLegitimately","componentStatus","unchangedMessage","unchangedLegitimately","_this$currentLane3","_this$options","getModelComponentIfExist","unmerged","unmergedComponents","getEntry","name","getRef","existingBitMapId","bitMap","getBitIdIfExist","ignoreVersion","componentOnOther","idOnCurrentLane","getComponent","isRemoved","shouldMerge","shouldRemoveFromMain","shouldBeRemoved","getCurrentId","head","getHeadAsTagIfExist","getDivergeData","targetHead","throws","componentFromModel","getCurrentComponent","loadComponent","getConsumerComponent","isTargetNotAhead","isTargetAhead","shouldIgnore","isModified","componentModificationStatus","getComponentStatusById","modified","isSourceCodeModified","isComponentSourceCodeModified","modifiedType","ignoreConfigChanges","_this$options2","NoCommonSnap","resolveUnrelated","message","handleNoCommonSnap","isDiverged","isSourceAhead","mainHead","returnAccordingToOurs","headToSaveInLane","unrelatedHead","unrelatedLaneId","resolvedUnrelated","strategy","headOnCurrentLane","returnAccordingToTheirs","resolvedRef","unrelatedHeadRef","currentVersionRef","otherVersionRef","hasResolvedFromMain","hashToCompare","divergeDataFromMain","sourceHead","hasResolvedLocally","getHeadRegardlessOfLane","hasResolvedRemotely","refToSaveInLane","_this$currentLane4","_this$currentLane5","_this$otherLane4","_this$currentLane6","exports"],"sources":["merge-status-provider.ts"],"sourcesContent":["import { Workspace } from '@teambit/workspace';\nimport { MergeStrategy } from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport mapSeries from 'p-map-series';\nimport { BitId, BitIds } from '@teambit/legacy/dist/bit-id';\nimport { DEFAULT_LANE, LaneId } from '@teambit/lane-id';\nimport { getDivergeData } from '@teambit/legacy/dist/scope/component-ops/get-diverge-data';\nimport { Lane, ModelComponent, Version } from '@teambit/legacy/dist/scope/models';\nimport { Ref } from '@teambit/legacy/dist/scope/objects';\nimport { Tmp } from '@teambit/legacy/dist/scope/repositories';\nimport ConsumerComponent from '@teambit/legacy/dist/consumer/component/consumer-component';\nimport { ImporterMain } from '@teambit/importer';\nimport { Logger } from '@teambit/logger';\nimport { compact } from 'lodash';\nimport threeWayMerge from '@teambit/legacy/dist/consumer/versions-ops/merge-version/three-way-merge';\nimport { SnapsDistance } from '@teambit/legacy/dist/scope/component-ops/snaps-distance';\nimport { NoCommonSnap } from '@teambit/legacy/dist/scope/exceptions/no-common-snap';\nimport { ConfigMerger } from './config-merger';\nimport { ComponentMergeStatus, ComponentMergeStatusBeforeMergeAttempt } from './merging.main.runtime';\n\nexport class MergeStatusProvider {\n  constructor(\n    private workspace: Workspace,\n    private logger: Logger,\n    private importer: ImporterMain,\n    private currentLane?: Lane, // currently checked out lane. if on main, then it's undefined.\n    private otherLane?: Lane, // the lane we want to merged to our lane. (undefined if it's \"main\").\n    private options?: { resolveUnrelated?: MergeStrategy; ignoreConfigChanges?: boolean }\n  ) {}\n\n  async getStatus(\n    bitIds: BitId[] // the id.version is the version we want to merge to the current component\n  ): Promise<ComponentMergeStatus[]> {\n    if (!this.currentLane && this.otherLane) {\n      await this.importer.importObjectsFromMainIfExist(this.otherLane.toBitIds().toVersionLatest());\n    }\n    const componentStatusBeforeMergeAttempt = await mapSeries(bitIds, (id) =>\n      this.getComponentStatusBeforeMergeAttempt(id)\n    );\n    // whether or not we need to import the gap between the common-snap and the other lane.\n    // the common-snap itself we need anyway in order to get the files hash/content for checking conflicts.\n    const shouldImportHistoryOfOtherLane =\n      !this.currentLane || // on main. we need all history in order to push each component to its remote\n      this.currentLane.scope !== this.otherLane?.scope; // on lane, but the other lane is from a different scope. we need all history in order to push to the current lane's scope\n    const toImport = componentStatusBeforeMergeAttempt\n      .map((compStatus) => {\n        if (!compStatus.divergeData) return [];\n        const versionsToImport = [compStatus.divergeData.commonSnapBeforeDiverge];\n        if (shouldImportHistoryOfOtherLane) {\n          versionsToImport.push(...compStatus.divergeData.snapsOnTargetOnly);\n        }\n        return compact(versionsToImport).map((v) => compStatus.id.changeVersion(v.toString()));\n      })\n      .flat();\n    const reason = shouldImportHistoryOfOtherLane\n      ? `for filling the gap between the common-snap and the head of ${this.otherLane?.id() || 'main'}`\n      : `for getting the common-snap between ${this.currentLane?.id() || 'main'} and ${this.otherLane?.id() || 'main'}`;\n    await this.workspace.consumer.scope.scopeImporter.importWithoutDeps(BitIds.fromArray(toImport), {\n      lane: this.otherLane,\n      cache: true,\n      includeVersionHistory: false,\n      reason,\n    });\n\n    const compStatusNotNeedMerge = componentStatusBeforeMergeAttempt.filter(\n      (c) => !c.mergeProps\n    ) as ComponentMergeStatus[];\n    const compStatusNeedMerge = componentStatusBeforeMergeAttempt.filter((c) => c.mergeProps);\n\n    const getComponentsStatusNeedMerge = async (): Promise<ComponentMergeStatus[]> => {\n      const tmp = new Tmp(this.workspace.consumer.scope);\n      try {\n        const componentsStatus = await Promise.all(\n          compStatusNeedMerge.map((compStatus) => this.getComponentMergeStatus(compStatus))\n        );\n        await tmp.clear();\n        return componentsStatus;\n      } catch (err: any) {\n        await tmp.clear();\n        throw err;\n      }\n    };\n    const results = await getComponentsStatusNeedMerge();\n\n    results.push(...compStatusNotNeedMerge);\n    return results;\n  }\n\n  private async getComponentMergeStatus(\n    componentMergeStatusBeforeMergeAttempt: ComponentMergeStatusBeforeMergeAttempt\n  ) {\n    const { id, divergeData, currentComponent, mergeProps } = componentMergeStatusBeforeMergeAttempt;\n    if (!mergeProps) throw new Error(`getDivergedMergeStatus, mergeProps is missing for ${id.toString()}`);\n    const { otherLaneHead, currentId, modelComponent } = mergeProps;\n    const repo = this.workspace.consumer.scope.objects;\n    if (!divergeData) throw new Error(`getDivergedMergeStatus, divergeData is missing for ${id.toString()}`);\n    if (!currentComponent) throw new Error(`getDivergedMergeStatus, currentComponent is missing for ${id.toString()}`);\n\n    const baseSnap = divergeData.commonSnapBeforeDiverge as Ref; // must be set when isTrueMerge\n    this.logger.debug(`merging snaps details:\nid:      ${id.toStringWithoutVersion()}\nbase:    ${baseSnap.toString()}\ncurrent: ${currentId.version}\nother:   ${otherLaneHead.toString()}`);\n    const baseComponent: Version = await modelComponent.loadVersion(baseSnap.toString(), repo);\n    const otherComponent: Version = await modelComponent.loadVersion(otherLaneHead.toString(), repo);\n\n    const currentLaneName = this.currentLane?.toLaneId().toString() || 'main';\n    const otherLaneName = this.otherLane ? this.otherLane.toLaneId().toString() : DEFAULT_LANE;\n    const currentLabel = `${currentId.version} (${currentLaneName === otherLaneName ? 'current' : currentLaneName})`;\n    const otherLabel = `${otherLaneHead.toString()} (${\n      otherLaneName === currentLaneName ? 'incoming' : otherLaneName\n    })`;\n    const workspaceIds = await this.workspace.listIds();\n    const configMerger = new ConfigMerger(\n      id.toStringWithoutVersion(),\n      workspaceIds,\n      this.otherLane,\n      currentComponent.extensions,\n      baseComponent.extensions,\n      otherComponent.extensions,\n      currentLabel,\n      otherLabel,\n      this.logger\n    );\n    const configMergeResult = configMerger.merge();\n\n    const mergeResults = await threeWayMerge({\n      consumer: this.workspace.consumer,\n      otherComponent,\n      otherLabel,\n      currentComponent,\n      currentLabel,\n      baseComponent,\n    });\n    return { currentComponent, id, mergeResults, divergeData, configMergeResult };\n  }\n\n  private returnUnmerged(id: BitId, msg: string, unmergedLegitimately = false): ComponentMergeStatusBeforeMergeAttempt {\n    const componentStatus: ComponentMergeStatusBeforeMergeAttempt = { id };\n    componentStatus.unchangedMessage = msg;\n    componentStatus.unchangedLegitimately = unmergedLegitimately;\n    return componentStatus;\n  }\n\n  private async getComponentStatusBeforeMergeAttempt(\n    id: BitId // the id.version is the version we want to merge to the current component\n  ): Promise<ComponentMergeStatusBeforeMergeAttempt> {\n    const consumer = this.workspace.consumer;\n    const componentStatus: ComponentMergeStatusBeforeMergeAttempt = { id };\n    const modelComponent = await consumer.scope.getModelComponentIfExist(id);\n    if (!modelComponent) {\n      return this.returnUnmerged(\n        id,\n        `component ${id.toString()} is on the lane/main but its objects were not found, please re-import the lane`\n      );\n    }\n    const unmerged = consumer.scope.objects.unmergedComponents.getEntry(id.name);\n    if (unmerged) {\n      return this.returnUnmerged(\n        id,\n        `component ${id.toStringWithoutVersion()} is in during-merge state a previous merge, please snap/tag it first (or use bit merge --resolve/--abort/ bit lane merge-abort)`\n      );\n    }\n    const repo = consumer.scope.objects;\n    const version = id.version as string;\n    const otherLaneHead = modelComponent.getRef(version);\n    const existingBitMapId = consumer.bitMap.getBitIdIfExist(id, { ignoreVersion: true });\n    const componentOnOther: Version = await modelComponent.loadVersion(version, consumer.scope.objects);\n    const idOnCurrentLane = this.currentLane?.getComponent(id);\n\n    if (componentOnOther.isRemoved()) {\n      // if exist in current lane, we want the current lane to get the soft-remove update.\n      // or if it was removed with --update-main, we want to merge it so then main will get the update.\n      const shouldMerge = idOnCurrentLane || componentOnOther.shouldRemoveFromMain();\n      if (shouldMerge) {\n        // remove the component from the workspace if exist.\n        componentStatus.shouldBeRemoved = true;\n      } else {\n        // on main, don't merge soft-removed components unless it's marked with removeOnMain.\n        // on lane, if it's not part of the current lane, don't merge it.\n        return this.returnUnmerged(id, `component has been removed`, true);\n      }\n    }\n    const getCurrentId = () => {\n      if (existingBitMapId) return existingBitMapId;\n      if (this.currentLane) {\n        if (!idOnCurrentLane) return null;\n        return idOnCurrentLane.id.changeVersion(idOnCurrentLane.head.toString());\n      }\n      // it's on main\n      const head = modelComponent.getHeadAsTagIfExist();\n      if (head) {\n        return id.changeVersion(head);\n      }\n      return null;\n    };\n    const currentId = getCurrentId();\n    if (!currentId) {\n      const divergeData = await getDivergeData({ repo, modelComponent, targetHead: otherLaneHead, throws: false });\n      return { ...componentStatus, componentFromModel: componentOnOther, divergeData };\n    }\n    const getCurrentComponent = () => {\n      if (existingBitMapId) return consumer.loadComponent(existingBitMapId);\n      return consumer.scope.getConsumerComponent(currentId);\n    };\n    const currentComponent = await getCurrentComponent();\n    if (currentComponent.isRemoved()) {\n      // we have a few options:\n      // 1. other is ahead. in this case, other recovered the component. so we can continue with the merge.\n      // it is possible that it is diverged, in which case, still continue with the merge, and later on, the\n      // merge-config will show a config conflict of the remove aspect.\n      // 2. other is not ahead. in this case, just ignore this component, no point to merge it, we want it removed.\n      // 3. there are errors when calculating the divergeData, e.g. no snap in common.\n      // here we need to differentiate between two cases:\n      // 3.1. the \"otherLane\" is main. in this case, we probably noticed that our component by accident got created\n      // with the same name of an existing component on main and therefore we removed it. so we want to keep this\n      // component removed during merges and we don't care about merging it.\n      // 3.2. the \"otherLane\" is a lane. in this case, it's possible that although it was removed in this lane, it's\n      // needed and is used by other components of the other other lane, so in order for this merge to work\n      // (and not throw error about deps from other lane), it needs the option to merge (user can decide whether to\n      // exclude it or to use --resolve-unrelated)\n      const divergeData = await getDivergeData({ repo, modelComponent, targetHead: otherLaneHead, throws: false });\n      const isTargetNotAhead = !divergeData.err && !divergeData.isTargetAhead();\n      const shouldIgnore = this.otherLane\n        ? isTargetNotAhead // options 3.2 above. if they're not related - don't ignore.\n        : isTargetNotAhead || divergeData.err; // it's main. options 3.1 above. even if they're not related - still ignore.\n      if (shouldIgnore) {\n        return this.returnUnmerged(id, `component has been removed`, true);\n      }\n    }\n\n    const isModified = async (): Promise<undefined | 'code' | 'config'> => {\n      const componentModificationStatus = await consumer.getComponentStatusById(currentComponent.id);\n      if (!componentModificationStatus.modified) return undefined;\n      if (!existingBitMapId) return undefined;\n      const baseComponent = await modelComponent.loadVersion(\n        existingBitMapId.version as string,\n        consumer.scope.objects\n      );\n      const isSourceCodeModified = await consumer.isComponentSourceCodeModified(baseComponent, currentComponent);\n      if (isSourceCodeModified) return 'code';\n      return 'config';\n    };\n\n    const modifiedType = await isModified();\n    if (modifiedType === 'config' && !this.options?.ignoreConfigChanges) {\n      return this.returnUnmerged(\n        id,\n        `component has config changes, please snap/tag it first. alternatively, use --ignore-config-changes flag to bypass`\n      );\n    }\n    if (modifiedType === 'code') {\n      return this.returnUnmerged(id, `component is modified, please snap/tag it first`);\n    }\n\n    if (!otherLaneHead) {\n      throw new Error(`merging: unable finding a hash for the version ${version} of ${id.toString()}`);\n    }\n    const divergeData = await getDivergeData({\n      repo,\n      modelComponent,\n      targetHead: otherLaneHead,\n      throws: false,\n    });\n    if (divergeData.err) {\n      if (!(divergeData.err instanceof NoCommonSnap) || !this.options?.resolveUnrelated) {\n        return this.returnUnmerged(\n          id,\n          `unable to traverse ${currentComponent.id.toString()} history. error: ${divergeData.err.message}`\n        );\n      }\n      return this.handleNoCommonSnap(\n        modelComponent,\n        id,\n        otherLaneHead,\n        currentComponent,\n        componentOnOther,\n        divergeData\n      );\n    }\n    if (!divergeData.isDiverged()) {\n      if (divergeData.isSourceAhead()) {\n        // do nothing!\n        return this.returnUnmerged(id, `component ${currentComponent.id.toString()} is ahead, nothing to merge`, true);\n      }\n      if (divergeData.isTargetAhead()) {\n        // just override with the model data\n        return {\n          ...componentStatus,\n          currentComponent,\n          componentFromModel: componentOnOther,\n          divergeData,\n        };\n      }\n      // we know that localHead and remoteHead are set, so if none of them is ahead they must be equal\n      return this.returnUnmerged(id, `component ${currentComponent.id.toString()} is already merged`, true);\n    }\n\n    // it's diverged and needs merge operation\n    const mergeProps = {\n      otherLaneHead,\n      currentId,\n      modelComponent,\n    };\n\n    return { ...componentStatus, currentComponent, mergeProps, divergeData };\n  }\n\n  private async handleNoCommonSnap(\n    modelComponent: ModelComponent,\n    id: BitId,\n    otherLaneHead: Ref,\n    currentComponent: ConsumerComponent,\n    componentOnOther?: Version,\n    divergeData?: SnapsDistance\n  ): Promise<ComponentMergeStatusBeforeMergeAttempt> {\n    let { resolveUnrelated } = this.options || {};\n    if (currentComponent.isRemoved()) {\n      resolveUnrelated = 'theirs';\n    }\n    if (!resolveUnrelated) throw new Error(`handleNoCommonSnap expects resolveUnrelated to be set`);\n    const consumer = this.workspace.consumer;\n    const repo = consumer.scope.objects;\n    const mainHead = modelComponent.head;\n\n    const returnAccordingToOurs = (\n      headToSaveInLane: Ref,\n      unrelatedHead: Ref,\n      unrelatedLaneId: LaneId\n    ): ComponentMergeStatusBeforeMergeAttempt => {\n      return {\n        currentComponent,\n        id,\n        divergeData,\n        resolvedUnrelated: {\n          strategy: 'ours',\n          headOnCurrentLane: headToSaveInLane,\n          unrelatedHead,\n          unrelatedLaneId,\n        },\n      };\n    };\n    const returnAccordingToTheirs = (\n      resolvedRef: Ref,\n      unrelatedHeadRef: Ref,\n      unrelatedLaneId: LaneId\n    ): ComponentMergeStatusBeforeMergeAttempt => {\n      // just override with the model data\n      return {\n        currentComponent,\n        componentFromModel: componentOnOther,\n        id,\n        divergeData,\n        resolvedUnrelated: {\n          strategy: 'theirs',\n          headOnCurrentLane: resolvedRef,\n          unrelatedHead: unrelatedHeadRef,\n          unrelatedLaneId,\n        },\n      };\n    };\n\n    const currentVersionRef = modelComponent.getRef(currentComponent.id.version as string);\n    if (!currentVersionRef)\n      throw new Error(\n        `handleNoCommonSnap, unable to get ref of current version \"${\n          currentComponent.id.version\n        }\" for \"${id.toString()}\"`\n      );\n    const otherVersionRef = modelComponent.getRef(id.version as string);\n    if (!otherVersionRef)\n      throw new Error(`handleNoCommonSnap, unable to get ref of other version \"${id.version}\" for \"${id.toString()}\"`);\n\n    if (mainHead) {\n      const hasResolvedFromMain = async (hashToCompare: Ref | null) => {\n        const divergeDataFromMain = await getDivergeData({\n          repo,\n          modelComponent,\n          sourceHead: hashToCompare,\n          targetHead: mainHead,\n          throws: false,\n        });\n        if (!divergeDataFromMain.err) return true;\n        return !(divergeDataFromMain.err instanceof NoCommonSnap);\n      };\n      const hasResolvedLocally = await hasResolvedFromMain(modelComponent.getHeadRegardlessOfLane() as Ref);\n      const hasResolvedRemotely = await hasResolvedFromMain(otherLaneHead);\n      if (!hasResolvedLocally && !hasResolvedRemotely) {\n        return this.returnUnmerged(\n          id,\n          `unable to traverse ${currentComponent.id.toString()} history. the main-head ${mainHead.toString()} doesn't appear in both lanes.\nit was probably created in each lane separately and it also exists on main. please merge main first to one of these lanes`\n        );\n      }\n      const refToSaveInLane = hasResolvedLocally ? currentVersionRef : otherVersionRef;\n      const unrelatedHeadRef = hasResolvedLocally ? otherVersionRef : currentVersionRef;\n      if (resolveUnrelated === 'ours') {\n        return returnAccordingToOurs(refToSaveInLane, unrelatedHeadRef, this.currentLane?.toLaneId() as LaneId);\n      }\n      if (resolveUnrelated === 'theirs') {\n        return returnAccordingToTheirs(refToSaveInLane, unrelatedHeadRef, this.currentLane?.toLaneId() as LaneId);\n      }\n      throw new Error(\n        `unsupported strategy \"${resolveUnrelated}\" of resolve-unrelated. supported strategies are: [ours, theirs]`\n      );\n    }\n\n    const refToSaveInLane = resolveUnrelated === 'ours' ? currentVersionRef : otherVersionRef;\n    const unrelatedHeadRef = resolveUnrelated === 'ours' ? otherVersionRef : currentVersionRef;\n    if (resolveUnrelated === 'ours') {\n      return returnAccordingToOurs(refToSaveInLane, unrelatedHeadRef, this.otherLane?.toLaneId() as LaneId);\n    }\n    if (resolveUnrelated === 'theirs') {\n      return returnAccordingToTheirs(refToSaveInLane, unrelatedHeadRef, this.currentLane?.toLaneId() as LaneId);\n    }\n    throw new Error(\n      `unsupported strategy \"${resolveUnrelated}\" of resolve-unrelated. supported strategies are: [ours, theirs]`\n    );\n  }\n}\n"],"mappings":"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"}

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

@@ -1,7 +1,7 @@
 import { CLIMain } from '@teambit/cli';
 import { Workspace } from '@teambit/workspace';
 import { Consumer } from '@teambit/legacy/dist/consumer';
-import { MergeStrategy, FailedComponents, ApplyVersionResult } from '@teambit/legacy/dist/consumer/versions-ops/merge-version';
+import { MergeStrategy, ApplyVersionResult } from '@teambit/legacy/dist/consumer/versions-ops/merge-version';
 import { SnappingMain } from '@teambit/snapping';
 import { BitId, BitIds } from '@teambit/legacy/dist/bit-id';
 import { LaneId } from '@teambit/lane-id';
@@ -35,16 +35,12 @@ export declare type WorkspaceDepsConflicts = Record<WorkspacePolicyConfigKeysNam
     version: string;
 }>>;
 export declare type ComponentMergeStatus = ComponentStatusBase & {
-    unmergedMessage?: string;
-    unmergedLegitimately?: boolean;
     mergeResults?: MergeResultsThreeWay | null;
     divergeData?: SnapsDistance;
     resolvedUnrelated?: ResolveUnrelatedData;
     configMergeResult?: ConfigMergeResult;
 };
 export declare type ComponentMergeStatusBeforeMergeAttempt = ComponentStatusBase & {
-    unmergedMessage?: string;
-    unmergedLegitimately?: boolean;
     divergeData?: SnapsDistance;
     resolvedUnrelated?: ResolveUnrelatedData;
     mergeProps?: {
@@ -53,6 +49,11 @@ export declare type ComponentMergeStatusBeforeMergeAttempt = ComponentStatusBase
         modelComponent: ModelComponent;
     };
 };
+export declare type FailedComponents = {
+    id: BitId;
+    unchangedMessage: string;
+    unchangedLegitimately?: boolean;
+};
 export declare type ApplyVersionResults = {
     components?: ApplyVersionResult[];
     version?: string;

package/dist/merging.main.runtime.js

@@ -1,21 +1,9 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-require("core-js/modules/es.array.iterator.js");
-require("core-js/modules/es.promise.js");
-require("core-js/modules/es.regexp.exec.js");
-require("core-js/modules/es.string.replace.js");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.MergingMain = void 0;
-function _defineProperty2() {
-  const data = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-  _defineProperty2 = function () {
-    return data;
-  };
-  return data;
-}
 function _cli() {
   const data = require("@teambit/cli");
   _cli = function () {
@@ -228,8 +216,12 @@ function _mergeStatusProvider() {
 }
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: 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; }
+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) { _defineProperty(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; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 // from => to
 // the pkg value is in a format of CONFLICT::OURS::THEIRS
 
@@ -269,9 +261,9 @@ class MergingMain {
     const currentLaneId = consumer.getCurrentLaneId();
     const currentLaneObject = await consumer.getCurrentLaneObject();
     const allComponentsStatus = await this.getAllComponentsStatus(bitIds, currentLaneId, currentLaneObject);
-    const failedComponents = allComponentsStatus.filter(c => c.unmergedMessage && !c.unmergedLegitimately);
+    const failedComponents = allComponentsStatus.filter(c => c.unchangedMessage && !c.unchangedLegitimately);
     if (failedComponents.length) {
-      const failureMsgs = failedComponents.map(failedComponent => `${_chalk().default.bold(failedComponent.id.toString())} - ${_chalk().default.red(failedComponent.unmergedMessage)}`).join('\n');
+      const failureMsgs = failedComponents.map(failedComponent => `${_chalk().default.bold(failedComponent.id.toString())} - ${_chalk().default.red(failedComponent.unchangedMessage)}`).join('\n');
       throw new (_bitError().BitError)(`unable to merge due to the following failures:\n${failureMsgs}`);
     }
     return this.mergeSnaps({
@@ -306,13 +298,13 @@ class MergingMain {
     if (componentWithConflict && !mergeStrategy) {
       mergeStrategy = await (0, _mergeVersion().getMergeStrategyInteractive)();
     }
-    const failedComponents = allComponentsStatus.filter(componentStatus => componentStatus.unmergedMessage).filter(componentStatus => !componentStatus.shouldBeRemoved).map(componentStatus => ({
+    const failedComponents = allComponentsStatus.filter(componentStatus => componentStatus.unchangedMessage).filter(componentStatus => !componentStatus.shouldBeRemoved).map(componentStatus => ({
       id: componentStatus.id,
-      failureMessage: componentStatus.unmergedMessage,
-      unchangedLegitimately: componentStatus.unmergedLegitimately
+      unchangedMessage: componentStatus.unchangedMessage,
+      unchangedLegitimately: componentStatus.unchangedLegitimately
     }));
     const componentIdsToRemove = allComponentsStatus.filter(componentStatus => componentStatus.shouldBeRemoved).map(c => c.id.changeVersion(undefined));
-    const succeededComponents = allComponentsStatus.filter(componentStatus => !componentStatus.unmergedMessage);
+    const succeededComponents = allComponentsStatus.filter(componentStatus => !componentStatus.unchangedMessage);
     // do not use Promise.all for applyVersion. otherwise, it'll write all components in parallel,
     // which can be an issue when some components are also dependencies of others
     const componentsResults = await (0, _pMapSeries().default)(succeededComponents, async ({
@@ -819,9 +811,9 @@ class MergingMain {
   }
 }
 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, _importer().default, _config().ConfigAspect, _remove().default]);
-(0, _defineProperty2().default)(MergingMain, "runtime", _cli().MainRuntime);
+_defineProperty(MergingMain, "slots", []);
+_defineProperty(MergingMain, "dependencies", [_cli().CLIAspect, _workspace().default, _snapping().default, _checkout().CheckoutAspect, _install().InstallAspect, _logger().LoggerAspect, _componentWriter().ComponentWriterAspect, _importer().default, _config().ConfigAspect, _remove().default]);
+_defineProperty(MergingMain, "runtime", _cli().MainRuntime);
 _merging().MergingAspect.addRuntime(MergingMain);
 
 //# sourceMappingURL=merging.main.runtime.js.map