@teambit/merging 0.0.431 → 0.0.433

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import { MergingAspect } from './merging.aspect';
-export { mergeReport, applyVersionReport, conflictSummaryReport, installationErrorOutput, compilationErrorOutput, getRemovedOutput, } from './merge-cmd';
+export { mergeReport, applyVersionReport, conflictSummaryReport, installationErrorOutput, compilationErrorOutput, getRemovedOutput, getAddedOutput, } from './merge-cmd';
 export type { MergingMain, ComponentMergeStatus, ApplyVersionResults } from './merging.main.runtime';
 export { ConfigMergeResult } from './config-merge-result';
 export default MergingAspect;

package/dist/index.js

@@ -34,6 +34,12 @@ Object.defineProperty(exports, "conflictSummaryReport", {
   }
 });
 exports.default = void 0;
+Object.defineProperty(exports, "getAddedOutput", {
+  enumerable: true,
+  get: function () {
+    return _mergeCmd().getAddedOutput;
+  }
+});
 Object.defineProperty(exports, "getRemovedOutput", {
   enumerable: true,
   get: function () {

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["_merging","data","require","_mergeCmd","_configMergeResult","_default","MergingAspect","exports","default"],"sources":["index.ts"],"sourcesContent":["import { MergingAspect } from './merging.aspect';\n\nexport {\n  mergeReport,\n  applyVersionReport,\n  conflictSummaryReport,\n  installationErrorOutput,\n  compilationErrorOutput,\n  getRemovedOutput,\n} from './merge-cmd';\nexport type { MergingMain, ComponentMergeStatus, ApplyVersionResults } from './merging.main.runtime';\nexport { ConfigMergeResult } from './config-merge-result';\nexport default MergingAspect;\nexport { MergingAspect };\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,SAAAA,SAAA;EAAA,MAAAC,IAAA,GAAAC,OAAA;EAAAF,QAAA,YAAAA,CAAA;IAAA,OAAAC,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAEA,SAAAE,UAAA;EAAA,MAAAF,IAAA,GAAAC,OAAA;EAAAC,SAAA,YAAAA,CAAA;IAAA,OAAAF,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AASA,SAAAG,mBAAA;EAAA,MAAAH,IAAA,GAAAC,OAAA;EAAAE,kBAAA,YAAAA,CAAA;IAAA,OAAAH,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAA0D,IAAAI,QAAA,GAC3CC,wBAAa;AAAAC,OAAA,CAAAC,OAAA,GAAAH,QAAA"}
+{"version":3,"names":["_merging","data","require","_mergeCmd","_configMergeResult","_default","MergingAspect","exports","default"],"sources":["index.ts"],"sourcesContent":["import { MergingAspect } from './merging.aspect';\n\nexport {\n  mergeReport,\n  applyVersionReport,\n  conflictSummaryReport,\n  installationErrorOutput,\n  compilationErrorOutput,\n  getRemovedOutput,\n  getAddedOutput,\n} from './merge-cmd';\nexport type { MergingMain, ComponentMergeStatus, ApplyVersionResults } from './merging.main.runtime';\nexport { ConfigMergeResult } from './config-merge-result';\nexport default MergingAspect;\nexport { MergingAspect };\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,SAAAA,SAAA;EAAA,MAAAC,IAAA,GAAAC,OAAA;EAAAF,QAAA,YAAAA,CAAA;IAAA,OAAAC,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAEA,SAAAE,UAAA;EAAA,MAAAF,IAAA,GAAAC,OAAA;EAAAC,SAAA,YAAAA,CAAA;IAAA,OAAAF,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAUA,SAAAG,mBAAA;EAAA,MAAAH,IAAA,GAAAC,OAAA;EAAAE,kBAAA,YAAAA,CAAA;IAAA,OAAAH,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAA0D,IAAAI,QAAA,GAC3CC,wBAAa;AAAAC,OAAA,CAAAC,OAAA,GAAAH,QAAA"}

package/dist/merge-cmd.d.ts

@@ -1,5 +1,6 @@
 import { Command, CommandOptions } from '@teambit/cli';
 import { BitId } from '@teambit/legacy-bit-id';
+import { ComponentID } from '@teambit/component-id';
 import { ApplyVersionResult } from '@teambit/legacy/dist/consumer/versions-ops/merge-version';
 import { ApplyVersionResults, MergingMain } from './merging.main.runtime';
 import { ConfigMergeResult } from './config-merge-result';
@@ -35,3 +36,4 @@ export declare function conflictSummaryReport(components: ApplyVersionResult[]):
 export declare function installationErrorOutput(installationError?: Error): string;
 export declare function compilationErrorOutput(compilationError?: Error): string;
 export declare function getRemovedOutput(removedComponents?: BitId[]): string;
+export declare function getAddedOutput(addedComponents?: ComponentID[]): string;

package/dist/merge-cmd.js

@@ -10,6 +10,7 @@ exports.MergeCmd = void 0;
 exports.applyVersionReport = applyVersionReport;
 exports.compilationErrorOutput = compilationErrorOutput;
 exports.conflictSummaryReport = conflictSummaryReport;
+exports.getAddedOutput = getAddedOutput;
 exports.getRemovedOutput = getRemovedOutput;
 exports.installationErrorOutput = installationErrorOutput;
 exports.mergeReport = mergeReport;
@@ -267,5 +268,11 @@ function getRemovedOutput(removedComponents) {
   const body = removedComponents.join('\n');
   return `\n\n${_chalk().default.underline(title)}\n${body}\n\n`;
 }
+function getAddedOutput(addedComponents) {
+  if (!(addedComponents !== null && addedComponents !== void 0 && addedComponents.length)) return '';
+  const title = `the following ${addedComponents.length} component(s) have been added`;
+  const body = addedComponents.join('\n');
+  return `\n\n${_chalk().default.underline(title)}\n${body}\n\n`;
+}
 
 //# sourceMappingURL=merge-cmd.js.map

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

@@ -17,6 +17,7 @@ import { Logger, LoggerMain } from '@teambit/logger';
 import { MergeResultsThreeWay } from '@teambit/legacy/dist/consumer/versions-ops/merge-version/three-way-merge';
 import { WorkspacePolicyConfigKeysNames } from '@teambit/dependency-resolver';
 import { CheckoutMain, ComponentStatusBase } from '@teambit/checkout';
+import { ComponentID } from '@teambit/component-id';
 import { SnapsDistance } from '@teambit/legacy/dist/scope/component-ops/snaps-distance';
 import { InstallMain } from '@teambit/install';
 import { ConfigMergeResult } from './config-merge-result';
@@ -55,6 +56,7 @@ export declare type ApplyVersionResults = {
     version?: string;
     failedComponents?: FailedComponents[];
     removedComponents?: BitId[];
+    addedComponents?: ComponentID[];
     resolvedComponents?: ConsumerComponent[];
     abortedComponents?: ApplyVersionResult[];
     mergeSnapResults?: {

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","_getDivergeData","_chalk","_config","_remove","_repositories","_utils","_componentWriter","_importer","_logger","_lodash","_threeWayMerge","_noCommonSnap","_dependencyResolver","_checkout","_componentId","_constants","_deleteComponentFiles","_install","_mergeCmd","_merging","_configMerger","_configMergeResult","_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","_this$workspace","consumer","merge","ids","mergeStrategy","abort","resolve","noSnap","message","build","skipDependencyInstallation","OutsideWorkspaceError","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","markFilesToBeRemovedIfNeeded","deleteFilesIfNeeded","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","importObjectsFromMainIfExist","toBitIds","toVersionLatest","componentStatusBeforeMergeAttempt","getComponentStatusBeforeMergeAttempt","toImport","compStatus","divergeData","versionsToImport","snapsOnTargetOnly","commonSnapBeforeDiverge","v","flat","scopeImporter","importManyIfMissingWithoutDeps","lane","compStatusNotNeedMerge","mergeProps","compStatusNeedMerge","getComponentsStatusNeedMerge","tmp","Tmp","componentsStatus","Promise","all","getComponentMergeStatus","clear","returnUnmerged","msg","getModelComponentIfExist","unmerged","getEntry","toStringWithoutVersion","repo","otherLaneHead","existingBitMapId","getBitIdIfExist","ignoreVersion","componentOnOther","loadVersion","isRemoved","getCurrentId","idOnLane","getComponent","head","getHeadAsTagIfExist","currentId","getDivergeData","targetHead","throws","componentFromModel","getCurrentComponent","loadComponent","getConsumerComponent","isModified","componentModificationStatus","getComponentStatusById","modified","baseComponent","ignoreConfigChanges","isComponentSourceCodeModified","isComponentModified","mainHead","NoCommonSnap","resolveUnrelated","hasResolvedFromMain","hashToCompare","divergeDataFromMain","sourceHead","hasResolvedLocally","getHeadRegardlessOfLane","hasResolvedRemotely","versionToSaveInLane","resolvedRef","strategy","isDiverged","isSourceAhead","isTargetAhead","componentMergeStatusBeforeMergeAttempt","baseSnap","otherComponent","currentLaneName","toLaneId","otherLaneName","DEFAULT_LANE","currentLabel","otherLabel","workspaceIds","listIds","configMerger","ConfigMerger","threeWayMerge","filesStatus","unmergedComponent","remote","handleResolveUnrelated","addComponent","unrelated","addEntry","markAllFilesAsUnchanged","files","file","pathNormalizeToLinux","relative","FileStatus","unchanged","MergeOptions","ours","remoteId","idToLoad","theirs","legacyComponent","loadComponentFromModelImportIfNeeded","updated","modifiedStatus","modifiedFiles","applyModifiedVersion","manyComponentsWriterOpts","writeConfig","writeMany","writtenPath","successfullyMergedConfig","getSuccessfullyMergedConfig","manual","unmergedPaths","f","filePath","setHead","markVersionAsLocal","values","getIdsForUnmerged","reset","removeComponent","fullName","abortedComponents","snap","legacyBitIds","_legacy","resolvedComponents","localLaneObject","bitId","remoteScopeName","remoteLaneId","remoteLanes","laneIdStr","getComponents","r","BitId","tagMessage","unmodified","idsStr","componentIds","resolveMultipleComponentIds","entry","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 { DEFAULT_LANE, LaneId } from '@teambit/lane-id';\nimport { AutoTagResult } from '@teambit/legacy/dist/scope/component-ops/auto-tag';\nimport { getDivergeData } from '@teambit/legacy/dist/scope/component-ops/get-diverge-data';\nimport { UnmergedComponent } from '@teambit/legacy/dist/scope/lanes/unmerged-components';\nimport { Lane, ModelComponent, Version } 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 { Tmp } from '@teambit/legacy/dist/scope/repositories';\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 threeWayMerge, {\n  MergeResultsThreeWay,\n} from '@teambit/legacy/dist/consumer/versions-ops/merge-version/three-way-merge';\nimport { NoCommonSnap } from '@teambit/legacy/dist/scope/exceptions/no-common-snap';\nimport { DependencyResolverAspect, WorkspacePolicyConfigKeysNames } from '@teambit/dependency-resolver';\nimport {\n  ApplyVersionWithComps,\n  CheckoutAspect,\n  CheckoutMain,\n  ComponentStatusBase,\n  applyModifiedVersion,\n  deleteFilesIfNeeded,\n  markFilesToBeRemovedIfNeeded,\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 { ConfigMerger } from './config-merger';\nimport { ConfigMergeResult } from './config-merge-result';\n\ntype ResolveUnrelatedData = { strategy: MergeStrategy; head: Ref };\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  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  private consumer: Consumer;\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    this.consumer = this.workspace?.consumer;\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    markFilesToBeRemovedIfNeeded(succeededComponents, componentsResults);\n\n    await deleteFilesIfNeeded(componentsResults, this.workspace);\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    if (!currentLane && otherLane) {\n      await this.importer.importObjectsFromMainIfExist(otherLane.toBitIds().toVersionLatest());\n    }\n    const componentStatusBeforeMergeAttempt = await mapSeries(bitIds, (id) =>\n      this.getComponentStatusBeforeMergeAttempt(id, currentLane, options)\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.consumer.scope.scopeImporter.importManyIfMissingWithoutDeps({\n      ids: BitIds.fromArray(toImport),\n      lane: otherLane || undefined,\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.consumer.scope);\n      try {\n        const componentsStatus = await Promise.all(\n          compStatusNeedMerge.map((compStatus) =>\n            this.getComponentMergeStatus(currentLane, otherLane || undefined, compStatus)\n          )\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 getComponentStatusBeforeMergeAttempt(\n    id: BitId, // the id.version is the version we want to merge to the current component\n    localLane: Lane | null, // currently checked out lane. if on main, then it's null.\n    options?: { resolveUnrelated?: MergeStrategy; ignoreConfigChanges?: boolean }\n  ): Promise<ComponentMergeStatusBeforeMergeAttempt> {\n    const consumer = this.workspace.consumer;\n    const componentStatus: ComponentMergeStatusBeforeMergeAttempt = { id };\n    const returnUnmerged = (msg: string, unmergedLegitimately = false) => {\n      componentStatus.unmergedMessage = msg;\n      componentStatus.unmergedLegitimately = unmergedLegitimately;\n      return componentStatus;\n    };\n    const modelComponent = await consumer.scope.getModelComponentIfExist(id);\n    if (!modelComponent) {\n      return returnUnmerged(\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 returnUnmerged(\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    if (componentOnOther.isRemoved()) {\n      if (existingBitMapId && localLane) {\n        // continue with merging the component, so then the current lane will get the soft-remove update.\n        // also, remove the component from the workspace.\n        componentStatus.shouldBeRemoved = true;\n      } else {\n        // on main, don't merge soft-removed components.\n        // on lane, if it's not part of the current lane (!existingBitMapId), don't merge it.\n        return returnUnmerged(`component has been removed`, true);\n      }\n    }\n    const getCurrentId = () => {\n      if (existingBitMapId) return existingBitMapId;\n      if (localLane) {\n        const idOnLane = localLane.getComponent(id);\n        if (!idOnLane) return null;\n        return idOnLane.id.changeVersion(idOnLane.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      return returnUnmerged(`component has been removed`, true);\n    }\n    const isModified = async () => {\n      const componentModificationStatus = await consumer.getComponentStatusById(currentComponent.id);\n      if (!componentModificationStatus.modified) return false;\n      if (!existingBitMapId) return false;\n      const baseComponent = await modelComponent.loadVersion(\n        existingBitMapId.version as string,\n        consumer.scope.objects\n      );\n      return options?.ignoreConfigChanges\n        ? consumer.isComponentSourceCodeModified(baseComponent, currentComponent)\n        : true;\n    };\n\n    const isComponentModified = await isModified();\n\n    if (isComponentModified) {\n      return returnUnmerged(`component is modified, please snap/tag it first`);\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      const mainHead = modelComponent.head;\n      if (divergeData.err instanceof NoCommonSnap && options?.resolveUnrelated && 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 returnUnmerged(\n            `unable to traverse ${currentComponent.id.toString()} history. the main-head ${mainHead.toString()} doesn't appear in both lanes, it was probably created in each lane separately`\n          );\n        }\n        const versionToSaveInLane = hasResolvedLocally ? currentComponent.id.version : id.version;\n        const resolvedRef = modelComponent.getRef(versionToSaveInLane as string);\n        if (!resolvedRef) throw new Error(`unable to get ref of \"${versionToSaveInLane}\" for \"${id.toString()}\"`);\n        if (options?.resolveUnrelated === 'theirs') {\n          // just override with the model data\n          return {\n            currentComponent,\n            componentFromModel: componentOnOther,\n            id,\n            divergeData,\n            resolvedUnrelated: { strategy: 'theirs', head: resolvedRef },\n          };\n        }\n        if (options?.resolveUnrelated === 'ours') {\n          return {\n            currentComponent,\n            id,\n            divergeData,\n            resolvedUnrelated: { strategy: 'ours', head: resolvedRef },\n          };\n        }\n        throw new Error(\n          `unsupported strategy \"${options?.resolveUnrelated}\" of resolve-unrelated. supported strategies are: [ours, theirs]`\n        );\n      }\n      return returnUnmerged(\n        `unable to traverse ${currentComponent.id.toString()} history. error: ${divergeData.err.message}`\n      );\n    }\n    if (!divergeData.isDiverged()) {\n      if (divergeData.isSourceAhead()) {\n        // do nothing!\n        return returnUnmerged(`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 returnUnmerged(`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 getComponentMergeStatus(\n    localLane: Lane | null, // currently checked out lane. if on main, then it's null.\n    otherLane: Lane | undefined, // the lane name we want to merged to our lane. (can be also \"main\").\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.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 = localLane?.toLaneId().toString() || 'main';\n    const otherLaneName = otherLane ? 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      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.consumer,\n      otherComponent,\n      otherLabel,\n      currentComponent,\n      currentLabel,\n      baseComponent,\n    });\n    return { currentComponent, id, mergeResults, divergeData, configMergeResult };\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      remote: laneId.scope, // @todo: remove. it has been deprecated around 0.0.832\n      lane: laneId.name, // @todo: remove. it has been deprecated around 0.0.832\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      if (!localLane) throw new Error('localLane must be defined when resolvedUnrelated');\n      if (!resolvedUnrelated?.head) throw new Error('resolvedUnrelated must have head prop');\n      localLane.addComponent({ id, head: resolvedUnrelated.head });\n      unmergedComponent.laneId = localLane.toLaneId();\n      unmergedComponent.head = resolvedUnrelated.head;\n      unmergedComponent.unrelated = true;\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    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.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;AAEA,SAAAe,gBAAA;EAAA,MAAAf,IAAA,GAAAC,OAAA;EAAAc,eAAA,YAAAA,CAAA;IAAA,OAAAf,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAIA,SAAAgB,OAAA;EAAA,MAAAhB,IAAA,GAAAG,sBAAA,CAAAF,OAAA;EAAAe,MAAA,YAAAA,CAAA;IAAA,OAAAhB,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAiB,QAAA;EAAA,MAAAjB,IAAA,GAAAC,OAAA;EAAAgB,OAAA,YAAAA,CAAA;IAAA,OAAAjB,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAkB,QAAA;EAAA,MAAAlB,IAAA,GAAAG,sBAAA,CAAAF,OAAA;EAAAiB,OAAA,YAAAA,CAAA;IAAA,OAAAlB,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAmB,cAAA;EAAA,MAAAnB,IAAA,GAAAC,OAAA;EAAAkB,aAAA,YAAAA,CAAA;IAAA,OAAAnB,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAoB,OAAA;EAAA,MAAApB,IAAA,GAAAC,OAAA;EAAAmB,MAAA,YAAAA,CAAA;IAAA,OAAApB,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAqB,iBAAA;EAAA,MAAArB,IAAA,GAAAC,OAAA;EAAAoB,gBAAA,YAAAA,CAAA;IAAA,OAAArB,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAEA,SAAAsB,UAAA;EAAA,MAAAtB,IAAA,GAAAG,sBAAA,CAAAF,OAAA;EAAAqB,SAAA,YAAAA,CAAA;IAAA,OAAAtB,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAuB,QAAA;EAAA,MAAAvB,IAAA,GAAAC,OAAA;EAAAsB,OAAA,YAAAA,CAAA;IAAA,OAAAvB,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAwB,QAAA;EAAA,MAAAxB,IAAA,GAAAC,OAAA;EAAAuB,OAAA,YAAAA,CAAA;IAAA,OAAAxB,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAyB,eAAA;EAAA,MAAAzB,IAAA,GAAAG,sBAAA,CAAAF,OAAA;EAAAwB,cAAA,YAAAA,CAAA;IAAA,OAAAzB,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAGA,SAAA0B,cAAA;EAAA,MAAA1B,IAAA,GAAAC,OAAA;EAAAyB,aAAA,YAAAA,CAAA;IAAA,OAAA1B,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAA2B,oBAAA;EAAA,MAAA3B,IAAA,GAAAC,OAAA;EAAA0B,mBAAA,YAAAA,CAAA;IAAA,OAAA3B,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAA4B,UAAA;EAAA,MAAA5B,IAAA,GAAAC,OAAA;EAAA2B,SAAA,YAAAA,CAAA;IAAA,OAAA5B,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AASA,SAAA6B,aAAA;EAAA,MAAA7B,IAAA,GAAAC,OAAA;EAAA4B,YAAA,YAAAA,CAAA;IAAA,OAAA7B,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAA8B,WAAA;EAAA,MAAA9B,IAAA,GAAAC,OAAA;EAAA6B,UAAA,YAAAA,CAAA;IAAA,OAAA9B,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAA+B,sBAAA;EAAA,MAAA/B,IAAA,GAAAG,sBAAA,CAAAF,OAAA;EAAA8B,qBAAA,YAAAA,CAAA;IAAA,OAAA/B,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAEA,SAAAgC,SAAA;EAAA,MAAAhC,IAAA,GAAAC,OAAA;EAAA+B,QAAA,YAAAA,CAAA;IAAA,OAAAhC,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAiC,UAAA;EAAA,MAAAjC,IAAA,GAAAC,OAAA;EAAAgC,SAAA,YAAAA,CAAA;IAAA,OAAAjC,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAkC,SAAA;EAAA,MAAAlC,IAAA,GAAAC,OAAA;EAAAiC,QAAA,YAAAA,CAAA;IAAA,OAAAlC,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAmC,cAAA;EAAA,MAAAnC,IAAA,GAAAC,OAAA;EAAAkC,aAAA,YAAAA,CAAA;IAAA,OAAAnC,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAoC,mBAAA;EAAA,MAAApC,IAAA,GAAAC,OAAA;EAAAmC,kBAAA,YAAAA,CAAA;IAAA,OAAApC,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAA0D,SAAAqC,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,SAAAjC,wBAAAqC,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;AAKkB;AAC2C;;AA6ChH,MAAMS,WAAW,CAAC;EAEvBC,WAAWA,CACDC,SAAoB,EACpBC,OAAoB,EACpBC,QAAsB,EACtBC,QAAsB,EACtBC,MAAc,EACdC,eAAoC,EACpCC,QAAsB,EACtBC,MAAkB,EAClBC,MAAkB,EAC1B;IAAA,IAAAC,eAAA;IAAA,KATQT,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;IAAA,IAAAb,gBAAA,GAAAjC,OAAA;IAE1B,IAAI,CAACgD,QAAQ,IAAAD,eAAA,GAAG,IAAI,CAACT,SAAS,cAAAS,eAAA,uBAAdA,eAAA,CAAgBC,QAAQ;EAC1C;EAEA,MAAMC,KAAKA,CACTC,GAAa,EACbC,aAA4B,EAC5BC,KAAc,EACdC,OAAgB,EAChBC,MAAe,EACfC,OAAe,EACfC,KAAc,EACdC,0BAAmC,EACL;IAC9B,IAAI,CAAC,IAAI,CAACnB,SAAS,EAAE,MAAM,KAAIoB,kCAAqB,EAAC,CAAC;IACtD,MAAMV,QAAkB,GAAG,IAAI,CAACV,SAAS,CAACU,QAAQ;IAClD,IAAIW,YAAY;IAChB,IAAIN,OAAO,EAAE;MACXM,YAAY,GAAG,MAAM,IAAI,CAACC,YAAY,CAACV,GAAG,EAAEK,OAAO,EAAEC,KAAK,CAAC;IAC7D,CAAC,MAAM,IAAIJ,KAAK,EAAE;MAChBO,YAAY,GAAG,MAAM,IAAI,CAACE,UAAU,CAACX,GAAG,CAAC;IAC3C,CAAC,MAAM;MACL,MAAMY,MAAM,GAAG,MAAM,IAAI,CAACC,oBAAoB,CAACf,QAAQ,EAAEE,GAAG,CAAC;MAC7DS,YAAY,GAAG,MAAM,IAAI,CAACK,yBAAyB,CACjDhB,QAAQ,EACRc,MAAM,EACNX,aAAa,EACbG,MAAM,EACNC,OAAO,EACPC,KAAK,EACLC,0BACF,CAAC;IACH;IACA,MAAMT,QAAQ,CAACiB,SAAS,CAAC,CAAC;IAC1B,OAAON,YAAY;EACrB;;EAEA;AACF;AACA;AACA;EACE,MAAMK,yBAAyBA,CAC7BhB,QAAkB,EAClBc,MAAe,EACfX,aAA4B,EAC5BG,MAAe,EACfY,WAAmB,EACnBV,KAAc,EACdC,0BAAmC,EACL;IAC9B,MAAMU,aAAa,GAAGnB,QAAQ,CAACoB,gBAAgB,CAAC,CAAC;IACjD,MAAMC,iBAAiB,GAAG,MAAMrB,QAAQ,CAACsB,oBAAoB,CAAC,CAAC;IAC/D,MAAMC,mBAAmB,GAAG,MAAM,IAAI,CAACC,sBAAsB,CAACV,MAAM,EAAEK,aAAa,EAAEE,iBAAiB,CAAC;IACvG,MAAMI,gBAAgB,GAAGF,mBAAmB,CAAClD,MAAM,CAAEqD,CAAC,IAAKA,CAAC,CAACC,eAAe,IAAI,CAACD,CAAC,CAACE,oBAAoB,CAAC;IACxG,IAAIH,gBAAgB,CAAC3C,MAAM,EAAE;MAC3B,MAAM+C,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;MACrBpC,aAAa;MACboB,mBAAmB;MACnBiB,MAAM,EAAErB,aAAa;MACrBsB,SAAS,EAAEpB,iBAAiB;MAC5Bf,MAAM;MACNY,WAAW;MACXV,KAAK;MACLC;IACF,CAAC,CAAC;EACJ;;EAEA;AACF;AACA;EACE,MAAM8B,UAAUA,CAAC;IACfpC,aAAa;IACboB,mBAAmB;IACnBiB,MAAM;IACNC,SAAS;IACTnC,MAAM;IACNoC,GAAG;IACHxB,WAAW;IACXV,KAAK;IACLC;EAWF,CAAC,EAAgC;IAAA,IAAAkC,iBAAA;IAC/B,MAAM3C,QAAQ,GAAG,IAAI,CAACV,SAAS,CAACU,QAAQ;IACxC,MAAM4C,qBAAqB,GAAGrB,mBAAmB,CAACsB,IAAI,CACnDC,SAAS,IAAKA,SAAS,CAACnC,YAAY,IAAImC,SAAS,CAACnC,YAAY,CAACoC,YAClE,CAAC;IACD,IAAIH,qBAAqB,IAAI,CAACzC,aAAa,EAAE;MAC3CA,aAAa,GAAG,MAAM,IAAA6C,2CAA2B,EAAC,CAAC;IACrD;IACA,MAAMvB,gBAAoC,GAAGF,mBAAmB,CAC7DlD,MAAM,CAAE4E,eAAe,IAAKA,eAAe,CAACtB,eAAe,CAAC,CAC5DtD,MAAM,CAAE4E,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,CAC7ClD,MAAM,CAAE4E,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,CAAClD,MAAM,CAAE4E,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,MAAM9D,QAAQ,CAAC+D,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;QACZR,aAAa;QACboE,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,IAAAa,wCAA4B,EAAClB,mBAAmB,EAAEC,iBAAiB,CAAC;IAEpE,MAAM,IAAAkB,+BAAmB,EAAClB,iBAAiB,EAAE,IAAI,CAACnE,SAAS,CAAC;IAE5D,MAAMsF,cAAc,GAAG,IAAAC,iBAAO,EAACrB,mBAAmB,CAAC1B,GAAG,CAAEJ,CAAC,IAAKA,CAAC,CAACmC,iBAAiB,CAAC,CAAC;IAEnF,MAAM;MAAEiB,oBAAoB;MAAEC;IAAuB,CAAC,GAAG,MAAM,IAAI,CAACC,oCAAoC,CACtGJ,cACF,CAAC;IAED,MAAM,IAAI,CAACK,qCAAqC,CAACL,cAAc,EAAEG,sBAAsB,CAAC;IAExF,IAAItC,SAAS,EAAEzC,QAAQ,CAAC+D,KAAK,CAACmB,OAAO,CAACC,GAAG,CAAC1C,SAAS,CAAC;IAEpD,MAAMzC,QAAQ,CAAC+D,KAAK,CAACmB,OAAO,CAACE,OAAO,CAAC,CAAC,CAAC,CAAC;;IAExC,MAAMpF,QAAQ,CAAC+D,KAAK,CAACmB,OAAO,CAACG,kBAAkB,CAACC,KAAK,CAAC,CAAC;IAEvD,MAAMtF,QAAQ,CAACuF,WAAW,CAAC,CAAC;IAE5B,IAAIlC,oBAAoB,CAACvE,MAAM,EAAE;MAC/B,MAAM0G,kBAAkB,GAAGC,eAAM,CAACC,SAAS,CAACrC,oBAAoB,CAAC;MACjE,MAAM,IAAAsC,+BAAqB,EAAC3F,QAAQ,EAAEwF,kBAAkB,CAAC;MACzD,MAAMxF,QAAQ,CAAC4F,eAAe,CAACJ,kBAAkB,CAAC;IACpD;IAEA,MAAMK,iCAAiC,GAAGtE,mBAAmB,CAACuE,IAAI,CAAEpE,CAAC;MAAA,IAAAqE,oBAAA;MAAA,QAAAA,oBAAA,GAAKrE,CAAC,CAACmC,iBAAiB,cAAAkC,oBAAA,uBAAnBA,oBAAA,CAAqBhD,YAAY,CAAC,CAAC;IAAA,EAAC;IAC9G,MAAMiD,uBAAuB,GAAGpD,qBAAqB,IAAIzC,aAAa,KAAK,QAAQ;IACnF,IAAI,CAACM,0BAA0B,IAAI,CAACuF,uBAAuB,IAAI,CAACH,iCAAiC,EAAE;MACjG,IAAI;QACF,MAAM,IAAI,CAACtG,OAAO,CAACA,OAAO,CAACgE,SAAS,EAAE;UACpC0C,MAAM,EAAE,IAAI;UACZC,cAAc,EAAE,KAAK;UACrBC,MAAM,EAAE;QACV,CAAC,CAAC;MACJ,CAAC,CAAC,OAAOC,GAAQ,EAAE;QACjB,IAAI,CAAC1G,MAAM,CAAC2G,KAAK,CAAE,4BAA2B,EAAED,GAAG,CAAC;QACpD,IAAI,CAAC1G,MAAM,CAAC4G,YAAY,CAAE,uEAAsEF,GAAG,CAAC7F,OAAQ,EAAC,CAAC;MAChH;IACF;IAEA,MAAMgG,mBAAmB,GAAG,MAAAA,CAAA,KAAY;MACtC;MACA;MACA,IAAIjG,MAAM,IAAI0F,uBAAuB,IAAIH,iCAAiC,EAAE;QAC1E,OAAO,IAAI;MACb;MACA,IAAInD,GAAG,EAAE;QACP,MAAM8D,QAAQ,GAAGjF,mBAAmB,CAACO,GAAG,CAAEJ,CAAC,IAAKA,CAAC,CAACQ,EAAE,CAAC;QACrD,MAAMuE,OAAO,GAAG,MAAM,IAAI,CAACC,mBAAmB,CAACF,QAAQ,EAAEtF,WAAW,EAAEV,KAAK,CAAC;QAC5E,IAAI,CAACiG,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,CAAChH,QAAQ,EAAEkB,WAAW,EAAEV,KAAK,CAAC;IAClE,CAAC;IACD,IAAIyG,gBAAyD,GAAG,IAAI;IACpE,IAAIC,cAAiC;IACrC,MAAMC,cAAc,GAAG,IAAI,CAAC7H,SAAS,CAAC8H,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,CAAC9G,SAAS,CAAC8H,MAAM,CAACE,mBAAmB,CAACH,cAAc,CAAC;IAC3D;IAEA,OAAO;MACLI,UAAU,EAAE9D,iBAAiB,CAAC3B,GAAG,CAAEJ,CAAC,IAAKA,CAAC,CAAC8F,kBAAkB,CAAC;MAC9D/F,gBAAgB;MAChBoF,iBAAiB,EAAE,CAAC,GAAGxD,oBAAoB,EAAE,IAAI,EAAAV,iBAAA,GAAAsE,gBAAgB,cAAAtE,iBAAA,uBAAhBA,iBAAA,CAAkBkE,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,CAACnI,SAAS,CAACoI,oBAAoB,CAAC,CAAC;IAC7D,IAAI3C,sBAAsB,EAAE;MAC1B,MAAM4C,iBAAiB,GAAG,KAAIC,sCAAiB,EAAC,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,CAC7E;QACE1F,EAAE,EAAE2F,8CAAwB,CAAC3F,EAAE;QAC/B4F,QAAQ,EAAE/C;MACZ,CAAC,CACF,CAAC;MACFH,cAAc,CAACmD,OAAO,CAACJ,iBAAiB,CAAC;IAC3C;IACA/C,cAAc,CAAC5F,OAAO,CAAEgJ,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,CAAC9C,GAAG,CAAEJ,CAAC,IAAKA,CAAC,CAAC4G,qBAAqB,CAAC,CAAC,CAAC;;IAEvE;IACA,MAAMC,eAAgD,GAAG,CAAC,CAAC;IAC3D,MAAMC,kBAAmD,GAAG,CAAC,CAAC,CAAC,CAAC;IAChE5D,cAAc,CAAC5F,OAAO,CAAEgJ,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,CAAC7J,OAAO,CAAE8J,QAAQ,IAAK;QACxC,IAAI,CAACH,kBAAkB,CAACG,QAAQ,CAAC,EAAE;QACnCH,kBAAkB,CAACG,QAAQ,CAAC,CAAC9J,OAAO,CAAE+J,GAAa,IAAK;UACtD,IAAIA,GAAG,CAACC,KAAK,EAAE,OAAO,CAAC;UACvB,IAAIT,eAAe,CAACQ,GAAG,CAAC1E,IAAI,CAAC,EAAE;YAC7B,IAAI,CAACkE,eAAe,CAACQ,GAAG,CAAC1E,IAAI,CAAC,CAAC4E,QAAQ,CAACF,GAAG,CAACtE,OAAO,CAAC,EAAE8D,eAAe,CAACQ,GAAG,CAAC1E,IAAI,CAAC,CAAC7F,IAAI,CAACuK,GAAG,CAACtE,OAAO,CAAC;YACjG+D,kBAAkB,CAACO,GAAG,CAAC1E,IAAI,CAAC,CAAC7F,IAAI,CAACwJ,WAAW,CAACG,SAAS,CAAC;YACxD;UACF;UACAI,eAAe,CAACQ,GAAG,CAAC1E,IAAI,CAAC,GAAG,CAAC0E,GAAG,CAACtE,OAAO,CAAC;UACzC+D,kBAAkB,CAACO,GAAG,CAAC1E,IAAI,CAAC,GAAG,CAAC2D,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,CAAC5F,OAAO,CAAEgJ,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,CAAC7J,OAAO,CAAE8J,QAAQ,IAAK;QACxC,IAAI,CAACO,oBAAoB,CAACP,QAAQ,CAAC,EAAE;QACrCO,oBAAoB,CAACP,QAAQ,CAAC,CAAC9J,OAAO,CAAE+J,GAAa,IAAK;UACxD,IAAIA,GAAG,CAACC,KAAK,EAAE,OAAO,CAAC;UACvB,IAAIE,YAAY,CAACH,GAAG,CAAC1E,IAAI,CAAC,EAAE;YAC1B,IAAI,CAAC6E,YAAY,CAACH,GAAG,CAAC1E,IAAI,CAAC,CAAC4E,QAAQ,CAACF,GAAG,CAACtE,OAAO,CAAC,EAAEyE,YAAY,CAACH,GAAG,CAAC1E,IAAI,CAAC,CAAC7F,IAAI,CAACuK,GAAG,CAACtE,OAAO,CAAC;YAC3F0E,mBAAmB,CAACJ,GAAG,CAAC1E,IAAI,CAAC,CAAC7F,IAAI,CAACwJ,WAAW,CAACG,SAAS,CAAC;YACzD;UACF;UACAe,YAAY,CAACH,GAAG,CAAC1E,IAAI,CAAC,GAAG,CAAC0E,GAAG,CAACtE,OAAO,CAAC;UACtC0E,mBAAmB,CAACJ,GAAG,CAAC1E,IAAI,CAAC,GAAG,CAAC2D,WAAW,CAACG,SAAS,CAAC;QACzD,CAAC,CAAC;MACJ,CAAC,CAAC;IACJ,CAAC,CAAC;IAEF,MAAMmB,qBAAqB,GAAGhM,MAAM,CAACY,IAAI,CAACqK,eAAe,CAAC;IAC1D,MAAMgB,kBAAkB,GAAGjM,MAAM,CAACY,IAAI,CAACgL,YAAY,CAAC;IACpD,IAAI,CAACI,qBAAqB,CAACxK,MAAM,IAAI,CAACyK,kBAAkB,CAACzK,MAAM,EAAE,OAAO,CAAC,CAAC;IAE1E,MAAM0K,eAAe,GAAG,IAAI,CAAC3J,MAAM,CAAC2J,eAAe;IACnD,IAAI,CAACA,eAAe,EAAE,MAAM,IAAIC,KAAK,CAAE,qEAAoE,CAAC;IAC5G,MAAMC,WAAW,GAAGF,eAAe,CAACG,UAAU,CAACC,iBAAiB,CAAC/B,8CAAwB,CAAC3F,EAAE,CAAC;IAC7F,MAAM0G,MAAM,GAAGc,WAAW,aAAXA,WAAW,uBAAXA,WAAW,CAAE7J,MAAM,CAAC+I,MAAM;IACzC,IAAI,CAACA,MAAM,EAAE;MACX,OAAO,CAAC,CAAC;IACX;;IAEA;IACA,MAAMiB,oBAAoB,GAAG,CAAC,CAAC;IAC/BP,qBAAqB,CAACtK,OAAO,CAAE8K,OAAO,IAAK;MACzC,IAAIvB,eAAe,CAACuB,OAAO,CAAC,CAAChL,MAAM,GAAG,CAAC,EAAE;QACvC;QACA;MACF;MACA+J,gCAAmB,CAAC7J,OAAO,CAAE8J,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,CAACvK,MAAM,CAACwK,KAAK,CACd,2BAA0BJ,OAAQ,SAAQE,UAAW,OAAMC,MAAO,mBAAkBzB,kBAAkB,CACrGsB,OAAO,CACR,CAACzH,IAAI,CAAC,IAAI,CAAE,EACf,CAAC;MACH,CAAC,CAAC;IACJ,CAAC,CAAC;;IAEF;IACA,MAAM8H,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,CAACvK,OAAO,CAAE8K,OAAO,IAAK;MACtC,IAAIZ,YAAY,CAACY,OAAO,CAAC,CAAChL,MAAM,GAAG,CAAC,EAAE;QACpC;QACA;MACF;MACA,MAAM0L,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,CAACnL,OAAO,CAAE8J,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,CAAC/L,IAAI,CAACsL,OAAO,CAAC;QACrD,IAAIgB,iBAAM,CAACC,SAAS,CAACL,QAAQ,EAAEG,kBAAkB,CAAC,EAAE;UAClD;UACA;QACF;QACAT,sBAAsB,CAACtB,QAAQ,CAAC,CAACtK,IAAI,CAAC;UACpC6F,IAAI,EAAEyF,OAAO;UACbrF,OAAO,EAAE+F,WAAW,CAACQ,OAAO,CAACP,UAAU,EAAEI,kBAAkB,CAAC;UAC5D7B,KAAK,EAAE;QACT,CAAC,CAAC;QACFuB,uCAAuC,CAAC/L,IAAI,CAACsL,OAAO,CAAC;QACrD,IAAI,CAACpK,MAAM,CAACwK,KAAK,CACd,6BAA4BJ,OAAQ,aAAYe,kBAAmB,YAAWH,QAAS,mBAAkBvB,mBAAmB,CAC3HW,OAAO,CACR,CAACzH,IAAI,CAAC,IAAI,CAAE,EACf,CAAC;MACH,CAAC,CAAC;IACJ,CAAC,CAAC;IACF8H,cAAc,CAACnL,OAAO,CAAE8J,QAAQ,IAAK;MACnC,IAAI,IAAAmC,iBAAO,EAACb,sBAAsB,CAACtB,QAAQ,CAAC,CAAC,EAAE,OAAOsB,sBAAsB,CAACtB,QAAQ,CAAC;IACxF,CAAC,CAAC;IAEF,IAAIyB,uCAAuC,CAACzL,MAAM,EAAE;MAClDuJ,UAAU,CAACrJ,OAAO,CAAEkM,MAAM,IAAK;QAC7B,IAAIA,MAAM,aAANA,MAAM,eAANA,MAAM,CAAEpD,QAAQ,EAAE;UACpBe,gCAAmB,CAAC7J,OAAO,CAAE8J,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,CAACzK,MAAM,CAC3DgN,GAAG,IAAK,CAACd,uCAAuC,CAACtB,QAAQ,CAACoC,GAAG,CAAChH,IAAI,CACrE,CAAC;YACD,IAAI,CAAC6G,MAAM,CAACpD,QAAQ,CAACgB,QAAQ,CAAC,CAAChK,MAAM,EAAE,OAAOoM,MAAM,CAACpD,QAAQ,CAACgB,QAAQ,CAAC;UACzE,CAAC,CAAC;UACF,IAAI,IAAAmC,iBAAO,EAACC,MAAM,CAACpD,QAAQ,CAAC,EAAEoD,MAAM,CAACpD,QAAQ,GAAGvE,SAAS;QAC3D;MACF,CAAC,CAAC;IACJ;IAEA,IAAIjG,MAAM,CAACY,IAAI,CAAC2L,oBAAoB,CAAC,CAAC/K,MAAM,EAAE;MAC5C,MAAM0K,eAAe,CAAClE,KAAK,CAAC,CAAC;IAC/B;IAEA,IAAI,CAAC5F,MAAM,CAACwK,KAAK,CAAC,+BAA+B,EAAEL,oBAAoB,CAAC;IACxE,IAAI,CAACnK,MAAM,CAACwK,KAAK,CAAC,iCAAiC,EAAEE,sBAAsB,CAAC;IAE5E,OAAO;MACLtF,oBAAoB,EAAExH,MAAM,CAACY,IAAI,CAAC2L,oBAAoB,CAAC,CAAC/K,MAAM,GAAG+K,oBAAoB,GAAGtG,SAAS;MACjGwB,sBAAsB,EAAEzH,MAAM,CAACY,IAAI,CAACkM,sBAAsB,CAAC,CAACtL,MAAM,GAAGsL,sBAAsB,GAAG7G;IAChG,CAAC;EACH;;EAEA;AACF;AACA;AACA;AACA;AACA;EACE,MAAM+H,cAAcA,CAClBxK,MAAe;EAAE;EACjByK,WAAwB;EAAE;EAC1BC,SAAuB;EAAE;EACzBC,OAA6E,EAC5C;IACjC,IAAI,CAACF,WAAW,IAAIC,SAAS,EAAE;MAC7B,MAAM,IAAI,CAAC5L,QAAQ,CAAC8L,4BAA4B,CAACF,SAAS,CAACG,QAAQ,CAAC,CAAC,CAACC,eAAe,CAAC,CAAC,CAAC;IAC1F;IACA,MAAMC,iCAAiC,GAAG,MAAM,IAAAnI,qBAAS,EAAC5C,MAAM,EAAGoB,EAAE,IACnE,IAAI,CAAC4J,oCAAoC,CAAC5J,EAAE,EAAEqJ,WAAW,EAAEE,OAAO,CACpE,CAAC;IACD,MAAMM,QAAQ,GAAGF,iCAAiC,CAC/C/J,GAAG,CAAEkK,UAAU,IAAK;MACnB,IAAI,CAACA,UAAU,CAACC,WAAW,EAAE,OAAO,EAAE;MACtC,MAAMC,gBAAgB,GAAG,IAAArH,iBAAO,EAAC,CAC/B,GAAGmH,UAAU,CAACC,WAAW,CAACE,iBAAiB,EAC3CH,UAAU,CAACC,WAAW,CAACG,uBAAuB,CAC/C,CAAC;MACF,OAAOF,gBAAgB,CAACpK,GAAG,CAAEuK,CAAC,IAAKL,UAAU,CAAC9J,EAAE,CAACoB,aAAa,CAAC+I,CAAC,CAAClK,QAAQ,CAAC,CAAC,CAAC,CAAC;IAC/E,CAAC,CAAC,CACDmK,IAAI,CAAC,CAAC;IAET,MAAM,IAAI,CAACtM,QAAQ,CAAC+D,KAAK,CAACwI,aAAa,CAACC,8BAA8B,CAAC;MACrEtM,GAAG,EAAEuF,eAAM,CAACC,SAAS,CAACqG,QAAQ,CAAC;MAC/BU,IAAI,EAAEjB,SAAS,IAAIjI;IACrB,CAAC,CAAC;IAEF,MAAMmJ,sBAAsB,GAAGb,iCAAiC,CAACxN,MAAM,CACpEqD,CAAC,IAAK,CAACA,CAAC,CAACiL,UACZ,CAA2B;IAC3B,MAAMC,mBAAmB,GAAGf,iCAAiC,CAACxN,MAAM,CAAEqD,CAAC,IAAKA,CAAC,CAACiL,UAAU,CAAC;IAEzF,MAAME,4BAA4B,GAAG,MAAAA,CAAA,KAA6C;MAChF,MAAMC,GAAG,GAAG,KAAIC,mBAAG,EAAC,IAAI,CAAC/M,QAAQ,CAAC+D,KAAK,CAAC;MACxC,IAAI;QACF,MAAMiJ,gBAAgB,GAAG,MAAMC,OAAO,CAACC,GAAG,CACxCN,mBAAmB,CAAC9K,GAAG,CAAEkK,UAAU,IACjC,IAAI,CAACmB,uBAAuB,CAAC5B,WAAW,EAAEC,SAAS,IAAIjI,SAAS,EAAEyI,UAAU,CAC9E,CACF,CAAC;QACD,MAAMc,GAAG,CAACM,KAAK,CAAC,CAAC;QACjB,OAAOJ,gBAAgB;MACzB,CAAC,CAAC,OAAO5G,GAAQ,EAAE;QACjB,MAAM0G,GAAG,CAACM,KAAK,CAAC,CAAC;QACjB,MAAMhH,GAAG;MACX;IACF,CAAC;IACD,MAAMK,OAAO,GAAG,MAAMoG,4BAA4B,CAAC,CAAC;IAEpDpG,OAAO,CAACjI,IAAI,CAAC,GAAGkO,sBAAsB,CAAC;IACvC,OAAOjG,OAAO;EAChB;EAEA,MAAcqF,oCAAoCA,CAChD5J,EAAS;EAAE;EACXO,SAAsB;EAAE;EACxBgJ,OAA6E,EAC5B;IACjD,MAAMzL,QAAQ,GAAG,IAAI,CAACV,SAAS,CAACU,QAAQ;IACxC,MAAMiD,eAAuD,GAAG;MAAEf;IAAG,CAAC;IACtE,MAAMmL,cAAc,GAAGA,CAACC,GAAW,EAAE1L,oBAAoB,GAAG,KAAK,KAAK;MACpEqB,eAAe,CAACtB,eAAe,GAAG2L,GAAG;MACrCrK,eAAe,CAACrB,oBAAoB,GAAGA,oBAAoB;MAC3D,OAAOqB,eAAe;IACxB,CAAC;IACD,MAAMa,cAAc,GAAG,MAAM9D,QAAQ,CAAC+D,KAAK,CAACwJ,wBAAwB,CAACrL,EAAE,CAAC;IACxE,IAAI,CAAC4B,cAAc,EAAE;MACnB,OAAOuJ,cAAc,CAClB,aAAYnL,EAAE,CAACC,QAAQ,CAAC,CAAE,gFAC7B,CAAC;IACH;IACA,MAAMqL,QAAQ,GAAGxN,QAAQ,CAAC+D,KAAK,CAACmB,OAAO,CAACG,kBAAkB,CAACoI,QAAQ,CAACvL,EAAE,CAACmC,IAAI,CAAC;IAC5E,IAAImJ,QAAQ,EAAE;MACZ,OAAOH,cAAc,CAClB,aAAYnL,EAAE,CAACwL,sBAAsB,CAAC,CAAE,kIAC3C,CAAC;IACH;IACA,MAAMC,IAAI,GAAG3N,QAAQ,CAAC+D,KAAK,CAACmB,OAAO;IACnC,MAAMT,OAAO,GAAGvC,EAAE,CAACuC,OAAiB;IACpC,MAAMmJ,aAAa,GAAG9J,cAAc,CAACU,MAAM,CAACC,OAAO,CAAC;IACpD,MAAMoJ,gBAAgB,GAAG7N,QAAQ,CAACoH,MAAM,CAAC0G,eAAe,CAAC5L,EAAE,EAAE;MAAE6L,aAAa,EAAE;IAAK,CAAC,CAAC;IACrF,MAAMC,gBAAyB,GAAG,MAAMlK,cAAc,CAACmK,WAAW,CAACxJ,OAAO,EAAEzE,QAAQ,CAAC+D,KAAK,CAACmB,OAAO,CAAC;IACnG,IAAI8I,gBAAgB,CAACE,SAAS,CAAC,CAAC,EAAE;MAChC,IAAIL,gBAAgB,IAAIpL,SAAS,EAAE;QACjC;QACA;QACAQ,eAAe,CAACC,eAAe,GAAG,IAAI;MACxC,CAAC,MAAM;QACL;QACA;QACA,OAAOmK,cAAc,CAAE,4BAA2B,EAAE,IAAI,CAAC;MAC3D;IACF;IACA,MAAMc,YAAY,GAAGA,CAAA,KAAM;MACzB,IAAIN,gBAAgB,EAAE,OAAOA,gBAAgB;MAC7C,IAAIpL,SAAS,EAAE;QACb,MAAM2L,QAAQ,GAAG3L,SAAS,CAAC4L,YAAY,CAACnM,EAAE,CAAC;QAC3C,IAAI,CAACkM,QAAQ,EAAE,OAAO,IAAI;QAC1B,OAAOA,QAAQ,CAAClM,EAAE,CAACoB,aAAa,CAAC8K,QAAQ,CAACE,IAAI,CAACnM,QAAQ,CAAC,CAAC,CAAC;MAC5D;MACA;MACA,MAAMmM,IAAI,GAAGxK,cAAc,CAACyK,mBAAmB,CAAC,CAAC;MACjD,IAAID,IAAI,EAAE;QACR,OAAOpM,EAAE,CAACoB,aAAa,CAACgL,IAAI,CAAC;MAC/B;MACA,OAAO,IAAI;IACb,CAAC;IACD,MAAME,SAAS,GAAGL,YAAY,CAAC,CAAC;IAChC,IAAI,CAACK,SAAS,EAAE;MACd,MAAMvC,WAAW,GAAG,MAAM,IAAAwC,gCAAc,EAAC;QAAEd,IAAI;QAAE7J,cAAc;QAAE4K,UAAU,EAAEd,aAAa;QAAEe,MAAM,EAAE;MAAM,CAAC,CAAC;MAC5G,OAAAjQ,aAAA,CAAAA,aAAA,KAAYuE,eAAe;QAAE2L,kBAAkB,EAAEZ,gBAAgB;QAAE/B;MAAW;IAChF;IACA,MAAM4C,mBAAmB,GAAGA,CAAA,KAAM;MAChC,IAAIhB,gBAAgB,EAAE,OAAO7N,QAAQ,CAAC8O,aAAa,CAACjB,gBAAgB,CAAC;MACrE,OAAO7N,QAAQ,CAAC+D,KAAK,CAACgL,oBAAoB,CAACP,SAAS,CAAC;IACvD,CAAC;IACD,MAAM7K,gBAAgB,GAAG,MAAMkL,mBAAmB,CAAC,CAAC;IACpD,IAAIlL,gBAAgB,CAACuK,SAAS,CAAC,CAAC,EAAE;MAChC,OAAOb,cAAc,CAAE,4BAA2B,EAAE,IAAI,CAAC;IAC3D;IACA,MAAM2B,UAAU,GAAG,MAAAA,CAAA,KAAY;MAC7B,MAAMC,2BAA2B,GAAG,MAAMjP,QAAQ,CAACkP,sBAAsB,CAACvL,gBAAgB,CAACzB,EAAE,CAAC;MAC9F,IAAI,CAAC+M,2BAA2B,CAACE,QAAQ,EAAE,OAAO,KAAK;MACvD,IAAI,CAACtB,gBAAgB,EAAE,OAAO,KAAK;MACnC,MAAMuB,aAAa,GAAG,MAAMtL,cAAc,CAACmK,WAAW,CACpDJ,gBAAgB,CAACpJ,OAAO,EACxBzE,QAAQ,CAAC+D,KAAK,CAACmB,OACjB,CAAC;MACD,OAAOuG,OAAO,aAAPA,OAAO,eAAPA,OAAO,CAAE4D,mBAAmB,GAC/BrP,QAAQ,CAACsP,6BAA6B,CAACF,aAAa,EAAEzL,gBAAgB,CAAC,GACvE,IAAI;IACV,CAAC;IAED,MAAM4L,mBAAmB,GAAG,MAAMP,UAAU,CAAC,CAAC;IAE9C,IAAIO,mBAAmB,EAAE;MACvB,OAAOlC,cAAc,CAAE,iDAAgD,CAAC;IAC1E;IACA,IAAI,CAACO,aAAa,EAAE;MAClB,MAAM,IAAInE,KAAK,CAAE,kDAAiDhF,OAAQ,OAAMvC,EAAE,CAACC,QAAQ,CAAC,CAAE,EAAC,CAAC;IAClG;IACA,MAAM8J,WAAW,GAAG,MAAM,IAAAwC,gCAAc,EAAC;MACvCd,IAAI;MACJ7J,cAAc;MACd4K,UAAU,EAAEd,aAAa;MACzBe,MAAM,EAAE;IACV,CAAC,CAAC;IACF,IAAI1C,WAAW,CAAC7F,GAAG,EAAE;MACnB,MAAMoJ,QAAQ,GAAG1L,cAAc,CAACwK,IAAI;MACpC,IAAIrC,WAAW,CAAC7F,GAAG,YAAYqJ,4BAAY,IAAIhE,OAAO,aAAPA,OAAO,eAAPA,OAAO,CAAEiE,gBAAgB,IAAIF,QAAQ,EAAE;QACpF,MAAMG,mBAAmB,GAAG,MAAOC,aAAyB,IAAK;UAC/D,MAAMC,mBAAmB,GAAG,MAAM,IAAApB,gCAAc,EAAC;YAC/Cd,IAAI;YACJ7J,cAAc;YACdgM,UAAU,EAAEF,aAAa;YACzBlB,UAAU,EAAEc,QAAQ;YACpBb,MAAM,EAAE;UACV,CAAC,CAAC;UACF,IAAI,CAACkB,mBAAmB,CAACzJ,GAAG,EAAE,OAAO,IAAI;UACzC,OAAO,EAAEyJ,mBAAmB,CAACzJ,GAAG,YAAYqJ,4BAAY,CAAC;QAC3D,CAAC;QACD,MAAMM,kBAAkB,GAAG,MAAMJ,mBAAmB,CAAC7L,cAAc,CAACkM,uBAAuB,CAAC,CAAQ,CAAC;QACrG,MAAMC,mBAAmB,GAAG,MAAMN,mBAAmB,CAAC/B,aAAa,CAAC;QACpE,IAAI,CAACmC,kBAAkB,IAAI,CAACE,mBAAmB,EAAE;UAC/C,OAAO5C,cAAc,CAClB,sBAAqB1J,gBAAgB,CAACzB,EAAE,CAACC,QAAQ,CAAC,CAAE,2BAA0BqN,QAAQ,CAACrN,QAAQ,CAAC,CAAE,gFACrG,CAAC;QACH;QACA,MAAM+N,mBAAmB,GAAGH,kBAAkB,GAAGpM,gBAAgB,CAACzB,EAAE,CAACuC,OAAO,GAAGvC,EAAE,CAACuC,OAAO;QACzF,MAAM0L,WAAW,GAAGrM,cAAc,CAACU,MAAM,CAAC0L,mBAA6B,CAAC;QACxE,IAAI,CAACC,WAAW,EAAE,MAAM,IAAI1G,KAAK,CAAE,yBAAwByG,mBAAoB,UAAShO,EAAE,CAACC,QAAQ,CAAC,CAAE,GAAE,CAAC;QACzG,IAAI,CAAAsJ,OAAO,aAAPA,OAAO,uBAAPA,OAAO,CAAEiE,gBAAgB,MAAK,QAAQ,EAAE;UAC1C;UACA,OAAO;YACL/L,gBAAgB;YAChBiL,kBAAkB,EAAEZ,gBAAgB;YACpC9L,EAAE;YACF+J,WAAW;YACXrI,iBAAiB,EAAE;cAAEwM,QAAQ,EAAE,QAAQ;cAAE9B,IAAI,EAAE6B;YAAY;UAC7D,CAAC;QACH;QACA,IAAI,CAAA1E,OAAO,aAAPA,OAAO,uBAAPA,OAAO,CAAEiE,gBAAgB,MAAK,MAAM,EAAE;UACxC,OAAO;YACL/L,gBAAgB;YAChBzB,EAAE;YACF+J,WAAW;YACXrI,iBAAiB,EAAE;cAAEwM,QAAQ,EAAE,MAAM;cAAE9B,IAAI,EAAE6B;YAAY;UAC3D,CAAC;QACH;QACA,MAAM,IAAI1G,KAAK,CACZ,yBAAwBgC,OAAO,aAAPA,OAAO,uBAAPA,OAAO,CAAEiE,gBAAiB,kEACrD,CAAC;MACH;MACA,OAAOrC,cAAc,CAClB,sBAAqB1J,gBAAgB,CAACzB,EAAE,CAACC,QAAQ,CAAC,CAAE,oBAAmB8J,WAAW,CAAC7F,GAAG,CAAC7F,OAAQ,EAClG,CAAC;IACH;IACA,IAAI,CAAC0L,WAAW,CAACoE,UAAU,CAAC,CAAC,EAAE;MAC7B,IAAIpE,WAAW,CAACqE,aAAa,CAAC,CAAC,EAAE;QAC/B;QACA,OAAOjD,cAAc,CAAE,aAAY1J,gBAAgB,CAACzB,EAAE,CAACC,QAAQ,CAAC,CAAE,6BAA4B,EAAE,IAAI,CAAC;MACvG;MACA,IAAI8J,WAAW,CAACsE,aAAa,CAAC,CAAC,EAAE;QAC/B;QACA,OAAA7R,aAAA,CAAAA,aAAA,KACKuE,eAAe;UAClBU,gBAAgB;UAChBiL,kBAAkB,EAAEZ,gBAAgB;UACpC/B;QAAW;MAEf;MACA;MACA,OAAOoB,cAAc,CAAE,aAAY1J,gBAAgB,CAACzB,EAAE,CAACC,QAAQ,CAAC,CAAE,oBAAmB,EAAE,IAAI,CAAC;IAC9F;;IAEA;IACA,MAAMwK,UAAU,GAAG;MACjBiB,aAAa;MACbY,SAAS;MACT1K;IACF,CAAC;IAED,OAAApF,aAAA,CAAAA,aAAA,KAAYuE,eAAe;MAAEU,gBAAgB;MAAEgJ,UAAU;MAAEV;IAAW;EACxE;EAEA,MAAckB,uBAAuBA,CACnC1K,SAAsB;EAAE;EACxB+I,SAA2B;EAAE;EAC7BgF,sCAA8E,EAC9E;IACA,MAAM;MAAEtO,EAAE;MAAE+J,WAAW;MAAEtI,gBAAgB;MAAEgJ;IAAW,CAAC,GAAG6D,sCAAsC;IAChG,IAAI,CAAC7D,UAAU,EAAE,MAAM,IAAIlD,KAAK,CAAE,qDAAoDvH,EAAE,CAACC,QAAQ,CAAC,CAAE,EAAC,CAAC;IACtG,MAAM;MAAEyL,aAAa;MAAEY,SAAS;MAAE1K;IAAe,CAAC,GAAG6I,UAAU;IAC/D,MAAMgB,IAAI,GAAG,IAAI,CAAC3N,QAAQ,CAAC+D,KAAK,CAACmB,OAAO;IACxC,IAAI,CAAC+G,WAAW,EAAE,MAAM,IAAIxC,KAAK,CAAE,sDAAqDvH,EAAE,CAACC,QAAQ,CAAC,CAAE,EAAC,CAAC;IACxG,IAAI,CAACwB,gBAAgB,EAAE,MAAM,IAAI8F,KAAK,CAAE,2DAA0DvH,EAAE,CAACC,QAAQ,CAAC,CAAE,EAAC,CAAC;IAElH,MAAMsO,QAAQ,GAAGxE,WAAW,CAACG,uBAA8B,CAAC,CAAC;IAC7D,IAAI,CAAC1M,MAAM,CAACwK,KAAK,CAAE;AACvB,WAAWhI,EAAE,CAACwL,sBAAsB,CAAC,CAAE;AACvC,WAAW+C,QAAQ,CAACtO,QAAQ,CAAC,CAAE;AAC/B,WAAWqM,SAAS,CAAC/J,OAAQ;AAC7B,WAAWmJ,aAAa,CAACzL,QAAQ,CAAC,CAAE,EAAC,CAAC;IAClC,MAAMiN,aAAsB,GAAG,MAAMtL,cAAc,CAACmK,WAAW,CAACwC,QAAQ,CAACtO,QAAQ,CAAC,CAAC,EAAEwL,IAAI,CAAC;IAC1F,MAAM+C,cAAuB,GAAG,MAAM5M,cAAc,CAACmK,WAAW,CAACL,aAAa,CAACzL,QAAQ,CAAC,CAAC,EAAEwL,IAAI,CAAC;IAEhG,MAAMgD,eAAe,GAAG,CAAAlO,SAAS,aAATA,SAAS,uBAATA,SAAS,CAAEmO,QAAQ,CAAC,CAAC,CAACzO,QAAQ,CAAC,CAAC,KAAI,MAAM;IAClE,MAAM0O,aAAa,GAAGrF,SAAS,GAAGA,SAAS,CAACoF,QAAQ,CAAC,CAAC,CAACzO,QAAQ,CAAC,CAAC,GAAG2O,sBAAY;IAChF,MAAMC,YAAY,GAAI,GAAEvC,SAAS,CAAC/J,OAAQ,KAAIkM,eAAe,KAAKE,aAAa,GAAG,SAAS,GAAGF,eAAgB,GAAE;IAChH,MAAMK,UAAU,GAAI,GAAEpD,aAAa,CAACzL,QAAQ,CAAC,CAAE,KAC7C0O,aAAa,KAAKF,eAAe,GAAG,UAAU,GAAGE,aAClD,GAAE;IACH,MAAMI,YAAY,GAAG,MAAM,IAAI,CAAC3R,SAAS,CAAC4R,OAAO,CAAC,CAAC;IACnD,MAAMC,YAAY,GAAG,KAAIC,4BAAY,EACnClP,EAAE,CAACwL,sBAAsB,CAAC,CAAC,EAC3BuD,YAAY,EACZzF,SAAS,EACT7H,gBAAgB,CAACgG,UAAU,EAC3ByF,aAAa,CAACzF,UAAU,EACxB+G,cAAc,CAAC/G,UAAU,EACzBoH,YAAY,EACZC,UAAU,EACV,IAAI,CAACtR,MACP,CAAC;IACD,MAAMmE,iBAAiB,GAAGsN,YAAY,CAAClR,KAAK,CAAC,CAAC;IAE9C,MAAMU,YAAY,GAAG,MAAM,IAAA0Q,wBAAa,EAAC;MACvCrR,QAAQ,EAAE,IAAI,CAACA,QAAQ;MACvB0Q,cAAc;MACdM,UAAU;MACVrN,gBAAgB;MAChBoN,YAAY;MACZ3B;IACF,CAAC,CAAC;IACF,OAAO;MAAEzL,gBAAgB;MAAEzB,EAAE;MAAEvB,YAAY;MAAEsL,WAAW;MAAEpI;IAAkB,CAAC;EAC/E;EAEA,MAAcS,YAAYA,CAAC;IACzBX,gBAAgB;IAChBzB,EAAE;IACFvB,YAAY;IACZR,aAAa;IACboE,UAAU;IACV/B,MAAM;IACNC,SAAS;IACTmB,iBAAiB;IACjBC;EAWF,CAAC,EAAkC;IACjC,MAAM7D,QAAQ,GAAG,IAAI,CAACV,SAAS,CAACU,QAAQ;IACxC,IAAIsR,WAAW,GAAG,CAAC,CAAC;IACpB,MAAMC,iBAAoC,GAAG;MAC3C;MACArP,EAAE,EAAE;QAAEmC,IAAI,EAAEnC,EAAE,CAACmC,IAAI;QAAEN,KAAK,EAAE7B,EAAE,CAAC6B;MAAM,CAAC;MACtCuK,IAAI,EAAE/J,UAAU;MAChBiN,MAAM,EAAEhP,MAAM,CAACuB,KAAK;MAAE;MACtB0I,IAAI,EAAEjK,MAAM,CAAC6B,IAAI;MAAE;MACnB7B;IACF,CAAC;IACDN,EAAE,GAAGyB,gBAAgB,GAAGA,gBAAgB,CAACzB,EAAE,GAAGA,EAAE;IAEhD,MAAM4B,cAAc,GAAG,MAAM9D,QAAQ,CAAC+D,KAAK,CAACC,iBAAiB,CAAC9B,EAAE,CAAC;IACjE,MAAMuP,sBAAsB,GAAGA,CAAA,KAAM;MACnC,IAAI,CAAC9N,gBAAgB,EAAE,MAAM,IAAI8F,KAAK,CAAC,yDAAyD,CAAC;MACjG,IAAI,CAAChH,SAAS,EAAE,MAAM,IAAIgH,KAAK,CAAC,kDAAkD,CAAC;MACnF,IAAI,EAAC7F,iBAAiB,aAAjBA,iBAAiB,eAAjBA,iBAAiB,CAAE0K,IAAI,GAAE,MAAM,IAAI7E,KAAK,CAAC,uCAAuC,CAAC;MACtFhH,SAAS,CAACiP,YAAY,CAAC;QAAExP,EAAE;QAAEoM,IAAI,EAAE1K,iBAAiB,CAAC0K;MAAK,CAAC,CAAC;MAC5DiD,iBAAiB,CAAC/O,MAAM,GAAGC,SAAS,CAACmO,QAAQ,CAAC,CAAC;MAC/CW,iBAAiB,CAACjD,IAAI,GAAG1K,iBAAiB,CAAC0K,IAAI;MAC/CiD,iBAAiB,CAACI,SAAS,GAAG,IAAI;MAClC3R,QAAQ,CAAC+D,KAAK,CAACmB,OAAO,CAACG,kBAAkB,CAACuM,QAAQ,CAACL,iBAAiB,CAAC;MACrE,OAAO;QAAE/J,kBAAkB,EAAE;UAAEtF,EAAE;UAAEoP;QAAY,CAAC;QAAExO,SAAS,EAAEa;MAAiB,CAAC;IACjF,CAAC;IAED,MAAMkO,uBAAuB,GAAGA,CAAA,KAAM;MACpC,IAAI,CAAClO,gBAAgB,EAAE,MAAM,IAAI8F,KAAK,CAAE,mDAAkDvH,EAAE,CAACC,QAAQ,CAAC,CAAE,EAAC,CAAC;MAC1GwB,gBAAgB,CAACmO,KAAK,CAAC9S,OAAO,CAAE+S,IAAI,IAAK;QACvCT,WAAW,CAAC,IAAAU,6BAAoB,EAACD,IAAI,CAACE,QAAQ,CAAC,CAAC,GAAGC,0BAAU,CAACC,SAAS;MACzE,CAAC,CAAC;IACJ,CAAC;IACD,IAAIxR,YAAY,IAAIA,YAAY,CAACoC,YAAY,IAAI5C,aAAa,KAAKiS,4BAAY,CAACC,IAAI,EAAE;MACpFR,uBAAuB,CAAC,CAAC;MACzB7R,QAAQ,CAAC+D,KAAK,CAACmB,OAAO,CAACG,kBAAkB,CAACuM,QAAQ,CAACL,iBAAiB,CAAC;MACrE,OAAO;QAAE/J,kBAAkB,EAAE;UAAEtF,EAAE;UAAEoP;QAAY,CAAC;QAAExO,SAAS,EAAEa,gBAAgB,IAAIJ;MAAU,CAAC;IAC9F;IACA,IAAI,CAAAK,iBAAiB,aAAjBA,iBAAiB,uBAAjBA,iBAAiB,CAAEwM,QAAQ,MAAK,MAAM,EAAE;MAC1CyB,uBAAuB,CAAC,CAAC;MACzB,OAAOJ,sBAAsB,CAAC,CAAC;IACjC;IACA,MAAMa,QAAQ,GAAGpQ,EAAE,CAACoB,aAAa,CAACiB,UAAU,CAACpC,QAAQ,CAAC,CAAC,CAAC;IACxD,MAAMoQ,QAAQ,GAAG,CAAC5R,YAAY,IAAIR,aAAa,KAAKiS,4BAAY,CAACI,MAAM,GAAGF,QAAQ,GAAGpQ,EAAE;IACvF,MAAMuQ,eAAe,GAAG,MAAMzS,QAAQ,CAAC0S,oCAAoC,CAACH,QAAQ,CAAC;IACrF,IAAI5R,YAAY,IAAIR,aAAa,KAAKiS,4BAAY,CAACI,MAAM,EAAE;MACzD;MACAC,eAAe,CAAChO,OAAO,GAAGvC,EAAE,CAACuC,OAAO;IACtC;IACA,MAAMqN,KAAK,GAAGW,eAAe,CAACX,KAAK;IACnCA,KAAK,CAAC9S,OAAO,CAAE+S,IAAI,IAAK;MACtB;MACAT,WAAW,CAAC,IAAAU,6BAAoB,EAACD,IAAI,CAACE,QAAQ,CAAC,CAAC,GAAGC,0BAAU,CAACS,OAAO;IACvE,CAAC,CAAC;IAEF,IAAIhS,YAAY,EAAE;MAChB;MACA,MAAM;QAAE2Q,WAAW,EAAEsB,cAAc;QAAEC;MAAc,CAAC,GAAG,IAAAC,gCAAoB,EAAChB,KAAK,EAAEnR,YAAY,EAAER,aAAa,CAAC;MAC/GsS,eAAe,CAACX,KAAK,GAAGe,aAAa;MACrCvB,WAAW,GAAA5S,aAAA,CAAAA,aAAA,KAAQ4S,WAAW,GAAKsB,cAAc,CAAE;IACrD;IAEA,MAAMG,wBAAwB,GAAG;MAC/B/S,QAAQ;MACRuH,UAAU,EAAE,CAACkL,eAAe,CAAC;MAC7BhS,0BAA0B,EAAE,IAAI;MAChCuS,WAAW,EAAE,KAAK,CAAE;IACtB,CAAC;;IACD,MAAM,IAAI,CAACrT,eAAe,CAACsT,SAAS,CAACF,wBAAwB,CAAC;IAE9D,IAAIlP,iBAAiB,EAAE;MACrB,IAAI,CAAC4O,eAAe,CAACS,WAAW,EAAE;QAChC,MAAM,IAAIzJ,KAAK,CAAE,wCAAuCvH,EAAE,CAACC,QAAQ,CAAC,CAAE,EAAC,CAAC;MAC1E;MACA,MAAMgR,wBAAwB,GAAGtP,iBAAiB,CAACuP,2BAA2B,CAAC,CAAC;MAChF,IAAID,wBAAwB,EAAE;QAC5B5B,iBAAiB,CAAC7I,YAAY,GAAGyK,wBAAwB;QACzD;QACA;MACF;IACF;;IAEA;IACA;IACA,IAAIxS,YAAY,EAAE;MAChB,IAAIA,YAAY,CAACoC,YAAY,IAAI5C,aAAa,KAAKiS,4BAAY,CAACiB,MAAM,EAAE;QACtE9B,iBAAiB,CAAC+B,aAAa,GAAG3S,YAAY,CAACkS,aAAa,CAACxU,MAAM,CAAEkV,CAAC,IAAKA,CAAC,CAACzL,QAAQ,CAAC,CAAChG,GAAG,CAAEyR,CAAC,IAAKA,CAAC,CAACC,QAAQ,CAAC;MAC/G;MACAxT,QAAQ,CAAC+D,KAAK,CAACmB,OAAO,CAACG,kBAAkB,CAACuM,QAAQ,CAACL,iBAAiB,CAAC;IACvE,CAAC,MAAM,IAAI9O,SAAS,EAAE;MACpB,IAAImB,iBAAiB,EAAE;QACrB;QACA,OAAO6N,sBAAsB,CAAC,CAAC;MACjC;MACAhP,SAAS,CAACiP,YAAY,CAAC;QAAExP,EAAE;QAAEoM,IAAI,EAAE/J;MAAW,CAAC,CAAC;IAClD,CAAC,MAAM;MACL;MACAT,cAAc,CAAC2P,OAAO,CAAClP,UAAU,CAAC;MAClC;MACAT,cAAc,CAAC4P,kBAAkB,CAACnP,UAAU,CAACpC,QAAQ,CAAC,CAAC,CAAC;MACxDnC,QAAQ,CAAC+D,KAAK,CAACmB,OAAO,CAACC,GAAG,CAACrB,cAAc,CAAC;IAC5C;IAEA,OAAO;MAAE0D,kBAAkB,EAAE;QAAEtF,EAAE;QAAEoP;MAAY,CAAC;MAAExO,SAAS,EAAEa,gBAAgB,IAAIJ;IAAU,CAAC;EAC9F;EAEA,MAAc1C,UAAUA,CAAC8S,MAAgB,EAAgC;IACvE,MAAM3T,QAAQ,GAAG,IAAI,CAACV,SAAS,CAACU,QAAQ;IACxC,MAAME,GAAG,GAAG,MAAM,IAAI,CAAC0T,iBAAiB,CAACD,MAAM,CAAC;IAChD,MAAMlN,OAAO,GAAG,MAAM,IAAI,CAAChH,QAAQ,CAACA,QAAQ,CAAC;MAAES,GAAG;MAAE2T,KAAK,EAAE;IAAK,CAAC,CAAC;IAClE3T,GAAG,CAAClB,OAAO,CAAEkD,EAAE,IAAKlC,QAAQ,CAAC+D,KAAK,CAACmB,OAAO,CAACG,kBAAkB,CAACyO,eAAe,CAAC5R,EAAE,CAAC6R,QAAQ,CAAC,CAAC;IAC3F,MAAM/T,QAAQ,CAAC+D,KAAK,CAACmB,OAAO,CAACG,kBAAkB,CAACC,KAAK,CAAC,CAAC;IACvD,OAAO;MAAE0O,iBAAiB,EAAEvN,OAAO,CAACc;IAAW,CAAC;EAClD;EAEA,MAAc3G,YAAYA,CAAC+S,MAAgB,EAAEzS,WAAmB,EAAEV,KAAc,EAAgC;IAC9G,MAAMN,GAAG,GAAG,MAAM,IAAI,CAAC0T,iBAAiB,CAACD,MAAM,CAAC;IAChD;IACA,MAAM;MAAE7M;IAAkB,CAAC,GAAG,MAAM,IAAI,CAACtH,QAAQ,CAACyU,IAAI,CAAC;MACrDC,YAAY,EAAEzO,eAAM,CAACC,SAAS,CAACxF,GAAG,CAAC4B,GAAG,CAAEI,EAAE,IAAKA,EAAE,CAACiS,OAAO,CAAC,CAAC;MAC3D3T,KAAK;MACLD,OAAO,EAAEW;IACX,CAAC,CAAC;IACF,OAAO;MAAEkT,kBAAkB,EAAEtN;IAAkB,CAAC;EAClD;EAEA,MAActF,sBAAsBA,CAClCV,MAAe,EACf0B,MAAc,EACd6R,eAA4B,EACK;IACjC,MAAMnU,GAAG,GAAG,MAAM+M,OAAO,CAACC,GAAG,CAC3BpM,MAAM,CAACgB,GAAG,CAAC,MAAOwS,KAAK,IAAK;MAC1B,MAAMC,eAAe,GAAG/R,MAAM,CAAC0B,SAAS,CAAC,CAAC,GAAGoQ,KAAK,CAACvQ,KAAK,GAAGvB,MAAM,CAACuB,KAAK;MACvE,MAAMyQ,YAAY,GAAGrQ,gBAAM,CAACC,IAAI,CAAC5B,MAAM,CAAC6B,IAAI,EAAEkQ,eAAyB,CAAC;MACxE,MAAMhQ,UAAU,GAAG,MAAM,IAAI,CAACvE,QAAQ,CAAC+D,KAAK,CAACmB,OAAO,CAACuP,WAAW,CAACjQ,MAAM,CAACgQ,YAAY,EAAEF,KAAK,CAAC;MAC5F,MAAMI,SAAS,GAAGF,YAAY,CAACrS,QAAQ,CAAC,CAAC;MACzC,IAAI,CAACoC,UAAU,EAAE;QACf,MAAM,KAAIjC,oBAAQ,EAAE,oCAAmCgS,KAAK,CAAC5G,sBAAsB,CAAC,CAAE,SAAQgH,SAAU,GAAE,CAAC;MAC7G;MACA,OAAOJ,KAAK,CAAChR,aAAa,CAACiB,UAAU,CAACpC,QAAQ,CAAC,CAAC,CAAC;IACnD,CAAC,CACH,CAAC;IAED,OAAO,IAAI,CAACmJ,cAAc,CAACpL,GAAG,EAAEmU,eAAe,EAAEA,eAAe,CAAC;EACnE;EAEA,MAAcrN,sBAAsBA,CAClChH,QAAkB,EAClBkB,WAAmB,EACnBV,KAAc,EACe;IAC7B,MAAM6E,kBAAkB,GAAGrF,QAAQ,CAAC+D,KAAK,CAACmB,OAAO,CAACG,kBAAkB,CAACsP,aAAa,CAAC,CAAC;IACpF,IAAI,CAACjV,MAAM,CAACwK,KAAK,CAAE,8CAA6C7E,kBAAkB,CAACvG,MAAM,CAACqD,QAAQ,CAAC,CAAE,aAAY,CAAC;IAClH,IAAI,CAACkD,kBAAkB,CAACvG,MAAM,EAAE,OAAO,IAAI;IAC3C,MAAMoB,GAAG,GAAGuF,eAAM,CAACC,SAAS,CAACL,kBAAkB,CAACvD,GAAG,CAAE8S,CAAC,IAAK,KAAIC,cAAK,EAACD,CAAC,CAAC1S,EAAE,CAAC,CAAC,CAAC;IAC5E,OAAO,IAAI,CAAC1C,QAAQ,CAACyU,IAAI,CAAC;MACxBC,YAAY,EAAEhU,GAAG;MACjBM,KAAK;MACLD,OAAO,EAAEW;IACX,CAAC,CAAC;EACJ;EAEA,MAAcwF,mBAAmBA,CAACF,QAAiB,EAAEsO,UAAkB,EAAEtU,KAAc,EAA8B;IACnH,MAAMN,GAAG,GAAGsG,QAAQ,CAAC1E,GAAG,CAAEI,EAAE,IAAK;MAC/B,OAAOA,EAAE,CAACwL,sBAAsB,CAAC,CAAC;IACpC,CAAC,CAAC;IACF,IAAI,CAAChO,MAAM,CAACwK,KAAK,CAAE,6CAA4C1D,QAAQ,CAAC1H,MAAM,CAACqD,QAAQ,CAAC,CAAE,aAAY,CAAC;IACvG,OAAO,IAAI,CAAC3C,QAAQ,CAACkD,GAAG,CAAC;MACvBxC,GAAG;MACHM,KAAK;MACLD,OAAO,EAAEuU,UAAU;MACnBC,UAAU,EAAE;IACd,CAAC,CAAC;EACJ;EAEA,MAAcnB,iBAAiBA,CAACoB,MAAiB,EAA0B;IACzE,IAAIA,MAAM,IAAIA,MAAM,CAAClW,MAAM,EAAE;MAC3B,MAAMmW,YAAY,GAAG,MAAM,IAAI,CAAC3V,SAAS,CAAC4V,2BAA2B,CAACF,MAAM,CAAC;MAC7EC,YAAY,CAACjW,OAAO,CAAEkD,EAAE,IAAK;QAC3B,MAAMiT,KAAK,GAAG,IAAI,CAAC7V,SAAS,CAACU,QAAQ,CAAC+D,KAAK,CAACmB,OAAO,CAACG,kBAAkB,CAACoI,QAAQ,CAACvL,EAAE,CAAC6R,QAAQ,CAAC;QAC5F,IAAI,CAACoB,KAAK,EAAE;UACV,MAAM,KAAIC,uBAAY,EAAE,2BAA0BlT,EAAE,CAACC,QAAQ,CAAC,CAAE,kCAAiC,CAAC;QACpG;MACF,CAAC,CAAC;MACF,OAAO8S,YAAY;IACrB;IACA,MAAMI,oBAAoB,GAAG,IAAI,CAAC/V,SAAS,CAACU,QAAQ,CAAC+D,KAAK,CAACmB,OAAO,CAACG,kBAAkB,CAACsP,aAAa,CAAC,CAAC;IACrG,IAAI,CAACU,oBAAoB,CAACvW,MAAM,EAAE,MAAM,KAAIsW,uBAAY,EAAE,oDAAmD,CAAC;IAC9G,OAAOC,oBAAoB,CAACvT,GAAG,CAAEwT,CAAC,IAAKC,0BAAW,CAACC,UAAU,CAAC,KAAIX,cAAK,EAACS,CAAC,CAACpT,EAAE,CAAC,CAAC,CAAC;EACjF;EAEA,MAAcnB,oBAAoBA,CAACf,QAAkB,EAAEE,GAAa,EAAoB;IACtF,MAAMuV,cAAc,GAAG,KAAIC,yBAAc,EAAC1V,QAAQ,CAAC;IACnD,IAAI,CAACE,GAAG,CAACpB,MAAM,EAAE;MACf,MAAM6W,YAAY,GAAG,MAAMF,cAAc,CAACG,0BAA0B,CAAC,CAAC;MACtE,OAAOD,YAAY,CAAC7T,GAAG,CAAEJ,CAAC,IAAKA,CAAC,CAACQ,EAAE,CAAC;IACtC;IACA,IAAI,IAAA2T,sBAAW,EAAC3V,GAAG,CAAC,EAAE;MACpB,OAAOuV,cAAc,CAACK,+BAA+B,CAAC5V,GAAG,CAAC;IAC5D;IACA,OAAOA,GAAG,CAAC4B,GAAG,CAAEI,EAAE,IAAKlC,QAAQ,CAAC+V,WAAW,CAAC7T,EAAE,CAAC,CAAC;EAClD;EAgBA,aAAa8T,QAAQA,CAAC,CACpBC,GAAG,EACH3W,SAAS,EACTE,QAAQ,EACRC,QAAQ,EACRF,OAAO,EACP2W,UAAU,EACVC,UAAU,EACVvW,QAAQ,EACRC,MAAM,EACNC,MAAM,CAYP,EAAE;IACD,MAAMJ,MAAM,GAAGwW,UAAU,CAACE,YAAY,CAACC,wBAAa,CAACnU,EAAE,CAAC;IACxD,MAAMoU,OAAO,GAAG,IAAIlX,WAAW,CAC7BE,SAAS,EACTC,OAAO,EACPC,QAAQ,EACRC,QAAQ,EACRC,MAAM,EACNyW,UAAU,EACVvW,QAAQ,EACRC,MAAM,EACNC,MACF,CAAC;IACDmW,GAAG,CAACM,QAAQ,CAAC,KAAIC,oBAAQ,EAACF,OAAO,CAAC,CAAC;IACnC,OAAOA,OAAO;EAChB;AACF;AAACG,OAAA,CAAArX,WAAA,GAAAA,WAAA;AAAA,IAAAH,gBAAA,GAAAjC,OAAA,EAn8BYoC,WAAW,WA+4BP,EAAE;AAAA,IAAAH,gBAAA,GAAAjC,OAAA,EA/4BNoC,WAAW,kBAg5BA,CACpBsX,gBAAS,EACTC,oBAAe,EACfC,mBAAc,EACdC,0BAAc,EACdC,wBAAa,EACbC,sBAAY,EACZC,wCAAqB,EACrBC,mBAAc,EACdC,sBAAY,EACZC,iBAAY,CACb;AAAA,IAAAlY,gBAAA,GAAAjC,OAAA,EA35BUoC,WAAW,aA45BLgY,kBAAW;AAyC9Bf,wBAAa,CAACgB,UAAU,CAACjY,WAAW,CAAC"}
+{"version":3,"names":["_cli","data","require","_semver","_interopRequireDefault","_workspace","_interopRequireWildcard","_componentsList","_mergeVersion","_snapping","_hasWildcard","_pMapSeries","_bitId","_bitError","_generalError","_laneId","_getDivergeData","_chalk","_config","_remove","_repositories","_utils","_componentWriter","_importer","_logger","_lodash","_threeWayMerge","_noCommonSnap","_dependencyResolver","_checkout","_componentId","_constants","_deleteComponentFiles","_install","_mergeCmd","_merging","_configMerger","_configMergeResult","_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","_this$workspace","consumer","merge","ids","mergeStrategy","abort","resolve","noSnap","message","build","skipDependencyInstallation","OutsideWorkspaceError","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","markFilesToBeRemovedIfNeeded","deleteFilesIfNeeded","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","importObjectsFromMainIfExist","toBitIds","toVersionLatest","componentStatusBeforeMergeAttempt","getComponentStatusBeforeMergeAttempt","toImport","compStatus","divergeData","versionsToImport","snapsOnTargetOnly","commonSnapBeforeDiverge","v","flat","scopeImporter","importManyIfMissingWithoutDeps","lane","compStatusNotNeedMerge","mergeProps","compStatusNeedMerge","getComponentsStatusNeedMerge","tmp","Tmp","componentsStatus","Promise","all","getComponentMergeStatus","clear","returnUnmerged","msg","getModelComponentIfExist","unmerged","getEntry","toStringWithoutVersion","repo","otherLaneHead","existingBitMapId","getBitIdIfExist","ignoreVersion","componentOnOther","loadVersion","isRemoved","getCurrentId","idOnLane","getComponent","head","getHeadAsTagIfExist","currentId","getDivergeData","targetHead","throws","componentFromModel","getCurrentComponent","loadComponent","getConsumerComponent","isModified","componentModificationStatus","getComponentStatusById","modified","baseComponent","ignoreConfigChanges","isComponentSourceCodeModified","isComponentModified","mainHead","NoCommonSnap","resolveUnrelated","hasResolvedFromMain","hashToCompare","divergeDataFromMain","sourceHead","hasResolvedLocally","getHeadRegardlessOfLane","hasResolvedRemotely","versionToSaveInLane","resolvedRef","strategy","isDiverged","isSourceAhead","isTargetAhead","componentMergeStatusBeforeMergeAttempt","baseSnap","otherComponent","currentLaneName","toLaneId","otherLaneName","DEFAULT_LANE","currentLabel","otherLabel","workspaceIds","listIds","configMerger","ConfigMerger","threeWayMerge","filesStatus","unmergedComponent","remote","handleResolveUnrelated","addComponent","unrelated","addEntry","markAllFilesAsUnchanged","files","file","pathNormalizeToLinux","relative","FileStatus","unchanged","MergeOptions","ours","remoteId","idToLoad","theirs","legacyComponent","loadComponentFromModelImportIfNeeded","updated","modifiedStatus","modifiedFiles","applyModifiedVersion","manyComponentsWriterOpts","writeConfig","writeMany","writtenPath","successfullyMergedConfig","getSuccessfullyMergedConfig","manual","unmergedPaths","f","filePath","setHead","markVersionAsLocal","values","getIdsForUnmerged","reset","removeComponent","fullName","abortedComponents","snap","legacyBitIds","_legacy","resolvedComponents","localLaneObject","bitId","remoteScopeName","remoteLaneId","remoteLanes","laneIdStr","getComponents","r","BitId","tagMessage","unmodified","idsStr","componentIds","resolveMultipleComponentIds","entry","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 { DEFAULT_LANE, LaneId } from '@teambit/lane-id';\nimport { AutoTagResult } from '@teambit/legacy/dist/scope/component-ops/auto-tag';\nimport { getDivergeData } from '@teambit/legacy/dist/scope/component-ops/get-diverge-data';\nimport { UnmergedComponent } from '@teambit/legacy/dist/scope/lanes/unmerged-components';\nimport { Lane, ModelComponent, Version } 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 { Tmp } from '@teambit/legacy/dist/scope/repositories';\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 threeWayMerge, {\n  MergeResultsThreeWay,\n} from '@teambit/legacy/dist/consumer/versions-ops/merge-version/three-way-merge';\nimport { NoCommonSnap } from '@teambit/legacy/dist/scope/exceptions/no-common-snap';\nimport { DependencyResolverAspect, WorkspacePolicyConfigKeysNames } from '@teambit/dependency-resolver';\nimport {\n  ApplyVersionWithComps,\n  CheckoutAspect,\n  CheckoutMain,\n  ComponentStatusBase,\n  applyModifiedVersion,\n  deleteFilesIfNeeded,\n  markFilesToBeRemovedIfNeeded,\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 { ConfigMerger } from './config-merger';\nimport { ConfigMergeResult } from './config-merge-result';\n\ntype ResolveUnrelatedData = { strategy: MergeStrategy; head: Ref };\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  private consumer: Consumer;\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    this.consumer = this.workspace?.consumer;\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    markFilesToBeRemovedIfNeeded(succeededComponents, componentsResults);\n\n    await deleteFilesIfNeeded(componentsResults, this.workspace);\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    if (!currentLane && otherLane) {\n      await this.importer.importObjectsFromMainIfExist(otherLane.toBitIds().toVersionLatest());\n    }\n    const componentStatusBeforeMergeAttempt = await mapSeries(bitIds, (id) =>\n      this.getComponentStatusBeforeMergeAttempt(id, currentLane, options)\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.consumer.scope.scopeImporter.importManyIfMissingWithoutDeps({\n      ids: BitIds.fromArray(toImport),\n      lane: otherLane || undefined,\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.consumer.scope);\n      try {\n        const componentsStatus = await Promise.all(\n          compStatusNeedMerge.map((compStatus) =>\n            this.getComponentMergeStatus(currentLane, otherLane || undefined, compStatus)\n          )\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 getComponentStatusBeforeMergeAttempt(\n    id: BitId, // the id.version is the version we want to merge to the current component\n    localLane: Lane | null, // currently checked out lane. if on main, then it's null.\n    options?: { resolveUnrelated?: MergeStrategy; ignoreConfigChanges?: boolean }\n  ): Promise<ComponentMergeStatusBeforeMergeAttempt> {\n    const consumer = this.workspace.consumer;\n    const componentStatus: ComponentMergeStatusBeforeMergeAttempt = { id };\n    const returnUnmerged = (msg: string, unmergedLegitimately = false) => {\n      componentStatus.unmergedMessage = msg;\n      componentStatus.unmergedLegitimately = unmergedLegitimately;\n      return componentStatus;\n    };\n    const modelComponent = await consumer.scope.getModelComponentIfExist(id);\n    if (!modelComponent) {\n      return returnUnmerged(\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 returnUnmerged(\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    if (componentOnOther.isRemoved()) {\n      if (existingBitMapId && localLane) {\n        // continue with merging the component, so then the current lane will get the soft-remove update.\n        // also, remove the component from the workspace.\n        componentStatus.shouldBeRemoved = true;\n      } else {\n        // on main, don't merge soft-removed components.\n        // on lane, if it's not part of the current lane (!existingBitMapId), don't merge it.\n        return returnUnmerged(`component has been removed`, true);\n      }\n    }\n    const getCurrentId = () => {\n      if (existingBitMapId) return existingBitMapId;\n      if (localLane) {\n        const idOnLane = localLane.getComponent(id);\n        if (!idOnLane) return null;\n        return idOnLane.id.changeVersion(idOnLane.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      return returnUnmerged(`component has been removed`, true);\n    }\n    const isModified = async () => {\n      const componentModificationStatus = await consumer.getComponentStatusById(currentComponent.id);\n      if (!componentModificationStatus.modified) return false;\n      if (!existingBitMapId) return false;\n      const baseComponent = await modelComponent.loadVersion(\n        existingBitMapId.version as string,\n        consumer.scope.objects\n      );\n      return options?.ignoreConfigChanges\n        ? consumer.isComponentSourceCodeModified(baseComponent, currentComponent)\n        : true;\n    };\n\n    const isComponentModified = await isModified();\n\n    if (isComponentModified) {\n      return returnUnmerged(`component is modified, please snap/tag it first`);\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      const mainHead = modelComponent.head;\n      if (divergeData.err instanceof NoCommonSnap && options?.resolveUnrelated && 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 returnUnmerged(\n            `unable to traverse ${currentComponent.id.toString()} history. the main-head ${mainHead.toString()} doesn't appear in both lanes, it was probably created in each lane separately`\n          );\n        }\n        const versionToSaveInLane = hasResolvedLocally ? currentComponent.id.version : id.version;\n        const resolvedRef = modelComponent.getRef(versionToSaveInLane as string);\n        if (!resolvedRef) throw new Error(`unable to get ref of \"${versionToSaveInLane}\" for \"${id.toString()}\"`);\n        if (options?.resolveUnrelated === 'theirs') {\n          // just override with the model data\n          return {\n            currentComponent,\n            componentFromModel: componentOnOther,\n            id,\n            divergeData,\n            resolvedUnrelated: { strategy: 'theirs', head: resolvedRef },\n          };\n        }\n        if (options?.resolveUnrelated === 'ours') {\n          return {\n            currentComponent,\n            id,\n            divergeData,\n            resolvedUnrelated: { strategy: 'ours', head: resolvedRef },\n          };\n        }\n        throw new Error(\n          `unsupported strategy \"${options?.resolveUnrelated}\" of resolve-unrelated. supported strategies are: [ours, theirs]`\n        );\n      }\n      return returnUnmerged(\n        `unable to traverse ${currentComponent.id.toString()} history. error: ${divergeData.err.message}`\n      );\n    }\n    if (!divergeData.isDiverged()) {\n      if (divergeData.isSourceAhead()) {\n        // do nothing!\n        return returnUnmerged(`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 returnUnmerged(`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 getComponentMergeStatus(\n    localLane: Lane | null, // currently checked out lane. if on main, then it's null.\n    otherLane: Lane | undefined, // the lane name we want to merged to our lane. (can be also \"main\").\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.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 = localLane?.toLaneId().toString() || 'main';\n    const otherLaneName = otherLane ? 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      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.consumer,\n      otherComponent,\n      otherLabel,\n      currentComponent,\n      currentLabel,\n      baseComponent,\n    });\n    return { currentComponent, id, mergeResults, divergeData, configMergeResult };\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      remote: laneId.scope, // @todo: remove. it has been deprecated around 0.0.832\n      lane: laneId.name, // @todo: remove. it has been deprecated around 0.0.832\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      if (!localLane) throw new Error('localLane must be defined when resolvedUnrelated');\n      if (!resolvedUnrelated?.head) throw new Error('resolvedUnrelated must have head prop');\n      localLane.addComponent({ id, head: resolvedUnrelated.head });\n      unmergedComponent.laneId = localLane.toLaneId();\n      unmergedComponent.head = resolvedUnrelated.head;\n      unmergedComponent.unrelated = true;\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    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.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.431",
+  "version": "0.0.433",
   "homepage": "https://bit.cloud/teambit/component/merging",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.component",
     "name": "merging",
-    "version": "0.0.431"
+    "version": "0.0.433"
   },
   "dependencies": {
     "lodash": "4.17.21",
@@ -18,21 +18,21 @@
     "@teambit/component-id": "0.0.427",
     "@teambit/legacy-bit-id": "0.0.423",
     "@teambit/harmony": "0.4.6",
-    "@teambit/dependency-resolver": "0.0.1116",
+    "@teambit/dependency-resolver": "0.0.1118",
     "@teambit/component-version": "0.0.409",
-    "@teambit/envs": "0.0.1116",
-    "@teambit/logger": "0.0.841",
+    "@teambit/envs": "0.0.1118",
+    "@teambit/logger": "0.0.842",
     "@teambit/bit-error": "0.0.402",
-    "@teambit/cli": "0.0.748",
-    "@teambit/checkout": "0.0.285",
-    "@teambit/component-writer": "0.0.152",
-    "@teambit/config": "0.0.762",
-    "@teambit/importer": "0.0.545",
-    "@teambit/install": "0.0.206",
-    "@teambit/lane-id": "0.0.263",
-    "@teambit/remove": "0.0.293",
-    "@teambit/snapping": "0.0.431",
-    "@teambit/workspace": "0.0.1116"
+    "@teambit/cli": "0.0.749",
+    "@teambit/checkout": "0.0.287",
+    "@teambit/component-writer": "0.0.154",
+    "@teambit/config": "0.0.763",
+    "@teambit/importer": "0.0.547",
+    "@teambit/install": "0.0.207",
+    "@teambit/lane-id": "0.0.264",
+    "@teambit/remove": "0.0.295",
+    "@teambit/snapping": "0.0.433",
+    "@teambit/workspace": "0.0.1118"
   },
   "devDependencies": {
     "@types/lodash": "4.14.165",
@@ -46,7 +46,7 @@
     "@types/testing-library__jest-dom": "5.9.5"
   },
   "peerDependencies": {
-    "@teambit/legacy": "1.0.527",
+    "@teambit/legacy": "1.0.528",
     "react": "^16.8.0 || ^17.0.0",
     "react-dom": "^16.8.0 || ^17.0.0"
   },