@teambit/merging 0.0.405 → 0.0.407

package/dist/merge-cmd.js

@@ -74,7 +74,7 @@ if no ids are specified, all pending-merge components will be merged. (run "bit
 optionally use '--abort' to revert the last merge/lane-merge.
 ${(0, _constants().WILDCARD_HELP)('merge')}`);
     (0, _defineProperty2().default)(this, "alias", '');
-    (0, _defineProperty2().default)(this, "options", [['', 'ours', 'in case of a conflict, override the used version with the current modification'], ['', 'theirs', 'in case of a conflict, override the current modification with the specified version'], ['', 'manual', 'in case of a conflict, leave the files with a conflict state to resolve them manually later'], ['', 'abort', 'EXPERIMENTAL. in case of an unresolved merge, revert to the state before the merge began'], ['', 'resolve', 'EXPERIMENTAL. mark an unresolved merge as resolved and create a new snap with the changes'], ['', 'no-snap', 'EXPERIMENTAL. do not auto snap in case the merge completed without conflicts'], ['', 'build', 'in case of snap during the merge, run the build-pipeline (similar to bit snap --build)'], ['', 'verbose', 'show details of components that were not merged legitimately'], ['x', 'skip-dependency-installation', 'do not install packages of the imported components'], ['m', 'message <message>', 'EXPERIMENTAL. override the default message for the auto snap']]);
+    (0, _defineProperty2().default)(this, "options", [['', 'ours', 'in case of a conflict, override the used version with the current modification'], ['', 'theirs', 'in case of a conflict, override the current modification with the specified version'], ['', 'manual', 'in case of a conflict, leave the files with a conflict state to resolve them manually later'], ['', 'abort', 'in case of an unresolved merge, revert to the state before the merge began'], ['', 'resolve', 'mark an unresolved merge as resolved and create a new snap with the changes'], ['', 'no-snap', 'do not auto snap in case the merge completed without conflicts'], ['', 'build', 'in case of snap during the merge, run the build-pipeline (similar to bit snap --build)'], ['', 'verbose', 'show details of components that were not merged legitimately'], ['x', 'skip-dependency-installation', 'do not install packages of the imported components'], ['m', 'message <message>', 'override the default message for the auto snap']]);
     (0, _defineProperty2().default)(this, "loader", true);
   }
   async report([ids = []], {

package/dist/merge-cmd.js.map

@@ -1 +1 @@
-{"version":3,"names":["MergeCmd","constructor","merging","WILDCARD_HELP","report","ids","ours","theirs","manual","abort","resolve","build","noSnap","verbose","message","skipDependencyInstallation","isFeatureEnabled","BUILD_ON_CI","Boolean","mergeStrategy","getMergeStrategy","BitError","components","failedComponents","version","resolvedComponents","abortedComponents","mergeSnapResults","mergeSnapError","merge","title","componentsStr","map","c","id","toStringWithoutVersion","join","chalk","underline","green","mergeReport","removedComponents","leftUnresolvedConflicts","configMergeResults","workspaceDepsUpdates","getSuccessOutput","length","bold","applyVersionReport","getConflictSummary","suggestion","conflictSummaryReport","yellow","configMergeWithConflicts","filter","hasConflicts","getConfigMergeConflictSummary","comps","compIdStr","MergeConfigFilename","getSnapsOutput","snappedComponents","autoSnappedResults","outputComponents","component","componentOutput","toString","autoTag","result","triggeredBy","searchWithoutScopeAndVersion","autoTagComp","a","AUTO_SNAPPED_MSG","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","name","files","filesStatus","file","note","FileStatus","white","cyan","installationErrorOutput","installationError","subTitle","red","compilationErrorOutput","compilationError"],"sources":["merge-cmd.ts"],"sourcesContent":["import chalk from 'chalk';\nimport { Command, CommandOptions } from '@teambit/cli';\nimport { BitId } from '@teambit/legacy-bit-id';\nimport { compact } from 'lodash';\nimport { WILDCARD_HELP, AUTO_SNAPPED_MSG, MergeConfigFilename } from '@teambit/legacy/dist/constants';\nimport {\n  getMergeStrategy,\n  FileStatus,\n  ApplyVersionResult,\n} from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport { isFeatureEnabled, BUILD_ON_CI } from '@teambit/legacy/dist/api/consumer/lib/feature-toggle';\nimport { BitError } from '@teambit/bit-error';\nimport { ApplyVersionResults, MergingMain } from './merging.main.runtime';\nimport { ConfigMergeResult } from './config-merge-result';\n\nexport class MergeCmd implements Command {\n  name = 'merge [ids...]';\n  description = 'merge changes of the remote head into local';\n  helpUrl = 'docs/components/merging-changes';\n  group = 'development';\n  extendedDescription = `merge changes of the remote head into local. when on a lane, merge the remote head of the lane into the local.\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/lane-merge.\n${WILDCARD_HELP('merge')}`;\n  alias = '';\n  options = [\n    ['', 'ours', 'in case of a conflict, override the used version with the current modification'],\n    ['', 'theirs', 'in case of a conflict, override the current modification with the specified version'],\n    ['', 'manual', 'in case of a conflict, leave the files with a conflict state to resolve them manually later'],\n    ['', 'abort', 'EXPERIMENTAL. in case of an unresolved merge, revert to the state before the merge began'],\n    ['', 'resolve', 'EXPERIMENTAL. mark an unresolved merge as resolved and create a new snap with the changes'],\n    ['', 'no-snap', 'EXPERIMENTAL. do not auto snap in case the merge completed without conflicts'],\n    ['', 'build', 'in case of snap during the merge, run the build-pipeline (similar to bit snap --build)'],\n    ['', 'verbose', 'show details of components that were not merged legitimately'],\n    ['x', 'skip-dependency-installation', 'do not install packages of the imported components'],\n    ['m', 'message <message>', 'EXPERIMENTAL. override the default message for the auto snap'],\n  ] as CommandOptions;\n  loader = true;\n\n  constructor(private merging: MergingMain) {}\n\n  async report(\n    [ids = []]: [string[]],\n    {\n      ours = false,\n      theirs = false,\n      manual = false,\n      abort = false,\n      resolve = false,\n      build = false,\n      noSnap = false,\n      verbose = false,\n      message,\n      skipDependencyInstallation = false,\n    }: {\n      ours?: boolean;\n      theirs?: boolean;\n      manual?: boolean;\n      abort?: boolean;\n      resolve?: boolean;\n      build?: boolean;\n      noSnap?: boolean;\n      verbose?: boolean;\n      message: string;\n      skipDependencyInstallation?: boolean;\n    }\n  ) {\n    build = isFeatureEnabled(BUILD_ON_CI) ? Boolean(build) : true;\n    const mergeStrategy = getMergeStrategy(ours, theirs, manual);\n    if (abort && resolve) throw new BitError('unable to use \"abort\" and \"resolve\" flags together');\n    if (noSnap && message) throw new BitError('unable to use \"noSnap\" and \"message\" flags together');\n    const {\n      components,\n      failedComponents,\n      version,\n      resolvedComponents,\n      abortedComponents,\n      mergeSnapResults,\n      mergeSnapError,\n    }: ApplyVersionResults = await this.merging.merge(\n      ids,\n      mergeStrategy as any,\n      abort,\n      resolve,\n      noSnap,\n      message,\n      build,\n      skipDependencyInstallation\n    );\n    if (resolvedComponents) {\n      const title = 'successfully resolved component(s)\\n';\n      const componentsStr = resolvedComponents.map((c) => c.id.toStringWithoutVersion()).join('\\n');\n      return chalk.underline(title) + chalk.green(componentsStr);\n    }\n    if (abortedComponents) {\n      const title = 'successfully aborted the merge of the following component(s)\\n';\n      const componentsStr = abortedComponents.map((c) => c.id.toStringWithoutVersion()).join('\\n');\n      return chalk.underline(title) + chalk.green(componentsStr);\n    }\n\n    return mergeReport({\n      components,\n      failedComponents,\n      version,\n      mergeSnapResults,\n      mergeSnapError,\n      verbose,\n    });\n  }\n}\n\nexport function mergeReport({\n  components,\n  failedComponents,\n  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    // @ts-ignore version is set in case of merge command\n    const title = `successfully merged components${version ? `from version ${chalk.bold(version)}` : ''}\\n`;\n    // @ts-ignore components is set in case of merge command\n    return chalk.underline(title) + chalk.green(applyVersionReport(components));\n  };\n\n  const getConflictSummary = () => {\n    if (!components || !components.length || !leftUnresolvedConflicts) return '';\n    const title = `\\n\\nfiles with conflicts summary\\n`;\n    const suggestion = `\\n\\nthe merge process wasn't completed due to the conflicts above. fix them manually and then run \"bit install\".\nonce ready, snap/tag the components to complete the merge.`;\n    return chalk.underline(title) + conflictSummaryReport(components) + chalk.yellow(suggestion);\n  };\n\n  const configMergeWithConflicts = configMergeResults?.filter((c) => c.hasConflicts()) || [];\n  const getConfigMergeConflictSummary = () => {\n    if (!configMergeWithConflicts.length) return '';\n    const comps = configMergeWithConflicts.map((c) => c.compIdStr).join('\\n');\n    const title = `\\n\\ncomponents with config-merge conflicts\\n`;\n    const suggestion = `\\nconflicts were found while trying to merge the config. fix them manually by editing the ${MergeConfigFilename} file in the workspace root.\nonce ready, snap/tag the components to complete the merge.`;\n    return chalk.underline(title) + comps + chalk.yellow(suggestion);\n  };\n\n  const getSnapsOutput = () => {\n    if (mergeSnapError) {\n      return `\n${chalk.bold(\n  'snapping the merged components had failed with the following error, please fix the issues and snap manually'\n)}\n${mergeSnapError.message}\n`;\n    }\n    if (!mergeSnapResults || !mergeSnapResults.snappedComponents) return '';\n    const { snappedComponents, autoSnappedResults } = mergeSnapResults;\n    const outputComponents = (comps) => {\n      return comps\n        .map((component) => {\n          let componentOutput = `     > ${component.id.toString()}`;\n          const autoTag = autoSnappedResults.filter((result) =>\n            result.triggeredBy.searchWithoutScopeAndVersion(component.id)\n          );\n          if (autoTag.length) {\n            const autoTagComp = autoTag.map((a) => a.component.id.toString());\n            componentOutput += `\\n       ${AUTO_SNAPPED_MSG}: ${autoTagComp.join(', ')}`;\n          }\n          return componentOutput;\n        })\n        .join('\\n');\n    };\n\n    return `\\n${chalk.underline(\n      'merge-snapped components'\n    )}\\n(${'components that snapped as a result of the merge'})\\n${outputComponents(snappedComponents)}\\n`;\n  };\n\n  const 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 = '\\nthe merge has been skipped on the following component(s)';\n    const body = compact(\n      failedComponents.map((failedComponent) => {\n        if (!verbose && failedComponent.unchangedLegitimately) return null;\n        const color = failedComponent.unchangedLegitimately ? 'white' : 'red';\n        return `${chalk.bold(failedComponent.id.toString())} - ${chalk[color](failedComponent.failureMessage)}`;\n      })\n    ).join('\\n');\n    if (!body) {\n      return `${chalk.bold(`\\nthe merge has been skipped on ${failedComponents.length} component(s) legitimately`)}\n(use --verbose to list them next time)`;\n    }\n    return `\\n${chalk.underline(title)}\\n${body}\\n\\n`;\n  };\n\n  const getSummary = () => {\n    const merged = components?.length || 0;\n    const unchangedLegitimately = failedComponents?.filter((f) => f.unchangedLegitimately).length || 0;\n    const failedToMerge = failedComponents?.filter((f) => !f.unchangedLegitimately).length || 0;\n    const autoSnapped =\n      (mergeSnapResults?.snappedComponents.length || 0) + (mergeSnapResults?.autoSnappedResults.length || 0);\n\n    const newLines = '\\n\\n';\n    const title = chalk.bold.underline('Merge Summary');\n    const mergedStr = `\\nTotal Merged: ${chalk.bold(merged.toString())}`;\n    const unchangedLegitimatelyStr = `\\nTotal Unchanged: ${chalk.bold(unchangedLegitimately.toString())}`;\n    const failedToMergeStr = `\\nTotal Failed: ${chalk.bold(failedToMerge.toString())}`;\n    const autoSnappedStr = `\\nTotal Snapped: ${chalk.bold(autoSnapped.toString())}`;\n    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\nexport function applyVersionReport(components: ApplyVersionResult[], addName = true, showVersion = false): string {\n  const tab = addName ? '\\t' : '';\n  return components\n    .map((component: ApplyVersionResult) => {\n      const name = showVersion ? component.id.toString() : component.id.toStringWithoutVersion();\n      const files = Object.keys(component.filesStatus)\n        .map((file) => {\n          const note =\n            component.filesStatus[file] === FileStatus.manual\n              ? chalk.white(\n                  'automatic merge failed. please fix conflicts manually and then run \"bit install\" and \"bit compile\"'\n                )\n              : '';\n          return `${tab}${component.filesStatus[file]} ${chalk.bold(file)} ${note}`;\n        })\n        .join('\\n');\n      return `${addName ? name : ''}\\n${chalk.cyan(files)}`;\n    })\n    .join('\\n\\n');\n}\n\nexport function conflictSummaryReport(components: ApplyVersionResult[]): string {\n  const tab = '\\t';\n  return compact(\n    components.map((component: ApplyVersionResult) => {\n      const name = component.id.toStringWithoutVersion();\n      const files = compact(\n        Object.keys(component.filesStatus).map((file) => {\n          if (component.filesStatus[file] === FileStatus.manual) {\n            return `${tab}${component.filesStatus[file]} ${chalk.bold(file)}`;\n          }\n          return null;\n        })\n      );\n      if (!files.length) return null;\n\n      return `${name}\\n${chalk.cyan(files.join('\\n'))}`;\n    })\n  ).join('\\n');\n}\n\nexport function installationErrorOutput(installationError?: Error) {\n  if (!installationError) return '';\n  const title = chalk.underline('Installation Error');\n  const subTitle =\n    'The following error had been caught from the package manager, please fix the issue and run \"bit install\"';\n  const body = chalk.red(installationError.message);\n  return `\\n\\n${title}\\n${subTitle}\\n${body}`;\n}\n\nexport function compilationErrorOutput(compilationError?: Error) {\n  if (!compilationError) return '';\n  const title = chalk.underline('Compilation Error');\n  const subTitle = 'The following error had been caught from the compiler, please fix the issue and run \"bit compile\"';\n  const body = chalk.red(compilationError.message);\n  return `\\n\\n${title}\\n${subTitle}\\n${body}`;\n}\n\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"],"mappings":"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"}
+{"version":3,"names":["MergeCmd","constructor","merging","WILDCARD_HELP","report","ids","ours","theirs","manual","abort","resolve","build","noSnap","verbose","message","skipDependencyInstallation","isFeatureEnabled","BUILD_ON_CI","Boolean","mergeStrategy","getMergeStrategy","BitError","components","failedComponents","version","resolvedComponents","abortedComponents","mergeSnapResults","mergeSnapError","merge","title","componentsStr","map","c","id","toStringWithoutVersion","join","chalk","underline","green","mergeReport","removedComponents","leftUnresolvedConflicts","configMergeResults","workspaceDepsUpdates","getSuccessOutput","length","bold","applyVersionReport","getConflictSummary","suggestion","conflictSummaryReport","yellow","configMergeWithConflicts","filter","hasConflicts","getConfigMergeConflictSummary","comps","compIdStr","MergeConfigFilename","getSnapsOutput","snappedComponents","autoSnappedResults","outputComponents","component","componentOutput","toString","autoTag","result","triggeredBy","searchWithoutScopeAndVersion","autoTagComp","a","AUTO_SNAPPED_MSG","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","name","files","filesStatus","file","note","FileStatus","white","cyan","installationErrorOutput","installationError","subTitle","red","compilationErrorOutput","compilationError"],"sources":["merge-cmd.ts"],"sourcesContent":["import chalk from 'chalk';\nimport { Command, CommandOptions } from '@teambit/cli';\nimport { BitId } from '@teambit/legacy-bit-id';\nimport { compact } from 'lodash';\nimport { WILDCARD_HELP, AUTO_SNAPPED_MSG, MergeConfigFilename } from '@teambit/legacy/dist/constants';\nimport {\n  getMergeStrategy,\n  FileStatus,\n  ApplyVersionResult,\n} from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport { isFeatureEnabled, BUILD_ON_CI } from '@teambit/legacy/dist/api/consumer/lib/feature-toggle';\nimport { BitError } from '@teambit/bit-error';\nimport { ApplyVersionResults, MergingMain } from './merging.main.runtime';\nimport { ConfigMergeResult } from './config-merge-result';\n\nexport class MergeCmd implements Command {\n  name = 'merge [ids...]';\n  description = 'merge changes of the remote head into local';\n  helpUrl = 'docs/components/merging-changes';\n  group = 'development';\n  extendedDescription = `merge changes of the remote head into local. when on a lane, merge the remote head of the lane into the local.\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/lane-merge.\n${WILDCARD_HELP('merge')}`;\n  alias = '';\n  options = [\n    ['', 'ours', 'in case of a conflict, override the used version with the current modification'],\n    ['', 'theirs', 'in case of a conflict, override the current modification with the specified version'],\n    ['', 'manual', 'in case of a conflict, leave the files with a conflict state to resolve them manually later'],\n    ['', 'abort', 'in case of an unresolved merge, revert to the state before the merge began'],\n    ['', 'resolve', 'mark an unresolved merge as resolved and create a new snap with the changes'],\n    ['', 'no-snap', 'do not auto snap in case the merge completed without conflicts'],\n    ['', 'build', 'in case of snap during the merge, run the build-pipeline (similar to bit snap --build)'],\n    ['', 'verbose', 'show details of components that were not merged legitimately'],\n    ['x', 'skip-dependency-installation', 'do not install packages of the imported components'],\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      abort = false,\n      resolve = false,\n      build = false,\n      noSnap = false,\n      verbose = false,\n      message,\n      skipDependencyInstallation = false,\n    }: {\n      ours?: boolean;\n      theirs?: boolean;\n      manual?: boolean;\n      abort?: boolean;\n      resolve?: boolean;\n      build?: boolean;\n      noSnap?: boolean;\n      verbose?: boolean;\n      message: string;\n      skipDependencyInstallation?: boolean;\n    }\n  ) {\n    build = isFeatureEnabled(BUILD_ON_CI) ? Boolean(build) : true;\n    const mergeStrategy = getMergeStrategy(ours, theirs, manual);\n    if (abort && resolve) throw new BitError('unable to use \"abort\" and \"resolve\" flags together');\n    if (noSnap && message) throw new BitError('unable to use \"noSnap\" and \"message\" flags together');\n    const {\n      components,\n      failedComponents,\n      version,\n      resolvedComponents,\n      abortedComponents,\n      mergeSnapResults,\n      mergeSnapError,\n    }: ApplyVersionResults = await this.merging.merge(\n      ids,\n      mergeStrategy as any,\n      abort,\n      resolve,\n      noSnap,\n      message,\n      build,\n      skipDependencyInstallation\n    );\n    if (resolvedComponents) {\n      const title = 'successfully resolved component(s)\\n';\n      const componentsStr = resolvedComponents.map((c) => c.id.toStringWithoutVersion()).join('\\n');\n      return chalk.underline(title) + chalk.green(componentsStr);\n    }\n    if (abortedComponents) {\n      const title = 'successfully aborted the merge of the following component(s)\\n';\n      const componentsStr = abortedComponents.map((c) => c.id.toStringWithoutVersion()).join('\\n');\n      return chalk.underline(title) + chalk.green(componentsStr);\n    }\n\n    return mergeReport({\n      components,\n      failedComponents,\n      version,\n      mergeSnapResults,\n      mergeSnapError,\n      verbose,\n    });\n  }\n}\n\nexport function mergeReport({\n  components,\n  failedComponents,\n  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    // @ts-ignore version is set in case of merge command\n    const title = `successfully merged components${version ? `from version ${chalk.bold(version)}` : ''}\\n`;\n    // @ts-ignore components is set in case of merge command\n    return chalk.underline(title) + chalk.green(applyVersionReport(components));\n  };\n\n  const getConflictSummary = () => {\n    if (!components || !components.length || !leftUnresolvedConflicts) return '';\n    const title = `\\n\\nfiles with conflicts summary\\n`;\n    const suggestion = `\\n\\nthe merge process wasn't completed due to the conflicts above. fix them manually and then run \"bit install\".\nonce ready, snap/tag the components to complete the merge.`;\n    return chalk.underline(title) + conflictSummaryReport(components) + chalk.yellow(suggestion);\n  };\n\n  const configMergeWithConflicts = configMergeResults?.filter((c) => c.hasConflicts()) || [];\n  const getConfigMergeConflictSummary = () => {\n    if (!configMergeWithConflicts.length) return '';\n    const comps = configMergeWithConflicts.map((c) => c.compIdStr).join('\\n');\n    const title = `\\n\\ncomponents with config-merge conflicts\\n`;\n    const suggestion = `\\nconflicts were found while trying to merge the config. fix them manually by editing the ${MergeConfigFilename} file in the workspace root.\nonce ready, snap/tag the components to complete the merge.`;\n    return chalk.underline(title) + comps + chalk.yellow(suggestion);\n  };\n\n  const getSnapsOutput = () => {\n    if (mergeSnapError) {\n      return `\n${chalk.bold(\n  'snapping the merged components had failed with the following error, please fix the issues and snap manually'\n)}\n${mergeSnapError.message}\n`;\n    }\n    if (!mergeSnapResults || !mergeSnapResults.snappedComponents) return '';\n    const { snappedComponents, autoSnappedResults } = mergeSnapResults;\n    const outputComponents = (comps) => {\n      return comps\n        .map((component) => {\n          let componentOutput = `     > ${component.id.toString()}`;\n          const autoTag = autoSnappedResults.filter((result) =>\n            result.triggeredBy.searchWithoutScopeAndVersion(component.id)\n          );\n          if (autoTag.length) {\n            const autoTagComp = autoTag.map((a) => a.component.id.toString());\n            componentOutput += `\\n       ${AUTO_SNAPPED_MSG}: ${autoTagComp.join(', ')}`;\n          }\n          return componentOutput;\n        })\n        .join('\\n');\n    };\n\n    return `\\n${chalk.underline(\n      'merge-snapped components'\n    )}\\n(${'components that snapped as a result of the merge'})\\n${outputComponents(snappedComponents)}\\n`;\n  };\n\n  const 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 = '\\nthe merge has been skipped on the following component(s)';\n    const body = compact(\n      failedComponents.map((failedComponent) => {\n        if (!verbose && failedComponent.unchangedLegitimately) return null;\n        const color = failedComponent.unchangedLegitimately ? 'white' : 'red';\n        return `${chalk.bold(failedComponent.id.toString())} - ${chalk[color](failedComponent.failureMessage)}`;\n      })\n    ).join('\\n');\n    if (!body) {\n      return `${chalk.bold(`\\nthe merge has been skipped on ${failedComponents.length} component(s) legitimately`)}\n(use --verbose to list them next time)`;\n    }\n    return `\\n${chalk.underline(title)}\\n${body}\\n\\n`;\n  };\n\n  const getSummary = () => {\n    const merged = components?.length || 0;\n    const unchangedLegitimately = failedComponents?.filter((f) => f.unchangedLegitimately).length || 0;\n    const failedToMerge = failedComponents?.filter((f) => !f.unchangedLegitimately).length || 0;\n    const autoSnapped =\n      (mergeSnapResults?.snappedComponents.length || 0) + (mergeSnapResults?.autoSnappedResults.length || 0);\n\n    const newLines = '\\n\\n';\n    const title = chalk.bold.underline('Merge Summary');\n    const mergedStr = `\\nTotal Merged: ${chalk.bold(merged.toString())}`;\n    const unchangedLegitimatelyStr = `\\nTotal Unchanged: ${chalk.bold(unchangedLegitimately.toString())}`;\n    const failedToMergeStr = `\\nTotal Failed: ${chalk.bold(failedToMerge.toString())}`;\n    const autoSnappedStr = `\\nTotal Snapped: ${chalk.bold(autoSnapped.toString())}`;\n    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\nexport function applyVersionReport(components: ApplyVersionResult[], addName = true, showVersion = false): string {\n  const tab = addName ? '\\t' : '';\n  return components\n    .map((component: ApplyVersionResult) => {\n      const name = showVersion ? component.id.toString() : component.id.toStringWithoutVersion();\n      const files = Object.keys(component.filesStatus)\n        .map((file) => {\n          const note =\n            component.filesStatus[file] === FileStatus.manual\n              ? chalk.white(\n                  'automatic merge failed. please fix conflicts manually and then run \"bit install\" and \"bit compile\"'\n                )\n              : '';\n          return `${tab}${component.filesStatus[file]} ${chalk.bold(file)} ${note}`;\n        })\n        .join('\\n');\n      return `${addName ? name : ''}\\n${chalk.cyan(files)}`;\n    })\n    .join('\\n\\n');\n}\n\nexport function conflictSummaryReport(components: ApplyVersionResult[]): string {\n  const tab = '\\t';\n  return compact(\n    components.map((component: ApplyVersionResult) => {\n      const name = component.id.toStringWithoutVersion();\n      const files = compact(\n        Object.keys(component.filesStatus).map((file) => {\n          if (component.filesStatus[file] === FileStatus.manual) {\n            return `${tab}${component.filesStatus[file]} ${chalk.bold(file)}`;\n          }\n          return null;\n        })\n      );\n      if (!files.length) return null;\n\n      return `${name}\\n${chalk.cyan(files.join('\\n'))}`;\n    })\n  ).join('\\n');\n}\n\nexport function installationErrorOutput(installationError?: Error) {\n  if (!installationError) return '';\n  const title = chalk.underline('Installation Error');\n  const subTitle =\n    'The following error had been caught from the package manager, please fix the issue and run \"bit install\"';\n  const body = chalk.red(installationError.message);\n  return `\\n\\n${title}\\n${subTitle}\\n${body}`;\n}\n\nexport function compilationErrorOutput(compilationError?: Error) {\n  if (!compilationError) return '';\n  const title = chalk.underline('Compilation Error');\n  const subTitle = 'The following error had been caught from the compiler, please fix the issue and run \"bit compile\"';\n  const body = chalk.red(compilationError.message);\n  return `\\n\\n${title}\\n${subTitle}\\n${body}`;\n}\n\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"],"mappings":"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"}

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@teambit/merging",
-  "version": "0.0.405",
+  "version": "0.0.407",
   "homepage": "https://bit.cloud/teambit/component/merging",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.component",
     "name": "merging",
