@teambit/merging 1.0.944 → 1.0.946

package/dist/merge-cmd.d.ts

@@ -1,4 +1,4 @@
-import type { Command, CommandOptions } from '@teambit/cli';
+import type { Command, CommandOptions, Report } from '@teambit/cli';
 import type { ConfigMergeResult } from '@teambit/config-merger';
 import { type MergeStrategy, type ApplyVersionResults } from '@teambit/component.modules.merge-helper';
 import type { MergingMain } from './merging.main.runtime';
@@ -31,8 +31,8 @@ export declare class MergeCmd implements Command {
         verbose?: boolean;
         message: string;
         skipDependencyInstallation?: boolean;
-    }): Promise<string>;
+    }): Promise<string | Report>;
 }
 export declare function mergeReport({ components, failedComponents, removedComponents, version, mergeSnapResults, mergeSnapError, leftUnresolvedConflicts, verbose, configMergeResults, workspaceConfigUpdateResult, }: ApplyVersionResults & {
     configMergeResults?: ConfigMergeResult[];
-}): string;
+}): string | Report;

package/dist/merge-cmd.js

@@ -178,27 +178,25 @@ function mergeReport({
     });
     return (0, _cli().formatSection)('merge-snapped components', 'components snapped as a result of the merge', items);
   };
