@teambit/merging 0.0.459 → 0.0.460

package/dist/merge-cmd.d.ts

@@ -32,6 +32,10 @@ export declare class MergeCmd implements Command {
 export declare function mergeReport({ components, failedComponents, removedComponents, version, mergeSnapResults, mergeSnapError, leftUnresolvedConflicts, verbose, configMergeResults, workspaceDepsUpdates, }: ApplyVersionResults & {
     configMergeResults?: ConfigMergeResult[];
 }): string;
+/**
+ * shows only the file-changes section.
+ * if all files are "unchanged", it returns an empty string
+ */
 export declare function applyVersionReport(components: ApplyVersionResult[], addName?: boolean, showVersion?: boolean): string;
 export declare function conflictSummaryReport(components: ApplyVersionResult[]): string;
 export declare function installationErrorOutput(installationError?: Error): string;

package/dist/merge-cmd.js

@@ -145,10 +145,9 @@ function mergeReport({
 }) {
   const getSuccessOutput = () => {
     if (!components || !components.length) return '';
-    // @ts-ignore version is set in case of merge command
-    const title = `successfully merged components${version ? `from version ${_chalk().default.bold(version)}` : ''}\n`;
-    // @ts-ignore components is set in case of merge command
-    return _chalk().default.underline(title) + _chalk().default.green(applyVersionReport(components));
+    const title = `successfully merged ${components.length} components${version ? `from version ${_chalk().default.bold(version)}` : ''}\n`;
+    const fileChangesReport = applyVersionReport(components);
+    return _chalk().default.bold(title) + fileChangesReport;
   };
   const getConflictSummary = () => {
     if (!components || !components.length || !leftUnresolvedConflicts) return '';
@@ -230,16 +229,28 @@ ${mergeSnapError.message}
   };
   return getSuccessOutput() + getFailureOutput() + getRemovedOutput(removedComponents) + getSnapsOutput() + getWorkspaceDepsOutput() + getConfigMergeConflictSummary() + getConflictSummary() + getSummary();
 }
+
+/**
+ * shows only the file-changes section.
+ * if all files are "unchanged", it returns an empty string
+ */
 function applyVersionReport(components, addName = true, showVersion = false) {
   const tab = addName ? '\t' : '';
-  return components.map(component => {
+  const fileChanges = (0, _lodash().compact)(components.map(component => {
     const name = showVersion ? component.id.toString() : component.id.toStringWithoutVersion();
-    const files = Object.keys(component.filesStatus).map(file => {
+    const files = (0, _lodash().compact)(Object.keys(component.filesStatus).map(file => {
+      if (component.filesStatus[file] === _mergeVersion().FileStatus.unchanged) return null;
       const note = component.filesStatus[file] === _mergeVersion().FileStatus.manual ? _chalk().default.white('automatic merge failed. please fix conflicts manually and then run "bit install" and "bit compile"') : '';
       return `${tab}${component.filesStatus[file]} ${_chalk().default.bold(file)} ${note}`;
-    }).join('\n');
+    })).join('\n');
+    if (!files) return null;
     return `${addName ? name : ''}\n${_chalk().default.cyan(files)}`;
-  }).join('\n\n');
+  })).join('\n\n');
+  if (!fileChanges) {
+    return '';
+  }
+  const title = `\n${_constants().FILE_CHANGES_CHECKOUT_MSG}\n`;
+  return _chalk().default.underline(title) + fileChanges;
 }
 function conflictSummaryReport(components) {
   const tab = '\t';

package/dist/merge-cmd.js.map

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

package/dist/merge-status-provider.js

@@ -95,19 +95,30 @@ class MergeStatusProvider {
     this.options = options;
   }
   async getStatus(bitIds) {
+    var _this$otherLane, _this$otherLane2, _this$currentLane, _this$otherLane3;
     if (!this.currentLane && this.otherLane) {
       await this.importer.importObjectsFromMainIfExist(this.otherLane.toBitIds().toVersionLatest());
     }
     const componentStatusBeforeMergeAttempt = await (0, _pMapSeries().default)(bitIds, id => this.getComponentStatusBeforeMergeAttempt(id));
+    // whether or not we need to import the gap between the common-snap and the other lane.
+    // the common-snap itself we need anyway in order to get the files hash/content for checking conflicts.
+    const shouldImportHistoryOfOtherLane = !this.currentLane ||
+    // on main. we need all history in order to push each component to its remote
+    this.currentLane.scope !== ((_this$otherLane = this.otherLane) === null || _this$otherLane === void 0 ? void 0 : _this$otherLane.scope); // on lane, but the other lane is from a different scope. we need all history in order to push to the current lane's scope
     const toImport = componentStatusBeforeMergeAttempt.map(compStatus => {
       if (!compStatus.divergeData) return [];
-      const versionsToImport = (0, _lodash().compact)([...compStatus.divergeData.snapsOnTargetOnly, compStatus.divergeData.commonSnapBeforeDiverge]);
-      return versionsToImport.map(v => compStatus.id.changeVersion(v.toString()));
+      const versionsToImport = [compStatus.divergeData.commonSnapBeforeDiverge];
+      if (shouldImportHistoryOfOtherLane) {
+        versionsToImport.push(...compStatus.divergeData.snapsOnTargetOnly);
+      }
+      return (0, _lodash().compact)(versionsToImport).map(v => compStatus.id.changeVersion(v.toString()));
     }).flat();
+    const reason = shouldImportHistoryOfOtherLane ? `for filling the gap between the common-snap and the head of ${((_this$otherLane2 = this.otherLane) === null || _this$otherLane2 === void 0 ? void 0 : _this$otherLane2.id()) || 'main'}` : `for getting the common-snap between ${((_this$currentLane = this.currentLane) === null || _this$currentLane === void 0 ? void 0 : _this$currentLane.id()) || 'main'} and ${((_this$otherLane3 = this.otherLane) === null || _this$otherLane3 === void 0 ? void 0 : _this$otherLane3.id()) || 'main'}`;
     await this.workspace.consumer.scope.scopeImporter.importWithoutDeps(_bitId().BitIds.fromArray(toImport), {
       lane: this.otherLane,
       cache: true,
-      includeVersionHistory: false
+      includeVersionHistory: false,
+      reason
     });
     const compStatusNotNeedMerge = componentStatusBeforeMergeAttempt.filter(c => !c.mergeProps);
     const compStatusNeedMerge = componentStatusBeforeMergeAttempt.filter(c => c.mergeProps);
@@ -127,7 +138,7 @@ class MergeStatusProvider {
     return results;
   }
   async getComponentMergeStatus(componentMergeStatusBeforeMergeAttempt) {
-    var _this$currentLane;
+    var _this$currentLane2;
     const {
       id,
       divergeData,
@@ -151,7 +162,7 @@ current: ${currentId.version}
 other:   ${otherLaneHead.toString()}`);
     const baseComponent = await modelComponent.loadVersion(baseSnap.toString(), repo);
     const otherComponent = await modelComponent.loadVersion(otherLaneHead.toString(), repo);
-    const currentLaneName = ((_this$currentLane = this.currentLane) === null || _this$currentLane === void 0 ? void 0 : _this$currentLane.toLaneId().toString()) || 'main';
+    const currentLaneName = ((_this$currentLane2 = this.currentLane) === null || _this$currentLane2 === void 0 ? void 0 : _this$currentLane2.toLaneId().toString()) || 'main';
     const otherLaneName = this.otherLane ? this.otherLane.toLaneId().toString() : _laneId().DEFAULT_LANE;
     const currentLabel = `${currentId.version} (${currentLaneName === otherLaneName ? 'current' : currentLaneName})`;
     const otherLabel = `${otherLaneHead.toString()} (${otherLaneName === currentLaneName ? 'incoming' : otherLaneName})`;
@@ -183,7 +194,7 @@ other:   ${otherLaneHead.toString()}`);
     return componentStatus;
   }
   async getComponentStatusBeforeMergeAttempt(id) {
-    var _this$currentLane2, _this$options;
+    var _this$currentLane3, _this$options;
     const consumer = this.workspace.consumer;
     const componentStatus = {
       id
@@ -203,7 +214,7 @@ other:   ${otherLaneHead.toString()}`);
       ignoreVersion: true
     });
     const componentOnOther = await modelComponent.loadVersion(version, consumer.scope.objects);
-    const idOnCurrentLane = (_this$currentLane2 = this.currentLane) === null || _this$currentLane2 === void 0 ? void 0 : _this$currentLane2.getComponent(id);
+    const idOnCurrentLane = (_this$currentLane3 = this.currentLane) === null || _this$currentLane3 === void 0 ? void 0 : _this$currentLane3.getComponent(id);
     if (componentOnOther.isRemoved()) {
       // if exist in current lane, we want the current lane to get the soft-remove update.
       // or if it was removed with --update-main, we want to merge it so then main will get the update.
@@ -254,15 +265,25 @@ other:   ${otherLaneHead.toString()}`);
       // it is possible that it is diverged, in which case, still continue with the merge, and later on, the
       // merge-config will show a config conflict of the remove aspect.
       // 2. other is not ahead. in this case, just ignore this component, no point to merge it, we want it removed.
-      // 3. there are errors when calculating the divergeData, e.g. no snap in common. in such cases, we assume
-      // there are issues with this component, and is better not to merge it.
+      // 3. there are errors when calculating the divergeData, e.g. no snap in common.
+      // here we need to differentiate between two cases:
+      // 3.1. the "otherLane" is main. in this case, we probably noticed that our component by accident got created
+      // with the same name of an existing component on main and therefore we removed it. so we want to keep this
+      // component removed during merges and we don't care about merging it.
+      // 3.2. the "otherLane" is a lane. in this case, it's possible that although it was removed in this lane, it's
+      // needed and is used by other components of the other other lane, so in order for this merge to work
+      // (and not throw error about deps from other lane), it needs the option to merge (user can decide whether to
+      // exclude it or to use --resolve-unrelated)
       const divergeData = await (0, _getDivergeData().getDivergeData)({
         repo,
         modelComponent,
         targetHead: otherLaneHead,
         throws: false
       });
-      if (divergeData.err || !divergeData.isTargetAhead()) {
+      const isTargetNotAhead = !divergeData.err && !divergeData.isTargetAhead();
+      const shouldIgnore = this.otherLane ? isTargetNotAhead // options 3.2 above. if they're not related - don't ignore.
+      : isTargetNotAhead || divergeData.err; // it's main. options 3.1 above. even if they're not related - still ignore.
+      if (shouldIgnore) {
         return this.returnUnmerged(id, `component has been removed`, true);
       }
     }
@@ -328,9 +349,12 @@ other:   ${otherLaneHead.toString()}`);
     });
   }
   async handleNoCommonSnap(modelComponent, id, otherLaneHead, currentComponent, componentOnOther, divergeData) {
-    const {
+    let {
       resolveUnrelated
     } = this.options || {};
+    if (currentComponent.isRemoved()) {
+      resolveUnrelated = 'theirs';
+    }
     if (!resolveUnrelated) throw new Error(`handleNoCommonSnap expects resolveUnrelated to be set`);
     const consumer = this.workspace.consumer;
     const repo = consumer.scope.objects;
@@ -388,24 +412,24 @@ it was probably created in each lane separately and it also exists on main. plea
       const refToSaveInLane = hasResolvedLocally ? currentVersionRef : otherVersionRef;
       const unrelatedHeadRef = hasResolvedLocally ? otherVersionRef : currentVersionRef;
       if (resolveUnrelated === 'ours') {
-        var _this$currentLane3;
-        return returnAccordingToOurs(refToSaveInLane, unrelatedHeadRef, (_this$currentLane3 = this.currentLane) === null || _this$currentLane3 === void 0 ? void 0 : _this$currentLane3.toLaneId());
+        var _this$currentLane4;
+        return returnAccordingToOurs(refToSaveInLane, unrelatedHeadRef, (_this$currentLane4 = this.currentLane) === null || _this$currentLane4 === void 0 ? void 0 : _this$currentLane4.toLaneId());
       }
       if (resolveUnrelated === 'theirs') {
-        var _this$currentLane4;
-        return returnAccordingToTheirs(refToSaveInLane, unrelatedHeadRef, (_this$currentLane4 = this.currentLane) === null || _this$currentLane4 === void 0 ? void 0 : _this$currentLane4.toLaneId());
+        var _this$currentLane5;
+        return returnAccordingToTheirs(refToSaveInLane, unrelatedHeadRef, (_this$currentLane5 = this.currentLane) === null || _this$currentLane5 === void 0 ? void 0 : _this$currentLane5.toLaneId());
       }
       throw new Error(`unsupported strategy "${resolveUnrelated}" of resolve-unrelated. supported strategies are: [ours, theirs]`);
     }
     const refToSaveInLane = resolveUnrelated === 'ours' ? currentVersionRef : otherVersionRef;
     const unrelatedHeadRef = resolveUnrelated === 'ours' ? otherVersionRef : currentVersionRef;
     if (resolveUnrelated === 'ours') {
-      var _this$otherLane;
-      return returnAccordingToOurs(refToSaveInLane, unrelatedHeadRef, (_this$otherLane = this.otherLane) === null || _this$otherLane === void 0 ? void 0 : _this$otherLane.toLaneId());
+      var _this$otherLane4;
+      return returnAccordingToOurs(refToSaveInLane, unrelatedHeadRef, (_this$otherLane4 = this.otherLane) === null || _this$otherLane4 === void 0 ? void 0 : _this$otherLane4.toLaneId());
     }
     if (resolveUnrelated === 'theirs') {
-      var _this$currentLane5;
-      return returnAccordingToTheirs(refToSaveInLane, unrelatedHeadRef, (_this$currentLane5 = this.currentLane) === null || _this$currentLane5 === void 0 ? void 0 : _this$currentLane5.toLaneId());
+      var _this$currentLane6;
+      return returnAccordingToTheirs(refToSaveInLane, unrelatedHeadRef, (_this$currentLane6 = this.currentLane) === null || _this$currentLane6 === void 0 ? void 0 : _this$currentLane6.toLaneId());
     }
     throw new Error(`unsupported strategy "${resolveUnrelated}" of resolve-unrelated. supported strategies are: [ours, theirs]`);
   }

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

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

package/dist/merging.main.runtime.js

@@ -660,10 +660,7 @@ class MergingMain {
       legacyComponent.version = id.version;
     }
     const files = legacyComponent.files;
-    files.forEach(file => {
-      // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!
-      filesStatus[(0, _utils().pathNormalizeToLinux)(file.relative)] = _mergeVersion().FileStatus.updated;
-    });
+    (0, _checkout().updateFileStatus)(files, filesStatus, currentComponent || undefined);
     if (mergeResults) {
       // update files according to the merge results
       const {

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

@@ -1 +1 @@
-{"version":3,"names":["_cli","data","require","_semver","_interopRequireDefault","_workspace","_interopRequireWildcard","_componentsList","_mergeVersion","_snapping","_hasWildcard","_pMapSeries","_bitId","_bitError","_generalError","_laneId","_chalk","_config","_remove","_utils","_componentWriter","_importer","_logger","_lodash","_dependencyResolver","_checkout","_componentId","_constants","_deleteComponentFiles","_install","_mergeCmd","_merging","_configMergeResult","_mergeStatusProvider","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","obj","__esModule","default","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","ownKeys","object","enumerableOnly","keys","getOwnPropertySymbols","symbols","filter","sym","enumerable","push","apply","_objectSpread","target","i","arguments","length","source","forEach","_defineProperty2","getOwnPropertyDescriptors","defineProperties","MergingMain","constructor","workspace","install","snapping","checkout","logger","componentWriter","importer","config","remove","merge","ids","mergeStrategy","abort","resolve","noSnap","message","build","skipDependencyInstallation","OutsideWorkspaceError","consumer","mergeResults","resolveMerge","abortMerge","bitIds","getComponentsToMerge","mergeComponentsFromRemote","onDestroy","snapMessage","currentLaneId","getCurrentLaneId","currentLaneObject","getCurrentLaneObject","allComponentsStatus","getAllComponentsStatus","failedComponents","c","unmergedMessage","unmergedLegitimately","failureMsgs","map","failedComponent","chalk","bold","id","toString","red","join","BitError","mergeSnaps","laneId","localLane","tag","_mergeSnapResults","componentWithConflict","find","component","hasConflicts","getMergeStrategyInteractive","componentStatus","shouldBeRemoved","failureMessage","unchangedLegitimately","componentIdsToRemove","changeVersion","undefined","succeededComponents","componentsResults","mapSeries","currentComponent","resolvedUnrelated","configMergeResult","modelComponent","scope","getModelComponent","updatedLaneId","isDefault","LaneId","from","name","applyVersion","remoteHead","getRef","version","allConfigMerge","compact","workspaceDepsUpdates","workspaceDepsConflicts","updateWorkspaceJsoncWithDepsIfNeeded","generateConfigMergeConflictFileForAll","objects","add","persist","unmergedComponents","write","writeBitMap","compBitIdsToRemove","BitIds","fromArray","deleteComponentsFiles","cleanFromBitMap","componentsHasConfigMergeConflicts","some","_c$configMergeResult","leftUnresolvedConflicts","dedupe","updateExisting","import","err","error","consoleError","getSnapOrTagResults","idsToTag","results","tagAllLaneComponent","taggedComponents","autoTaggedResults","removedComponents","snappedComponents","autoSnappedResults","snapResolvedComponents","mergeSnapResults","mergeSnapError","bitMapSnapshot","bitMap","takeSnapshot","restoreFromSnapshot","components","applyVersionResult","configMergeFile","getConflictMergeFile","workspaceConflict","ConfigMergeResult","DependencyResolverAspect","conflict","unshift","configMerge","generateMergeConflictFile","addConflict","compIdStr","hasConflict","allResults","getDepsResolverResult","nonConflictDeps","nonConflictSources","_configMerge$getDepsR","mergedConfig","mergedConfigPolicy","policy","DEPENDENCIES_FIELDS","depField","pkg","force","includes","conflictDeps","conflictDepsSources","_configMerge$getDepsR2","mergedConfigConflict","notConflictedPackages","conflictedPackages","workspaceConfig","Error","depResolver","extensions","findCoreExtension","workspaceJsonUpdates","pkgName","_policy$depField","currentVer","newVer","debug","WS_DEPS_FIELDS","workspaceJsonConflicts","dependencies","peerDependencies","conflictPackagesToRemoveFromConfigMerge","conflictRaw","currentVal","otherVal","split","_policy$depField2","currentVerInWsJson","semver","satisfies","replace","isEmpty","result","_result$conflict","_result$conflict2","dep","getMergeStatus","currentLane","otherLane","options","mergeStatusProvider","MergeStatusProvider","getStatus","filesStatus","unmergedComponent","head","handleResolveUnrelated","addComponent","headOnCurrentLane","unrelated","unrelatedHead","unrelatedLaneId","addEntry","markAllFilesAsUnchanged","files","file","pathNormalizeToLinux","relative","FileStatus","unchanged","MergeOptions","ours","strategy","remoteId","idToLoad","theirs","legacyComponent","loadComponentFromModelImportIfNeeded","updated","modifiedStatus","modifiedFiles","applyModifiedVersion","removeFilesIfNeeded","manyComponentsWriterOpts","writeConfig","writeMany","writtenPath","successfullyMergedConfig","getSuccessfullyMergedConfig","manual","unmergedPaths","f","filePath","setHead","markVersionAsLocal","values","getIdsForUnmerged","reset","removeComponent","fullName","abortedComponents","snap","legacyBitIds","_legacy","resolvedComponents","localLaneObject","Promise","all","bitId","remoteScopeName","remoteLaneId","remoteLanes","laneIdStr","toStringWithoutVersion","getComponents","r","BitId","tagMessage","unmodified","idsStr","componentIds","resolveMultipleComponentIds","entry","getEntry","GeneralError","unresolvedComponents","u","ComponentID","fromLegacy","componentsList","ComponentsList","mergePending","listMergePendingComponents","hasWildcard","listComponentsByIdsWithWildcard","getParsedId","provider","cli","loggerMain","compWriter","createLogger","MergingAspect","merging","register","MergeCmd","exports","CLIAspect","WorkspaceAspect","SnappingAspect","CheckoutAspect","InstallAspect","LoggerAspect","ComponentWriterAspect","ImporterAspect","ConfigAspect","RemoveAspect","MainRuntime","addRuntime"],"sources":["merging.main.runtime.ts"],"sourcesContent":["import { CLIAspect, CLIMain, MainRuntime } from '@teambit/cli';\nimport semver from 'semver';\nimport WorkspaceAspect, { OutsideWorkspaceError, Workspace } from '@teambit/workspace';\nimport { Consumer } from '@teambit/legacy/dist/consumer';\nimport ComponentsList from '@teambit/legacy/dist/consumer/component/components-list';\nimport {\n  MergeStrategy,\n  FailedComponents,\n  FileStatus,\n  ApplyVersionResult,\n  getMergeStrategyInteractive,\n  MergeOptions,\n} from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport SnappingAspect, { SnapResults, SnappingMain, TagResults } from '@teambit/snapping';\nimport hasWildcard from '@teambit/legacy/dist/utils/string/has-wildcard';\nimport mapSeries from 'p-map-series';\nimport { BitId, BitIds } from '@teambit/legacy/dist/bit-id';\nimport { BitError } from '@teambit/bit-error';\nimport GeneralError from '@teambit/legacy/dist/error/general-error';\nimport { LaneId } from '@teambit/lane-id';\nimport { AutoTagResult } from '@teambit/legacy/dist/scope/component-ops/auto-tag';\nimport { UnmergedComponent } from '@teambit/legacy/dist/scope/lanes/unmerged-components';\nimport { Lane, ModelComponent } from '@teambit/legacy/dist/scope/models';\nimport { Ref } from '@teambit/legacy/dist/scope/objects';\nimport chalk from 'chalk';\nimport { ConfigAspect, ConfigMain } from '@teambit/config';\nimport RemoveAspect, { RemoveMain } from '@teambit/remove';\nimport { pathNormalizeToLinux } from '@teambit/legacy/dist/utils';\nimport { ComponentWriterAspect, ComponentWriterMain } from '@teambit/component-writer';\nimport ConsumerComponent from '@teambit/legacy/dist/consumer/component/consumer-component';\nimport ImporterAspect, { ImporterMain } from '@teambit/importer';\nimport { Logger, LoggerAspect, LoggerMain } from '@teambit/logger';\nimport { compact, isEmpty } from 'lodash';\nimport { MergeResultsThreeWay } from '@teambit/legacy/dist/consumer/versions-ops/merge-version/three-way-merge';\nimport { DependencyResolverAspect, WorkspacePolicyConfigKeysNames } from '@teambit/dependency-resolver';\nimport {\n  ApplyVersionWithComps,\n  CheckoutAspect,\n  CheckoutMain,\n  ComponentStatusBase,\n  applyModifiedVersion,\n  removeFilesIfNeeded,\n} from '@teambit/checkout';\nimport { ComponentID } from '@teambit/component-id';\nimport { DEPENDENCIES_FIELDS } from '@teambit/legacy/dist/constants';\nimport deleteComponentsFiles from '@teambit/legacy/dist/consumer/component-ops/delete-component-files';\nimport { SnapsDistance } from '@teambit/legacy/dist/scope/component-ops/snaps-distance';\nimport { InstallMain, InstallAspect } from '@teambit/install';\nimport { MergeCmd } from './merge-cmd';\nimport { MergingAspect } from './merging.aspect';\nimport { ConfigMergeResult } from './config-merge-result';\nimport { MergeStatusProvider } from './merge-status-provider';\n\ntype ResolveUnrelatedData = {\n  strategy: MergeStrategy;\n  headOnCurrentLane: Ref;\n  unrelatedHead: Ref;\n  unrelatedLaneId: LaneId;\n};\ntype PkgEntry = { name: string; version: string; force: boolean };\n\nexport type WorkspaceDepsUpdates = { [pkgName: string]: [string, string] }; // from => to\nexport type WorkspaceDepsConflicts = Record<WorkspacePolicyConfigKeysNames, Array<{ name: string; version: string }>>; // the pkg value is in a format of CONFLICT::OURS::THEIRS\n\nexport type ComponentMergeStatus = ComponentStatusBase & {\n  unmergedMessage?: string;\n  unmergedLegitimately?: boolean; // failed to merge but for a legitimate reason, such as, up-to-date\n  mergeResults?: MergeResultsThreeWay | null;\n  divergeData?: SnapsDistance;\n  resolvedUnrelated?: ResolveUnrelatedData;\n  configMergeResult?: ConfigMergeResult;\n};\n\nexport type ComponentMergeStatusBeforeMergeAttempt = ComponentStatusBase & {\n  unmergedMessage?: string;\n  unmergedLegitimately?: boolean; // failed to merge but for a legitimate reason, such as, up-to-date\n  divergeData?: SnapsDistance;\n  resolvedUnrelated?: ResolveUnrelatedData;\n  mergeProps?: {\n    otherLaneHead: Ref;\n    currentId: BitId;\n    modelComponent: ModelComponent;\n  };\n};\n\nexport type ApplyVersionResults = {\n  components?: ApplyVersionResult[];\n  version?: string;\n  failedComponents?: FailedComponents[];\n  removedComponents?: BitId[];\n  addedComponents?: ComponentID[]; // relevant when restoreMissingComponents is true (e.g. bit lane merge-abort)\n  resolvedComponents?: ConsumerComponent[]; // relevant for bit merge --resolve\n  abortedComponents?: ApplyVersionResult[]; // relevant for bit merge --abort\n  mergeSnapResults?: {\n    snappedComponents: ConsumerComponent[];\n    autoSnappedResults: AutoTagResult[];\n    removedComponents?: BitIds;\n  } | null;\n  mergeSnapError?: Error;\n  leftUnresolvedConflicts?: boolean;\n  verbose?: boolean;\n  newFromLane?: string[];\n  newFromLaneAdded?: boolean;\n  installationError?: Error; // in case the package manager failed, it won't throw, instead, it'll return error here\n  compilationError?: Error; // in case the compiler failed, it won't throw, instead, it'll return error here\n  workspaceDepsUpdates?: WorkspaceDepsUpdates; // in case workspace.jsonc has been updated with dependencies versions\n};\n\nexport class MergingMain {\n  constructor(\n    private workspace: Workspace,\n    private install: InstallMain,\n    private snapping: SnappingMain,\n    private checkout: CheckoutMain,\n    private logger: Logger,\n    private componentWriter: ComponentWriterMain,\n    private importer: ImporterMain,\n    private config: ConfigMain,\n    private remove: RemoveMain\n  ) {}\n\n  async merge(\n    ids: string[],\n    mergeStrategy: MergeStrategy,\n    abort: boolean,\n    resolve: boolean,\n    noSnap: boolean,\n    message: string,\n    build: boolean,\n    skipDependencyInstallation: boolean\n  ): Promise<ApplyVersionResults> {\n    if (!this.workspace) throw new OutsideWorkspaceError();\n    const consumer: Consumer = this.workspace.consumer;\n    let mergeResults;\n    if (resolve) {\n      mergeResults = await this.resolveMerge(ids, message, build);\n    } else if (abort) {\n      mergeResults = await this.abortMerge(ids);\n    } else {\n      const bitIds = await this.getComponentsToMerge(consumer, ids);\n      mergeResults = await this.mergeComponentsFromRemote(\n        consumer,\n        bitIds,\n        mergeStrategy,\n        noSnap,\n        message,\n        build,\n        skipDependencyInstallation\n      );\n    }\n    await consumer.onDestroy();\n    return mergeResults;\n  }\n\n  /**\n   * when user is on main, it merges the remote main components into local.\n   * when user is on a lane, it merges the remote lane components into the local lane.\n   */\n  async mergeComponentsFromRemote(\n    consumer: Consumer,\n    bitIds: BitId[],\n    mergeStrategy: MergeStrategy,\n    noSnap: boolean,\n    snapMessage: string,\n    build: boolean,\n    skipDependencyInstallation: boolean\n  ): Promise<ApplyVersionResults> {\n    const currentLaneId = consumer.getCurrentLaneId();\n    const currentLaneObject = await consumer.getCurrentLaneObject();\n    const allComponentsStatus = await this.getAllComponentsStatus(bitIds, currentLaneId, currentLaneObject);\n    const failedComponents = allComponentsStatus.filter((c) => c.unmergedMessage && !c.unmergedLegitimately);\n    if (failedComponents.length) {\n      const failureMsgs = failedComponents\n        .map(\n          (failedComponent) =>\n            `${chalk.bold(failedComponent.id.toString())} - ${chalk.red(failedComponent.unmergedMessage as string)}`\n        )\n        .join('\\n');\n      throw new BitError(`unable to merge due to the following failures:\\n${failureMsgs}`);\n    }\n\n    return this.mergeSnaps({\n      mergeStrategy,\n      allComponentsStatus,\n      laneId: currentLaneId,\n      localLane: currentLaneObject,\n      noSnap,\n      snapMessage,\n      build,\n      skipDependencyInstallation,\n    });\n  }\n\n  /**\n   * merge multiple components according to the \"allComponentsStatus\".\n   */\n  async mergeSnaps({\n    mergeStrategy,\n    allComponentsStatus,\n    laneId,\n    localLane,\n    noSnap,\n    tag,\n    snapMessage,\n    build,\n    skipDependencyInstallation,\n  }: {\n    mergeStrategy: MergeStrategy;\n    allComponentsStatus: ComponentMergeStatus[];\n    laneId: LaneId;\n    localLane: Lane | null;\n    noSnap: boolean;\n    tag?: boolean;\n    snapMessage: string;\n    build: boolean;\n    skipDependencyInstallation?: boolean;\n  }): Promise<ApplyVersionResults> {\n    const consumer = this.workspace.consumer;\n    const componentWithConflict = allComponentsStatus.find(\n      (component) => component.mergeResults && component.mergeResults.hasConflicts\n    );\n    if (componentWithConflict && !mergeStrategy) {\n      mergeStrategy = await getMergeStrategyInteractive();\n    }\n    const failedComponents: FailedComponents[] = allComponentsStatus\n      .filter((componentStatus) => componentStatus.unmergedMessage)\n      .filter((componentStatus) => !componentStatus.shouldBeRemoved)\n      .map((componentStatus) => ({\n        id: componentStatus.id,\n        failureMessage: componentStatus.unmergedMessage as string,\n        unchangedLegitimately: componentStatus.unmergedLegitimately,\n      }));\n\n    const componentIdsToRemove = allComponentsStatus\n      .filter((componentStatus) => componentStatus.shouldBeRemoved)\n      .map((c) => c.id.changeVersion(undefined));\n\n    const succeededComponents = allComponentsStatus.filter((componentStatus) => !componentStatus.unmergedMessage);\n    // do not use Promise.all for applyVersion. otherwise, it'll write all components in parallel,\n    // which can be an issue when some components are also dependencies of others\n    const componentsResults = await mapSeries(\n      succeededComponents,\n      async ({ currentComponent, id, mergeResults, resolvedUnrelated, configMergeResult }) => {\n        const modelComponent = await consumer.scope.getModelComponent(id);\n        const updatedLaneId = laneId.isDefault() ? LaneId.from(laneId.name, id.scope as string) : laneId;\n        return this.applyVersion({\n          currentComponent,\n          id,\n          mergeResults,\n          mergeStrategy,\n          remoteHead: modelComponent.getRef(id.version as string) as Ref,\n          laneId: updatedLaneId,\n          localLane,\n          resolvedUnrelated,\n          configMergeResult,\n        });\n      }\n    );\n\n    const allConfigMerge = compact(succeededComponents.map((c) => c.configMergeResult));\n\n    const { workspaceDepsUpdates, workspaceDepsConflicts } = await this.updateWorkspaceJsoncWithDepsIfNeeded(\n      allConfigMerge\n    );\n\n    await this.generateConfigMergeConflictFileForAll(allConfigMerge, workspaceDepsConflicts);\n\n    if (localLane) consumer.scope.objects.add(localLane);\n\n    await consumer.scope.objects.persist(); // persist anyway, if localLane is null it should save all main heads\n\n    await consumer.scope.objects.unmergedComponents.write();\n\n    await consumer.writeBitMap();\n\n    if (componentIdsToRemove.length) {\n      const compBitIdsToRemove = BitIds.fromArray(componentIdsToRemove);\n      await deleteComponentsFiles(consumer, compBitIdsToRemove);\n      await consumer.cleanFromBitMap(compBitIdsToRemove);\n    }\n\n    const componentsHasConfigMergeConflicts = allComponentsStatus.some((c) => c.configMergeResult?.hasConflicts());\n    const leftUnresolvedConflicts = componentWithConflict && mergeStrategy === 'manual';\n    if (!skipDependencyInstallation && !leftUnresolvedConflicts && !componentsHasConfigMergeConflicts) {\n      try {\n        await this.install.install(undefined, {\n          dedupe: true,\n          updateExisting: false,\n          import: false,\n        });\n      } catch (err: any) {\n        this.logger.error(`failed installing packages`, err);\n        this.logger.consoleError(`failed installing packages, see the log for full stacktrace. error: ${err.message}`);\n      }\n    }\n\n    const getSnapOrTagResults = async () => {\n      // if one of the component has conflict, don't snap-merge. otherwise, some of the components would be snap-merged\n      // and some not. besides the fact that it could by mistake tag dependent, it's a confusing state. better not snap.\n      if (noSnap || leftUnresolvedConflicts || componentsHasConfigMergeConflicts) {\n        return null;\n      }\n      if (tag) {\n        const idsToTag = allComponentsStatus.map((c) => c.id);\n        const results = await this.tagAllLaneComponent(idsToTag, snapMessage, build);\n        if (!results) return null;\n        const { taggedComponents, autoTaggedResults, removedComponents } = results;\n        return { snappedComponents: taggedComponents, autoSnappedResults: autoTaggedResults, removedComponents };\n      }\n      return this.snapResolvedComponents(consumer, snapMessage, build);\n    };\n    let mergeSnapResults: ApplyVersionResults['mergeSnapResults'] = null;\n    let mergeSnapError: Error | undefined;\n    const bitMapSnapshot = this.workspace.bitMap.takeSnapshot();\n    try {\n      mergeSnapResults = await getSnapOrTagResults();\n    } catch (err: any) {\n      mergeSnapError = err;\n      this.workspace.bitMap.restoreFromSnapshot(bitMapSnapshot);\n    }\n\n    return {\n      components: componentsResults.map((c) => c.applyVersionResult),\n      failedComponents,\n      removedComponents: [...componentIdsToRemove, ...(mergeSnapResults?.removedComponents || [])],\n      mergeSnapResults,\n      mergeSnapError,\n      leftUnresolvedConflicts,\n      workspaceDepsUpdates,\n    };\n  }\n\n  private async generateConfigMergeConflictFileForAll(\n    allConfigMerge: ConfigMergeResult[],\n    workspaceDepsConflicts?: WorkspaceDepsConflicts\n  ) {\n    const configMergeFile = this.workspace.getConflictMergeFile();\n    if (workspaceDepsConflicts) {\n      const workspaceConflict = new ConfigMergeResult('WORKSPACE', 'ours', 'theirs', [\n        {\n          id: DependencyResolverAspect.id,\n          conflict: workspaceDepsConflicts,\n        },\n      ]);\n      allConfigMerge.unshift(workspaceConflict);\n    }\n    allConfigMerge.forEach((configMerge) => {\n      const conflict = configMerge.generateMergeConflictFile();\n      if (!conflict) return;\n      configMergeFile.addConflict(configMerge.compIdStr, conflict);\n    });\n    if (configMergeFile.hasConflict()) {\n      await configMergeFile.write();\n    }\n  }\n\n  private async updateWorkspaceJsoncWithDepsIfNeeded(\n    allConfigMerge: ConfigMergeResult[]\n  ): Promise<{ workspaceDepsUpdates?: WorkspaceDepsUpdates; workspaceDepsConflicts?: WorkspaceDepsConflicts }> {\n    const allResults = allConfigMerge.map((c) => c.getDepsResolverResult());\n\n    // aggregate all dependencies that can be updated (not conflicting)\n    const nonConflictDeps: { [pkgName: string]: string[] } = {};\n    const nonConflictSources: { [pkgName: string]: string[] } = {}; // for logging/debugging purposes\n    allConfigMerge.forEach((configMerge) => {\n      const mergedConfig = configMerge.getDepsResolverResult()?.mergedConfig;\n      if (!mergedConfig || mergedConfig === '-') return;\n      const mergedConfigPolicy = mergedConfig.policy || {};\n      DEPENDENCIES_FIELDS.forEach((depField) => {\n        if (!mergedConfigPolicy[depField]) return;\n        mergedConfigPolicy[depField].forEach((pkg: PkgEntry) => {\n          if (pkg.force) return; // we only care about auto-detected dependencies\n          if (nonConflictDeps[pkg.name]) {\n            if (!nonConflictDeps[pkg.name].includes(pkg.version)) nonConflictDeps[pkg.name].push(pkg.version);\n            nonConflictSources[pkg.name].push(configMerge.compIdStr);\n            return;\n          }\n          nonConflictDeps[pkg.name] = [pkg.version];\n          nonConflictSources[pkg.name] = [configMerge.compIdStr];\n        });\n      });\n    });\n\n    // aggregate all dependencies that have conflicts\n    const conflictDeps: { [pkgName: string]: string[] } = {};\n    const conflictDepsSources: { [pkgName: string]: string[] } = {}; // for logging/debugging purposes\n    allConfigMerge.forEach((configMerge) => {\n      const mergedConfigConflict = configMerge.getDepsResolverResult()?.conflict;\n      if (!mergedConfigConflict) return;\n      DEPENDENCIES_FIELDS.forEach((depField) => {\n        if (!mergedConfigConflict[depField]) return;\n        mergedConfigConflict[depField].forEach((pkg: PkgEntry) => {\n          if (pkg.force) return; // we only care about auto-detected dependencies\n          if (conflictDeps[pkg.name]) {\n            if (!conflictDeps[pkg.name].includes(pkg.version)) conflictDeps[pkg.name].push(pkg.version);\n            conflictDepsSources[pkg.name].push(configMerge.compIdStr);\n            return;\n          }\n          conflictDeps[pkg.name] = [pkg.version];\n          conflictDepsSources[pkg.name] = [configMerge.compIdStr];\n        });\n      });\n    });\n\n    const notConflictedPackages = Object.keys(nonConflictDeps);\n    const conflictedPackages = Object.keys(conflictDeps);\n    if (!notConflictedPackages.length && !conflictedPackages.length) return {};\n\n    const workspaceConfig = this.config.workspaceConfig;\n    if (!workspaceConfig) throw new Error(`updateWorkspaceJsoncWithDepsIfNeeded unable to get workspace config`);\n    const depResolver = workspaceConfig.extensions.findCoreExtension(DependencyResolverAspect.id);\n    const policy = depResolver?.config.policy;\n    if (!policy) {\n      return {};\n    }\n\n    // calculate the workspace.json updates\n    const workspaceJsonUpdates = {};\n    notConflictedPackages.forEach((pkgName) => {\n      if (nonConflictDeps[pkgName].length > 1) {\n        // we only want the deps that the other lane has them in the workspace.json and that all comps use the same dep.\n        return;\n      }\n      DEPENDENCIES_FIELDS.forEach((depField) => {\n        if (!policy[depField]?.[pkgName]) return; // doesn't exists in the workspace.json\n        const currentVer = policy[depField][pkgName];\n        const newVer = nonConflictDeps[pkgName][0];\n        if (currentVer === newVer) return;\n        workspaceJsonUpdates[pkgName] = [currentVer, newVer];\n        policy[depField][pkgName] = newVer;\n        this.logger.debug(\n          `update workspace.jsonc: ${pkgName} from ${currentVer} to ${newVer}. Triggered by: ${nonConflictSources[\n            pkgName\n          ].join(', ')}`\n        );\n      });\n    });\n\n    // calculate the workspace.json conflicts\n    const WS_DEPS_FIELDS = ['dependencies', 'peerDependencies'];\n    const workspaceJsonConflicts = { dependencies: [], peerDependencies: [] };\n    const conflictPackagesToRemoveFromConfigMerge: string[] = [];\n    conflictedPackages.forEach((pkgName) => {\n      if (conflictDeps[pkgName].length > 1) {\n        // we only want the deps that the other lane has them in the workspace.json and that all comps use the same dep.\n        return;\n      }\n      const conflictRaw = conflictDeps[pkgName][0];\n      const [, currentVal, otherVal] = conflictRaw.split('::');\n\n      WS_DEPS_FIELDS.forEach((depField) => {\n        if (!policy[depField]?.[pkgName]) return;\n        const currentVerInWsJson = policy[depField][pkgName];\n        if (!currentVerInWsJson) return;\n        // the version is coming from the workspace.jsonc\n        conflictPackagesToRemoveFromConfigMerge.push(pkgName);\n        if (semver.satisfies(otherVal, currentVerInWsJson)) {\n          // the other version is compatible with the current version in the workspace.json\n          return;\n        }\n        workspaceJsonConflicts[depField].push({\n          name: pkgName,\n          version: conflictRaw.replace(currentVal, currentVerInWsJson),\n          force: false,\n        });\n        conflictPackagesToRemoveFromConfigMerge.push(pkgName);\n        this.logger.debug(\n          `conflict workspace.jsonc: ${pkgName} current: ${currentVerInWsJson}, other: ${otherVal}. Triggered by: ${conflictDepsSources[\n            pkgName\n          ].join(', ')}`\n        );\n      });\n    });\n    WS_DEPS_FIELDS.forEach((depField) => {\n      if (isEmpty(workspaceJsonConflicts[depField])) delete workspaceJsonConflicts[depField];\n    });\n\n    if (conflictPackagesToRemoveFromConfigMerge.length) {\n      allResults.forEach((result) => {\n        if (result?.conflict) {\n          DEPENDENCIES_FIELDS.forEach((depField) => {\n            if (!result.conflict?.[depField]) return;\n            result.conflict[depField] = result.conflict?.[depField].filter(\n              (dep) => !conflictPackagesToRemoveFromConfigMerge.includes(dep.name)\n            );\n            if (!result.conflict[depField].length) delete result.conflict[depField];\n          });\n          if (isEmpty(result.conflict)) result.conflict = undefined;\n        }\n      });\n    }\n\n    if (Object.keys(workspaceJsonUpdates).length) {\n      await workspaceConfig.write();\n    }\n\n    this.logger.debug('final workspace.jsonc updates', workspaceJsonUpdates);\n    this.logger.debug('final workspace.jsonc conflicts', workspaceJsonConflicts);\n\n    return {\n      workspaceDepsUpdates: Object.keys(workspaceJsonUpdates).length ? workspaceJsonUpdates : undefined,\n      workspaceDepsConflicts: Object.keys(workspaceJsonConflicts).length ? workspaceJsonConflicts : undefined,\n    };\n  }\n\n  /**\n   * this function gets called from two different commands:\n   * 1. \"bit merge <ids...>\", when merging a component from a remote to the local.\n   * in this case, the remote and local are on the same lane or both on main.\n   * 2. \"bit lane merge\", when merging from one lane to another.\n   */\n  async getMergeStatus(\n    bitIds: BitId[], // the id.version is the version we want to merge to the current component\n    currentLane: Lane | null, // currently checked out lane. if on main, then it's null.\n    otherLane?: Lane | null, // the lane we want to merged to our lane. (null if it's \"main\").\n    options?: { resolveUnrelated?: MergeStrategy; ignoreConfigChanges?: boolean }\n  ): Promise<ComponentMergeStatus[]> {\n    const mergeStatusProvider = new MergeStatusProvider(\n      this.workspace,\n      this.logger,\n      this.importer,\n      currentLane || undefined,\n      otherLane || undefined,\n      options\n    );\n    return mergeStatusProvider.getStatus(bitIds);\n  }\n\n  private async applyVersion({\n    currentComponent,\n    id,\n    mergeResults,\n    mergeStrategy,\n    remoteHead,\n    laneId,\n    localLane,\n    resolvedUnrelated,\n    configMergeResult,\n  }: {\n    currentComponent: ConsumerComponent | null | undefined;\n    id: BitId;\n    mergeResults: MergeResultsThreeWay | null | undefined;\n    mergeStrategy: MergeStrategy;\n    remoteHead: Ref;\n    laneId: LaneId;\n    localLane: Lane | null;\n    resolvedUnrelated?: ResolveUnrelatedData;\n    configMergeResult?: ConfigMergeResult;\n  }): Promise<ApplyVersionWithComps> {\n    const consumer = this.workspace.consumer;\n    let filesStatus = {};\n    const unmergedComponent: UnmergedComponent = {\n      // @ts-ignore\n      id: { name: id.name, scope: id.scope },\n      head: remoteHead,\n      laneId,\n    };\n    id = currentComponent ? currentComponent.id : id;\n\n    const modelComponent = await consumer.scope.getModelComponent(id);\n    const handleResolveUnrelated = () => {\n      if (!currentComponent) throw new Error('currentComponent must be defined when resolvedUnrelated');\n      // because when on a main, we don't allow merging lanes with unrelated. we asks users to switch to the lane\n      // first and then merge with --resolve-unrelated\n      if (!localLane) throw new Error('localLane must be defined when resolvedUnrelated');\n      if (!resolvedUnrelated) throw new Error('resolvedUnrelated must be populated');\n      localLane.addComponent({ id, head: resolvedUnrelated.headOnCurrentLane });\n      unmergedComponent.unrelated = {\n        unrelatedHead: resolvedUnrelated.unrelatedHead,\n        headOnCurrentLane: resolvedUnrelated.headOnCurrentLane,\n        unrelatedLaneId: resolvedUnrelated.unrelatedLaneId,\n      };\n      consumer.scope.objects.unmergedComponents.addEntry(unmergedComponent);\n      return { applyVersionResult: { id, filesStatus }, component: currentComponent };\n    };\n\n    const markAllFilesAsUnchanged = () => {\n      if (!currentComponent) throw new Error(`applyVersion expect to get currentComponent for ${id.toString()}`);\n      currentComponent.files.forEach((file) => {\n        filesStatus[pathNormalizeToLinux(file.relative)] = FileStatus.unchanged;\n      });\n    };\n    if (mergeResults && mergeResults.hasConflicts && mergeStrategy === MergeOptions.ours) {\n      markAllFilesAsUnchanged();\n      consumer.scope.objects.unmergedComponents.addEntry(unmergedComponent);\n      return { applyVersionResult: { id, filesStatus }, component: currentComponent || undefined };\n    }\n    if (resolvedUnrelated?.strategy === 'ours') {\n      markAllFilesAsUnchanged();\n      return handleResolveUnrelated();\n    }\n    const remoteId = id.changeVersion(remoteHead.toString());\n    const idToLoad = !mergeResults || mergeStrategy === MergeOptions.theirs ? remoteId : id;\n    const legacyComponent = await consumer.loadComponentFromModelImportIfNeeded(idToLoad);\n    if (mergeResults && mergeStrategy === MergeOptions.theirs) {\n      // in this case, we don't want to update .bitmap with the version of the remote. we want to keep the same version\n      legacyComponent.version = id.version;\n    }\n    const files = legacyComponent.files;\n    files.forEach((file) => {\n      // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n      filesStatus[pathNormalizeToLinux(file.relative)] = FileStatus.updated;\n    });\n\n    if (mergeResults) {\n      // update files according to the merge results\n      const { filesStatus: modifiedStatus, modifiedFiles } = applyModifiedVersion(files, mergeResults, mergeStrategy);\n      legacyComponent.files = modifiedFiles;\n      filesStatus = { ...filesStatus, ...modifiedStatus };\n    }\n\n    await removeFilesIfNeeded(filesStatus, currentComponent || undefined);\n\n    const manyComponentsWriterOpts = {\n      consumer,\n      components: [legacyComponent],\n      skipDependencyInstallation: true,\n      writeConfig: false, // @todo: should write if config exists before, needs to figure out how to do it.\n    };\n    await this.componentWriter.writeMany(manyComponentsWriterOpts);\n\n    if (configMergeResult) {\n      if (!legacyComponent.writtenPath) {\n        throw new Error(`component.writtenPath is missing for ${id.toString()}`);\n      }\n      const successfullyMergedConfig = configMergeResult.getSuccessfullyMergedConfig();\n      if (successfullyMergedConfig) {\n        unmergedComponent.mergedConfig = successfullyMergedConfig;\n        // no need to `unmergedComponents.addEntry` here. it'll be added in the next lines inside `if (mergeResults)`.\n        // because if `configMergeResult` is set, `mergeResults` must be set as well. both happen on diverge.\n      }\n    }\n\n    // if mergeResults, the head snap is going to be updated on a later phase when snapping with two parents\n    // otherwise, update the head of the current lane or main\n    if (mergeResults) {\n      if (mergeResults.hasConflicts && mergeStrategy === MergeOptions.manual) {\n        unmergedComponent.unmergedPaths = mergeResults.modifiedFiles.filter((f) => f.conflict).map((f) => f.filePath);\n      }\n      consumer.scope.objects.unmergedComponents.addEntry(unmergedComponent);\n    } else if (localLane) {\n      if (resolvedUnrelated) {\n        // must be \"theirs\"\n        return handleResolveUnrelated();\n      }\n      localLane.addComponent({ id, head: remoteHead });\n    } else {\n      // this is main\n      modelComponent.setHead(remoteHead);\n      // mark it as local, otherwise, when importing this component from a remote, it'll override it.\n      modelComponent.markVersionAsLocal(remoteHead.toString());\n      consumer.scope.objects.add(modelComponent);\n    }\n\n    return { applyVersionResult: { id, filesStatus }, component: currentComponent || undefined };\n  }\n\n  private async abortMerge(values: string[]): Promise<ApplyVersionResults> {\n    const consumer = this.workspace.consumer;\n    const ids = await this.getIdsForUnmerged(values);\n    const results = await this.checkout.checkout({ ids, reset: true });\n    ids.forEach((id) => consumer.scope.objects.unmergedComponents.removeComponent(id.fullName));\n    await consumer.scope.objects.unmergedComponents.write();\n    return { abortedComponents: results.components };\n  }\n\n  private async resolveMerge(values: string[], snapMessage: string, build: boolean): Promise<ApplyVersionResults> {\n    const ids = await this.getIdsForUnmerged(values);\n    // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n    const { snappedComponents } = await this.snapping.snap({\n      legacyBitIds: BitIds.fromArray(ids.map((id) => id._legacy)),\n      build,\n      message: snapMessage,\n    });\n    return { resolvedComponents: snappedComponents };\n  }\n\n  private async getAllComponentsStatus(\n    bitIds: BitId[],\n    laneId: LaneId,\n    localLaneObject: Lane | null\n  ): Promise<ComponentMergeStatus[]> {\n    const ids = await Promise.all(\n      bitIds.map(async (bitId) => {\n        const remoteScopeName = laneId.isDefault() ? bitId.scope : laneId.scope;\n        const remoteLaneId = LaneId.from(laneId.name, remoteScopeName as string);\n        const remoteHead = await this.workspace.consumer.scope.objects.remoteLanes.getRef(remoteLaneId, bitId);\n        const laneIdStr = remoteLaneId.toString();\n        if (!remoteHead) {\n          throw new BitError(`unable to find a remote head of \"${bitId.toStringWithoutVersion()}\" in \"${laneIdStr}\"`);\n        }\n        return bitId.changeVersion(remoteHead.toString());\n      })\n    );\n\n    return this.getMergeStatus(ids, localLaneObject, localLaneObject);\n  }\n\n  private async snapResolvedComponents(\n    consumer: Consumer,\n    snapMessage: string,\n    build: boolean\n  ): Promise<SnapResults | null> {\n    const unmergedComponents = consumer.scope.objects.unmergedComponents.getComponents();\n    this.logger.debug(`merge-snaps, snapResolvedComponents, total ${unmergedComponents.length.toString()} components`);\n    if (!unmergedComponents.length) return null;\n    const ids = BitIds.fromArray(unmergedComponents.map((r) => new BitId(r.id)));\n    return this.snapping.snap({\n      legacyBitIds: ids,\n      build,\n      message: snapMessage,\n    });\n  }\n\n  private async tagAllLaneComponent(idsToTag: BitId[], tagMessage: string, build: boolean): Promise<TagResults | null> {\n    const ids = idsToTag.map((id) => {\n      return id.toStringWithoutVersion();\n    });\n    this.logger.debug(`merge-snaps, tagResolvedComponents, total ${idsToTag.length.toString()} components`);\n    return this.snapping.tag({\n      ids,\n      build,\n      message: tagMessage,\n      unmodified: true,\n    });\n  }\n\n  private async getIdsForUnmerged(idsStr?: string[]): Promise<ComponentID[]> {\n    if (idsStr && idsStr.length) {\n      const componentIds = await this.workspace.resolveMultipleComponentIds(idsStr);\n      componentIds.forEach((id) => {\n        const entry = this.workspace.consumer.scope.objects.unmergedComponents.getEntry(id.fullName);\n        if (!entry) {\n          throw new GeneralError(`unable to merge-resolve ${id.toString()}, it is not marked as unresolved`);\n        }\n      });\n      return componentIds;\n    }\n    const unresolvedComponents = this.workspace.consumer.scope.objects.unmergedComponents.getComponents();\n    if (!unresolvedComponents.length) throw new GeneralError(`all components are resolved already, nothing to do`);\n    return unresolvedComponents.map((u) => ComponentID.fromLegacy(new BitId(u.id)));\n  }\n\n  private async getComponentsToMerge(consumer: Consumer, ids: string[]): Promise<BitId[]> {\n    const componentsList = new ComponentsList(consumer);\n    if (!ids.length) {\n      const mergePending = await componentsList.listMergePendingComponents();\n      return mergePending.map((c) => c.id);\n    }\n    if (hasWildcard(ids)) {\n      return componentsList.listComponentsByIdsWithWildcard(ids);\n    }\n    return ids.map((id) => consumer.getParsedId(id));\n  }\n\n  static slots = [];\n  static dependencies = [\n    CLIAspect,\n    WorkspaceAspect,\n    SnappingAspect,\n    CheckoutAspect,\n    InstallAspect,\n    LoggerAspect,\n    ComponentWriterAspect,\n    ImporterAspect,\n    ConfigAspect,\n    RemoveAspect,\n  ];\n  static runtime = MainRuntime;\n  static async provider([\n    cli,\n    workspace,\n    snapping,\n    checkout,\n    install,\n    loggerMain,\n    compWriter,\n    importer,\n    config,\n    remove,\n  ]: [\n    CLIMain,\n    Workspace,\n    SnappingMain,\n    CheckoutMain,\n    InstallMain,\n    LoggerMain,\n    ComponentWriterMain,\n    ImporterMain,\n    ConfigMain,\n    RemoveMain\n  ]) {\n    const logger = loggerMain.createLogger(MergingAspect.id);\n    const merging = new MergingMain(\n      workspace,\n      install,\n      snapping,\n      checkout,\n      logger,\n      compWriter,\n      importer,\n      config,\n      remove\n    );\n    cli.register(new MergeCmd(merging));\n    return merging;\n  }\n}\n\nMergingAspect.addRuntime(MergingMain);\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA,SAAAA,KAAA;EAAA,MAAAC,IAAA,GAAAC,OAAA;EAAAF,IAAA,YAAAA,CAAA;IAAA,OAAAC,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAE,QAAA;EAAA,MAAAF,IAAA,GAAAG,sBAAA,CAAAF,OAAA;EAAAC,OAAA,YAAAA,CAAA;IAAA,OAAAF,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAI,WAAA;EAAA,MAAAJ,IAAA,GAAAK,uBAAA,CAAAJ,OAAA;EAAAG,UAAA,YAAAA,CAAA;IAAA,OAAAJ,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAEA,SAAAM,gBAAA;EAAA,MAAAN,IAAA,GAAAG,sBAAA,CAAAF,OAAA;EAAAK,eAAA,YAAAA,CAAA;IAAA,OAAAN,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAO,cAAA;EAAA,MAAAP,IAAA,GAAAC,OAAA;EAAAM,aAAA,YAAAA,CAAA;IAAA,OAAAP,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAQA,SAAAQ,UAAA;EAAA,MAAAR,IAAA,GAAAG,sBAAA,CAAAF,OAAA;EAAAO,SAAA,YAAAA,CAAA;IAAA,OAAAR,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAS,aAAA;EAAA,MAAAT,IAAA,GAAAG,sBAAA,CAAAF,OAAA;EAAAQ,YAAA,YAAAA,CAAA;IAAA,OAAAT,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAU,YAAA;EAAA,MAAAV,IAAA,GAAAG,sBAAA,CAAAF,OAAA;EAAAS,WAAA,YAAAA,CAAA;IAAA,OAAAV,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAW,OAAA;EAAA,MAAAX,IAAA,GAAAC,OAAA;EAAAU,MAAA,YAAAA,CAAA;IAAA,OAAAX,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAY,UAAA;EAAA,MAAAZ,IAAA,GAAAC,OAAA;EAAAW,SAAA,YAAAA,CAAA;IAAA,OAAAZ,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAa,cAAA;EAAA,MAAAb,IAAA,GAAAG,sBAAA,CAAAF,OAAA;EAAAY,aAAA,YAAAA,CAAA;IAAA,OAAAb,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAc,QAAA;EAAA,MAAAd,IAAA,GAAAC,OAAA;EAAAa,OAAA,YAAAA,CAAA;IAAA,OAAAd,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAKA,SAAAe,OAAA;EAAA,MAAAf,IAAA,GAAAG,sBAAA,CAAAF,OAAA;EAAAc,MAAA,YAAAA,CAAA;IAAA,OAAAf,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAgB,QAAA;EAAA,MAAAhB,IAAA,GAAAC,OAAA;EAAAe,OAAA,YAAAA,CAAA;IAAA,OAAAhB,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAiB,QAAA;EAAA,MAAAjB,IAAA,GAAAG,sBAAA,CAAAF,OAAA;EAAAgB,OAAA,YAAAA,CAAA;IAAA,OAAAjB,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAkB,OAAA;EAAA,MAAAlB,IAAA,GAAAC,OAAA;EAAAiB,MAAA,YAAAA,CAAA;IAAA,OAAAlB,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAmB,iBAAA;EAAA,MAAAnB,IAAA,GAAAC,OAAA;EAAAkB,gBAAA,YAAAA,CAAA;IAAA,OAAAnB,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAEA,SAAAoB,UAAA;EAAA,MAAApB,IAAA,GAAAG,sBAAA,CAAAF,OAAA;EAAAmB,SAAA,YAAAA,CAAA;IAAA,OAAApB,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAqB,QAAA;EAAA,MAAArB,IAAA,GAAAC,OAAA;EAAAoB,OAAA,YAAAA,CAAA;IAAA,OAAArB,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAsB,QAAA;EAAA,MAAAtB,IAAA,GAAAC,OAAA;EAAAqB,OAAA,YAAAA,CAAA;IAAA,OAAAtB,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAEA,SAAAuB,oBAAA;EAAA,MAAAvB,IAAA,GAAAC,OAAA;EAAAsB,mBAAA,YAAAA,CAAA;IAAA,OAAAvB,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAwB,UAAA;EAAA,MAAAxB,IAAA,GAAAC,OAAA;EAAAuB,SAAA,YAAAA,CAAA;IAAA,OAAAxB,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAQA,SAAAyB,aAAA;EAAA,MAAAzB,IAAA,GAAAC,OAAA;EAAAwB,YAAA,YAAAA,CAAA;IAAA,OAAAzB,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAA0B,WAAA;EAAA,MAAA1B,IAAA,GAAAC,OAAA;EAAAyB,UAAA,YAAAA,CAAA;IAAA,OAAA1B,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAA2B,sBAAA;EAAA,MAAA3B,IAAA,GAAAG,sBAAA,CAAAF,OAAA;EAAA0B,qBAAA,YAAAA,CAAA;IAAA,OAAA3B,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAEA,SAAA4B,SAAA;EAAA,MAAA5B,IAAA,GAAAC,OAAA;EAAA2B,QAAA,YAAAA,CAAA;IAAA,OAAA5B,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAA6B,UAAA;EAAA,MAAA7B,IAAA,GAAAC,OAAA;EAAA4B,SAAA,YAAAA,CAAA;IAAA,OAAA7B,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAA8B,SAAA;EAAA,MAAA9B,IAAA,GAAAC,OAAA;EAAA6B,QAAA,YAAAA,CAAA;IAAA,OAAA9B,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAA+B,mBAAA;EAAA,MAAA/B,IAAA,GAAAC,OAAA;EAAA8B,kBAAA,YAAAA,CAAA;IAAA,OAAA/B,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAgC,qBAAA;EAAA,MAAAhC,IAAA,GAAAC,OAAA;EAAA+B,oBAAA,YAAAA,CAAA;IAAA,OAAAhC,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAA8D,SAAAiC,yBAAAC,WAAA,eAAAC,OAAA,kCAAAC,iBAAA,OAAAD,OAAA,QAAAE,gBAAA,OAAAF,OAAA,YAAAF,wBAAA,YAAAA,CAAAC,WAAA,WAAAA,WAAA,GAAAG,gBAAA,GAAAD,iBAAA,KAAAF,WAAA;AAAA,SAAA7B,wBAAAiC,GAAA,EAAAJ,WAAA,SAAAA,WAAA,IAAAI,GAAA,IAAAA,GAAA,CAAAC,UAAA,WAAAD,GAAA,QAAAA,GAAA,oBAAAA,GAAA,wBAAAA,GAAA,4BAAAE,OAAA,EAAAF,GAAA,UAAAG,KAAA,GAAAR,wBAAA,CAAAC,WAAA,OAAAO,KAAA,IAAAA,KAAA,CAAAC,GAAA,CAAAJ,GAAA,YAAAG,KAAA,CAAAE,GAAA,CAAAL,GAAA,SAAAM,MAAA,WAAAC,qBAAA,GAAAC,MAAA,CAAAC,cAAA,IAAAD,MAAA,CAAAE,wBAAA,WAAAC,GAAA,IAAAX,GAAA,QAAAW,GAAA,kBAAAH,MAAA,CAAAI,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAd,GAAA,EAAAW,GAAA,SAAAI,IAAA,GAAAR,qBAAA,GAAAC,MAAA,CAAAE,wBAAA,CAAAV,GAAA,EAAAW,GAAA,cAAAI,IAAA,KAAAA,IAAA,CAAAV,GAAA,IAAAU,IAAA,CAAAC,GAAA,KAAAR,MAAA,CAAAC,cAAA,CAAAH,MAAA,EAAAK,GAAA,EAAAI,IAAA,YAAAT,MAAA,CAAAK,GAAA,IAAAX,GAAA,CAAAW,GAAA,SAAAL,MAAA,CAAAJ,OAAA,GAAAF,GAAA,MAAAG,KAAA,IAAAA,KAAA,CAAAa,GAAA,CAAAhB,GAAA,EAAAM,MAAA,YAAAA,MAAA;AAAA,SAAAW,QAAAC,MAAA,EAAAC,cAAA,QAAAC,IAAA,GAAAZ,MAAA,CAAAY,IAAA,CAAAF,MAAA,OAAAV,MAAA,CAAAa,qBAAA,QAAAC,OAAA,GAAAd,MAAA,CAAAa,qBAAA,CAAAH,MAAA,GAAAC,cAAA,KAAAG,OAAA,GAAAA,OAAA,CAAAC,MAAA,WAAAC,GAAA,WAAAhB,MAAA,CAAAE,wBAAA,CAAAQ,MAAA,EAAAM,GAAA,EAAAC,UAAA,OAAAL,IAAA,CAAAM,IAAA,CAAAC,KAAA,CAAAP,IAAA,EAAAE,OAAA,YAAAF,IAAA;AAAA,SAAAQ,cAAAC,MAAA,aAAAC,CAAA,MAAAA,CAAA,GAAAC,SAAA,CAAAC,MAAA,EAAAF,CAAA,UAAAG,MAAA,WAAAF,SAAA,CAAAD,CAAA,IAAAC,SAAA,CAAAD,CAAA,QAAAA,CAAA,OAAAb,OAAA,CAAAT,MAAA,CAAAyB,MAAA,OAAAC,OAAA,WAAAvB,GAAA,QAAAwB,gBAAA,GAAAjC,OAAA,EAAA2B,MAAA,EAAAlB,GAAA,EAAAsB,MAAA,CAAAtB,GAAA,SAAAH,MAAA,CAAA4B,yBAAA,GAAA5B,MAAA,CAAA6B,gBAAA,CAAAR,MAAA,EAAArB,MAAA,CAAA4B,yBAAA,CAAAH,MAAA,KAAAhB,OAAA,CAAAT,MAAA,CAAAyB,MAAA,GAAAC,OAAA,WAAAvB,GAAA,IAAAH,MAAA,CAAAC,cAAA,CAAAoB,MAAA,EAAAlB,GAAA,EAAAH,MAAA,CAAAE,wBAAA,CAAAuB,MAAA,EAAAtB,GAAA,iBAAAkB,MAAA;AAUc;AAC2C;;AA8ChH,MAAMS,WAAW,CAAC;EACvBC,WAAWA,CACDC,SAAoB,EACpBC,OAAoB,EACpBC,QAAsB,EACtBC,QAAsB,EACtBC,MAAc,EACdC,eAAoC,EACpCC,QAAsB,EACtBC,MAAkB,EAClBC,MAAkB,EAC1B;IAAA,KATQR,SAAoB,GAApBA,SAAoB;IAAA,KACpBC,OAAoB,GAApBA,OAAoB;IAAA,KACpBC,QAAsB,GAAtBA,QAAsB;IAAA,KACtBC,QAAsB,GAAtBA,QAAsB;IAAA,KACtBC,MAAc,GAAdA,MAAc;IAAA,KACdC,eAAoC,GAApCA,eAAoC;IAAA,KACpCC,QAAsB,GAAtBA,QAAsB;IAAA,KACtBC,MAAkB,GAAlBA,MAAkB;IAAA,KAClBC,MAAkB,GAAlBA,MAAkB;EACzB;EAEH,MAAMC,KAAKA,CACTC,GAAa,EACbC,aAA4B,EAC5BC,KAAc,EACdC,OAAgB,EAChBC,MAAe,EACfC,OAAe,EACfC,KAAc,EACdC,0BAAmC,EACL;IAC9B,IAAI,CAAC,IAAI,CAACjB,SAAS,EAAE,MAAM,KAAIkB,kCAAqB,EAAC,CAAC;IACtD,MAAMC,QAAkB,GAAG,IAAI,CAACnB,SAAS,CAACmB,QAAQ;IAClD,IAAIC,YAAY;IAChB,IAAIP,OAAO,EAAE;MACXO,YAAY,GAAG,MAAM,IAAI,CAACC,YAAY,CAACX,GAAG,EAAEK,OAAO,EAAEC,KAAK,CAAC;IAC7D,CAAC,MAAM,IAAIJ,KAAK,EAAE;MAChBQ,YAAY,GAAG,MAAM,IAAI,CAACE,UAAU,CAACZ,GAAG,CAAC;IAC3C,CAAC,MAAM;MACL,MAAMa,MAAM,GAAG,MAAM,IAAI,CAACC,oBAAoB,CAACL,QAAQ,EAAET,GAAG,CAAC;MAC7DU,YAAY,GAAG,MAAM,IAAI,CAACK,yBAAyB,CACjDN,QAAQ,EACRI,MAAM,EACNZ,aAAa,EACbG,MAAM,EACNC,OAAO,EACPC,KAAK,EACLC,0BACF,CAAC;IACH;IACA,MAAME,QAAQ,CAACO,SAAS,CAAC,CAAC;IAC1B,OAAON,YAAY;EACrB;;EAEA;AACF;AACA;AACA;EACE,MAAMK,yBAAyBA,CAC7BN,QAAkB,EAClBI,MAAe,EACfZ,aAA4B,EAC5BG,MAAe,EACfa,WAAmB,EACnBX,KAAc,EACdC,0BAAmC,EACL;IAC9B,MAAMW,aAAa,GAAGT,QAAQ,CAACU,gBAAgB,CAAC,CAAC;IACjD,MAAMC,iBAAiB,GAAG,MAAMX,QAAQ,CAACY,oBAAoB,CAAC,CAAC;IAC/D,MAAMC,mBAAmB,GAAG,MAAM,IAAI,CAACC,sBAAsB,CAACV,MAAM,EAAEK,aAAa,EAAEE,iBAAiB,CAAC;IACvG,MAAMI,gBAAgB,GAAGF,mBAAmB,CAACjD,MAAM,CAAEoD,CAAC,IAAKA,CAAC,CAACC,eAAe,IAAI,CAACD,CAAC,CAACE,oBAAoB,CAAC;IACxG,IAAIH,gBAAgB,CAAC1C,MAAM,EAAE;MAC3B,MAAM8C,WAAW,GAAGJ,gBAAgB,CACjCK,GAAG,CACDC,eAAe,IACb,GAAEC,gBAAK,CAACC,IAAI,CAACF,eAAe,CAACG,EAAE,CAACC,QAAQ,CAAC,CAAC,CAAE,MAAKH,gBAAK,CAACI,GAAG,CAACL,eAAe,CAACJ,eAAyB,CAAE,EAC3G,CAAC,CACAU,IAAI,CAAC,IAAI,CAAC;MACb,MAAM,KAAIC,oBAAQ,EAAE,mDAAkDT,WAAY,EAAC,CAAC;IACtF;IAEA,OAAO,IAAI,CAACU,UAAU,CAAC;MACrBrC,aAAa;MACbqB,mBAAmB;MACnBiB,MAAM,EAAErB,aAAa;MACrBsB,SAAS,EAAEpB,iBAAiB;MAC5BhB,MAAM;MACNa,WAAW;MACXX,KAAK;MACLC;IACF,CAAC,CAAC;EACJ;;EAEA;AACF;AACA;EACE,MAAM+B,UAAUA,CAAC;IACfrC,aAAa;IACbqB,mBAAmB;IACnBiB,MAAM;IACNC,SAAS;IACTpC,MAAM;IACNqC,GAAG;IACHxB,WAAW;IACXX,KAAK;IACLC;EAWF,CAAC,EAAgC;IAAA,IAAAmC,iBAAA;IAC/B,MAAMjC,QAAQ,GAAG,IAAI,CAACnB,SAAS,CAACmB,QAAQ;IACxC,MAAMkC,qBAAqB,GAAGrB,mBAAmB,CAACsB,IAAI,CACnDC,SAAS,IAAKA,SAAS,CAACnC,YAAY,IAAImC,SAAS,CAACnC,YAAY,CAACoC,YAClE,CAAC;IACD,IAAIH,qBAAqB,IAAI,CAAC1C,aAAa,EAAE;MAC3CA,aAAa,GAAG,MAAM,IAAA8C,2CAA2B,EAAC,CAAC;IACrD;IACA,MAAMvB,gBAAoC,GAAGF,mBAAmB,CAC7DjD,MAAM,CAAE2E,eAAe,IAAKA,eAAe,CAACtB,eAAe,CAAC,CAC5DrD,MAAM,CAAE2E,eAAe,IAAK,CAACA,eAAe,CAACC,eAAe,CAAC,CAC7DpB,GAAG,CAAEmB,eAAe,KAAM;MACzBf,EAAE,EAAEe,eAAe,CAACf,EAAE;MACtBiB,cAAc,EAAEF,eAAe,CAACtB,eAAyB;MACzDyB,qBAAqB,EAAEH,eAAe,CAACrB;IACzC,CAAC,CAAC,CAAC;IAEL,MAAMyB,oBAAoB,GAAG9B,mBAAmB,CAC7CjD,MAAM,CAAE2E,eAAe,IAAKA,eAAe,CAACC,eAAe,CAAC,CAC5DpB,GAAG,CAAEJ,CAAC,IAAKA,CAAC,CAACQ,EAAE,CAACoB,aAAa,CAACC,SAAS,CAAC,CAAC;IAE5C,MAAMC,mBAAmB,GAAGjC,mBAAmB,CAACjD,MAAM,CAAE2E,eAAe,IAAK,CAACA,eAAe,CAACtB,eAAe,CAAC;IAC7G;IACA;IACA,MAAM8B,iBAAiB,GAAG,MAAM,IAAAC,qBAAS,EACvCF,mBAAmB,EACnB,OAAO;MAAEG,gBAAgB;MAAEzB,EAAE;MAAEvB,YAAY;MAAEiD,iBAAiB;MAAEC;IAAkB,CAAC,KAAK;MACtF,MAAMC,cAAc,GAAG,MAAMpD,QAAQ,CAACqD,KAAK,CAACC,iBAAiB,CAAC9B,EAAE,CAAC;MACjE,MAAM+B,aAAa,GAAGzB,MAAM,CAAC0B,SAAS,CAAC,CAAC,GAAGC,gBAAM,CAACC,IAAI,CAAC5B,MAAM,CAAC6B,IAAI,EAAEnC,EAAE,CAAC6B,KAAe,CAAC,GAAGvB,MAAM;MAChG,OAAO,IAAI,CAAC8B,YAAY,CAAC;QACvBX,gBAAgB;QAChBzB,EAAE;QACFvB,YAAY;QACZT,aAAa;QACbqE,UAAU,EAAET,cAAc,CAACU,MAAM,CAACtC,EAAE,CAACuC,OAAiB,CAAQ;QAC9DjC,MAAM,EAAEyB,aAAa;QACrBxB,SAAS;QACTmB,iBAAiB;QACjBC;MACF,CAAC,CAAC;IACJ,CACF,CAAC;IAED,MAAMa,cAAc,GAAG,IAAAC,iBAAO,EAACnB,mBAAmB,CAAC1B,GAAG,CAAEJ,CAAC,IAAKA,CAAC,CAACmC,iBAAiB,CAAC,CAAC;IAEnF,MAAM;MAAEe,oBAAoB;MAAEC;IAAuB,CAAC,GAAG,MAAM,IAAI,CAACC,oCAAoC,CACtGJ,cACF,CAAC;IAED,MAAM,IAAI,CAACK,qCAAqC,CAACL,cAAc,EAAEG,sBAAsB,CAAC;IAExF,IAAIpC,SAAS,EAAE/B,QAAQ,CAACqD,KAAK,CAACiB,OAAO,CAACC,GAAG,CAACxC,SAAS,CAAC;IAEpD,MAAM/B,QAAQ,CAACqD,KAAK,CAACiB,OAAO,CAACE,OAAO,CAAC,CAAC,CAAC,CAAC;;IAExC,MAAMxE,QAAQ,CAACqD,KAAK,CAACiB,OAAO,CAACG,kBAAkB,CAACC,KAAK,CAAC,CAAC;IAEvD,MAAM1E,QAAQ,CAAC2E,WAAW,CAAC,CAAC;IAE5B,IAAIhC,oBAAoB,CAACtE,MAAM,EAAE;MAC/B,MAAMuG,kBAAkB,GAAGC,eAAM,CAACC,SAAS,CAACnC,oBAAoB,CAAC;MACjE,MAAM,IAAAoC,+BAAqB,EAAC/E,QAAQ,EAAE4E,kBAAkB,CAAC;MACzD,MAAM5E,QAAQ,CAACgF,eAAe,CAACJ,kBAAkB,CAAC;IACpD;IAEA,MAAMK,iCAAiC,GAAGpE,mBAAmB,CAACqE,IAAI,CAAElE,CAAC;MAAA,IAAAmE,oBAAA;MAAA,QAAAA,oBAAA,GAAKnE,CAAC,CAACmC,iBAAiB,cAAAgC,oBAAA,uBAAnBA,oBAAA,CAAqB9C,YAAY,CAAC,CAAC;IAAA,EAAC;IAC9G,MAAM+C,uBAAuB,GAAGlD,qBAAqB,IAAI1C,aAAa,KAAK,QAAQ;IACnF,IAAI,CAACM,0BAA0B,IAAI,CAACsF,uBAAuB,IAAI,CAACH,iCAAiC,EAAE;MACjG,IAAI;QACF,MAAM,IAAI,CAACnG,OAAO,CAACA,OAAO,CAAC+D,SAAS,EAAE;UACpCwC,MAAM,EAAE,IAAI;UACZC,cAAc,EAAE,KAAK;UACrBC,MAAM,EAAE;QACV,CAAC,CAAC;MACJ,CAAC,CAAC,OAAOC,GAAQ,EAAE;QACjB,IAAI,CAACvG,MAAM,CAACwG,KAAK,CAAE,4BAA2B,EAAED,GAAG,CAAC;QACpD,IAAI,CAACvG,MAAM,CAACyG,YAAY,CAAE,uEAAsEF,GAAG,CAAC5F,OAAQ,EAAC,CAAC;MAChH;IACF;IAEA,MAAM+F,mBAAmB,GAAG,MAAAA,CAAA,KAAY;MACtC;MACA;MACA,IAAIhG,MAAM,IAAIyF,uBAAuB,IAAIH,iCAAiC,EAAE;QAC1E,OAAO,IAAI;MACb;MACA,IAAIjD,GAAG,EAAE;QACP,MAAM4D,QAAQ,GAAG/E,mBAAmB,CAACO,GAAG,CAAEJ,CAAC,IAAKA,CAAC,CAACQ,EAAE,CAAC;QACrD,MAAMqE,OAAO,GAAG,MAAM,IAAI,CAACC,mBAAmB,CAACF,QAAQ,EAAEpF,WAAW,EAAEX,KAAK,CAAC;QAC5E,IAAI,CAACgG,OAAO,EAAE,OAAO,IAAI;QACzB,MAAM;UAAEE,gBAAgB;UAAEC,iBAAiB;UAAEC;QAAkB,CAAC,GAAGJ,OAAO;QAC1E,OAAO;UAAEK,iBAAiB,EAAEH,gBAAgB;UAAEI,kBAAkB,EAAEH,iBAAiB;UAAEC;QAAkB,CAAC;MAC1G;MACA,OAAO,IAAI,CAACG,sBAAsB,CAACpG,QAAQ,EAAEQ,WAAW,EAAEX,KAAK,CAAC;IAClE,CAAC;IACD,IAAIwG,gBAAyD,GAAG,IAAI;IACpE,IAAIC,cAAiC;IACrC,MAAMC,cAAc,GAAG,IAAI,CAAC1H,SAAS,CAAC2H,MAAM,CAACC,YAAY,CAAC,CAAC;IAC3D,IAAI;MACFJ,gBAAgB,GAAG,MAAMV,mBAAmB,CAAC,CAAC;IAChD,CAAC,CAAC,OAAOH,GAAQ,EAAE;MACjBc,cAAc,GAAGd,GAAG;MACpB,IAAI,CAAC3G,SAAS,CAAC2H,MAAM,CAACE,mBAAmB,CAACH,cAAc,CAAC;IAC3D;IAEA,OAAO;MACLI,UAAU,EAAE5D,iBAAiB,CAAC3B,GAAG,CAAEJ,CAAC,IAAKA,CAAC,CAAC4F,kBAAkB,CAAC;MAC9D7F,gBAAgB;MAChBkF,iBAAiB,EAAE,CAAC,GAAGtD,oBAAoB,EAAE,IAAI,EAAAV,iBAAA,GAAAoE,gBAAgB,cAAApE,iBAAA,uBAAhBA,iBAAA,CAAkBgE,iBAAiB,KAAI,EAAE,CAAC,CAAC;MAC5FI,gBAAgB;MAChBC,cAAc;MACdlB,uBAAuB;MACvBlB;IACF,CAAC;EACH;EAEA,MAAcG,qCAAqCA,CACjDL,cAAmC,EACnCG,sBAA+C,EAC/C;IACA,MAAM0C,eAAe,GAAG,IAAI,CAAChI,SAAS,CAACiI,oBAAoB,CAAC,CAAC;IAC7D,IAAI3C,sBAAsB,EAAE;MAC1B,MAAM4C,iBAAiB,GAAG,KAAIC,sCAAiB,EAAC,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,CAC7E;QACExF,EAAE,EAAEyF,8CAAwB,CAACzF,EAAE;QAC/B0F,QAAQ,EAAE/C;MACZ,CAAC,CACF,CAAC;MACFH,cAAc,CAACmD,OAAO,CAACJ,iBAAiB,CAAC;IAC3C;IACA/C,cAAc,CAACzF,OAAO,CAAE6I,WAAW,IAAK;MACtC,MAAMF,QAAQ,GAAGE,WAAW,CAACC,yBAAyB,CAAC,CAAC;MACxD,IAAI,CAACH,QAAQ,EAAE;MACfL,eAAe,CAACS,WAAW,CAACF,WAAW,CAACG,SAAS,EAAEL,QAAQ,CAAC;IAC9D,CAAC,CAAC;IACF,IAAIL,eAAe,CAACW,WAAW,CAAC,CAAC,EAAE;MACjC,MAAMX,eAAe,CAACnC,KAAK,CAAC,CAAC;IAC/B;EACF;EAEA,MAAcN,oCAAoCA,CAChDJ,cAAmC,EACwE;IAC3G,MAAMyD,UAAU,GAAGzD,cAAc,CAAC5C,GAAG,CAAEJ,CAAC,IAAKA,CAAC,CAAC0G,qBAAqB,CAAC,CAAC,CAAC;;IAEvE;IACA,MAAMC,eAAgD,GAAG,CAAC,CAAC;IAC3D,MAAMC,kBAAmD,GAAG,CAAC,CAAC,CAAC,CAAC;IAChE5D,cAAc,CAACzF,OAAO,CAAE6I,WAAW,IAAK;MAAA,IAAAS,qBAAA;MACtC,MAAMC,YAAY,IAAAD,qBAAA,GAAGT,WAAW,CAACM,qBAAqB,CAAC,CAAC,cAAAG,qBAAA,uBAAnCA,qBAAA,CAAqCC,YAAY;MACtE,IAAI,CAACA,YAAY,IAAIA,YAAY,KAAK,GAAG,EAAE;MAC3C,MAAMC,kBAAkB,GAAGD,YAAY,CAACE,MAAM,IAAI,CAAC,CAAC;MACpDC,gCAAmB,CAAC1J,OAAO,CAAE2J,QAAQ,IAAK;QACxC,IAAI,CAACH,kBAAkB,CAACG,QAAQ,CAAC,EAAE;QACnCH,kBAAkB,CAACG,QAAQ,CAAC,CAAC3J,OAAO,CAAE4J,GAAa,IAAK;UACtD,IAAIA,GAAG,CAACC,KAAK,EAAE,OAAO,CAAC;UACvB,IAAIT,eAAe,CAACQ,GAAG,CAACxE,IAAI,CAAC,EAAE;YAC7B,IAAI,CAACgE,eAAe,CAACQ,GAAG,CAACxE,IAAI,CAAC,CAAC0E,QAAQ,CAACF,GAAG,CAACpE,OAAO,CAAC,EAAE4D,eAAe,CAACQ,GAAG,CAACxE,IAAI,CAAC,CAAC5F,IAAI,CAACoK,GAAG,CAACpE,OAAO,CAAC;YACjG6D,kBAAkB,CAACO,GAAG,CAACxE,IAAI,CAAC,CAAC5F,IAAI,CAACqJ,WAAW,CAACG,SAAS,CAAC;YACxD;UACF;UACAI,eAAe,CAACQ,GAAG,CAACxE,IAAI,CAAC,GAAG,CAACwE,GAAG,CAACpE,OAAO,CAAC;UACzC6D,kBAAkB,CAACO,GAAG,CAACxE,IAAI,CAAC,GAAG,CAACyD,WAAW,CAACG,SAAS,CAAC;QACxD,CAAC,CAAC;MACJ,CAAC,CAAC;IACJ,CAAC,CAAC;;IAEF;IACA,MAAMe,YAA6C,GAAG,CAAC,CAAC;IACxD,MAAMC,mBAAoD,GAAG,CAAC,CAAC,CAAC,CAAC;IACjEvE,cAAc,CAACzF,OAAO,CAAE6I,WAAW,IAAK;MAAA,IAAAoB,sBAAA;MACtC,MAAMC,oBAAoB,IAAAD,sBAAA,GAAGpB,WAAW,CAACM,qBAAqB,CAAC,CAAC,cAAAc,sBAAA,uBAAnCA,sBAAA,CAAqCtB,QAAQ;MAC1E,IAAI,CAACuB,oBAAoB,EAAE;MAC3BR,gCAAmB,CAAC1J,OAAO,CAAE2J,QAAQ,IAAK;QACxC,IAAI,CAACO,oBAAoB,CAACP,QAAQ,CAAC,EAAE;QACrCO,oBAAoB,CAACP,QAAQ,CAAC,CAAC3J,OAAO,CAAE4J,GAAa,IAAK;UACxD,IAAIA,GAAG,CAACC,KAAK,EAAE,OAAO,CAAC;UACvB,IAAIE,YAAY,CAACH,GAAG,CAACxE,IAAI,CAAC,EAAE;YAC1B,IAAI,CAAC2E,YAAY,CAACH,GAAG,CAACxE,IAAI,CAAC,CAAC0E,QAAQ,CAACF,GAAG,CAACpE,OAAO,CAAC,EAAEuE,YAAY,CAACH,GAAG,CAACxE,IAAI,CAAC,CAAC5F,IAAI,CAACoK,GAAG,CAACpE,OAAO,CAAC;YAC3FwE,mBAAmB,CAACJ,GAAG,CAACxE,IAAI,CAAC,CAAC5F,IAAI,CAACqJ,WAAW,CAACG,SAAS,CAAC;YACzD;UACF;UACAe,YAAY,CAACH,GAAG,CAACxE,IAAI,CAAC,GAAG,CAACwE,GAAG,CAACpE,OAAO,CAAC;UACtCwE,mBAAmB,CAACJ,GAAG,CAACxE,IAAI,CAAC,GAAG,CAACyD,WAAW,CAACG,SAAS,CAAC;QACzD,CAAC,CAAC;MACJ,CAAC,CAAC;IACJ,CAAC,CAAC;IAEF,MAAMmB,qBAAqB,GAAG7L,MAAM,CAACY,IAAI,CAACkK,eAAe,CAAC;IAC1D,MAAMgB,kBAAkB,GAAG9L,MAAM,CAACY,IAAI,CAAC6K,YAAY,CAAC;IACpD,IAAI,CAACI,qBAAqB,CAACrK,MAAM,IAAI,CAACsK,kBAAkB,CAACtK,MAAM,EAAE,OAAO,CAAC,CAAC;IAE1E,MAAMuK,eAAe,GAAG,IAAI,CAACxJ,MAAM,CAACwJ,eAAe;IACnD,IAAI,CAACA,eAAe,EAAE,MAAM,IAAIC,KAAK,CAAE,qEAAoE,CAAC;IAC5G,MAAMC,WAAW,GAAGF,eAAe,CAACG,UAAU,CAACC,iBAAiB,CAAC/B,8CAAwB,CAACzF,EAAE,CAAC;IAC7F,MAAMwG,MAAM,GAAGc,WAAW,aAAXA,WAAW,uBAAXA,WAAW,CAAE1J,MAAM,CAAC4I,MAAM;IACzC,IAAI,CAACA,MAAM,EAAE;MACX,OAAO,CAAC,CAAC;IACX;;IAEA;IACA,MAAMiB,oBAAoB,GAAG,CAAC,CAAC;IAC/BP,qBAAqB,CAACnK,OAAO,CAAE2K,OAAO,IAAK;MACzC,IAAIvB,eAAe,CAACuB,OAAO,CAAC,CAAC7K,MAAM,GAAG,CAAC,EAAE;QACvC;QACA;MACF;MACA4J,gCAAmB,CAAC1J,OAAO,CAAE2J,QAAQ,IAAK;QAAA,IAAAiB,gBAAA;QACxC,IAAI,GAAAA,gBAAA,GAACnB,MAAM,CAACE,QAAQ,CAAC,cAAAiB,gBAAA,eAAhBA,gBAAA,CAAmBD,OAAO,CAAC,GAAE,OAAO,CAAC;QAC1C,MAAME,UAAU,GAAGpB,MAAM,CAACE,QAAQ,CAAC,CAACgB,OAAO,CAAC;QAC5C,MAAMG,MAAM,GAAG1B,eAAe,CAACuB,OAAO,CAAC,CAAC,CAAC,CAAC;QAC1C,IAAIE,UAAU,KAAKC,MAAM,EAAE;QAC3BJ,oBAAoB,CAACC,OAAO,CAAC,GAAG,CAACE,UAAU,EAAEC,MAAM,CAAC;QACpDrB,MAAM,CAACE,QAAQ,CAAC,CAACgB,OAAO,CAAC,GAAGG,MAAM;QAClC,IAAI,CAACpK,MAAM,CAACqK,KAAK,CACd,2BAA0BJ,OAAQ,SAAQE,UAAW,OAAMC,MAAO,mBAAkBzB,kBAAkB,CACrGsB,OAAO,CACR,CAACvH,IAAI,CAAC,IAAI,CAAE,EACf,CAAC;MACH,CAAC,CAAC;IACJ,CAAC,CAAC;;IAEF;IACA,MAAM4H,cAAc,GAAG,CAAC,cAAc,EAAE,kBAAkB,CAAC;IAC3D,MAAMC,sBAAsB,GAAG;MAAEC,YAAY,EAAE,EAAE;MAAEC,gBAAgB,EAAE;IAAG,CAAC;IACzE,MAAMC,uCAAiD,GAAG,EAAE;IAC5DhB,kBAAkB,CAACpK,OAAO,CAAE2K,OAAO,IAAK;MACtC,IAAIZ,YAAY,CAACY,OAAO,CAAC,CAAC7K,MAAM,GAAG,CAAC,EAAE;QACpC;QACA;MACF;MACA,MAAMuL,WAAW,GAAGtB,YAAY,CAACY,OAAO,CAAC,CAAC,CAAC,CAAC;MAC5C,MAAM,GAAGW,UAAU,EAAEC,QAAQ,CAAC,GAAGF,WAAW,CAACG,KAAK,CAAC,IAAI,CAAC;MAExDR,cAAc,CAAChL,OAAO,CAAE2J,QAAQ,IAAK;QAAA,IAAA8B,iBAAA;QACnC,IAAI,GAAAA,iBAAA,GAAChC,MAAM,CAACE,QAAQ,CAAC,cAAA8B,iBAAA,eAAhBA,iBAAA,CAAmBd,OAAO,CAAC,GAAE;QAClC,MAAMe,kBAAkB,GAAGjC,MAAM,CAACE,QAAQ,CAAC,CAACgB,OAAO,CAAC;QACpD,IAAI,CAACe,kBAAkB,EAAE;QACzB;QACAN,uCAAuC,CAAC5L,IAAI,CAACmL,OAAO,CAAC;QACrD,IAAIgB,iBAAM,CAACC,SAAS,CAACL,QAAQ,EAAEG,kBAAkB,CAAC,EAAE;UAClD;UACA;QACF;QACAT,sBAAsB,CAACtB,QAAQ,CAAC,CAACnK,IAAI,CAAC;UACpC4F,IAAI,EAAEuF,OAAO;UACbnF,OAAO,EAAE6F,WAAW,CAACQ,OAAO,CAACP,UAAU,EAAEI,kBAAkB,CAAC;UAC5D7B,KAAK,EAAE;QACT,CAAC,CAAC;QACFuB,uCAAuC,CAAC5L,IAAI,CAACmL,OAAO,CAAC;QACrD,IAAI,CAACjK,MAAM,CAACqK,KAAK,CACd,6BAA4BJ,OAAQ,aAAYe,kBAAmB,YAAWH,QAAS,mBAAkBvB,mBAAmB,CAC3HW,OAAO,CACR,CAACvH,IAAI,CAAC,IAAI,CAAE,EACf,CAAC;MACH,CAAC,CAAC;IACJ,CAAC,CAAC;IACF4H,cAAc,CAAChL,OAAO,CAAE2J,QAAQ,IAAK;MACnC,IAAI,IAAAmC,iBAAO,EAACb,sBAAsB,CAACtB,QAAQ,CAAC,CAAC,EAAE,OAAOsB,sBAAsB,CAACtB,QAAQ,CAAC;IACxF,CAAC,CAAC;IAEF,IAAIyB,uCAAuC,CAACtL,MAAM,EAAE;MAClDoJ,UAAU,CAAClJ,OAAO,CAAE+L,MAAM,IAAK;QAC7B,IAAIA,MAAM,aAANA,MAAM,eAANA,MAAM,CAAEpD,QAAQ,EAAE;UACpBe,gCAAmB,CAAC1J,OAAO,CAAE2J,QAAQ,IAAK;YAAA,IAAAqC,gBAAA,EAAAC,iBAAA;YACxC,IAAI,GAAAD,gBAAA,GAACD,MAAM,CAACpD,QAAQ,cAAAqD,gBAAA,eAAfA,gBAAA,CAAkBrC,QAAQ,CAAC,GAAE;YAClCoC,MAAM,CAACpD,QAAQ,CAACgB,QAAQ,CAAC,IAAAsC,iBAAA,GAAGF,MAAM,CAACpD,QAAQ,cAAAsD,iBAAA,uBAAfA,iBAAA,CAAkBtC,QAAQ,CAAC,CAACtK,MAAM,CAC3D6M,GAAG,IAAK,CAACd,uCAAuC,CAACtB,QAAQ,CAACoC,GAAG,CAAC9G,IAAI,CACrE,CAAC;YACD,IAAI,CAAC2G,MAAM,CAACpD,QAAQ,CAACgB,QAAQ,CAAC,CAAC7J,MAAM,EAAE,OAAOiM,MAAM,CAACpD,QAAQ,CAACgB,QAAQ,CAAC;UACzE,CAAC,CAAC;UACF,IAAI,IAAAmC,iBAAO,EAACC,MAAM,CAACpD,QAAQ,CAAC,EAAEoD,MAAM,CAACpD,QAAQ,GAAGrE,SAAS;QAC3D;MACF,CAAC,CAAC;IACJ;IAEA,IAAIhG,MAAM,CAACY,IAAI,CAACwL,oBAAoB,CAAC,CAAC5K,MAAM,EAAE;MAC5C,MAAMuK,eAAe,CAAClE,KAAK,CAAC,CAAC;IAC/B;IAEA,IAAI,CAACzF,MAAM,CAACqK,KAAK,CAAC,+BAA+B,EAAEL,oBAAoB,CAAC;IACxE,IAAI,CAAChK,MAAM,CAACqK,KAAK,CAAC,iCAAiC,EAAEE,sBAAsB,CAAC;IAE5E,OAAO;MACLtF,oBAAoB,EAAErH,MAAM,CAACY,IAAI,CAACwL,oBAAoB,CAAC,CAAC5K,MAAM,GAAG4K,oBAAoB,GAAGpG,SAAS;MACjGsB,sBAAsB,EAAEtH,MAAM,CAACY,IAAI,CAAC+L,sBAAsB,CAAC,CAACnL,MAAM,GAAGmL,sBAAsB,GAAG3G;IAChG,CAAC;EACH;;EAEA;AACF;AACA;AACA;AACA;AACA;EACE,MAAM6H,cAAcA,CAClBtK,MAAe;EAAE;EACjBuK,WAAwB;EAAE;EAC1BC,SAAuB;EAAE;EACzBC,OAA6E,EAC5C;IACjC,MAAMC,mBAAmB,GAAG,KAAIC,0CAAmB,EACjD,IAAI,CAAClM,SAAS,EACd,IAAI,CAACI,MAAM,EACX,IAAI,CAACE,QAAQ,EACbwL,WAAW,IAAI9H,SAAS,EACxB+H,SAAS,IAAI/H,SAAS,EACtBgI,OACF,CAAC;IACD,OAAOC,mBAAmB,CAACE,SAAS,CAAC5K,MAAM,CAAC;EAC9C;EAEA,MAAcwD,YAAYA,CAAC;IACzBX,gBAAgB;IAChBzB,EAAE;IACFvB,YAAY;IACZT,aAAa;IACbqE,UAAU;IACV/B,MAAM;IACNC,SAAS;IACTmB,iBAAiB;IACjBC;EAWF,CAAC,EAAkC;IACjC,MAAMnD,QAAQ,GAAG,IAAI,CAACnB,SAAS,CAACmB,QAAQ;IACxC,IAAIiL,WAAW,GAAG,CAAC,CAAC;IACpB,MAAMC,iBAAoC,GAAG;MAC3C;MACA1J,EAAE,EAAE;QAAEmC,IAAI,EAAEnC,EAAE,CAACmC,IAAI;QAAEN,KAAK,EAAE7B,EAAE,CAAC6B;MAAM,CAAC;MACtC8H,IAAI,EAAEtH,UAAU;MAChB/B;IACF,CAAC;IACDN,EAAE,GAAGyB,gBAAgB,GAAGA,gBAAgB,CAACzB,EAAE,GAAGA,EAAE;IAEhD,MAAM4B,cAAc,GAAG,MAAMpD,QAAQ,CAACqD,KAAK,CAACC,iBAAiB,CAAC9B,EAAE,CAAC;IACjE,MAAM4J,sBAAsB,GAAGA,CAAA,KAAM;MACnC,IAAI,CAACnI,gBAAgB,EAAE,MAAM,IAAI4F,KAAK,CAAC,yDAAyD,CAAC;MACjG;MACA;MACA,IAAI,CAAC9G,SAAS,EAAE,MAAM,IAAI8G,KAAK,CAAC,kDAAkD,CAAC;MACnF,IAAI,CAAC3F,iBAAiB,EAAE,MAAM,IAAI2F,KAAK,CAAC,qCAAqC,CAAC;MAC9E9G,SAAS,CAACsJ,YAAY,CAAC;QAAE7J,EAAE;QAAE2J,IAAI,EAAEjI,iBAAiB,CAACoI;MAAkB,CAAC,CAAC;MACzEJ,iBAAiB,CAACK,SAAS,GAAG;QAC5BC,aAAa,EAAEtI,iBAAiB,CAACsI,aAAa;QAC9CF,iBAAiB,EAAEpI,iBAAiB,CAACoI,iBAAiB;QACtDG,eAAe,EAAEvI,iBAAiB,CAACuI;MACrC,CAAC;MACDzL,QAAQ,CAACqD,KAAK,CAACiB,OAAO,CAACG,kBAAkB,CAACiH,QAAQ,CAACR,iBAAiB,CAAC;MACrE,OAAO;QAAEtE,kBAAkB,EAAE;UAAEpF,EAAE;UAAEyJ;QAAY,CAAC;QAAE7I,SAAS,EAAEa;MAAiB,CAAC;IACjF,CAAC;IAED,MAAM0I,uBAAuB,GAAGA,CAAA,KAAM;MACpC,IAAI,CAAC1I,gBAAgB,EAAE,MAAM,IAAI4F,KAAK,CAAE,mDAAkDrH,EAAE,CAACC,QAAQ,CAAC,CAAE,EAAC,CAAC;MAC1GwB,gBAAgB,CAAC2I,KAAK,CAACrN,OAAO,CAAEsN,IAAI,IAAK;QACvCZ,WAAW,CAAC,IAAAa,6BAAoB,EAACD,IAAI,CAACE,QAAQ,CAAC,CAAC,GAAGC,0BAAU,CAACC,SAAS;MACzE,CAAC,CAAC;IACJ,CAAC;IACD,IAAIhM,YAAY,IAAIA,YAAY,CAACoC,YAAY,IAAI7C,aAAa,KAAK0M,4BAAY,CAACC,IAAI,EAAE;MACpFR,uBAAuB,CAAC,CAAC;MACzB3L,QAAQ,CAACqD,KAAK,CAACiB,OAAO,CAACG,kBAAkB,CAACiH,QAAQ,CAACR,iBAAiB,CAAC;MACrE,OAAO;QAAEtE,kBAAkB,EAAE;UAAEpF,EAAE;UAAEyJ;QAAY,CAAC;QAAE7I,SAAS,EAAEa,gBAAgB,IAAIJ;MAAU,CAAC;IAC9F;IACA,IAAI,CAAAK,iBAAiB,aAAjBA,iBAAiB,uBAAjBA,iBAAiB,CAAEkJ,QAAQ,MAAK,MAAM,EAAE;MAC1CT,uBAAuB,CAAC,CAAC;MACzB,OAAOP,sBAAsB,CAAC,CAAC;IACjC;IACA,MAAMiB,QAAQ,GAAG7K,EAAE,CAACoB,aAAa,CAACiB,UAAU,CAACpC,QAAQ,CAAC,CAAC,CAAC;IACxD,MAAM6K,QAAQ,GAAG,CAACrM,YAAY,IAAIT,aAAa,KAAK0M,4BAAY,CAACK,MAAM,GAAGF,QAAQ,GAAG7K,EAAE;IACvF,MAAMgL,eAAe,GAAG,MAAMxM,QAAQ,CAACyM,oCAAoC,CAACH,QAAQ,CAAC;IACrF,IAAIrM,YAAY,IAAIT,aAAa,KAAK0M,4BAAY,CAACK,MAAM,EAAE;MACzD;MACAC,eAAe,CAACzI,OAAO,GAAGvC,EAAE,CAACuC,OAAO;IACtC;IACA,MAAM6H,KAAK,GAAGY,eAAe,CAACZ,KAAK;IACnCA,KAAK,CAACrN,OAAO,CAAEsN,IAAI,IAAK;MACtB;MACAZ,WAAW,CAAC,IAAAa,6BAAoB,EAACD,IAAI,CAACE,QAAQ,CAAC,CAAC,GAAGC,0BAAU,CAACU,OAAO;IACvE,CAAC,CAAC;IAEF,IAAIzM,YAAY,EAAE;MAChB;MACA,MAAM;QAAEgL,WAAW,EAAE0B,cAAc;QAAEC;MAAc,CAAC,GAAG,IAAAC,gCAAoB,EAACjB,KAAK,EAAE3L,YAAY,EAAET,aAAa,CAAC;MAC/GgN,eAAe,CAACZ,KAAK,GAAGgB,aAAa;MACrC3B,WAAW,GAAAhN,aAAA,CAAAA,aAAA,KAAQgN,WAAW,GAAK0B,cAAc,CAAE;IACrD;IAEA,MAAM,IAAAG,+BAAmB,EAAC7B,WAAW,EAAEhI,gBAAgB,IAAIJ,SAAS,CAAC;IAErE,MAAMkK,wBAAwB,GAAG;MAC/B/M,QAAQ;MACR2G,UAAU,EAAE,CAAC6F,eAAe,CAAC;MAC7B1M,0BAA0B,EAAE,IAAI;MAChCkN,WAAW,EAAE,KAAK,CAAE;IACtB,CAAC;;IACD,MAAM,IAAI,CAAC9N,eAAe,CAAC+N,SAAS,CAACF,wBAAwB,CAAC;IAE9D,IAAI5J,iBAAiB,EAAE;MACrB,IAAI,CAACqJ,eAAe,CAACU,WAAW,EAAE;QAChC,MAAM,IAAIrE,KAAK,CAAE,wCAAuCrH,EAAE,CAACC,QAAQ,CAAC,CAAE,EAAC,CAAC;MAC1E;MACA,MAAM0L,wBAAwB,GAAGhK,iBAAiB,CAACiK,2BAA2B,CAAC,CAAC;MAChF,IAAID,wBAAwB,EAAE;QAC5BjC,iBAAiB,CAACpD,YAAY,GAAGqF,wBAAwB;QACzD;QACA;MACF;IACF;;IAEA;IACA;IACA,IAAIlN,YAAY,EAAE;MAChB,IAAIA,YAAY,CAACoC,YAAY,IAAI7C,aAAa,KAAK0M,4BAAY,CAACmB,MAAM,EAAE;QACtEnC,iBAAiB,CAACoC,aAAa,GAAGrN,YAAY,CAAC2M,aAAa,CAAChP,MAAM,CAAE2P,CAAC,IAAKA,CAAC,CAACrG,QAAQ,CAAC,CAAC9F,GAAG,CAAEmM,CAAC,IAAKA,CAAC,CAACC,QAAQ,CAAC;MAC/G;MACAxN,QAAQ,CAACqD,KAAK,CAACiB,OAAO,CAACG,kBAAkB,CAACiH,QAAQ,CAACR,iBAAiB,CAAC;IACvE,CAAC,MAAM,IAAInJ,SAAS,EAAE;MACpB,IAAImB,iBAAiB,EAAE;QACrB;QACA,OAAOkI,sBAAsB,CAAC,CAAC;MACjC;MACArJ,SAAS,CAACsJ,YAAY,CAAC;QAAE7J,EAAE;QAAE2J,IAAI,EAAEtH;MAAW,CAAC,CAAC;IAClD,CAAC,MAAM;MACL;MACAT,cAAc,CAACqK,OAAO,CAAC5J,UAAU,CAAC;MAClC;MACAT,cAAc,CAACsK,kBAAkB,CAAC7J,UAAU,CAACpC,QAAQ,CAAC,CAAC,CAAC;MACxDzB,QAAQ,CAACqD,KAAK,CAACiB,OAAO,CAACC,GAAG,CAACnB,cAAc,CAAC;IAC5C;IAEA,OAAO;MAAEwD,kBAAkB,EAAE;QAAEpF,EAAE;QAAEyJ;MAAY,CAAC;MAAE7I,SAAS,EAAEa,gBAAgB,IAAIJ;IAAU,CAAC;EAC9F;EAEA,MAAc1C,UAAUA,CAACwN,MAAgB,EAAgC;IACvE,MAAM3N,QAAQ,GAAG,IAAI,CAACnB,SAAS,CAACmB,QAAQ;IACxC,MAAMT,GAAG,GAAG,MAAM,IAAI,CAACqO,iBAAiB,CAACD,MAAM,CAAC;IAChD,MAAM9H,OAAO,GAAG,MAAM,IAAI,CAAC7G,QAAQ,CAACA,QAAQ,CAAC;MAAEO,GAAG;MAAEsO,KAAK,EAAE;IAAK,CAAC,CAAC;IAClEtO,GAAG,CAAChB,OAAO,CAAEiD,EAAE,IAAKxB,QAAQ,CAACqD,KAAK,CAACiB,OAAO,CAACG,kBAAkB,CAACqJ,eAAe,CAACtM,EAAE,CAACuM,QAAQ,CAAC,CAAC;IAC3F,MAAM/N,QAAQ,CAACqD,KAAK,CAACiB,OAAO,CAACG,kBAAkB,CAACC,KAAK,CAAC,CAAC;IACvD,OAAO;MAAEsJ,iBAAiB,EAAEnI,OAAO,CAACc;IAAW,CAAC;EAClD;EAEA,MAAczG,YAAYA,CAACyN,MAAgB,EAAEnN,WAAmB,EAAEX,KAAc,EAAgC;IAC9G,MAAMN,GAAG,GAAG,MAAM,IAAI,CAACqO,iBAAiB,CAACD,MAAM,CAAC;IAChD;IACA,MAAM;MAAEzH;IAAkB,CAAC,GAAG,MAAM,IAAI,CAACnH,QAAQ,CAACkP,IAAI,CAAC;MACrDC,YAAY,EAAErJ,eAAM,CAACC,SAAS,CAACvF,GAAG,CAAC6B,GAAG,CAAEI,EAAE,IAAKA,EAAE,CAAC2M,OAAO,CAAC,CAAC;MAC3DtO,KAAK;MACLD,OAAO,EAAEY;IACX,CAAC,CAAC;IACF,OAAO;MAAE4N,kBAAkB,EAAElI;IAAkB,CAAC;EAClD;EAEA,MAAcpF,sBAAsBA,CAClCV,MAAe,EACf0B,MAAc,EACduM,eAA4B,EACK;IACjC,MAAM9O,GAAG,GAAG,MAAM+O,OAAO,CAACC,GAAG,CAC3BnO,MAAM,CAACgB,GAAG,CAAC,MAAOoN,KAAK,IAAK;MAC1B,MAAMC,eAAe,GAAG3M,MAAM,CAAC0B,SAAS,CAAC,CAAC,GAAGgL,KAAK,CAACnL,KAAK,GAAGvB,MAAM,CAACuB,KAAK;MACvE,MAAMqL,YAAY,GAAGjL,gBAAM,CAACC,IAAI,CAAC5B,MAAM,CAAC6B,IAAI,EAAE8K,eAAyB,CAAC;MACxE,MAAM5K,UAAU,GAAG,MAAM,IAAI,CAAChF,SAAS,CAACmB,QAAQ,CAACqD,KAAK,CAACiB,OAAO,CAACqK,WAAW,CAAC7K,MAAM,CAAC4K,YAAY,EAAEF,KAAK,CAAC;MACtG,MAAMI,SAAS,GAAGF,YAAY,CAACjN,QAAQ,CAAC,CAAC;MACzC,IAAI,CAACoC,UAAU,EAAE;QACf,MAAM,KAAIjC,oBAAQ,EAAE,oCAAmC4M,KAAK,CAACK,sBAAsB,CAAC,CAAE,SAAQD,SAAU,GAAE,CAAC;MAC7G;MACA,OAAOJ,KAAK,CAAC5L,aAAa,CAACiB,UAAU,CAACpC,QAAQ,CAAC,CAAC,CAAC;IACnD,CAAC,CACH,CAAC;IAED,OAAO,IAAI,CAACiJ,cAAc,CAACnL,GAAG,EAAE8O,eAAe,EAAEA,eAAe,CAAC;EACnE;EAEA,MAAcjI,sBAAsBA,CAClCpG,QAAkB,EAClBQ,WAAmB,EACnBX,KAAc,EACe;IAC7B,MAAM4E,kBAAkB,GAAGzE,QAAQ,CAACqD,KAAK,CAACiB,OAAO,CAACG,kBAAkB,CAACqK,aAAa,CAAC,CAAC;IACpF,IAAI,CAAC7P,MAAM,CAACqK,KAAK,CAAE,8CAA6C7E,kBAAkB,CAACpG,MAAM,CAACoD,QAAQ,CAAC,CAAE,aAAY,CAAC;IAClH,IAAI,CAACgD,kBAAkB,CAACpG,MAAM,EAAE,OAAO,IAAI;IAC3C,MAAMkB,GAAG,GAAGsF,eAAM,CAACC,SAAS,CAACL,kBAAkB,CAACrD,GAAG,CAAE2N,CAAC,IAAK,KAAIC,cAAK,EAACD,CAAC,CAACvN,EAAE,CAAC,CAAC,CAAC;IAC5E,OAAO,IAAI,CAACzC,QAAQ,CAACkP,IAAI,CAAC;MACxBC,YAAY,EAAE3O,GAAG;MACjBM,KAAK;MACLD,OAAO,EAAEY;IACX,CAAC,CAAC;EACJ;EAEA,MAAcsF,mBAAmBA,CAACF,QAAiB,EAAEqJ,UAAkB,EAAEpP,KAAc,EAA8B;IACnH,MAAMN,GAAG,GAAGqG,QAAQ,CAACxE,GAAG,CAAEI,EAAE,IAAK;MAC/B,OAAOA,EAAE,CAACqN,sBAAsB,CAAC,CAAC;IACpC,CAAC,CAAC;IACF,IAAI,CAAC5P,MAAM,CAACqK,KAAK,CAAE,6CAA4C1D,QAAQ,CAACvH,MAAM,CAACoD,QAAQ,CAAC,CAAE,aAAY,CAAC;IACvG,OAAO,IAAI,CAAC1C,QAAQ,CAACiD,GAAG,CAAC;MACvBzC,GAAG;MACHM,KAAK;MACLD,OAAO,EAAEqP,UAAU;MACnBC,UAAU,EAAE;IACd,CAAC,CAAC;EACJ;EAEA,MAActB,iBAAiBA,CAACuB,MAAiB,EAA0B;IACzE,IAAIA,MAAM,IAAIA,MAAM,CAAC9Q,MAAM,EAAE;MAC3B,MAAM+Q,YAAY,GAAG,MAAM,IAAI,CAACvQ,SAAS,CAACwQ,2BAA2B,CAACF,MAAM,CAAC;MAC7EC,YAAY,CAAC7Q,OAAO,CAAEiD,EAAE,IAAK;QAC3B,MAAM8N,KAAK,GAAG,IAAI,CAACzQ,SAAS,CAACmB,QAAQ,CAACqD,KAAK,CAACiB,OAAO,CAACG,kBAAkB,CAAC8K,QAAQ,CAAC/N,EAAE,CAACuM,QAAQ,CAAC;QAC5F,IAAI,CAACuB,KAAK,EAAE;UACV,MAAM,KAAIE,uBAAY,EAAE,2BAA0BhO,EAAE,CAACC,QAAQ,CAAC,CAAE,kCAAiC,CAAC;QACpG;MACF,CAAC,CAAC;MACF,OAAO2N,YAAY;IACrB;IACA,MAAMK,oBAAoB,GAAG,IAAI,CAAC5Q,SAAS,CAACmB,QAAQ,CAACqD,KAAK,CAACiB,OAAO,CAACG,kBAAkB,CAACqK,aAAa,CAAC,CAAC;IACrG,IAAI,CAACW,oBAAoB,CAACpR,MAAM,EAAE,MAAM,KAAImR,uBAAY,EAAE,oDAAmD,CAAC;IAC9G,OAAOC,oBAAoB,CAACrO,GAAG,CAAEsO,CAAC,IAAKC,0BAAW,CAACC,UAAU,CAAC,KAAIZ,cAAK,EAACU,CAAC,CAAClO,EAAE,CAAC,CAAC,CAAC;EACjF;EAEA,MAAcnB,oBAAoBA,CAACL,QAAkB,EAAET,GAAa,EAAoB;IACtF,MAAMsQ,cAAc,GAAG,KAAIC,yBAAc,EAAC9P,QAAQ,CAAC;IACnD,IAAI,CAACT,GAAG,CAAClB,MAAM,EAAE;MACf,MAAM0R,YAAY,GAAG,MAAMF,cAAc,CAACG,0BAA0B,CAAC,CAAC;MACtE,OAAOD,YAAY,CAAC3O,GAAG,CAAEJ,CAAC,IAAKA,CAAC,CAACQ,EAAE,CAAC;IACtC;IACA,IAAI,IAAAyO,sBAAW,EAAC1Q,GAAG,CAAC,EAAE;MACpB,OAAOsQ,cAAc,CAACK,+BAA+B,CAAC3Q,GAAG,CAAC;IAC5D;IACA,OAAOA,GAAG,CAAC6B,GAAG,CAAEI,EAAE,IAAKxB,QAAQ,CAACmQ,WAAW,CAAC3O,EAAE,CAAC,CAAC;EAClD;EAgBA,aAAa4O,QAAQA,CAAC,CACpBC,GAAG,EACHxR,SAAS,EACTE,QAAQ,EACRC,QAAQ,EACRF,OAAO,EACPwR,UAAU,EACVC,UAAU,EACVpR,QAAQ,EACRC,MAAM,EACNC,MAAM,CAYP,EAAE;IACD,MAAMJ,MAAM,GAAGqR,UAAU,CAACE,YAAY,CAACC,wBAAa,CAACjP,EAAE,CAAC;IACxD,MAAMkP,OAAO,GAAG,IAAI/R,WAAW,CAC7BE,SAAS,EACTC,OAAO,EACPC,QAAQ,EACRC,QAAQ,EACRC,MAAM,EACNsR,UAAU,EACVpR,QAAQ,EACRC,MAAM,EACNC,MACF,CAAC;IACDgR,GAAG,CAACM,QAAQ,CAAC,KAAIC,oBAAQ,EAACF,OAAO,CAAC,CAAC;IACnC,OAAOA,OAAO;EAChB;AACF;AAACG,OAAA,CAAAlS,WAAA,GAAAA,WAAA;AAAA,IAAAH,gBAAA,GAAAjC,OAAA,EA3rBYoC,WAAW,WAuoBP,EAAE;AAAA,IAAAH,gBAAA,GAAAjC,OAAA,EAvoBNoC,WAAW,kBAwoBA,CACpBmS,gBAAS,EACTC,oBAAe,EACfC,mBAAc,EACdC,0BAAc,EACdC,wBAAa,EACbC,sBAAY,EACZC,wCAAqB,EACrBC,mBAAc,EACdC,sBAAY,EACZC,iBAAY,CACb;AAAA,IAAA/S,gBAAA,GAAAjC,OAAA,EAnpBUoC,WAAW,aAopBL6S,kBAAW;AAyC9Bf,wBAAa,CAACgB,UAAU,CAAC9S,WAAW,CAAC"}
+{"version":3,"names":["_cli","data","require","_semver","_interopRequireDefault","_workspace","_interopRequireWildcard","_componentsList","_mergeVersion","_snapping","_hasWildcard","_pMapSeries","_bitId","_bitError","_generalError","_laneId","_chalk","_config","_remove","_utils","_componentWriter","_importer","_logger","_lodash","_dependencyResolver","_checkout","_componentId","_constants","_deleteComponentFiles","_install","_mergeCmd","_merging","_configMergeResult","_mergeStatusProvider","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","obj","__esModule","default","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","ownKeys","object","enumerableOnly","keys","getOwnPropertySymbols","symbols","filter","sym","enumerable","push","apply","_objectSpread","target","i","arguments","length","source","forEach","_defineProperty2","getOwnPropertyDescriptors","defineProperties","MergingMain","constructor","workspace","install","snapping","checkout","logger","componentWriter","importer","config","remove","merge","ids","mergeStrategy","abort","resolve","noSnap","message","build","skipDependencyInstallation","OutsideWorkspaceError","consumer","mergeResults","resolveMerge","abortMerge","bitIds","getComponentsToMerge","mergeComponentsFromRemote","onDestroy","snapMessage","currentLaneId","getCurrentLaneId","currentLaneObject","getCurrentLaneObject","allComponentsStatus","getAllComponentsStatus","failedComponents","c","unmergedMessage","unmergedLegitimately","failureMsgs","map","failedComponent","chalk","bold","id","toString","red","join","BitError","mergeSnaps","laneId","localLane","tag","_mergeSnapResults","componentWithConflict","find","component","hasConflicts","getMergeStrategyInteractive","componentStatus","shouldBeRemoved","failureMessage","unchangedLegitimately","componentIdsToRemove","changeVersion","undefined","succeededComponents","componentsResults","mapSeries","currentComponent","resolvedUnrelated","configMergeResult","modelComponent","scope","getModelComponent","updatedLaneId","isDefault","LaneId","from","name","applyVersion","remoteHead","getRef","version","allConfigMerge","compact","workspaceDepsUpdates","workspaceDepsConflicts","updateWorkspaceJsoncWithDepsIfNeeded","generateConfigMergeConflictFileForAll","objects","add","persist","unmergedComponents","write","writeBitMap","compBitIdsToRemove","BitIds","fromArray","deleteComponentsFiles","cleanFromBitMap","componentsHasConfigMergeConflicts","some","_c$configMergeResult","leftUnresolvedConflicts","dedupe","updateExisting","import","err","error","consoleError","getSnapOrTagResults","idsToTag","results","tagAllLaneComponent","taggedComponents","autoTaggedResults","removedComponents","snappedComponents","autoSnappedResults","snapResolvedComponents","mergeSnapResults","mergeSnapError","bitMapSnapshot","bitMap","takeSnapshot","restoreFromSnapshot","components","applyVersionResult","configMergeFile","getConflictMergeFile","workspaceConflict","ConfigMergeResult","DependencyResolverAspect","conflict","unshift","configMerge","generateMergeConflictFile","addConflict","compIdStr","hasConflict","allResults","getDepsResolverResult","nonConflictDeps","nonConflictSources","_configMerge$getDepsR","mergedConfig","mergedConfigPolicy","policy","DEPENDENCIES_FIELDS","depField","pkg","force","includes","conflictDeps","conflictDepsSources","_configMerge$getDepsR2","mergedConfigConflict","notConflictedPackages","conflictedPackages","workspaceConfig","Error","depResolver","extensions","findCoreExtension","workspaceJsonUpdates","pkgName","_policy$depField","currentVer","newVer","debug","WS_DEPS_FIELDS","workspaceJsonConflicts","dependencies","peerDependencies","conflictPackagesToRemoveFromConfigMerge","conflictRaw","currentVal","otherVal","split","_policy$depField2","currentVerInWsJson","semver","satisfies","replace","isEmpty","result","_result$conflict","_result$conflict2","dep","getMergeStatus","currentLane","otherLane","options","mergeStatusProvider","MergeStatusProvider","getStatus","filesStatus","unmergedComponent","head","handleResolveUnrelated","addComponent","headOnCurrentLane","unrelated","unrelatedHead","unrelatedLaneId","addEntry","markAllFilesAsUnchanged","files","file","pathNormalizeToLinux","relative","FileStatus","unchanged","MergeOptions","ours","strategy","remoteId","idToLoad","theirs","legacyComponent","loadComponentFromModelImportIfNeeded","updateFileStatus","modifiedStatus","modifiedFiles","applyModifiedVersion","removeFilesIfNeeded","manyComponentsWriterOpts","writeConfig","writeMany","writtenPath","successfullyMergedConfig","getSuccessfullyMergedConfig","manual","unmergedPaths","f","filePath","setHead","markVersionAsLocal","values","getIdsForUnmerged","reset","removeComponent","fullName","abortedComponents","snap","legacyBitIds","_legacy","resolvedComponents","localLaneObject","Promise","all","bitId","remoteScopeName","remoteLaneId","remoteLanes","laneIdStr","toStringWithoutVersion","getComponents","r","BitId","tagMessage","unmodified","idsStr","componentIds","resolveMultipleComponentIds","entry","getEntry","GeneralError","unresolvedComponents","u","ComponentID","fromLegacy","componentsList","ComponentsList","mergePending","listMergePendingComponents","hasWildcard","listComponentsByIdsWithWildcard","getParsedId","provider","cli","loggerMain","compWriter","createLogger","MergingAspect","merging","register","MergeCmd","exports","CLIAspect","WorkspaceAspect","SnappingAspect","CheckoutAspect","InstallAspect","LoggerAspect","ComponentWriterAspect","ImporterAspect","ConfigAspect","RemoveAspect","MainRuntime","addRuntime"],"sources":["merging.main.runtime.ts"],"sourcesContent":["import { CLIAspect, CLIMain, MainRuntime } from '@teambit/cli';\nimport semver from 'semver';\nimport WorkspaceAspect, { OutsideWorkspaceError, Workspace } from '@teambit/workspace';\nimport { Consumer } from '@teambit/legacy/dist/consumer';\nimport ComponentsList from '@teambit/legacy/dist/consumer/component/components-list';\nimport {\n  MergeStrategy,\n  FailedComponents,\n  FileStatus,\n  ApplyVersionResult,\n  getMergeStrategyInteractive,\n  MergeOptions,\n} from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport SnappingAspect, { SnapResults, SnappingMain, TagResults } from '@teambit/snapping';\nimport hasWildcard from '@teambit/legacy/dist/utils/string/has-wildcard';\nimport mapSeries from 'p-map-series';\nimport { BitId, BitIds } from '@teambit/legacy/dist/bit-id';\nimport { BitError } from '@teambit/bit-error';\nimport GeneralError from '@teambit/legacy/dist/error/general-error';\nimport { LaneId } from '@teambit/lane-id';\nimport { AutoTagResult } from '@teambit/legacy/dist/scope/component-ops/auto-tag';\nimport { UnmergedComponent } from '@teambit/legacy/dist/scope/lanes/unmerged-components';\nimport { Lane, ModelComponent } from '@teambit/legacy/dist/scope/models';\nimport { Ref } from '@teambit/legacy/dist/scope/objects';\nimport chalk from 'chalk';\nimport { ConfigAspect, ConfigMain } from '@teambit/config';\nimport RemoveAspect, { RemoveMain } from '@teambit/remove';\nimport { pathNormalizeToLinux } from '@teambit/legacy/dist/utils';\nimport { ComponentWriterAspect, ComponentWriterMain } from '@teambit/component-writer';\nimport ConsumerComponent from '@teambit/legacy/dist/consumer/component/consumer-component';\nimport ImporterAspect, { ImporterMain } from '@teambit/importer';\nimport { Logger, LoggerAspect, LoggerMain } from '@teambit/logger';\nimport { compact, isEmpty } from 'lodash';\nimport { MergeResultsThreeWay } from '@teambit/legacy/dist/consumer/versions-ops/merge-version/three-way-merge';\nimport { DependencyResolverAspect, WorkspacePolicyConfigKeysNames } from '@teambit/dependency-resolver';\nimport {\n  ApplyVersionWithComps,\n  CheckoutAspect,\n  CheckoutMain,\n  ComponentStatusBase,\n  applyModifiedVersion,\n  removeFilesIfNeeded,\n  updateFileStatus,\n} from '@teambit/checkout';\nimport { ComponentID } from '@teambit/component-id';\nimport { DEPENDENCIES_FIELDS } from '@teambit/legacy/dist/constants';\nimport deleteComponentsFiles from '@teambit/legacy/dist/consumer/component-ops/delete-component-files';\nimport { SnapsDistance } from '@teambit/legacy/dist/scope/component-ops/snaps-distance';\nimport { InstallMain, InstallAspect } from '@teambit/install';\nimport { MergeCmd } from './merge-cmd';\nimport { MergingAspect } from './merging.aspect';\nimport { ConfigMergeResult } from './config-merge-result';\nimport { MergeStatusProvider } from './merge-status-provider';\n\ntype ResolveUnrelatedData = {\n  strategy: MergeStrategy;\n  headOnCurrentLane: Ref;\n  unrelatedHead: Ref;\n  unrelatedLaneId: LaneId;\n};\ntype PkgEntry = { name: string; version: string; force: boolean };\n\nexport type WorkspaceDepsUpdates = { [pkgName: string]: [string, string] }; // from => to\nexport type WorkspaceDepsConflicts = Record<WorkspacePolicyConfigKeysNames, Array<{ name: string; version: string }>>; // the pkg value is in a format of CONFLICT::OURS::THEIRS\n\nexport type ComponentMergeStatus = ComponentStatusBase & {\n  unmergedMessage?: string;\n  unmergedLegitimately?: boolean; // failed to merge but for a legitimate reason, such as, up-to-date\n  mergeResults?: MergeResultsThreeWay | null;\n  divergeData?: SnapsDistance;\n  resolvedUnrelated?: ResolveUnrelatedData;\n  configMergeResult?: ConfigMergeResult;\n};\n\nexport type ComponentMergeStatusBeforeMergeAttempt = ComponentStatusBase & {\n  unmergedMessage?: string;\n  unmergedLegitimately?: boolean; // failed to merge but for a legitimate reason, such as, up-to-date\n  divergeData?: SnapsDistance;\n  resolvedUnrelated?: ResolveUnrelatedData;\n  mergeProps?: {\n    otherLaneHead: Ref;\n    currentId: BitId;\n    modelComponent: ModelComponent;\n  };\n};\n\nexport type ApplyVersionResults = {\n  components?: ApplyVersionResult[];\n  version?: string;\n  failedComponents?: FailedComponents[];\n  removedComponents?: BitId[];\n  addedComponents?: ComponentID[]; // relevant when restoreMissingComponents is true (e.g. bit lane merge-abort)\n  resolvedComponents?: ConsumerComponent[]; // relevant for bit merge --resolve\n  abortedComponents?: ApplyVersionResult[]; // relevant for bit merge --abort\n  mergeSnapResults?: {\n    snappedComponents: ConsumerComponent[];\n    autoSnappedResults: AutoTagResult[];\n    removedComponents?: BitIds;\n  } | null;\n  mergeSnapError?: Error;\n  leftUnresolvedConflicts?: boolean;\n  verbose?: boolean;\n  newFromLane?: string[];\n  newFromLaneAdded?: boolean;\n  installationError?: Error; // in case the package manager failed, it won't throw, instead, it'll return error here\n  compilationError?: Error; // in case the compiler failed, it won't throw, instead, it'll return error here\n  workspaceDepsUpdates?: WorkspaceDepsUpdates; // in case workspace.jsonc has been updated with dependencies versions\n};\n\nexport class MergingMain {\n  constructor(\n    private workspace: Workspace,\n    private install: InstallMain,\n    private snapping: SnappingMain,\n    private checkout: CheckoutMain,\n    private logger: Logger,\n    private componentWriter: ComponentWriterMain,\n    private importer: ImporterMain,\n    private config: ConfigMain,\n    private remove: RemoveMain\n  ) {}\n\n  async merge(\n    ids: string[],\n    mergeStrategy: MergeStrategy,\n    abort: boolean,\n    resolve: boolean,\n    noSnap: boolean,\n    message: string,\n    build: boolean,\n    skipDependencyInstallation: boolean\n  ): Promise<ApplyVersionResults> {\n    if (!this.workspace) throw new OutsideWorkspaceError();\n    const consumer: Consumer = this.workspace.consumer;\n    let mergeResults;\n    if (resolve) {\n      mergeResults = await this.resolveMerge(ids, message, build);\n    } else if (abort) {\n      mergeResults = await this.abortMerge(ids);\n    } else {\n      const bitIds = await this.getComponentsToMerge(consumer, ids);\n      mergeResults = await this.mergeComponentsFromRemote(\n        consumer,\n        bitIds,\n        mergeStrategy,\n        noSnap,\n        message,\n        build,\n        skipDependencyInstallation\n      );\n    }\n    await consumer.onDestroy();\n    return mergeResults;\n  }\n\n  /**\n   * when user is on main, it merges the remote main components into local.\n   * when user is on a lane, it merges the remote lane components into the local lane.\n   */\n  async mergeComponentsFromRemote(\n    consumer: Consumer,\n    bitIds: BitId[],\n    mergeStrategy: MergeStrategy,\n    noSnap: boolean,\n    snapMessage: string,\n    build: boolean,\n    skipDependencyInstallation: boolean\n  ): Promise<ApplyVersionResults> {\n    const currentLaneId = consumer.getCurrentLaneId();\n    const currentLaneObject = await consumer.getCurrentLaneObject();\n    const allComponentsStatus = await this.getAllComponentsStatus(bitIds, currentLaneId, currentLaneObject);\n    const failedComponents = allComponentsStatus.filter((c) => c.unmergedMessage && !c.unmergedLegitimately);\n    if (failedComponents.length) {\n      const failureMsgs = failedComponents\n        .map(\n          (failedComponent) =>\n            `${chalk.bold(failedComponent.id.toString())} - ${chalk.red(failedComponent.unmergedMessage as string)}`\n        )\n        .join('\\n');\n      throw new BitError(`unable to merge due to the following failures:\\n${failureMsgs}`);\n    }\n\n    return this.mergeSnaps({\n      mergeStrategy,\n      allComponentsStatus,\n      laneId: currentLaneId,\n      localLane: currentLaneObject,\n      noSnap,\n      snapMessage,\n      build,\n      skipDependencyInstallation,\n    });\n  }\n\n  /**\n   * merge multiple components according to the \"allComponentsStatus\".\n   */\n  async mergeSnaps({\n    mergeStrategy,\n    allComponentsStatus,\n    laneId,\n    localLane,\n    noSnap,\n    tag,\n    snapMessage,\n    build,\n    skipDependencyInstallation,\n  }: {\n    mergeStrategy: MergeStrategy;\n    allComponentsStatus: ComponentMergeStatus[];\n    laneId: LaneId;\n    localLane: Lane | null;\n    noSnap: boolean;\n    tag?: boolean;\n    snapMessage: string;\n    build: boolean;\n    skipDependencyInstallation?: boolean;\n  }): Promise<ApplyVersionResults> {\n    const consumer = this.workspace.consumer;\n    const componentWithConflict = allComponentsStatus.find(\n      (component) => component.mergeResults && component.mergeResults.hasConflicts\n    );\n    if (componentWithConflict && !mergeStrategy) {\n      mergeStrategy = await getMergeStrategyInteractive();\n    }\n    const failedComponents: FailedComponents[] = allComponentsStatus\n      .filter((componentStatus) => componentStatus.unmergedMessage)\n      .filter((componentStatus) => !componentStatus.shouldBeRemoved)\n      .map((componentStatus) => ({\n        id: componentStatus.id,\n        failureMessage: componentStatus.unmergedMessage as string,\n        unchangedLegitimately: componentStatus.unmergedLegitimately,\n      }));\n\n    const componentIdsToRemove = allComponentsStatus\n      .filter((componentStatus) => componentStatus.shouldBeRemoved)\n      .map((c) => c.id.changeVersion(undefined));\n\n    const succeededComponents = allComponentsStatus.filter((componentStatus) => !componentStatus.unmergedMessage);\n    // do not use Promise.all for applyVersion. otherwise, it'll write all components in parallel,\n    // which can be an issue when some components are also dependencies of others\n    const componentsResults = await mapSeries(\n      succeededComponents,\n      async ({ currentComponent, id, mergeResults, resolvedUnrelated, configMergeResult }) => {\n        const modelComponent = await consumer.scope.getModelComponent(id);\n        const updatedLaneId = laneId.isDefault() ? LaneId.from(laneId.name, id.scope as string) : laneId;\n        return this.applyVersion({\n          currentComponent,\n          id,\n          mergeResults,\n          mergeStrategy,\n          remoteHead: modelComponent.getRef(id.version as string) as Ref,\n          laneId: updatedLaneId,\n          localLane,\n          resolvedUnrelated,\n          configMergeResult,\n        });\n      }\n    );\n\n    const allConfigMerge = compact(succeededComponents.map((c) => c.configMergeResult));\n\n    const { workspaceDepsUpdates, workspaceDepsConflicts } = await this.updateWorkspaceJsoncWithDepsIfNeeded(\n      allConfigMerge\n    );\n\n    await this.generateConfigMergeConflictFileForAll(allConfigMerge, workspaceDepsConflicts);\n\n    if (localLane) consumer.scope.objects.add(localLane);\n\n    await consumer.scope.objects.persist(); // persist anyway, if localLane is null it should save all main heads\n\n    await consumer.scope.objects.unmergedComponents.write();\n\n    await consumer.writeBitMap();\n\n    if (componentIdsToRemove.length) {\n      const compBitIdsToRemove = BitIds.fromArray(componentIdsToRemove);\n      await deleteComponentsFiles(consumer, compBitIdsToRemove);\n      await consumer.cleanFromBitMap(compBitIdsToRemove);\n    }\n\n    const componentsHasConfigMergeConflicts = allComponentsStatus.some((c) => c.configMergeResult?.hasConflicts());\n    const leftUnresolvedConflicts = componentWithConflict && mergeStrategy === 'manual';\n    if (!skipDependencyInstallation && !leftUnresolvedConflicts && !componentsHasConfigMergeConflicts) {\n      try {\n        await this.install.install(undefined, {\n          dedupe: true,\n          updateExisting: false,\n          import: false,\n        });\n      } catch (err: any) {\n        this.logger.error(`failed installing packages`, err);\n        this.logger.consoleError(`failed installing packages, see the log for full stacktrace. error: ${err.message}`);\n      }\n    }\n\n    const getSnapOrTagResults = async () => {\n      // if one of the component has conflict, don't snap-merge. otherwise, some of the components would be snap-merged\n      // and some not. besides the fact that it could by mistake tag dependent, it's a confusing state. better not snap.\n      if (noSnap || leftUnresolvedConflicts || componentsHasConfigMergeConflicts) {\n        return null;\n      }\n      if (tag) {\n        const idsToTag = allComponentsStatus.map((c) => c.id);\n        const results = await this.tagAllLaneComponent(idsToTag, snapMessage, build);\n        if (!results) return null;\n        const { taggedComponents, autoTaggedResults, removedComponents } = results;\n        return { snappedComponents: taggedComponents, autoSnappedResults: autoTaggedResults, removedComponents };\n      }\n      return this.snapResolvedComponents(consumer, snapMessage, build);\n    };\n    let mergeSnapResults: ApplyVersionResults['mergeSnapResults'] = null;\n    let mergeSnapError: Error | undefined;\n    const bitMapSnapshot = this.workspace.bitMap.takeSnapshot();\n    try {\n      mergeSnapResults = await getSnapOrTagResults();\n    } catch (err: any) {\n      mergeSnapError = err;\n      this.workspace.bitMap.restoreFromSnapshot(bitMapSnapshot);\n    }\n\n    return {\n      components: componentsResults.map((c) => c.applyVersionResult),\n      failedComponents,\n      removedComponents: [...componentIdsToRemove, ...(mergeSnapResults?.removedComponents || [])],\n      mergeSnapResults,\n      mergeSnapError,\n      leftUnresolvedConflicts,\n      workspaceDepsUpdates,\n    };\n  }\n\n  private async generateConfigMergeConflictFileForAll(\n    allConfigMerge: ConfigMergeResult[],\n    workspaceDepsConflicts?: WorkspaceDepsConflicts\n  ) {\n    const configMergeFile = this.workspace.getConflictMergeFile();\n    if (workspaceDepsConflicts) {\n      const workspaceConflict = new ConfigMergeResult('WORKSPACE', 'ours', 'theirs', [\n        {\n          id: DependencyResolverAspect.id,\n          conflict: workspaceDepsConflicts,\n        },\n      ]);\n      allConfigMerge.unshift(workspaceConflict);\n    }\n    allConfigMerge.forEach((configMerge) => {\n      const conflict = configMerge.generateMergeConflictFile();\n      if (!conflict) return;\n      configMergeFile.addConflict(configMerge.compIdStr, conflict);\n    });\n    if (configMergeFile.hasConflict()) {\n      await configMergeFile.write();\n    }\n  }\n\n  private async updateWorkspaceJsoncWithDepsIfNeeded(\n    allConfigMerge: ConfigMergeResult[]\n  ): Promise<{ workspaceDepsUpdates?: WorkspaceDepsUpdates; workspaceDepsConflicts?: WorkspaceDepsConflicts }> {\n    const allResults = allConfigMerge.map((c) => c.getDepsResolverResult());\n\n    // aggregate all dependencies that can be updated (not conflicting)\n    const nonConflictDeps: { [pkgName: string]: string[] } = {};\n    const nonConflictSources: { [pkgName: string]: string[] } = {}; // for logging/debugging purposes\n    allConfigMerge.forEach((configMerge) => {\n      const mergedConfig = configMerge.getDepsResolverResult()?.mergedConfig;\n      if (!mergedConfig || mergedConfig === '-') return;\n      const mergedConfigPolicy = mergedConfig.policy || {};\n      DEPENDENCIES_FIELDS.forEach((depField) => {\n        if (!mergedConfigPolicy[depField]) return;\n        mergedConfigPolicy[depField].forEach((pkg: PkgEntry) => {\n          if (pkg.force) return; // we only care about auto-detected dependencies\n          if (nonConflictDeps[pkg.name]) {\n            if (!nonConflictDeps[pkg.name].includes(pkg.version)) nonConflictDeps[pkg.name].push(pkg.version);\n            nonConflictSources[pkg.name].push(configMerge.compIdStr);\n            return;\n          }\n          nonConflictDeps[pkg.name] = [pkg.version];\n          nonConflictSources[pkg.name] = [configMerge.compIdStr];\n        });\n      });\n    });\n\n    // aggregate all dependencies that have conflicts\n    const conflictDeps: { [pkgName: string]: string[] } = {};\n    const conflictDepsSources: { [pkgName: string]: string[] } = {}; // for logging/debugging purposes\n    allConfigMerge.forEach((configMerge) => {\n      const mergedConfigConflict = configMerge.getDepsResolverResult()?.conflict;\n      if (!mergedConfigConflict) return;\n      DEPENDENCIES_FIELDS.forEach((depField) => {\n        if (!mergedConfigConflict[depField]) return;\n        mergedConfigConflict[depField].forEach((pkg: PkgEntry) => {\n          if (pkg.force) return; // we only care about auto-detected dependencies\n          if (conflictDeps[pkg.name]) {\n            if (!conflictDeps[pkg.name].includes(pkg.version)) conflictDeps[pkg.name].push(pkg.version);\n            conflictDepsSources[pkg.name].push(configMerge.compIdStr);\n            return;\n          }\n          conflictDeps[pkg.name] = [pkg.version];\n          conflictDepsSources[pkg.name] = [configMerge.compIdStr];\n        });\n      });\n    });\n\n    const notConflictedPackages = Object.keys(nonConflictDeps);\n    const conflictedPackages = Object.keys(conflictDeps);\n    if (!notConflictedPackages.length && !conflictedPackages.length) return {};\n\n    const workspaceConfig = this.config.workspaceConfig;\n    if (!workspaceConfig) throw new Error(`updateWorkspaceJsoncWithDepsIfNeeded unable to get workspace config`);\n    const depResolver = workspaceConfig.extensions.findCoreExtension(DependencyResolverAspect.id);\n    const policy = depResolver?.config.policy;\n    if (!policy) {\n      return {};\n    }\n\n    // calculate the workspace.json updates\n    const workspaceJsonUpdates = {};\n    notConflictedPackages.forEach((pkgName) => {\n      if (nonConflictDeps[pkgName].length > 1) {\n        // we only want the deps that the other lane has them in the workspace.json and that all comps use the same dep.\n        return;\n      }\n      DEPENDENCIES_FIELDS.forEach((depField) => {\n        if (!policy[depField]?.[pkgName]) return; // doesn't exists in the workspace.json\n        const currentVer = policy[depField][pkgName];\n        const newVer = nonConflictDeps[pkgName][0];\n        if (currentVer === newVer) return;\n        workspaceJsonUpdates[pkgName] = [currentVer, newVer];\n        policy[depField][pkgName] = newVer;\n        this.logger.debug(\n          `update workspace.jsonc: ${pkgName} from ${currentVer} to ${newVer}. Triggered by: ${nonConflictSources[\n            pkgName\n          ].join(', ')}`\n        );\n      });\n    });\n\n    // calculate the workspace.json conflicts\n    const WS_DEPS_FIELDS = ['dependencies', 'peerDependencies'];\n    const workspaceJsonConflicts = { dependencies: [], peerDependencies: [] };\n    const conflictPackagesToRemoveFromConfigMerge: string[] = [];\n    conflictedPackages.forEach((pkgName) => {\n      if (conflictDeps[pkgName].length > 1) {\n        // we only want the deps that the other lane has them in the workspace.json and that all comps use the same dep.\n        return;\n      }\n      const conflictRaw = conflictDeps[pkgName][0];\n      const [, currentVal, otherVal] = conflictRaw.split('::');\n\n      WS_DEPS_FIELDS.forEach((depField) => {\n        if (!policy[depField]?.[pkgName]) return;\n        const currentVerInWsJson = policy[depField][pkgName];\n        if (!currentVerInWsJson) return;\n        // the version is coming from the workspace.jsonc\n        conflictPackagesToRemoveFromConfigMerge.push(pkgName);\n        if (semver.satisfies(otherVal, currentVerInWsJson)) {\n          // the other version is compatible with the current version in the workspace.json\n          return;\n        }\n        workspaceJsonConflicts[depField].push({\n          name: pkgName,\n          version: conflictRaw.replace(currentVal, currentVerInWsJson),\n          force: false,\n        });\n        conflictPackagesToRemoveFromConfigMerge.push(pkgName);\n        this.logger.debug(\n          `conflict workspace.jsonc: ${pkgName} current: ${currentVerInWsJson}, other: ${otherVal}. Triggered by: ${conflictDepsSources[\n            pkgName\n          ].join(', ')}`\n        );\n      });\n    });\n    WS_DEPS_FIELDS.forEach((depField) => {\n      if (isEmpty(workspaceJsonConflicts[depField])) delete workspaceJsonConflicts[depField];\n    });\n\n    if (conflictPackagesToRemoveFromConfigMerge.length) {\n      allResults.forEach((result) => {\n        if (result?.conflict) {\n          DEPENDENCIES_FIELDS.forEach((depField) => {\n            if (!result.conflict?.[depField]) return;\n            result.conflict[depField] = result.conflict?.[depField].filter(\n              (dep) => !conflictPackagesToRemoveFromConfigMerge.includes(dep.name)\n            );\n            if (!result.conflict[depField].length) delete result.conflict[depField];\n          });\n          if (isEmpty(result.conflict)) result.conflict = undefined;\n        }\n      });\n    }\n\n    if (Object.keys(workspaceJsonUpdates).length) {\n      await workspaceConfig.write();\n    }\n\n    this.logger.debug('final workspace.jsonc updates', workspaceJsonUpdates);\n    this.logger.debug('final workspace.jsonc conflicts', workspaceJsonConflicts);\n\n    return {\n      workspaceDepsUpdates: Object.keys(workspaceJsonUpdates).length ? workspaceJsonUpdates : undefined,\n      workspaceDepsConflicts: Object.keys(workspaceJsonConflicts).length ? workspaceJsonConflicts : undefined,\n    };\n  }\n\n  /**\n   * this function gets called from two different commands:\n   * 1. \"bit merge <ids...>\", when merging a component from a remote to the local.\n   * in this case, the remote and local are on the same lane or both on main.\n   * 2. \"bit lane merge\", when merging from one lane to another.\n   */\n  async getMergeStatus(\n    bitIds: BitId[], // the id.version is the version we want to merge to the current component\n    currentLane: Lane | null, // currently checked out lane. if on main, then it's null.\n    otherLane?: Lane | null, // the lane we want to merged to our lane. (null if it's \"main\").\n    options?: { resolveUnrelated?: MergeStrategy; ignoreConfigChanges?: boolean }\n  ): Promise<ComponentMergeStatus[]> {\n    const mergeStatusProvider = new MergeStatusProvider(\n      this.workspace,\n      this.logger,\n      this.importer,\n      currentLane || undefined,\n      otherLane || undefined,\n      options\n    );\n    return mergeStatusProvider.getStatus(bitIds);\n  }\n\n  private async applyVersion({\n    currentComponent,\n    id,\n    mergeResults,\n    mergeStrategy,\n    remoteHead,\n    laneId,\n    localLane,\n    resolvedUnrelated,\n    configMergeResult,\n  }: {\n    currentComponent: ConsumerComponent | null | undefined;\n    id: BitId;\n    mergeResults: MergeResultsThreeWay | null | undefined;\n    mergeStrategy: MergeStrategy;\n    remoteHead: Ref;\n    laneId: LaneId;\n    localLane: Lane | null;\n    resolvedUnrelated?: ResolveUnrelatedData;\n    configMergeResult?: ConfigMergeResult;\n  }): Promise<ApplyVersionWithComps> {\n    const consumer = this.workspace.consumer;\n    let filesStatus = {};\n    const unmergedComponent: UnmergedComponent = {\n      // @ts-ignore\n      id: { name: id.name, scope: id.scope },\n      head: remoteHead,\n      laneId,\n    };\n    id = currentComponent ? currentComponent.id : id;\n\n    const modelComponent = await consumer.scope.getModelComponent(id);\n    const handleResolveUnrelated = () => {\n      if (!currentComponent) throw new Error('currentComponent must be defined when resolvedUnrelated');\n      // because when on a main, we don't allow merging lanes with unrelated. we asks users to switch to the lane\n      // first and then merge with --resolve-unrelated\n      if (!localLane) throw new Error('localLane must be defined when resolvedUnrelated');\n      if (!resolvedUnrelated) throw new Error('resolvedUnrelated must be populated');\n      localLane.addComponent({ id, head: resolvedUnrelated.headOnCurrentLane });\n      unmergedComponent.unrelated = {\n        unrelatedHead: resolvedUnrelated.unrelatedHead,\n        headOnCurrentLane: resolvedUnrelated.headOnCurrentLane,\n        unrelatedLaneId: resolvedUnrelated.unrelatedLaneId,\n      };\n      consumer.scope.objects.unmergedComponents.addEntry(unmergedComponent);\n      return { applyVersionResult: { id, filesStatus }, component: currentComponent };\n    };\n\n    const markAllFilesAsUnchanged = () => {\n      if (!currentComponent) throw new Error(`applyVersion expect to get currentComponent for ${id.toString()}`);\n      currentComponent.files.forEach((file) => {\n        filesStatus[pathNormalizeToLinux(file.relative)] = FileStatus.unchanged;\n      });\n    };\n    if (mergeResults && mergeResults.hasConflicts && mergeStrategy === MergeOptions.ours) {\n      markAllFilesAsUnchanged();\n      consumer.scope.objects.unmergedComponents.addEntry(unmergedComponent);\n      return { applyVersionResult: { id, filesStatus }, component: currentComponent || undefined };\n    }\n    if (resolvedUnrelated?.strategy === 'ours') {\n      markAllFilesAsUnchanged();\n      return handleResolveUnrelated();\n    }\n    const remoteId = id.changeVersion(remoteHead.toString());\n    const idToLoad = !mergeResults || mergeStrategy === MergeOptions.theirs ? remoteId : id;\n    const legacyComponent = await consumer.loadComponentFromModelImportIfNeeded(idToLoad);\n    if (mergeResults && mergeStrategy === MergeOptions.theirs) {\n      // in this case, we don't want to update .bitmap with the version of the remote. we want to keep the same version\n      legacyComponent.version = id.version;\n    }\n    const files = legacyComponent.files;\n    updateFileStatus(files, filesStatus, currentComponent || undefined);\n\n    if (mergeResults) {\n      // update files according to the merge results\n      const { filesStatus: modifiedStatus, modifiedFiles } = applyModifiedVersion(files, mergeResults, mergeStrategy);\n      legacyComponent.files = modifiedFiles;\n      filesStatus = { ...filesStatus, ...modifiedStatus };\n    }\n\n    await removeFilesIfNeeded(filesStatus, currentComponent || undefined);\n\n    const manyComponentsWriterOpts = {\n      consumer,\n      components: [legacyComponent],\n      skipDependencyInstallation: true,\n      writeConfig: false, // @todo: should write if config exists before, needs to figure out how to do it.\n    };\n    await this.componentWriter.writeMany(manyComponentsWriterOpts);\n\n    if (configMergeResult) {\n      if (!legacyComponent.writtenPath) {\n        throw new Error(`component.writtenPath is missing for ${id.toString()}`);\n      }\n      const successfullyMergedConfig = configMergeResult.getSuccessfullyMergedConfig();\n      if (successfullyMergedConfig) {\n        unmergedComponent.mergedConfig = successfullyMergedConfig;\n        // no need to `unmergedComponents.addEntry` here. it'll be added in the next lines inside `if (mergeResults)`.\n        // because if `configMergeResult` is set, `mergeResults` must be set as well. both happen on diverge.\n      }\n    }\n\n    // if mergeResults, the head snap is going to be updated on a later phase when snapping with two parents\n    // otherwise, update the head of the current lane or main\n    if (mergeResults) {\n      if (mergeResults.hasConflicts && mergeStrategy === MergeOptions.manual) {\n        unmergedComponent.unmergedPaths = mergeResults.modifiedFiles.filter((f) => f.conflict).map((f) => f.filePath);\n      }\n      consumer.scope.objects.unmergedComponents.addEntry(unmergedComponent);\n    } else if (localLane) {\n      if (resolvedUnrelated) {\n        // must be \"theirs\"\n        return handleResolveUnrelated();\n      }\n      localLane.addComponent({ id, head: remoteHead });\n    } else {\n      // this is main\n      modelComponent.setHead(remoteHead);\n      // mark it as local, otherwise, when importing this component from a remote, it'll override it.\n      modelComponent.markVersionAsLocal(remoteHead.toString());\n      consumer.scope.objects.add(modelComponent);\n    }\n\n    return { applyVersionResult: { id, filesStatus }, component: currentComponent || undefined };\n  }\n\n  private async abortMerge(values: string[]): Promise<ApplyVersionResults> {\n    const consumer = this.workspace.consumer;\n    const ids = await this.getIdsForUnmerged(values);\n    const results = await this.checkout.checkout({ ids, reset: true });\n    ids.forEach((id) => consumer.scope.objects.unmergedComponents.removeComponent(id.fullName));\n    await consumer.scope.objects.unmergedComponents.write();\n    return { abortedComponents: results.components };\n  }\n\n  private async resolveMerge(values: string[], snapMessage: string, build: boolean): Promise<ApplyVersionResults> {\n    const ids = await this.getIdsForUnmerged(values);\n    // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n    const { snappedComponents } = await this.snapping.snap({\n      legacyBitIds: BitIds.fromArray(ids.map((id) => id._legacy)),\n      build,\n      message: snapMessage,\n    });\n    return { resolvedComponents: snappedComponents };\n  }\n\n  private async getAllComponentsStatus(\n    bitIds: BitId[],\n    laneId: LaneId,\n    localLaneObject: Lane | null\n  ): Promise<ComponentMergeStatus[]> {\n    const ids = await Promise.all(\n      bitIds.map(async (bitId) => {\n        const remoteScopeName = laneId.isDefault() ? bitId.scope : laneId.scope;\n        const remoteLaneId = LaneId.from(laneId.name, remoteScopeName as string);\n        const remoteHead = await this.workspace.consumer.scope.objects.remoteLanes.getRef(remoteLaneId, bitId);\n        const laneIdStr = remoteLaneId.toString();\n        if (!remoteHead) {\n          throw new BitError(`unable to find a remote head of \"${bitId.toStringWithoutVersion()}\" in \"${laneIdStr}\"`);\n        }\n        return bitId.changeVersion(remoteHead.toString());\n      })\n    );\n\n    return this.getMergeStatus(ids, localLaneObject, localLaneObject);\n  }\n\n  private async snapResolvedComponents(\n    consumer: Consumer,\n    snapMessage: string,\n    build: boolean\n  ): Promise<SnapResults | null> {\n    const unmergedComponents = consumer.scope.objects.unmergedComponents.getComponents();\n    this.logger.debug(`merge-snaps, snapResolvedComponents, total ${unmergedComponents.length.toString()} components`);\n    if (!unmergedComponents.length) return null;\n    const ids = BitIds.fromArray(unmergedComponents.map((r) => new BitId(r.id)));\n    return this.snapping.snap({\n      legacyBitIds: ids,\n      build,\n      message: snapMessage,\n    });\n  }\n\n  private async tagAllLaneComponent(idsToTag: BitId[], tagMessage: string, build: boolean): Promise<TagResults | null> {\n    const ids = idsToTag.map((id) => {\n      return id.toStringWithoutVersion();\n    });\n    this.logger.debug(`merge-snaps, tagResolvedComponents, total ${idsToTag.length.toString()} components`);\n    return this.snapping.tag({\n      ids,\n      build,\n      message: tagMessage,\n      unmodified: true,\n    });\n  }\n\n  private async getIdsForUnmerged(idsStr?: string[]): Promise<ComponentID[]> {\n    if (idsStr && idsStr.length) {\n      const componentIds = await this.workspace.resolveMultipleComponentIds(idsStr);\n      componentIds.forEach((id) => {\n        const entry = this.workspace.consumer.scope.objects.unmergedComponents.getEntry(id.fullName);\n        if (!entry) {\n          throw new GeneralError(`unable to merge-resolve ${id.toString()}, it is not marked as unresolved`);\n        }\n      });\n      return componentIds;\n    }\n    const unresolvedComponents = this.workspace.consumer.scope.objects.unmergedComponents.getComponents();\n    if (!unresolvedComponents.length) throw new GeneralError(`all components are resolved already, nothing to do`);\n    return unresolvedComponents.map((u) => ComponentID.fromLegacy(new BitId(u.id)));\n  }\n\n  private async getComponentsToMerge(consumer: Consumer, ids: string[]): Promise<BitId[]> {\n    const componentsList = new ComponentsList(consumer);\n    if (!ids.length) {\n      const mergePending = await componentsList.listMergePendingComponents();\n      return mergePending.map((c) => c.id);\n    }\n    if (hasWildcard(ids)) {\n      return componentsList.listComponentsByIdsWithWildcard(ids);\n    }\n    return ids.map((id) => consumer.getParsedId(id));\n  }\n\n  static slots = [];\n  static dependencies = [\n    CLIAspect,\n    WorkspaceAspect,\n    SnappingAspect,\n    CheckoutAspect,\n    InstallAspect,\n    LoggerAspect,\n    ComponentWriterAspect,\n    ImporterAspect,\n    ConfigAspect,\n    RemoveAspect,\n  ];\n  static runtime = MainRuntime;\n  static async provider([\n    cli,\n    workspace,\n    snapping,\n    checkout,\n    install,\n    loggerMain,\n    compWriter,\n    importer,\n    config,\n    remove,\n  ]: [\n    CLIMain,\n    Workspace,\n    SnappingMain,\n    CheckoutMain,\n    InstallMain,\n    LoggerMain,\n    ComponentWriterMain,\n    ImporterMain,\n    ConfigMain,\n    RemoveMain\n  ]) {\n    const logger = loggerMain.createLogger(MergingAspect.id);\n    const merging = new MergingMain(\n      workspace,\n      install,\n      snapping,\n      checkout,\n      logger,\n      compWriter,\n      importer,\n      config,\n      remove\n    );\n    cli.register(new MergeCmd(merging));\n    return merging;\n  }\n}\n\nMergingAspect.addRuntime(MergingMain);\n"],"mappings":"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"}

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@teambit/merging",
-  "version": "0.0.459",
+  "version": "0.0.460",
   "homepage": "https://bit.cloud/teambit/component/merging",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.component",
     "name": "merging",
-    "version": "0.0.459"
+    "version": "0.0.460"
   },
   "dependencies": {
     "lodash": "4.17.21",
@@ -18,21 +18,21 @@
     "@teambit/component-id": "0.0.427",
     "@teambit/legacy-bit-id": "1.0.0",
     "@teambit/harmony": "0.4.6",
-    "@teambit/dependency-resolver": "0.0.1144",
+    "@teambit/dependency-resolver": "0.0.1145",
     "@teambit/component-version": "1.0.0",
-    "@teambit/envs": "0.0.1144",
-    "@teambit/logger": "0.0.858",
+    "@teambit/envs": "0.0.1145",
+    "@teambit/logger": "0.0.859",
     "@teambit/bit-error": "0.0.402",
-    "@teambit/cli": "0.0.765",
-    "@teambit/importer": "0.0.573",
-    "@teambit/lane-id": "0.0.280",
-    "@teambit/workspace": "0.0.1144",
-    "@teambit/checkout": "0.0.313",
-    "@teambit/component-writer": "0.0.180",
-    "@teambit/config": "0.0.780",
-    "@teambit/install": "0.0.228",
-    "@teambit/remove": "0.0.321",
-    "@teambit/snapping": "0.0.459"
+    "@teambit/cli": "0.0.766",
+    "@teambit/importer": "0.0.574",
+    "@teambit/lane-id": "0.0.281",
+    "@teambit/workspace": "0.0.1145",
+    "@teambit/checkout": "0.0.314",
+    "@teambit/component-writer": "0.0.181",
+    "@teambit/config": "0.0.781",
+    "@teambit/install": "0.0.229",
+    "@teambit/remove": "0.0.322",
+    "@teambit/snapping": "0.0.460"
   },
   "devDependencies": {
     "@types/lodash": "4.14.165",
@@ -46,7 +46,7 @@
     "@types/testing-library__jest-dom": "5.9.5"
   },
   "peerDependencies": {
-    "@teambit/legacy": "1.0.549",
+    "@teambit/legacy": "1.0.551",
     "react": "^16.8.0 || ^17.0.0",
     "react-dom": "^16.8.0 || ^17.0.0"
   },