-    "version": "0.0.405"
+    "version": "0.0.407"
   },
   "dependencies": {
     "lodash": "4.17.21",
@@ -18,21 +18,21 @@
     "@teambit/component-id": "0.0.427",
     "@teambit/legacy-bit-id": "0.0.423",
     "@teambit/harmony": "0.4.6",
-    "@teambit/dependency-resolver": "0.0.1090",
+    "@teambit/dependency-resolver": "0.0.1092",
     "@teambit/component-version": "0.0.409",
-    "@teambit/envs": "0.0.1090",
-    "@teambit/logger": "0.0.825",
+    "@teambit/envs": "0.0.1092",
+    "@teambit/logger": "0.0.826",
     "@teambit/bit-error": "0.0.402",
-    "@teambit/cli": "0.0.732",
-    "@teambit/checkout": "0.0.259",
-    "@teambit/component-writer": "0.0.126",
-    "@teambit/config": "0.0.746",
-    "@teambit/importer": "0.0.519",
-    "@teambit/install": "0.0.190",
-    "@teambit/lane-id": "0.0.249",
-    "@teambit/remove": "0.0.267",
-    "@teambit/snapping": "0.0.405",
-    "@teambit/workspace": "0.0.1090"
+    "@teambit/cli": "0.0.733",
+    "@teambit/checkout": "0.0.261",
+    "@teambit/component-writer": "0.0.128",
+    "@teambit/config": "0.0.747",
+    "@teambit/importer": "0.0.521",
+    "@teambit/install": "0.0.191",
+    "@teambit/lane-id": "0.0.250",
+    "@teambit/remove": "0.0.269",
+    "@teambit/snapping": "0.0.407",
+    "@teambit/workspace": "0.0.1092"
   },
   "devDependencies": {
     "@types/lodash": "4.14.165",
@@ -46,7 +46,7 @@
     "@types/testing-library__jest-dom": "5.9.5"
   },
   "peerDependencies": {
-    "@teambit/legacy": "1.0.513",
+    "@teambit/legacy": "1.0.514",
     "react": "^16.8.0 || ^17.0.0",
     "react-dom": "^16.8.0 || ^17.0.0"
   },