-  const getFailureOutput = () => {
+  const getSkippedRemovedOutput = () => {
     if (!failedComponents || !failedComponents.length) return '';
-    // always show removed components - the user needs to know about these
     const skippedRemoved = failedComponents.filter(fc => fc.unchangedMessage === _mergeStatusProvider().compHasBeenRemovedMsg);
-    const otherComponents = failedComponents.filter(fc => fc.unchangedMessage !== _mergeStatusProvider().compHasBeenRemovedMsg);
-    const parts = [];
-    if (skippedRemoved.length) {
-      const items = skippedRemoved.map(fc => (0, _cli().formatItem)(_chalk().default.bold(fc.id.toString()), _cli().warnSymbol));
-      const section = (0, _cli().formatSection)('merge skipped - soft-removed', '', items);
-      const hint = (0, _cli().formatHint)('use "bit recover <component-id>" to restore, then re-run the merge');
-      parts.push(`${section}\n${hint}`);
-    }
-    if (otherComponents.length) {
-      if (!verbose) {
-        parts.push((0, _cli().formatHint)(`merge skipped for ${otherComponents.length} component(s) (use --verbose to list them)`));
-      } else {
-        const items = otherComponents.map(failedComponent => (0, _cli().formatItem)(`${_chalk().default.bold(failedComponent.id.toString())} - ${failedComponent.unchangedMessage}`));
-        parts.push((0, _cli().formatSection)('merge skipped', '', items));
-      }
-    }
-    return parts.join('\n\n');
+    if (!skippedRemoved.length) return '';
+    const items = skippedRemoved.map(fc => (0, _cli().formatItem)(_chalk().default.bold(fc.id.toString()), _cli().warnSymbol));
+    const section = (0, _cli().formatSection)('merge skipped - soft-removed', '', items);
+    const hint = (0, _cli().formatHint)('use "bit recover <component-id>" to restore, then re-run the merge');
+    return `${section}\n${hint}`;
+  };
+  const otherSkippedComponents = (failedComponents || []).filter(fc => fc.unchangedMessage !== _mergeStatusProvider().compHasBeenRemovedMsg);
+  const hasSkippedComponents = otherSkippedComponents.length > 0 && !verbose;
+  const getFailureOutputMinimal = () => {
+    if (!hasSkippedComponents) return '';
+    return (0, _cli().formatDetailsHint)(`full list of ${otherSkippedComponents.length} skipped component(s)`);
+  };
+  const getFailureOutputDetailed = () => {
+    if (!otherSkippedComponents.length) return '';
+    const items = otherSkippedComponents.map(failedComponent => (0, _cli().formatItem)(`${_chalk().default.bold(failedComponent.id.toString())} - ${failedComponent.unchangedMessage}`));
+    return (0, _cli().formatSection)('merge skipped', '', items);
   };
   const getSummary = () => {
     const merged = components?.length || 0;
@@ -218,7 +216,20 @@ function mergeReport({
     const conflictStr = `\nConflicts: ${_chalk().default.bold(getConflictStr() || 'none')}`;
     return title + mergedStr + unchangedLegitimatelyStr + autoSnappedStr + removedStr + conflictStr;
   };
-  return (0, _cli().joinSections)([getSuccessOutput(), getFailureOutput(), (0, _componentModules().getRemovedOutput)(removedComponents), getSnapsOutput(), getConfigMergeConflictSummary(), (0, _componentModules().getWorkspaceConfigUpdateOutput)(workspaceConfigUpdateResult), getConflictSummary(), getSummary()]);
+  const commonSections = () => [getSuccessOutput(), getSkippedRemovedOutput()];
+  const tailSections = () => [(0, _componentModules().getRemovedOutput)(removedComponents), getSnapsOutput(), getConfigMergeConflictSummary(), (0, _componentModules().getWorkspaceConfigUpdateOutput)(workspaceConfigUpdateResult), getConflictSummary(), getSummary()];
+
+  // when --verbose is passed or no skipped components, show detailed output inline
+  if (!hasSkippedComponents) {
+    return (0, _cli().joinSections)([...commonSections(), getFailureOutputDetailed(), ...tailSections()]);
+  }
+  const data = (0, _cli().joinSections)([...commonSections(), getFailureOutputMinimal(), ...tailSections()]);
+  const details = (0, _cli().joinSections)([...commonSections(), getFailureOutputDetailed(), ...tailSections()]);
+  return {
+    data,
+    code: 0,
+    details
+  };
 }
 
 //# sourceMappingURL=merge-cmd.js.map

package/dist/merge-cmd.js.map

@@ -1 +1 @@
-{"version":3,"names":["_chalk","data","_interopRequireDefault","require","_cli","_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","items","map","c","formatItem","id","toStringWithoutVersion","formatSection","mergeReport","exports","removedComponents","leftUnresolvedConflicts","configMergeResults","workspaceConfigUpdateResult","getSuccessOutput","length","title","formatTitle","chalk","bold","fileChangesReport","applyVersionReport","componentsWithConflicts","getConflictSummary","warnSymbol","conflictSummary","conflictSummaryReport","conflictedComponents","suggestion","formatHint","conflictStr","configMergeWithConflicts","filter","hasConflicts","getConfigMergeConflictSummary","comps","compIdStr","join","MergeConfigFilename","getSnapsOutput","errorSymbol","red","snappedComponents","autoSnappedResults","component","line","toString","autoTag","result","triggeredBy","searchWithoutVersion","autoTagComp","a","AUTO_SNAPPED_MSG","getFailureOutput","skippedRemoved","fc","unchangedMessage","compHasBeenRemovedMsg","otherComponents","parts","section","hint","push","failedComponent","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 {\n  warnSymbol,\n  errorSymbol,\n  formatTitle,\n  formatSection,\n  formatItem,\n  formatHint,\n  joinSections,\n} from '@teambit/cli';\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 items = resolvedComponents.map((c) => formatItem(c.id.toStringWithoutVersion()));\n      return formatSection('resolved components', '', items);\n    }\n    if (abortedComponents) {\n      const items = abortedComponents.map((c) => formatItem(c.id.toStringWithoutVersion()));\n      return formatSection('merge aborted', '', items);\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 `${formatTitle(`${errorSymbol} snap error`)}\\n${chalk.red(\n        'snapping merged components failed with the following error, please fix the issues and snap manually'\n      )}\\n${mergeSnapError.message}`;\n    }\n    if (!mergeSnapResults || !mergeSnapResults.snappedComponents) return '';\n    const { snappedComponents, autoSnappedResults } = mergeSnapResults;\n    const items = snappedComponents.map((component) => {\n      let line = formatItem(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        line += `\\n       ${AUTO_SNAPPED_MSG}: ${autoTagComp.join(', ')}`;\n      }\n      return line;\n    });\n    return formatSection('merge-snapped components', 'components snapped as a result of the merge', items);\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 items = skippedRemoved.map((fc) => formatItem(chalk.bold(fc.id.toString()), warnSymbol));\n      const section = formatSection('merge skipped - soft-removed', '', items);\n      const hint = formatHint('use \"bit recover <component-id>\" to restore, then re-run the merge');\n      parts.push(`${section}\\n${hint}`);\n    }\n\n    if (otherComponents.length) {\n      if (!verbose) {\n        parts.push(formatHint(`merge skipped for ${otherComponents.length} component(s) (use --verbose to list them)`));\n      } else {\n        const items = otherComponents.map((failedComponent) =>\n          formatItem(`${chalk.bold(failedComponent.id.toString())} - ${failedComponent.unchangedMessage}`)\n        );\n        parts.push(formatSection('merge skipped', '', items));\n      }\n    }\n\n    return parts.join('\\n\\n');\n  };\n\n  const getSummary = () => {\n    const merged = components?.length || 0;\n    const unchangedLegitimately = failedComponents?.filter((f) => f.unchangedLegitimately).length || 0;\n    const autoSnapped =\n      (mergeSnapResults?.snappedComponents.length || 0) + (mergeSnapResults?.autoSnappedResults.length || 0);\n    const getConflictStr = () => {\n      const comps = componentsWithConflicts ? `${componentsWithConflicts} components` : '';\n      const ws = workspaceConfigUpdateResult?.workspaceDepsConflicts ? 'workspace.jsonc file' : '';\n      const mergeConfig = configMergeWithConflicts.length ? `${MergeConfigFilename} file` : '';\n      return [comps, ws, mergeConfig].filter(Boolean).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":[]}
+{"version":3,"names":["_chalk","data","_interopRequireDefault","require","_cli","_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","items","map","c","formatItem","id","toStringWithoutVersion","formatSection","mergeReport","exports","removedComponents","leftUnresolvedConflicts","configMergeResults","workspaceConfigUpdateResult","getSuccessOutput","length","title","formatTitle","chalk","bold","fileChangesReport","applyVersionReport","componentsWithConflicts","getConflictSummary","warnSymbol","conflictSummary","conflictSummaryReport","conflictedComponents","suggestion","formatHint","conflictStr","configMergeWithConflicts","filter","hasConflicts","getConfigMergeConflictSummary","comps","compIdStr","join","MergeConfigFilename","getSnapsOutput","errorSymbol","red","snappedComponents","autoSnappedResults","component","line","toString","autoTag","result","triggeredBy","searchWithoutVersion","autoTagComp","a","AUTO_SNAPPED_MSG","getSkippedRemovedOutput","skippedRemoved","fc","unchangedMessage","compHasBeenRemovedMsg","section","hint","otherSkippedComponents","hasSkippedComponents","getFailureOutputMinimal","formatDetailsHint","getFailureOutputDetailed","failedComponent","getSummary","merged","unchangedLegitimately","f","autoSnapped","getConflictStr","ws","workspaceDepsConflicts","mergeConfig","mergedStr","unchangedLegitimatelyStr","autoSnappedStr","removedStr","commonSections","tailSections","getRemovedOutput","getWorkspaceConfigUpdateOutput","joinSections","details","code"],"sources":["merge-cmd.ts"],"sourcesContent":["import chalk from 'chalk';\nimport type { Command, CommandOptions, Report } from '@teambit/cli';\nimport {\n  warnSymbol,\n  errorSymbol,\n  formatTitle,\n  formatSection,\n  formatItem,\n  formatHint,\n  formatDetailsHint,\n  joinSections,\n} from '@teambit/cli';\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 items = resolvedComponents.map((c) => formatItem(c.id.toStringWithoutVersion()));\n      return formatSection('resolved components', '', items);\n    }\n    if (abortedComponents) {\n      const items = abortedComponents.map((c) => formatItem(c.id.toStringWithoutVersion()));\n      return formatSection('merge aborted', '', items);\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 | Report {\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 `${formatTitle(`${errorSymbol} snap error`)}\\n${chalk.red(\n        'snapping merged components failed with the following error, please fix the issues and snap manually'\n      )}\\n${mergeSnapError.message}`;\n    }\n    if (!mergeSnapResults || !mergeSnapResults.snappedComponents) return '';\n    const { snappedComponents, autoSnappedResults } = mergeSnapResults;\n    const items = snappedComponents.map((component) => {\n      let line = formatItem(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        line += `\\n       ${AUTO_SNAPPED_MSG}: ${autoTagComp.join(', ')}`;\n      }\n      return line;\n    });\n    return formatSection('merge-snapped components', 'components snapped as a result of the merge', items);\n  };\n\n  const getSkippedRemovedOutput = () => {\n    if (!failedComponents || !failedComponents.length) return '';\n    const skippedRemoved = failedComponents.filter((fc) => fc.unchangedMessage === compHasBeenRemovedMsg);\n    if (!skippedRemoved.length) return '';\n    const items = skippedRemoved.map((fc) => formatItem(chalk.bold(fc.id.toString()), warnSymbol));\n    const section = formatSection('merge skipped - soft-removed', '', items);\n    const hint = formatHint('use \"bit recover <component-id>\" to restore, then re-run the merge');\n    return `${section}\\n${hint}`;\n  };\n\n  const otherSkippedComponents = (failedComponents || []).filter((fc) => fc.unchangedMessage !== compHasBeenRemovedMsg);\n  const hasSkippedComponents = otherSkippedComponents.length > 0 && !verbose;\n\n  const getFailureOutputMinimal = () => {\n    if (!hasSkippedComponents) return '';\n    return formatDetailsHint(`full list of ${otherSkippedComponents.length} skipped component(s)`);\n  };\n\n  const getFailureOutputDetailed = () => {\n    if (!otherSkippedComponents.length) return '';\n    const items = otherSkippedComponents.map((failedComponent) =>\n      formatItem(`${chalk.bold(failedComponent.id.toString())} - ${failedComponent.unchangedMessage}`)\n    );\n    return formatSection('merge skipped', '', items);\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 [comps, ws, mergeConfig].filter(Boolean).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  const commonSections = () => [getSuccessOutput(), getSkippedRemovedOutput()];\n  const tailSections = () => [\n    getRemovedOutput(removedComponents),\n    getSnapsOutput(),\n    getConfigMergeConflictSummary(),\n    getWorkspaceConfigUpdateOutput(workspaceConfigUpdateResult),\n    getConflictSummary(),\n    getSummary(),\n  ];\n\n  // when --verbose is passed or no skipped components, show detailed output inline\n  if (!hasSkippedComponents) {\n    return joinSections([...commonSections(), getFailureOutputDetailed(), ...tailSections()]);\n  }\n\n  const data = joinSections([...commonSections(), getFailureOutputMinimal(), ...tailSections()]);\n  const details = joinSections([...commonSections(), getFailureOutputDetailed(), ...tailSections()]);\n  return { data, code: 0, details };\n}\n"],"mappings":"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","ignoreList":[]}

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@teambit/merging",
-  "version": "1.0.944",
+  "version": "1.0.946",
   "homepage": "https://bit.cloud/teambit/component/merging",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.component",
     "name": "merging",
-    "version": "1.0.944"
+    "version": "1.0.946"
   },
   "dependencies": {
     "chalk": "4.1.2",
@@ -15,34 +15,34 @@
     "@teambit/component.modules.merge-helper": "0.0.50",
     "@teambit/bit-error": "0.0.404",
     "@teambit/cli": "0.0.1315",
+    "@teambit/config-merger": "0.0.811",
     "@teambit/config-store": "0.0.195",
     "@teambit/legacy.constants": "0.0.26",
+    "@teambit/builder": "1.0.944",
     "@teambit/component-id": "1.2.4",
     "@teambit/component.snap-distance": "0.0.108",
+    "@teambit/dependency-resolver": "1.0.944",
+    "@teambit/importer": "1.0.944",
     "@teambit/lane-id": "0.0.312",
     "@teambit/legacy.consumer-component": "0.0.108",
     "@teambit/legacy.extension-data": "0.0.109",
     "@teambit/legacy.scope": "0.0.107",
     "@teambit/logger": "0.0.1408",
+    "@teambit/objects": "0.0.451",
+    "@teambit/scope": "1.0.944",
+    "@teambit/workspace": "1.0.944",
     "@teambit/harmony": "0.4.7",
+    "@teambit/application": "1.0.944",
+    "@teambit/component-writer": "1.0.944",
     "@teambit/config": "0.0.1490",
+    "@teambit/install": "1.0.944",
     "@teambit/legacy.component-list": "0.0.161",
     "@teambit/legacy.consumer": "0.0.107",
     "@teambit/pkg.modules.component-package-name": "0.0.114",
+    "@teambit/remove": "1.0.944",
+    "@teambit/snapping": "1.0.944",
     "@teambit/toolbox.path.path": "0.0.16",
-    "@teambit/config-merger": "0.0.810",
-    "@teambit/builder": "1.0.943",
-    "@teambit/dependency-resolver": "1.0.943",
-    "@teambit/importer": "1.0.943",
-    "@teambit/objects": "0.0.450",
-    "@teambit/scope": "1.0.943",
-    "@teambit/workspace": "1.0.943",
-    "@teambit/application": "1.0.943",
-    "@teambit/checkout": "1.0.943",
-    "@teambit/component-writer": "1.0.943",
-    "@teambit/install": "1.0.943",
-    "@teambit/remove": "1.0.943",
-    "@teambit/snapping": "1.0.943"
+    "@teambit/checkout": "1.0.945"
   },
   "devDependencies": {
     "@types/lodash": "4.14.165",