@teambit/merging 1.0.929 → 1.0.931

package/dist/merge-cmd.js

@@ -12,6 +12,13 @@ function _chalk() {
   };
   return data;
 }
+function _cli() {
+  const data = require("@teambit/cli");
+  _cli = function () {
+    return data;
+  };
+  return data;
+}
 function _lodash() {
   const data = require("lodash");
   _lodash = function () {
@@ -105,14 +112,14 @@ for lane-to-lane merging, use 'bit lane merge' instead.`);
       mergeSnapError
     } = await this.merging.merge(pattern, autoMergeResolve, abort, resolve, noSnap, message, build, skipDependencyInstallation);
     if (resolvedComponents) {
-      const title = 'successfully resolved component(s)\n';
+      const title = (0, _cli().formatTitle)('successfully resolved component(s)');
       const componentsStr = resolvedComponents.map(c => c.id.toStringWithoutVersion()).join('\n');
-      return _chalk().default.underline(title) + _chalk().default.green(componentsStr);
+      return `${title}\n${_chalk().default.green(componentsStr)}`;
     }
     if (abortedComponents) {
-      const title = 'successfully aborted the merge of the following component(s)\n';
+      const title = (0, _cli().formatTitle)('successfully aborted the merge of the following component(s)');
       const componentsStr = abortedComponents.map(c => c.id.toStringWithoutVersion()).join('\n');
-      return _chalk().default.underline(title) + _chalk().default.green(componentsStr);
+      return `${title}\n${_chalk().default.green(componentsStr)}`;
     }
     return mergeReport({
       components,
@@ -139,28 +146,26 @@ function mergeReport({
 }) {
   const getSuccessOutput = () => {
     if (!components || !components.length) return '';
-    const title = `successfully merged ${components.length} components${version ? `from version ${_chalk().default.bold(version)}` : ''}\n`;
+    const title = (0, _cli().formatTitle)(`successfully merged ${components.length} components${version ? ` from version ${_chalk().default.bold(version)}` : ''}`);
     const fileChangesReport = (0, _componentModules().applyVersionReport)(components);
-    return _chalk().default.bold(title) + fileChangesReport;
+    return fileChangesReport ? `${title}\n${fileChangesReport}` : title;
   };
   let componentsWithConflicts = 0;
   const getConflictSummary = () => {
     if (!components || !components.length || !leftUnresolvedConflicts) return '';
-    const title = `files with conflicts summary\n`;
-    const suggestion = `\n\nmerge process not completed due to the conflicts above. fix conflicts manually and then run "bit install".
-once ready, snap/tag the components to complete the merge.`;
+    const title = (0, _cli().formatTitle)(`${_cli().warnSymbol} files with conflicts summary`);
     const conflictSummary = (0, _componentModules().conflictSummaryReport)(components);
     componentsWithConflicts = conflictSummary.conflictedComponents;
-    return _chalk().default.underline(title) + conflictSummary.conflictStr + _chalk().default.yellow(suggestion);
+    const suggestion = (0, _cli().formatHint)(`merge 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.`);
+    return `${title}\n${conflictSummary.conflictStr}\n\n${suggestion}`;
   };
   const configMergeWithConflicts = configMergeResults?.filter(c => c.hasConflicts()) || [];
   const getConfigMergeConflictSummary = () => {
     if (!configMergeWithConflicts.length) return '';
     const comps = configMergeWithConflicts.map(c => c.compIdStr).join('\n');
-    const title = `components with config-merge conflicts\n`;
-    const suggestion = `\nconflicts were found while trying to merge the config. fix them manually by editing the ${_legacy().MergeConfigFilename} file in the workspace root.
-once ready, snap/tag the components to complete the merge.`;
-    return _chalk().default.underline(title) + comps + _chalk().default.yellow(suggestion);
+    const title = (0, _cli().formatTitle)(`${_cli().warnSymbol} components with config-merge conflicts`);
+    const suggestion = (0, _cli().formatHint)(`conflicts were found while trying to merge the config. fix them manually by editing the ${_legacy().MergeConfigFilename} file in the workspace root.\nonce ready, snap/tag the components to complete the merge.`);
+    return `${title}\n${comps}\n${suggestion}`;
   };
   const getSnapsOutput = () => {
     if (mergeSnapError) {
@@ -184,7 +189,7 @@ ${mergeSnapError.message}
         return componentOutput;
       }).join('\n');
     };
-    return `${_chalk().default.underline('merge-snapped components')}\n(${'components snapped as a result of the merge'})\n${outputComponents(snappedComponents)}`;
+    return `${(0, _cli().formatTitle)(`merge-snapped components (${snappedComponents.length})`)}\n${_chalk().default.dim('components snapped as a result of the merge')}\n${outputComponents(snappedComponents)}`;
   };
   const getFailureOutput = () => {
     if (!failedComponents || !failedComponents.length) return '';
@@ -208,7 +213,7 @@ ${mergeSnapError.message}
       if (!body) {
         parts.push(`${_chalk().default.bold(`\nmerge skipped legitimately for ${otherComponents.length} component(s)`)}\n(use --verbose to list them next time)`);
       } else {
-        parts.push(`${_chalk().default.underline(title)}\n${body}`);
+        parts.push(`${(0, _cli().formatTitle)(title)}\n${body}`);
       }
     }
     return parts.join('\n');
@@ -223,7 +228,7 @@ ${mergeSnapError.message}
       const mergeConfig = configMergeWithConflicts.length ? `${_legacy().MergeConfigFilename} file` : '';
       return (0, _lodash().compact)([comps, ws, mergeConfig]).join(', ');
     };
-    const title = _chalk().default.bold.underline('Merge Summary');
+    const title = (0, _cli().formatTitle)('Merge Summary');
     const mergedStr = `\nTotal Merged: ${_chalk().default.bold(merged.toString())}`;
     const unchangedLegitimatelyStr = `\nTotal Unchanged: ${_chalk().default.bold(unchangedLegitimately.toString())}`;
     const autoSnappedStr = `\nTotal Snapped: ${_chalk().default.bold(autoSnapped.toString())}`;
@@ -231,7 +236,7 @@ ${mergeSnapError.message}
     const conflictStr = `\nConflicts: ${_chalk().default.bold(getConflictStr() || 'none')}`;
     return title + mergedStr + unchangedLegitimatelyStr + autoSnappedStr + removedStr + conflictStr;
   };
-  return (0, _lodash().compact)([getSuccessOutput(), getFailureOutput(), (0, _componentModules().getRemovedOutput)(removedComponents), getSnapsOutput(), getConfigMergeConflictSummary(), (0, _componentModules().getWorkspaceConfigUpdateOutput)(workspaceConfigUpdateResult), getConflictSummary(), getSummary()]).join('\n\n');
+  return (0, _cli().joinSections)([getSuccessOutput(), getFailureOutput(), (0, _componentModules().getRemovedOutput)(removedComponents), getSnapsOutput(), getConfigMergeConflictSummary(), (0, _componentModules().getWorkspaceConfigUpdateOutput)(workspaceConfigUpdateResult), getConflictSummary(), getSummary()]);
 }
 
 //# sourceMappingURL=merge-cmd.js.map

package/dist/merge-cmd.js.map

@@ -1 +1 @@
-{"version":3,"names":["_chalk","data","_interopRequireDefault","require","_lodash","_legacy","_bitError","_componentModules","_mergeStatusProvider","e","__esModule","default","_defineProperty","r","t","_toPropertyKey","Object","defineProperty","value","enumerable","configurable","writable","i","_toPrimitive","Symbol","toPrimitive","call","TypeError","String","Number","MergeCmd","constructor","merging","configStore","name","description","COMPONENT_PATTERN_HELP","report","pattern","ours","theirs","manual","autoMergeResolve","abort","resolve","build","noSnap","verbose","message","skipDependencyInstallation","getConfigBoolean","CFG_FORCE_LOCAL_BUILD","Boolean","BitError","components","failedComponents","version","resolvedComponents","abortedComponents","mergeSnapResults","mergeSnapError","merge","title","componentsStr","map","c","id","toStringWithoutVersion","join","chalk","underline","green","mergeReport","exports","removedComponents","leftUnresolvedConflicts","configMergeResults","workspaceConfigUpdateResult","getSuccessOutput","length","bold","fileChangesReport","applyVersionReport","componentsWithConflicts","getConflictSummary","suggestion","conflictSummary","conflictSummaryReport","conflictedComponents","conflictStr","yellow","configMergeWithConflicts","filter","hasConflicts","getConfigMergeConflictSummary","comps","compIdStr","MergeConfigFilename","getSnapsOutput","snappedComponents","autoSnappedResults","outputComponents","component","componentOutput","toString","autoTag","result","triggeredBy","searchWithoutVersion","autoTagComp","a","AUTO_SNAPPED_MSG","getFailureOutput","skippedRemoved","fc","unchangedMessage","compHasBeenRemovedMsg","otherComponents","parts","removedTitle","removedBody","removedHint","push","body","compact","failedComponent","white","getSummary","merged","unchangedLegitimately","f","autoSnapped","getConflictStr","ws","workspaceDepsConflicts","mergeConfig","mergedStr","unchangedLegitimatelyStr","autoSnappedStr","removedStr","getRemovedOutput","getWorkspaceConfigUpdateOutput"],"sources":["merge-cmd.ts"],"sourcesContent":["import chalk from 'chalk';\nimport type { Command, CommandOptions } from '@teambit/cli';\nimport { compact } from 'lodash';\nimport {\n  COMPONENT_PATTERN_HELP,\n  AUTO_SNAPPED_MSG,\n  MergeConfigFilename,\n  CFG_FORCE_LOCAL_BUILD,\n} from '@teambit/legacy.constants';\nimport type { ConfigMergeResult } from '@teambit/config-merger';\nimport { BitError } from '@teambit/bit-error';\nimport {\n  type MergeStrategy,\n  type ApplyVersionResults,\n  applyVersionReport,\n  conflictSummaryReport,\n  getRemovedOutput,\n  getWorkspaceConfigUpdateOutput,\n} from '@teambit/component.modules.merge-helper';\nimport type { MergingMain } from './merging.main.runtime';\nimport { compHasBeenRemovedMsg } from './merge-status-provider';\nimport type { ConfigStoreMain } from '@teambit/config-store';\n\nexport class MergeCmd implements Command {\n  name = 'merge [component-pattern]';\n  description = 'merge diverged component history when local and remote have different versions';\n  helpUrl = 'reference/components/merging-changes';\n  group = 'version-control';\n  arguments = [{ name: 'component-pattern', description: COMPONENT_PATTERN_HELP }];\n  extendedDescription = `resolves diverged component history when both local and remote have created different snaps/tags from the same base version.\nif no component pattern is specified, all pending-merge components will be merged (run 'bit status' to list them).\n'bit status' will show diverged components and suggest either merging or resetting local changes.\npreferred approach: use 'bit reset' to remove local versions, then 'bit checkout head' to get remote versions.\nfor lane-to-lane merging, use 'bit lane merge' instead.`;\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    [\n      '',\n      'manual',\n      'same as \"--auto-merge-resolve manual\". in case of merge conflict, write the files with the conflict markers',\n    ],\n    [\n      'r',\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(\n    private merging: MergingMain,\n    private configStore: ConfigStoreMain\n  ) {}\n\n  async report(\n    [pattern]: [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 = this.configStore.getConfigBoolean(CFG_FORCE_LOCAL_BUILD) || Boolean(build);\n    if (ours || theirs) {\n      throw new BitError('the \"--ours\" and \"--theirs\" flags are deprecated. use \"--auto-merge-resolve\" instead');\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 (manual) autoMergeResolve = '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      pattern,\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  workspaceConfigUpdateResult,\n}: ApplyVersionResults & { configMergeResults?: ConfigMergeResult[] }): string {\n  const getSuccessOutput = () => {\n    if (!components || !components.length) return '';\n    const title = `successfully merged ${components.length} components${\n      version ? `from version ${chalk.bold(version)}` : ''\n    }\\n`;\n    const fileChangesReport = applyVersionReport(components);\n\n    return chalk.bold(title) + fileChangesReport;\n  };\n\n  let componentsWithConflicts = 0;\n  const getConflictSummary = () => {\n    if (!components || !components.length || !leftUnresolvedConflicts) return '';\n    const title = `files with conflicts summary\\n`;\n    const suggestion = `\\n\\nmerge process not completed due to the conflicts above. fix conflicts manually and then run \"bit install\".\nonce ready, snap/tag the components to complete the merge.`;\n    const conflictSummary = conflictSummaryReport(components);\n    componentsWithConflicts = conflictSummary.conflictedComponents;\n    return chalk.underline(title) + conflictSummary.conflictStr + chalk.yellow(suggestion);\n  };\n\n  const configMergeWithConflicts = configMergeResults?.filter((c) => c.hasConflicts()) || [];\n  const getConfigMergeConflictSummary = () => {\n    if (!configMergeWithConflicts.length) return '';\n    const comps = configMergeWithConflicts.map((c) => c.compIdStr).join('\\n');\n    const title = `components 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 `${chalk.bold(\n        'snapping merged components 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) => result.triggeredBy.searchWithoutVersion(component.id));\n          if (autoTag.length) {\n            const autoTagComp = autoTag.map((a) => a.component.id.toString());\n            componentOutput += `\\n       ${AUTO_SNAPPED_MSG}: ${autoTagComp.join(', ')}`;\n          }\n          return componentOutput;\n        })\n        .join('\\n');\n    };\n\n    return `${chalk.underline(\n      'merge-snapped components'\n    )}\\n(${'components snapped as a result of the merge'})\\n${outputComponents(snappedComponents)}`;\n  };\n\n  const getFailureOutput = () => {\n    if (!failedComponents || !failedComponents.length) return '';\n    // always show removed components - the user needs to know about these\n    const skippedRemoved = failedComponents.filter((fc) => fc.unchangedMessage === compHasBeenRemovedMsg);\n    const otherComponents = failedComponents.filter((fc) => fc.unchangedMessage !== compHasBeenRemovedMsg);\n\n    const parts: string[] = [];\n\n    if (skippedRemoved.length) {\n      const removedTitle = chalk.yellow(`\\nmerge skipped for ${skippedRemoved.length} soft-removed component(s):`);\n      const removedBody = skippedRemoved.map((fc) => `${chalk.bold(fc.id.toString())}`).join('\\n');\n      const removedHint = chalk.yellow(`(use \"bit recover <component-id>\" to restore, then re-run the merge)`);\n      parts.push(`${removedTitle}\\n${removedBody}\\n${removedHint}`);\n    }\n\n    if (otherComponents.length) {\n      const title = '\\nmerge skipped for the following component(s)';\n      const body = compact(\n        otherComponents.map((failedComponent) => {\n          // all failures here are \"unchangedLegitimately\". otherwise, it would have been thrown as an error\n          if (!verbose) return null;\n          return `${chalk.bold(failedComponent.id.toString())} - ${chalk.white(failedComponent.unchangedMessage)}`;\n        })\n      ).join('\\n');\n      if (!body) {\n        parts.push(\n          `${chalk.bold(`\\nmerge skipped legitimately for ${otherComponents.length} component(s)`)}\\n(use --verbose to list them next time)`\n        );\n      } else {\n        parts.push(`${chalk.underline(title)}\\n${body}`);\n      }\n    }\n\n    return parts.join('\\n');\n  };\n\n  const getSummary = () => {\n    const merged = components?.length || 0;\n    const unchangedLegitimately = failedComponents?.filter((f) => f.unchangedLegitimately).length || 0;\n    const autoSnapped =\n      (mergeSnapResults?.snappedComponents.length || 0) + (mergeSnapResults?.autoSnappedResults.length || 0);\n    const getConflictStr = () => {\n      const comps = componentsWithConflicts ? `${componentsWithConflicts} components` : '';\n      const ws = workspaceConfigUpdateResult?.workspaceDepsConflicts ? 'workspace.jsonc file' : '';\n      const mergeConfig = configMergeWithConflicts.length ? `${MergeConfigFilename} file` : '';\n      return compact([comps, ws, mergeConfig]).join(', ');\n    };\n\n    const title = chalk.bold.underline('Merge Summary');\n    const mergedStr = `\\nTotal Merged: ${chalk.bold(merged.toString())}`;\n    const unchangedLegitimatelyStr = `\\nTotal Unchanged: ${chalk.bold(unchangedLegitimately.toString())}`;\n    const autoSnappedStr = `\\nTotal Snapped: ${chalk.bold(autoSnapped.toString())}`;\n    const removedStr = `\\nTotal Removed: ${chalk.bold(removedComponents?.length.toString() || '0')}`;\n    const conflictStr = `\\nConflicts: ${chalk.bold(getConflictStr() || 'none')}`;\n\n    return title + mergedStr + unchangedLegitimatelyStr + autoSnappedStr + removedStr + conflictStr;\n  };\n\n  return compact([\n    getSuccessOutput(),\n    getFailureOutput(),\n    getRemovedOutput(removedComponents),\n    getSnapsOutput(),\n    getConfigMergeConflictSummary(),\n    getWorkspaceConfigUpdateOutput(workspaceConfigUpdateResult),\n    getConflictSummary(),\n    getSummary(),\n  ]).join('\\n\\n');\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_chalk","data","_interopRequireDefault","require","_cli","_lodash","_legacy","_bitError","_componentModules","_mergeStatusProvider","e","__esModule","default","_defineProperty","r","t","_toPropertyKey","Object","defineProperty","value","enumerable","configurable","writable","i","_toPrimitive","Symbol","toPrimitive","call","TypeError","String","Number","MergeCmd","constructor","merging","configStore","name","description","COMPONENT_PATTERN_HELP","report","pattern","ours","theirs","manual","autoMergeResolve","abort","resolve","build","noSnap","verbose","message","skipDependencyInstallation","getConfigBoolean","CFG_FORCE_LOCAL_BUILD","Boolean","BitError","components","failedComponents","version","resolvedComponents","abortedComponents","mergeSnapResults","mergeSnapError","merge","title","formatTitle","componentsStr","map","c","id","toStringWithoutVersion","join","chalk","green","mergeReport","exports","removedComponents","leftUnresolvedConflicts","configMergeResults","workspaceConfigUpdateResult","getSuccessOutput","length","bold","fileChangesReport","applyVersionReport","componentsWithConflicts","getConflictSummary","warnSymbol","conflictSummary","conflictSummaryReport","conflictedComponents","suggestion","formatHint","conflictStr","configMergeWithConflicts","filter","hasConflicts","getConfigMergeConflictSummary","comps","compIdStr","MergeConfigFilename","getSnapsOutput","snappedComponents","autoSnappedResults","outputComponents","component","componentOutput","toString","autoTag","result","triggeredBy","searchWithoutVersion","autoTagComp","a","AUTO_SNAPPED_MSG","dim","getFailureOutput","skippedRemoved","fc","unchangedMessage","compHasBeenRemovedMsg","otherComponents","parts","removedTitle","yellow","removedBody","removedHint","push","body","compact","failedComponent","white","getSummary","merged","unchangedLegitimately","f","autoSnapped","getConflictStr","ws","workspaceDepsConflicts","mergeConfig","mergedStr","unchangedLegitimatelyStr","autoSnappedStr","removedStr","joinSections","getRemovedOutput","getWorkspaceConfigUpdateOutput"],"sources":["merge-cmd.ts"],"sourcesContent":["import chalk from 'chalk';\nimport type { Command, CommandOptions } from '@teambit/cli';\nimport { warnSymbol, formatTitle, formatHint, joinSections } from '@teambit/cli';\nimport { compact } from 'lodash';\nimport {\n  COMPONENT_PATTERN_HELP,\n  AUTO_SNAPPED_MSG,\n  MergeConfigFilename,\n  CFG_FORCE_LOCAL_BUILD,\n} from '@teambit/legacy.constants';\nimport type { ConfigMergeResult } from '@teambit/config-merger';\nimport { BitError } from '@teambit/bit-error';\nimport {\n  type MergeStrategy,\n  type ApplyVersionResults,\n  applyVersionReport,\n  conflictSummaryReport,\n  getRemovedOutput,\n  getWorkspaceConfigUpdateOutput,\n} from '@teambit/component.modules.merge-helper';\nimport type { MergingMain } from './merging.main.runtime';\nimport { compHasBeenRemovedMsg } from './merge-status-provider';\nimport type { ConfigStoreMain } from '@teambit/config-store';\n\nexport class MergeCmd implements Command {\n  name = 'merge [component-pattern]';\n  description = 'merge diverged component history when local and remote have different versions';\n  helpUrl = 'reference/components/merging-changes';\n  group = 'version-control';\n  arguments = [{ name: 'component-pattern', description: COMPONENT_PATTERN_HELP }];\n  extendedDescription = `resolves diverged component history when both local and remote have created different snaps/tags from the same base version.\nif no component pattern is specified, all pending-merge components will be merged (run 'bit status' to list them).\n'bit status' will show diverged components and suggest either merging or resetting local changes.\npreferred approach: use 'bit reset' to remove local versions, then 'bit checkout head' to get remote versions.\nfor lane-to-lane merging, use 'bit lane merge' instead.`;\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    [\n      '',\n      'manual',\n      'same as \"--auto-merge-resolve manual\". in case of merge conflict, write the files with the conflict markers',\n    ],\n    [\n      'r',\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(\n    private merging: MergingMain,\n    private configStore: ConfigStoreMain\n  ) {}\n\n  async report(\n    [pattern]: [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 = this.configStore.getConfigBoolean(CFG_FORCE_LOCAL_BUILD) || Boolean(build);\n    if (ours || theirs) {\n      throw new BitError('the \"--ours\" and \"--theirs\" flags are deprecated. use \"--auto-merge-resolve\" instead');\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 (manual) autoMergeResolve = '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      pattern,\n      autoMergeResolve as any,\n      abort,\n      resolve,\n      noSnap,\n      message,\n      build,\n      skipDependencyInstallation\n    );\n    if (resolvedComponents) {\n      const title = formatTitle('successfully resolved component(s)');\n      const componentsStr = resolvedComponents.map((c) => c.id.toStringWithoutVersion()).join('\\n');\n      return `${title}\\n${chalk.green(componentsStr)}`;\n    }\n    if (abortedComponents) {\n      const title = formatTitle('successfully aborted the merge of the following component(s)');\n      const componentsStr = abortedComponents.map((c) => c.id.toStringWithoutVersion()).join('\\n');\n      return `${title}\\n${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  workspaceConfigUpdateResult,\n}: ApplyVersionResults & { configMergeResults?: ConfigMergeResult[] }): string {\n  const getSuccessOutput = () => {\n    if (!components || !components.length) return '';\n    const title = formatTitle(\n      `successfully merged ${components.length} components${version ? ` from version ${chalk.bold(version)}` : ''}`\n    );\n    const fileChangesReport = applyVersionReport(components);\n\n    return fileChangesReport ? `${title}\\n${fileChangesReport}` : title;\n  };\n\n  let componentsWithConflicts = 0;\n  const getConflictSummary = () => {\n    if (!components || !components.length || !leftUnresolvedConflicts) return '';\n    const title = formatTitle(`${warnSymbol} files with conflicts summary`);\n    const conflictSummary = conflictSummaryReport(components);\n    componentsWithConflicts = conflictSummary.conflictedComponents;\n    const suggestion = formatHint(\n      `merge 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    );\n    return `${title}\\n${conflictSummary.conflictStr}\\n\\n${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 = formatTitle(`${warnSymbol} components with config-merge conflicts`);\n    const suggestion = formatHint(\n      `conflicts 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    );\n    return `${title}\\n${comps}\\n${suggestion}`;\n  };\n\n  const getSnapsOutput = () => {\n    if (mergeSnapError) {\n      return `${chalk.bold(\n        'snapping merged components 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) => result.triggeredBy.searchWithoutVersion(component.id));\n          if (autoTag.length) {\n            const autoTagComp = autoTag.map((a) => a.component.id.toString());\n            componentOutput += `\\n       ${AUTO_SNAPPED_MSG}: ${autoTagComp.join(', ')}`;\n          }\n          return componentOutput;\n        })\n        .join('\\n');\n    };\n\n    return `${formatTitle(\n      `merge-snapped components (${snappedComponents.length})`\n    )}\\n${chalk.dim('components snapped as a result of the merge')}\\n${outputComponents(snappedComponents)}`;\n  };\n\n  const getFailureOutput = () => {\n    if (!failedComponents || !failedComponents.length) return '';\n    // always show removed components - the user needs to know about these\n    const skippedRemoved = failedComponents.filter((fc) => fc.unchangedMessage === compHasBeenRemovedMsg);\n    const otherComponents = failedComponents.filter((fc) => fc.unchangedMessage !== compHasBeenRemovedMsg);\n\n    const parts: string[] = [];\n\n    if (skippedRemoved.length) {\n      const removedTitle = chalk.yellow(`\\nmerge skipped for ${skippedRemoved.length} soft-removed component(s):`);\n      const removedBody = skippedRemoved.map((fc) => `${chalk.bold(fc.id.toString())}`).join('\\n');\n      const removedHint = chalk.yellow(`(use \"bit recover <component-id>\" to restore, then re-run the merge)`);\n      parts.push(`${removedTitle}\\n${removedBody}\\n${removedHint}`);\n    }\n\n    if (otherComponents.length) {\n      const title = '\\nmerge skipped for the following component(s)';\n      const body = compact(\n        otherComponents.map((failedComponent) => {\n          // all failures here are \"unchangedLegitimately\". otherwise, it would have been thrown as an error\n          if (!verbose) return null;\n          return `${chalk.bold(failedComponent.id.toString())} - ${chalk.white(failedComponent.unchangedMessage)}`;\n        })\n      ).join('\\n');\n      if (!body) {\n        parts.push(\n          `${chalk.bold(`\\nmerge skipped legitimately for ${otherComponents.length} component(s)`)}\\n(use --verbose to list them next time)`\n        );\n      } else {\n        parts.push(`${formatTitle(title)}\\n${body}`);\n      }\n    }\n\n    return parts.join('\\n');\n  };\n\n  const getSummary = () => {\n    const merged = components?.length || 0;\n    const unchangedLegitimately = failedComponents?.filter((f) => f.unchangedLegitimately).length || 0;\n    const autoSnapped =\n      (mergeSnapResults?.snappedComponents.length || 0) + (mergeSnapResults?.autoSnappedResults.length || 0);\n    const getConflictStr = () => {\n      const comps = componentsWithConflicts ? `${componentsWithConflicts} components` : '';\n      const ws = workspaceConfigUpdateResult?.workspaceDepsConflicts ? 'workspace.jsonc file' : '';\n      const mergeConfig = configMergeWithConflicts.length ? `${MergeConfigFilename} file` : '';\n      return compact([comps, ws, mergeConfig]).join(', ');\n    };\n\n    const title = formatTitle('Merge Summary');\n    const mergedStr = `\\nTotal Merged: ${chalk.bold(merged.toString())}`;\n    const unchangedLegitimatelyStr = `\\nTotal Unchanged: ${chalk.bold(unchangedLegitimately.toString())}`;\n    const autoSnappedStr = `\\nTotal Snapped: ${chalk.bold(autoSnapped.toString())}`;\n    const removedStr = `\\nTotal Removed: ${chalk.bold(removedComponents?.length.toString() || '0')}`;\n    const conflictStr = `\\nConflicts: ${chalk.bold(getConflictStr() || 'none')}`;\n\n    return title + mergedStr + unchangedLegitimatelyStr + autoSnappedStr + removedStr + conflictStr;\n  };\n\n  return joinSections([\n    getSuccessOutput(),\n    getFailureOutput(),\n    getRemovedOutput(removedComponents),\n    getSnapsOutput(),\n    getConfigMergeConflictSummary(),\n    getWorkspaceConfigUpdateOutput(workspaceConfigUpdateResult),\n    getConflictSummary(),\n    getSummary(),\n  ]);\n}\n"],"mappings":"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","ignoreList":[]}

package/package.json

@@ -1,21 +1,19 @@
 {
   "name": "@teambit/merging",
-  "version": "1.0.929",
+  "version": "1.0.931",
   "homepage": "https://bit.cloud/teambit/component/merging",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.component",
     "name": "merging",
-    "version": "1.0.929"
+    "version": "1.0.931"
   },
   "dependencies": {
     "chalk": "4.1.2",
     "lodash": "4.17.21",
     "p-map-series": "2.1.0",
-    "@teambit/component.modules.merge-helper": "0.0.45",
+    "@teambit/component.modules.merge-helper": "0.0.46",
     "@teambit/bit-error": "0.0.404",
-    "@teambit/cli": "0.0.1307",
-    "@teambit/config-store": "0.0.187",
     "@teambit/legacy.constants": "0.0.24",
     "@teambit/component-id": "1.2.4",
     "@teambit/component.snap-distance": "0.0.104",
@@ -23,26 +21,28 @@
     "@teambit/legacy.consumer-component": "0.0.104",
     "@teambit/legacy.extension-data": "0.0.105",
     "@teambit/legacy.scope": "0.0.103",
-    "@teambit/logger": "0.0.1400",
     "@teambit/harmony": "0.4.7",
-    "@teambit/config": "0.0.1482",
     "@teambit/legacy.component-list": "0.0.157",
     "@teambit/legacy.consumer": "0.0.103",
     "@teambit/pkg.modules.component-package-name": "0.0.110",
     "@teambit/toolbox.path.path": "0.0.16",
-    "@teambit/config-merger": "0.0.795",
-    "@teambit/builder": "1.0.928",
-    "@teambit/dependency-resolver": "1.0.928",
-    "@teambit/importer": "1.0.928",
-    "@teambit/objects": "0.0.435",
-    "@teambit/scope": "1.0.928",
-    "@teambit/workspace": "1.0.928",
-    "@teambit/application": "1.0.928",
-    "@teambit/checkout": "1.0.928",
-    "@teambit/component-writer": "1.0.928",
-    "@teambit/install": "1.0.928",
-    "@teambit/remove": "1.0.928",
-    "@teambit/snapping": "1.0.928"
+    "@teambit/cli": "0.0.1309",
+    "@teambit/config-merger": "0.0.797",
+    "@teambit/config-store": "0.0.189",
+    "@teambit/builder": "1.0.930",
+    "@teambit/dependency-resolver": "1.0.930",
+    "@teambit/importer": "1.0.930",
+    "@teambit/logger": "0.0.1402",
+    "@teambit/objects": "0.0.437",
+    "@teambit/scope": "1.0.930",
+    "@teambit/workspace": "1.0.930",
+    "@teambit/application": "1.0.930",
+    "@teambit/checkout": "1.0.930",
+    "@teambit/component-writer": "1.0.930",
+    "@teambit/config": "0.0.1484",
+    "@teambit/install": "1.0.930",
+    "@teambit/remove": "1.0.930",
+    "@teambit/snapping": "1.0.930"
   },
   "devDependencies": {
     "@types/lodash": "4.14.165",