@teambit/merging 1.0.543 → 1.0.545

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,12 +1,12 @@
1
1
  import { Command, CommandOptions } from '@teambit/cli';
2
2
  import { ComponentID } from '@teambit/component-id';
3
- import { GlobalConfigMain } from '@teambit/global-config';
4
3
  import { ConfigMergeResult, WorkspaceConfigUpdateResult } from '@teambit/config-merger';
5
4
  import { MergeStrategy } from './merge-version';
6
5
  import { ApplyVersionResults, MergingMain, ApplyVersionResult } from './merging.main.runtime';
6
+ import { ConfigStoreMain } from '@teambit/config-store';
7
7
  export declare class MergeCmd implements Command {
8
8
  private merging;
9
- private globalConfig;
9
+ private configStore;
10
10
  name: string;
11
11
  description: string;
12
12
  helpUrl: string;
@@ -19,7 +19,7 @@ export declare class MergeCmd implements Command {
19
19
  alias: string;
20
20
  options: CommandOptions;
21
21
  loader: boolean;
22
- constructor(merging: MergingMain, globalConfig: GlobalConfigMain);
22
+ constructor(merging: MergingMain, configStore: ConfigStoreMain);
23
23
  report([pattern]: [string], { ours, theirs, manual, autoMergeResolve, abort, resolve, build, noSnap, verbose, message, skipDependencyInstallation, }: {
24
24
  ours?: boolean;
25
25
  theirs?: boolean;
package/dist/merge-cmd.js CHANGED
@@ -52,9 +52,9 @@ function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object
52
52
  function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
53
53
  function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
54
54
  class MergeCmd {
55
- constructor(merging, globalConfig) {
55
+ constructor(merging, configStore) {
56
56
  this.merging = merging;
57
- this.globalConfig = globalConfig;
57
+ this.configStore = configStore;
58
58
  _defineProperty(this, "name", 'merge [component-pattern]');
59
59
  _defineProperty(this, "description", 'merge changes of the remote head into local - auto-snaps all merged components');
60
60
  _defineProperty(this, "helpUrl", 'reference/components/merging-changes');
@@ -84,7 +84,7 @@ optionally use '--abort' to revert the last merge. to revert a lane merge, use "
84
84
  message,
85
85
  skipDependencyInstallation = false
86
86
  }) {
87
- build = (await this.globalConfig.getBool(_legacy().CFG_FORCE_LOCAL_BUILD)) || Boolean(build);
87
+ build = this.configStore.getConfigBoolean(_legacy().CFG_FORCE_LOCAL_BUILD) || Boolean(build);
88
88
  if (ours || theirs) {
89
89
  throw new (_bitError().BitError)('the "--ours" and "--theirs" flags are deprecated. use "--auto-merge-resolve" instead');
90
90
  }
@@ -1 +1 @@
1
- {"version":3,"names":["_chalk","data","_interopRequireDefault","require","_lodash","_legacy","_bitError","_mergeVersion","e","__esModule","default","_defineProperty","r","t","_toPropertyKey","Object","defineProperty","value","enumerable","configurable","writable","i","_toPrimitive","Symbol","toPrimitive","call","TypeError","String","Number","MergeCmd","constructor","merging","globalConfig","name","description","COMPONENT_PATTERN_HELP","report","pattern","ours","theirs","manual","autoMergeResolve","abort","resolve","build","noSnap","verbose","message","skipDependencyInstallation","getBool","CFG_FORCE_LOCAL_BUILD","Boolean","BitError","components","failedComponents","version","resolvedComponents","abortedComponents","mergeSnapResults","mergeSnapError","merge","title","componentsStr","map","c","id","toStringWithoutVersion","join","chalk","underline","green","mergeReport","exports","removedComponents","leftUnresolvedConflicts","configMergeResults","workspaceConfigUpdateResult","getSuccessOutput","length","bold","fileChangesReport","applyVersionReport","componentsWithConflicts","getConflictSummary","suggestion","conflictSummary","conflictSummaryReport","conflictedComponents","conflictStr","yellow","configMergeWithConflicts","filter","hasConflicts","getConfigMergeConflictSummary","comps","compIdStr","MergeConfigFilename","getSnapsOutput","snappedComponents","autoSnappedResults","outputComponents","component","componentOutput","toString","autoTag","result","triggeredBy","searchWithoutVersion","autoTagComp","a","AUTO_SNAPPED_MSG","getFailureOutput","body","compact","failedComponent","white","unchangedMessage","getSummary","merged","unchangedLegitimately","f","autoSnapped","getConflictStr","ws","workspaceDepsConflicts","mergeConfig","mergedStr","unchangedLegitimatelyStr","autoSnappedStr","removedStr","getRemovedOutput","getWorkspaceConfigUpdateOutput","workspaceConfigConflictWriteError","workspaceDepsUpdates","workspaceDepsUnchanged","getWorkspaceConflictsOutput","red","getWorkspaceUnchangedDepsOutput","keys","pkgName","getWorkspaceDepsOutput","from","to","addName","showVersion","tab","fileChanges","files","filesStatus","file","FileStatus","unchanged","note","cyan","FILE_CHANGES_CHECKOUT_MSG","conflictedFiles","installationErrorOutput","installationError","subTitle","compilationErrorOutput","compilationError","getAddedOutput","addedComponents"],"sources":["merge-cmd.ts"],"sourcesContent":["import chalk from 'chalk';\nimport { Command, CommandOptions } from '@teambit/cli';\nimport { ComponentID } from '@teambit/component-id';\nimport { compact } from 'lodash';\nimport {\n COMPONENT_PATTERN_HELP,\n AUTO_SNAPPED_MSG,\n MergeConfigFilename,\n FILE_CHANGES_CHECKOUT_MSG,\n CFG_FORCE_LOCAL_BUILD,\n} from '@teambit/legacy.constants';\nimport { GlobalConfigMain } from '@teambit/global-config';\nimport { ConfigMergeResult, WorkspaceConfigUpdateResult, WorkspaceDepsUpdates } from '@teambit/config-merger';\nimport { BitError } from '@teambit/bit-error';\nimport { FileStatus, MergeStrategy } from './merge-version';\nimport { ApplyVersionResults, MergingMain, ApplyVersionResult } from './merging.main.runtime';\n\nexport class MergeCmd implements Command {\n name = 'merge [component-pattern]';\n description = 'merge changes of the remote head into local - auto-snaps all merged components';\n helpUrl = 'reference/components/merging-changes';\n group = 'development';\n arguments = [{ name: 'component-pattern', description: COMPONENT_PATTERN_HELP }];\n extendedDescription = `merge changes of the remote head into local when they are diverged. when on a lane, merge the remote head of the lane into the local\nand creates snaps for merged components that have diverged, on the lane.\nif no ids are specified, all pending-merge components will be merged. (run \"bit status\" to list them).\noptionally use '--abort' to revert the last merge. to revert a lane merge, use \"bit lane merge-abort\" command.`;\n alias = '';\n options = [\n ['', 'ours', 'DEPRECATED. use --auto-merge-resolve. in case of a conflict, keep the local modification'],\n [\n '',\n 'theirs',\n 'DEPRECATED. use --auto-merge-resolve. in case of a conflict, override the local modification with the specified version',\n ],\n [\n '',\n 'manual',\n 'same as \"--auto-merge-resolve manual\". in case of merge conflict, write the files with the conflict markers',\n ],\n [\n 'r',\n 'auto-merge-resolve <merge-strategy>',\n 'in case of a conflict, resolve according to the strategy: [ours, theirs, manual]',\n ],\n ['', 'abort', 'in case of an unresolved merge, revert to pre-merge state'],\n ['', 'resolve', 'mark an unresolved merge as resolved and create a new snap with the changes'],\n ['', 'no-snap', 'do not auto snap even if the merge completed without conflicts'],\n ['', 'build', 'in case of snap during the merge, run the build-pipeline (similar to bit snap --build)'],\n ['', 'verbose', 'show details of components that were not merged successfully'],\n ['x', 'skip-dependency-installation', 'do not install new dependencies resulting from the merge'],\n ['m', 'message <message>', 'override the default message for the auto snap'],\n ] as CommandOptions;\n loader = true;\n\n constructor(\n private merging: MergingMain,\n private globalConfig: GlobalConfigMain\n ) {}\n\n async report(\n [pattern]: [string],\n {\n ours = false,\n theirs = false,\n manual = false,\n autoMergeResolve,\n abort = false,\n resolve = false,\n build = false,\n noSnap = false,\n verbose = false,\n message,\n skipDependencyInstallation = false,\n }: {\n ours?: boolean;\n theirs?: boolean;\n manual?: boolean;\n autoMergeResolve?: MergeStrategy;\n abort?: boolean;\n resolve?: boolean;\n build?: boolean;\n noSnap?: boolean;\n verbose?: boolean;\n message: string;\n skipDependencyInstallation?: boolean;\n }\n ) {\n build = (await this.globalConfig.getBool(CFG_FORCE_LOCAL_BUILD)) || Boolean(build);\n if (ours || theirs) {\n throw new BitError('the \"--ours\" and \"--theirs\" flags are deprecated. use \"--auto-merge-resolve\" instead');\n }\n if (\n autoMergeResolve &&\n autoMergeResolve !== 'ours' &&\n autoMergeResolve !== 'theirs' &&\n autoMergeResolve !== 'manual'\n ) {\n throw new BitError('--auto-merge-resolve must be one of the following: [ours, theirs, manual]');\n }\n if (manual) autoMergeResolve = 'manual';\n if (abort && resolve) throw new BitError('unable to use \"abort\" and \"resolve\" flags together');\n if (noSnap && message) throw new BitError('unable to use \"noSnap\" and \"message\" flags together');\n const {\n components,\n failedComponents,\n version,\n resolvedComponents,\n abortedComponents,\n mergeSnapResults,\n mergeSnapError,\n }: ApplyVersionResults = await this.merging.merge(\n pattern,\n autoMergeResolve as any,\n abort,\n resolve,\n noSnap,\n message,\n build,\n skipDependencyInstallation\n );\n if (resolvedComponents) {\n const title = 'successfully resolved component(s)\\n';\n const componentsStr = resolvedComponents.map((c) => c.id.toStringWithoutVersion()).join('\\n');\n return chalk.underline(title) + chalk.green(componentsStr);\n }\n if (abortedComponents) {\n const title = 'successfully aborted the merge of the following component(s)\\n';\n const componentsStr = abortedComponents.map((c) => c.id.toStringWithoutVersion()).join('\\n');\n return chalk.underline(title) + chalk.green(componentsStr);\n }\n\n return mergeReport({\n components,\n failedComponents,\n version,\n mergeSnapResults,\n mergeSnapError,\n verbose,\n });\n }\n}\n\nexport function mergeReport({\n components,\n failedComponents,\n removedComponents,\n version,\n mergeSnapResults,\n mergeSnapError,\n leftUnresolvedConflicts,\n verbose,\n configMergeResults,\n workspaceConfigUpdateResult,\n}: ApplyVersionResults & { configMergeResults?: ConfigMergeResult[] }): string {\n const getSuccessOutput = () => {\n if (!components || !components.length) return '';\n const title = `successfully merged ${components.length} components${\n version ? `from version ${chalk.bold(version)}` : ''\n }\\n`;\n const fileChangesReport = applyVersionReport(components);\n\n return chalk.bold(title) + fileChangesReport;\n };\n\n let componentsWithConflicts = 0;\n const getConflictSummary = () => {\n if (!components || !components.length || !leftUnresolvedConflicts) return '';\n const title = `files with conflicts summary\\n`;\n const suggestion = `\\n\\nmerge process not completed due to the conflicts above. fix conflicts manually and then run \"bit install\".\nonce ready, snap/tag the components to complete the merge.`;\n const conflictSummary = conflictSummaryReport(components);\n componentsWithConflicts = conflictSummary.conflictedComponents;\n return chalk.underline(title) + conflictSummary.conflictStr + chalk.yellow(suggestion);\n };\n\n const configMergeWithConflicts = configMergeResults?.filter((c) => c.hasConflicts()) || [];\n const getConfigMergeConflictSummary = () => {\n if (!configMergeWithConflicts.length) return '';\n const comps = configMergeWithConflicts.map((c) => c.compIdStr).join('\\n');\n const title = `components with config-merge conflicts\\n`;\n const suggestion = `\\nconflicts were found while trying to merge the config. fix them manually by editing the ${MergeConfigFilename} file in the workspace root.\nonce ready, snap/tag the components to complete the merge.`;\n return chalk.underline(title) + comps + chalk.yellow(suggestion);\n };\n\n const getSnapsOutput = () => {\n if (mergeSnapError) {\n return `${chalk.bold(\n 'snapping merged components failed with the following error, please fix the issues and snap manually'\n )}\n${mergeSnapError.message}\n`;\n }\n if (!mergeSnapResults || !mergeSnapResults.snappedComponents) return '';\n const { snappedComponents, autoSnappedResults } = mergeSnapResults;\n const outputComponents = (comps) => {\n return comps\n .map((component) => {\n let componentOutput = ` > ${component.id.toString()}`;\n const autoTag = autoSnappedResults.filter((result) => result.triggeredBy.searchWithoutVersion(component.id));\n if (autoTag.length) {\n const autoTagComp = autoTag.map((a) => a.component.id.toString());\n componentOutput += `\\n ${AUTO_SNAPPED_MSG}: ${autoTagComp.join(', ')}`;\n }\n return componentOutput;\n })\n .join('\\n');\n };\n\n return `${chalk.underline(\n 'merge-snapped components'\n )}\\n(${'components snapped as a result of the merge'})\\n${outputComponents(snappedComponents)}`;\n };\n\n const getFailureOutput = () => {\n if (!failedComponents || !failedComponents.length) return '';\n const title = '\\nmerge skipped for the following component(s)';\n const body = compact(\n failedComponents.map((failedComponent) => {\n // all failures here are \"unchangedLegitimately\". otherwise, it would have been thrown as an error\n if (!verbose) return null;\n return `${chalk.bold(failedComponent.id.toString())} - ${chalk.white(failedComponent.unchangedMessage)}`;\n })\n ).join('\\n');\n if (!body) {\n return `${chalk.bold(`\\nmerge skipped legitimately for ${failedComponents.length} component(s)`)}\n(use --verbose to list them next time)`;\n }\n return `${chalk.underline(title)}\\n${body}`;\n };\n\n const getSummary = () => {\n const merged = components?.length || 0;\n const unchangedLegitimately = failedComponents?.filter((f) => f.unchangedLegitimately).length || 0;\n const autoSnapped =\n (mergeSnapResults?.snappedComponents.length || 0) + (mergeSnapResults?.autoSnappedResults.length || 0);\n const getConflictStr = () => {\n const comps = componentsWithConflicts ? `${componentsWithConflicts} components` : '';\n const ws = workspaceConfigUpdateResult?.workspaceDepsConflicts ? 'workspace.jsonc file' : '';\n const mergeConfig = configMergeWithConflicts.length ? `${MergeConfigFilename} file` : '';\n return compact([comps, ws, mergeConfig]).join(', ');\n };\n\n const title = chalk.bold.underline('Merge Summary');\n const mergedStr = `\\nTotal Merged: ${chalk.bold(merged.toString())}`;\n const unchangedLegitimatelyStr = `\\nTotal Unchanged: ${chalk.bold(unchangedLegitimately.toString())}`;\n const autoSnappedStr = `\\nTotal Snapped: ${chalk.bold(autoSnapped.toString())}`;\n const removedStr = `\\nTotal Removed: ${chalk.bold(removedComponents?.length.toString() || '0')}`;\n const conflictStr = `\\nConflicts: ${chalk.bold(getConflictStr() || 'none')}`;\n\n return title + mergedStr + unchangedLegitimatelyStr + autoSnappedStr + removedStr + conflictStr;\n };\n\n return compact([\n getSuccessOutput(),\n getFailureOutput(),\n getRemovedOutput(removedComponents),\n getSnapsOutput(),\n getConfigMergeConflictSummary(),\n getWorkspaceConfigUpdateOutput(workspaceConfigUpdateResult),\n getConflictSummary(),\n getSummary(),\n ]).join('\\n\\n');\n}\n\nexport function getWorkspaceConfigUpdateOutput(workspaceConfigUpdateResult?: WorkspaceConfigUpdateResult): string {\n if (!workspaceConfigUpdateResult) return '';\n const { workspaceConfigConflictWriteError, workspaceDepsConflicts, workspaceDepsUpdates, workspaceDepsUnchanged } =\n workspaceConfigUpdateResult;\n\n const getWorkspaceConflictsOutput = () => {\n if (!workspaceDepsConflicts && !workspaceConfigConflictWriteError) return '';\n if (workspaceConfigConflictWriteError) {\n return `${chalk.red(workspaceConfigConflictWriteError.message)}`;\n }\n return chalk.yellow('workspace.jsonc has conflicts, please edit the file and fix them');\n };\n\n const getWorkspaceUnchangedDepsOutput = () => {\n if (!workspaceDepsUnchanged) return '';\n const title = '\\nworkspace.jsonc was unable to update the following dependencies';\n const body = Object.keys(workspaceDepsUnchanged)\n .map((pkgName) => {\n return ` ${pkgName}: ${workspaceDepsUnchanged[pkgName]}`;\n })\n .join('\\n');\n\n return `${chalk.underline(title)}\\n${body}`;\n };\n\n return compact([\n getWorkspaceUnchangedDepsOutput(),\n getWorkspaceDepsOutput(workspaceDepsUpdates),\n getWorkspaceConflictsOutput(),\n ]).join('\\n\\n');\n}\n\nfunction getWorkspaceDepsOutput(workspaceDepsUpdates?: WorkspaceDepsUpdates): string {\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 `${chalk.underline(title)}\\n${body}`;\n}\n\n/**\n * shows only the file-changes section.\n * if all files are \"unchanged\", it returns an empty string\n */\nexport function applyVersionReport(components: ApplyVersionResult[], addName = true, showVersion = false): string {\n const tab = addName ? '\\t' : '';\n const fileChanges = compact(\n components.map((component: ApplyVersionResult) => {\n const name = showVersion ? component.id.toString() : component.id.toStringWithoutVersion();\n const files = compact(\n Object.keys(component.filesStatus).map((file) => {\n if (component.filesStatus[file] === FileStatus.unchanged) return null;\n const note =\n component.filesStatus[file] === FileStatus.manual\n ? chalk.white('automatic merge failed. please fix conflicts manually and then run \"bit install\"')\n : '';\n return `${tab}${String(component.filesStatus[file])} ${chalk.bold(file)} ${note}`;\n })\n ).join('\\n');\n if (!files) return null;\n return `${addName ? name : ''}\\n${chalk.cyan(files)}`;\n })\n ).join('\\n\\n');\n if (!fileChanges) {\n return '';\n }\n const title = `\\n${FILE_CHANGES_CHECKOUT_MSG}\\n`;\n return chalk.underline(title) + fileChanges;\n}\n\nexport function conflictSummaryReport(components: ApplyVersionResult[]): {\n conflictedComponents: number;\n conflictedFiles: number;\n conflictStr: string;\n} {\n const tab = '\\t';\n let conflictedComponents = 0;\n let conflictedFiles = 0;\n const conflictStr = 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 conflictedFiles += 1;\n return `${tab}${String(component.filesStatus[file])} ${chalk.bold(file)}`;\n }\n return null;\n })\n );\n if (!files.length) return null;\n conflictedComponents += 1;\n return `${name}\\n${chalk.cyan(files.join('\\n'))}`;\n })\n ).join('\\n');\n\n return { conflictedComponents, conflictedFiles, conflictStr };\n}\n\nexport function installationErrorOutput(installationError?: Error) {\n if (!installationError) return '';\n const title = chalk.underline('Installation Error');\n const subTitle = 'The following error was thrown by the package manager:';\n const body = chalk.red(installationError.message);\n const suggestion =\n 'Use \"bit install\" to complete the installation, remove the imported components using \"bit remove <comp id>\" or remove the missing dependencies from their source code';\n return `${title}\\n${subTitle}\\n${body}\\n${suggestion}`;\n}\n\nexport function compilationErrorOutput(compilationError?: Error) {\n if (!compilationError) return '';\n const title = chalk.underline('Compilation Error');\n const subTitle = 'The following error was thrown by the compiler';\n const body = chalk.red(compilationError.message);\n const suggestion = 'Please fix the issue and run \"bit compile\"';\n return `${title}\\n${subTitle}\\n${body}\\n${suggestion}`;\n}\n\nexport function getRemovedOutput(removedComponents?: ComponentID[]) {\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 `${chalk.underline(title)}\\n${body}`;\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 `${chalk.underline(title)}\\n${body}`;\n}\n"],"mappings":";;;;;;;;;;;;;;AAAA,SAAAA,OAAA;EAAA,MAAAC,IAAA,GAAAC,sBAAA,CAAAC,OAAA;EAAAH,MAAA,YAAAA,CAAA;IAAA,OAAAC,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAGA,SAAAG,QAAA;EAAA,MAAAH,IAAA,GAAAE,OAAA;EAAAC,OAAA,YAAAA,CAAA;IAAA,OAAAH,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAI,QAAA;EAAA,MAAAJ,IAAA,GAAAE,OAAA;EAAAE,OAAA,YAAAA,CAAA;IAAA,OAAAJ,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AASA,SAAAK,UAAA;EAAA,MAAAL,IAAA,GAAAE,OAAA;EAAAG,SAAA,YAAAA,CAAA;IAAA,OAAAL,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAM,cAAA;EAAA,MAAAN,IAAA,GAAAE,OAAA;EAAAI,aAAA,YAAAA,CAAA;IAAA,OAAAN,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAA4D,SAAAC,uBAAAM,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAAA,SAAAG,gBAAAH,CAAA,EAAAI,CAAA,EAAAC,CAAA,YAAAD,CAAA,GAAAE,cAAA,CAAAF,CAAA,MAAAJ,CAAA,GAAAO,MAAA,CAAAC,cAAA,CAAAR,CAAA,EAAAI,CAAA,IAAAK,KAAA,EAAAJ,CAAA,EAAAK,UAAA,MAAAC,YAAA,MAAAC,QAAA,UAAAZ,CAAA,CAAAI,CAAA,IAAAC,CAAA,EAAAL,CAAA;AAAA,SAAAM,eAAAD,CAAA,QAAAQ,CAAA,GAAAC,YAAA,CAAAT,CAAA,uCAAAQ,CAAA,GAAAA,CAAA,GAAAA,CAAA;AAAA,SAAAC,aAAAT,CAAA,EAAAD,CAAA,2BAAAC,CAAA,KAAAA,CAAA,SAAAA,CAAA,MAAAL,CAAA,GAAAK,CAAA,CAAAU,MAAA,CAAAC,WAAA,kBAAAhB,CAAA,QAAAa,CAAA,GAAAb,CAAA,CAAAiB,IAAA,CAAAZ,CAAA,EAAAD,CAAA,uCAAAS,CAAA,SAAAA,CAAA,YAAAK,SAAA,yEAAAd,CAAA,GAAAe,MAAA,GAAAC,MAAA,EAAAf,CAAA;AAGrD,MAAMgB,QAAQ,CAAoB;EAsCvCC,WAAWA,CACDC,OAAoB,EACpBC,YAA8B,EACtC;IAAA,KAFQD,OAAoB,GAApBA,OAAoB;IAAA,KACpBC,YAA8B,GAA9BA,YAA8B;IAAArB,eAAA,eAvCjC,2BAA2B;IAAAA,eAAA,sBACpB,gFAAgF;IAAAA,eAAA,kBACpF,sCAAsC;IAAAA,eAAA,gBACxC,aAAa;IAAAA,eAAA,oBACT,CAAC;MAAEsB,IAAI,EAAE,mBAAmB;MAAEC,WAAW,EAAEC;IAAuB,CAAC,CAAC;IAAAxB,eAAA,8BAC1D;AACxB;AACA;AACA,+GAA+G;IAAAA,eAAA,gBACrG,EAAE;IAAAA,eAAA,kBACA,CACR,CAAC,EAAE,EAAE,MAAM,EAAE,0FAA0F,CAAC,EACxG,CACE,EAAE,EACF,QAAQ,EACR,yHAAyH,CAC1H,EACD,CACE,EAAE,EACF,QAAQ,EACR,6GAA6G,CAC9G,EACD,CACE,GAAG,EACH,qCAAqC,EACrC,kFAAkF,CACnF,EACD,CAAC,EAAE,EAAE,OAAO,EAAE,2DAA2D,CAAC,EAC1E,CAAC,EAAE,EAAE,SAAS,EAAE,6EAA6E,CAAC,EAC9F,CAAC,EAAE,EAAE,SAAS,EAAE,gEAAgE,CAAC,EACjF,CAAC,EAAE,EAAE,OAAO,EAAE,wFAAwF,CAAC,EACvG,CAAC,EAAE,EAAE,SAAS,EAAE,8DAA8D,CAAC,EAC/E,CAAC,GAAG,EAAE,8BAA8B,EAAE,0DAA0D,CAAC,EACjG,CAAC,GAAG,EAAE,mBAAmB,EAAE,gDAAgD,CAAC,CAC7E;IAAAA,eAAA,iBACQ,IAAI;EAKV;EAEH,MAAMyB,MAAMA,CACV,CAACC,OAAO,CAAW,EACnB;IACEC,IAAI,GAAG,KAAK;IACZC,MAAM,GAAG,KAAK;IACdC,MAAM,GAAG,KAAK;IACdC,gBAAgB;IAChBC,KAAK,GAAG,KAAK;IACbC,OAAO,GAAG,KAAK;IACfC,KAAK,GAAG,KAAK;IACbC,MAAM,GAAG,KAAK;IACdC,OAAO,GAAG,KAAK;IACfC,OAAO;IACPC,0BAA0B,GAAG;EAa/B,CAAC,EACD;IACAJ,KAAK,GAAG,CAAC,MAAM,IAAI,CAACZ,YAAY,CAACiB,OAAO,CAACC,+BAAqB,CAAC,KAAKC,OAAO,CAACP,KAAK,CAAC;IAClF,IAAIN,IAAI,IAAIC,MAAM,EAAE;MAClB,MAAM,KAAIa,oBAAQ,EAAC,sFAAsF,CAAC;IAC5G;IACA,IACEX,gBAAgB,IAChBA,gBAAgB,KAAK,MAAM,IAC3BA,gBAAgB,KAAK,QAAQ,IAC7BA,gBAAgB,KAAK,QAAQ,EAC7B;MACA,MAAM,KAAIW,oBAAQ,EAAC,2EAA2E,CAAC;IACjG;IACA,IAAIZ,MAAM,EAAEC,gBAAgB,GAAG,QAAQ;IACvC,IAAIC,KAAK,IAAIC,OAAO,EAAE,MAAM,KAAIS,oBAAQ,EAAC,oDAAoD,CAAC;IAC9F,IAAIP,MAAM,IAAIE,OAAO,EAAE,MAAM,KAAIK,oBAAQ,EAAC,qDAAqD,CAAC;IAChG,MAAM;MACJC,UAAU;MACVC,gBAAgB;MAChBC,OAAO;MACPC,kBAAkB;MAClBC,iBAAiB;MACjBC,gBAAgB;MAChBC;IACmB,CAAC,GAAG,MAAM,IAAI,CAAC5B,OAAO,CAAC6B,KAAK,CAC/CvB,OAAO,EACPI,gBAAgB,EAChBC,KAAK,EACLC,OAAO,EACPE,MAAM,EACNE,OAAO,EACPH,KAAK,EACLI,0BACF,CAAC;IACD,IAAIQ,kBAAkB,EAAE;MACtB,MAAMK,KAAK,GAAG,sCAAsC;MACpD,MAAMC,aAAa,GAAGN,kBAAkB,CAACO,GAAG,CAAEC,CAAC,IAAKA,CAAC,CAACC,EAAE,CAACC,sBAAsB,CAAC,CAAC,CAAC,CAACC,IAAI,CAAC,IAAI,CAAC;MAC7F,OAAOC,gBAAK,CAACC,SAAS,CAACR,KAAK,CAAC,GAAGO,gBAAK,CAACE,KAAK,CAACR,aAAa,CAAC;IAC5D;IACA,IAAIL,iBAAiB,EAAE;MACrB,MAAMI,KAAK,GAAG,gEAAgE;MAC9E,MAAMC,aAAa,GAAGL,iBAAiB,CAACM,GAAG,CAAEC,CAAC,IAAKA,CAAC,CAACC,EAAE,CAACC,sBAAsB,CAAC,CAAC,CAAC,CAACC,IAAI,CAAC,IAAI,CAAC;MAC5F,OAAOC,gBAAK,CAACC,SAAS,CAACR,KAAK,CAAC,GAAGO,gBAAK,CAACE,KAAK,CAACR,aAAa,CAAC;IAC5D;IAEA,OAAOS,WAAW,CAAC;MACjBlB,UAAU;MACVC,gBAAgB;MAChBC,OAAO;MACPG,gBAAgB;MAChBC,cAAc;MACdb;IACF,CAAC,CAAC;EACJ;AACF;AAAC0B,OAAA,CAAA3C,QAAA,GAAAA,QAAA;AAEM,SAAS0C,WAAWA,CAAC;EAC1BlB,UAAU;EACVC,gBAAgB;EAChBmB,iBAAiB;EACjBlB,OAAO;EACPG,gBAAgB;EAChBC,cAAc;EACde,uBAAuB;EACvB5B,OAAO;EACP6B,kBAAkB;EAClBC;AACkE,CAAC,EAAU;EAC7E,MAAMC,gBAAgB,GAAGA,CAAA,KAAM;IAC7B,IAAI,CAACxB,UAAU,IAAI,CAACA,UAAU,CAACyB,MAAM,EAAE,OAAO,EAAE;IAChD,MAAMjB,KAAK,GAAG,uBAAuBR,UAAU,CAACyB,MAAM,cACpDvB,OAAO,GAAG,gBAAgBa,gBAAK,CAACW,IAAI,CAACxB,OAAO,CAAC,EAAE,GAAG,EAAE,IAClD;IACJ,MAAMyB,iBAAiB,GAAGC,kBAAkB,CAAC5B,UAAU,CAAC;IAExD,OAAOe,gBAAK,CAACW,IAAI,CAAClB,KAAK,CAAC,GAAGmB,iBAAiB;EAC9C,CAAC;EAED,IAAIE,uBAAuB,GAAG,CAAC;EAC/B,MAAMC,kBAAkB,GAAGA,CAAA,KAAM;IAC/B,IAAI,CAAC9B,UAAU,IAAI,CAACA,UAAU,CAACyB,MAAM,IAAI,CAACJ,uBAAuB,EAAE,OAAO,EAAE;IAC5E,MAAMb,KAAK,GAAG,gCAAgC;IAC9C,MAAMuB,UAAU,GAAG;AACvB,2DAA2D;IACvD,MAAMC,eAAe,GAAGC,qBAAqB,CAACjC,UAAU,CAAC;IACzD6B,uBAAuB,GAAGG,eAAe,CAACE,oBAAoB;IAC9D,OAAOnB,gBAAK,CAACC,SAAS,CAACR,KAAK,CAAC,GAAGwB,eAAe,CAACG,WAAW,GAAGpB,gBAAK,CAACqB,MAAM,CAACL,UAAU,CAAC;EACxF,CAAC;EAED,MAAMM,wBAAwB,GAAGf,kBAAkB,EAAEgB,MAAM,CAAE3B,CAAC,IAAKA,CAAC,CAAC4B,YAAY,CAAC,CAAC,CAAC,IAAI,EAAE;EAC1F,MAAMC,6BAA6B,GAAGA,CAAA,KAAM;IAC1C,IAAI,CAACH,wBAAwB,CAACZ,MAAM,EAAE,OAAO,EAAE;IAC/C,MAAMgB,KAAK,GAAGJ,wBAAwB,CAAC3B,GAAG,CAAEC,CAAC,IAAKA,CAAC,CAAC+B,SAAS,CAAC,CAAC5B,IAAI,CAAC,IAAI,CAAC;IACzE,MAAMN,KAAK,GAAG,0CAA0C;IACxD,MAAMuB,UAAU,GAAG,6FAA6FY,6BAAmB;AACvI,2DAA2D;IACvD,OAAO5B,gBAAK,CAACC,SAAS,CAACR,KAAK,CAAC,GAAGiC,KAAK,GAAG1B,gBAAK,CAACqB,MAAM,CAACL,UAAU,CAAC;EAClE,CAAC;EAED,MAAMa,cAAc,GAAGA,CAAA,KAAM;IAC3B,IAAItC,cAAc,EAAE;MAClB,OAAO,GAAGS,gBAAK,CAACW,IAAI,CAClB,qGACF,CAAC;AACP,EAAEpB,cAAc,CAACZ,OAAO;AACxB,CAAC;IACG;IACA,IAAI,CAACW,gBAAgB,IAAI,CAACA,gBAAgB,CAACwC,iBAAiB,EAAE,OAAO,EAAE;IACvE,MAAM;MAAEA,iBAAiB;MAAEC;IAAmB,CAAC,GAAGzC,gBAAgB;IAClE,MAAM0C,gBAAgB,GAAIN,KAAK,IAAK;MAClC,OAAOA,KAAK,CACT/B,GAAG,CAAEsC,SAAS,IAAK;QAClB,IAAIC,eAAe,GAAG,UAAUD,SAAS,CAACpC,EAAE,CAACsC,QAAQ,CAAC,CAAC,EAAE;QACzD,MAAMC,OAAO,GAAGL,kBAAkB,CAACR,MAAM,CAAEc,MAAM,IAAKA,MAAM,CAACC,WAAW,CAACC,oBAAoB,CAACN,SAAS,CAACpC,EAAE,CAAC,CAAC;QAC5G,IAAIuC,OAAO,CAAC1B,MAAM,EAAE;UAClB,MAAM8B,WAAW,GAAGJ,OAAO,CAACzC,GAAG,CAAE8C,CAAC,IAAKA,CAAC,CAACR,SAAS,CAACpC,EAAE,CAACsC,QAAQ,CAAC,CAAC,CAAC;UACjED,eAAe,IAAI,YAAYQ,0BAAgB,KAAKF,WAAW,CAACzC,IAAI,CAAC,IAAI,CAAC,EAAE;QAC9E;QACA,OAAOmC,eAAe;MACxB,CAAC,CAAC,CACDnC,IAAI,CAAC,IAAI,CAAC;IACf,CAAC;IAED,OAAO,GAAGC,gBAAK,CAACC,SAAS,CACvB,0BACF,CAAC,MAAM,6CAA6C,MAAM+B,gBAAgB,CAACF,iBAAiB,CAAC,EAAE;EACjG,CAAC;EAED,MAAMa,gBAAgB,GAAGA,CAAA,KAAM;IAC7B,IAAI,CAACzD,gBAAgB,IAAI,CAACA,gBAAgB,CAACwB,MAAM,EAAE,OAAO,EAAE;IAC5D,MAAMjB,KAAK,GAAG,gDAAgD;IAC9D,MAAMmD,IAAI,GAAG,IAAAC,iBAAO,EAClB3D,gBAAgB,CAACS,GAAG,CAAEmD,eAAe,IAAK;MACxC;MACA,IAAI,CAACpE,OAAO,EAAE,OAAO,IAAI;MACzB,OAAO,GAAGsB,gBAAK,CAACW,IAAI,CAACmC,eAAe,CAACjD,EAAE,CAACsC,QAAQ,CAAC,CAAC,CAAC,MAAMnC,gBAAK,CAAC+C,KAAK,CAACD,eAAe,CAACE,gBAAgB,CAAC,EAAE;IAC1G,CAAC,CACH,CAAC,CAACjD,IAAI,CAAC,IAAI,CAAC;IACZ,IAAI,CAAC6C,IAAI,EAAE;MACT,OAAO,GAAG5C,gBAAK,CAACW,IAAI,CAAC,oCAAoCzB,gBAAgB,CAACwB,MAAM,eAAe,CAAC;AACtG,uCAAuC;IACnC;IACA,OAAO,GAAGV,gBAAK,CAACC,SAAS,CAACR,KAAK,CAAC,KAAKmD,IAAI,EAAE;EAC7C,CAAC;EAED,MAAMK,UAAU,GAAGA,CAAA,KAAM;IACvB,MAAMC,MAAM,GAAGjE,UAAU,EAAEyB,MAAM,IAAI,CAAC;IACtC,MAAMyC,qBAAqB,GAAGjE,gBAAgB,EAAEqC,MAAM,CAAE6B,CAAC,IAAKA,CAAC,CAACD,qBAAqB,CAAC,CAACzC,MAAM,IAAI,CAAC;IAClG,MAAM2C,WAAW,GACf,CAAC/D,gBAAgB,EAAEwC,iBAAiB,CAACpB,MAAM,IAAI,CAAC,KAAKpB,gBAAgB,EAAEyC,kBAAkB,CAACrB,MAAM,IAAI,CAAC,CAAC;IACxG,MAAM4C,cAAc,GAAGA,CAAA,KAAM;MAC3B,MAAM5B,KAAK,GAAGZ,uBAAuB,GAAG,GAAGA,uBAAuB,aAAa,GAAG,EAAE;MACpF,MAAMyC,EAAE,GAAG/C,2BAA2B,EAAEgD,sBAAsB,GAAG,sBAAsB,GAAG,EAAE;MAC5F,MAAMC,WAAW,GAAGnC,wBAAwB,CAACZ,MAAM,GAAG,GAAGkB,6BAAmB,OAAO,GAAG,EAAE;MACxF,OAAO,IAAAiB,iBAAO,EAAC,CAACnB,KAAK,EAAE6B,EAAE,EAAEE,WAAW,CAAC,CAAC,CAAC1D,IAAI,CAAC,IAAI,CAAC;IACrD,CAAC;IAED,MAAMN,KAAK,GAAGO,gBAAK,CAACW,IAAI,CAACV,SAAS,CAAC,eAAe,CAAC;IACnD,MAAMyD,SAAS,GAAG,mBAAmB1D,gBAAK,CAACW,IAAI,CAACuC,MAAM,CAACf,QAAQ,CAAC,CAAC,CAAC,EAAE;IACpE,MAAMwB,wBAAwB,GAAG,sBAAsB3D,gBAAK,CAACW,IAAI,CAACwC,qBAAqB,CAAChB,QAAQ,CAAC,CAAC,CAAC,EAAE;IACrG,MAAMyB,cAAc,GAAG,oBAAoB5D,gBAAK,CAACW,IAAI,CAAC0C,WAAW,CAAClB,QAAQ,CAAC,CAAC,CAAC,EAAE;IAC/E,MAAM0B,UAAU,GAAG,oBAAoB7D,gBAAK,CAACW,IAAI,CAACN,iBAAiB,EAAEK,MAAM,CAACyB,QAAQ,CAAC,CAAC,IAAI,GAAG,CAAC,EAAE;IAChG,MAAMf,WAAW,GAAG,gBAAgBpB,gBAAK,CAACW,IAAI,CAAC2C,cAAc,CAAC,CAAC,IAAI,MAAM,CAAC,EAAE;IAE5E,OAAO7D,KAAK,GAAGiE,SAAS,GAAGC,wBAAwB,GAAGC,cAAc,GAAGC,UAAU,GAAGzC,WAAW;EACjG,CAAC;EAED,OAAO,IAAAyB,iBAAO,EAAC,CACbpC,gBAAgB,CAAC,CAAC,EAClBkC,gBAAgB,CAAC,CAAC,EAClBmB,gBAAgB,CAACzD,iBAAiB,CAAC,EACnCwB,cAAc,CAAC,CAAC,EAChBJ,6BAA6B,CAAC,CAAC,EAC/BsC,8BAA8B,CAACvD,2BAA2B,CAAC,EAC3DO,kBAAkB,CAAC,CAAC,EACpBkC,UAAU,CAAC,CAAC,CACb,CAAC,CAAClD,IAAI,CAAC,MAAM,CAAC;AACjB;AAEO,SAASgE,8BAA8BA,CAACvD,2BAAyD,EAAU;EAChH,IAAI,CAACA,2BAA2B,EAAE,OAAO,EAAE;EAC3C,MAAM;IAAEwD,iCAAiC;IAAER,sBAAsB;IAAES,oBAAoB;IAAEC;EAAuB,CAAC,GAC/G1D,2BAA2B;EAE7B,MAAM2D,2BAA2B,GAAGA,CAAA,KAAM;IACxC,IAAI,CAACX,sBAAsB,IAAI,CAACQ,iCAAiC,EAAE,OAAO,EAAE;IAC5E,IAAIA,iCAAiC,EAAE;MACrC,OAAO,GAAGhE,gBAAK,CAACoE,GAAG,CAACJ,iCAAiC,CAACrF,OAAO,CAAC,EAAE;IAClE;IACA,OAAOqB,gBAAK,CAACqB,MAAM,CAAC,kEAAkE,CAAC;EACzF,CAAC;EAED,MAAMgD,+BAA+B,GAAGA,CAAA,KAAM;IAC5C,IAAI,CAACH,sBAAsB,EAAE,OAAO,EAAE;IACtC,MAAMzE,KAAK,GAAG,mEAAmE;IACjF,MAAMmD,IAAI,GAAGjG,MAAM,CAAC2H,IAAI,CAACJ,sBAAsB,CAAC,CAC7CvE,GAAG,CAAE4E,OAAO,IAAK;MAChB,OAAO,KAAKA,OAAO,KAAKL,sBAAsB,CAACK,OAAO,CAAC,EAAE;IAC3D,CAAC,CAAC,CACDxE,IAAI,CAAC,IAAI,CAAC;IAEb,OAAO,GAAGC,gBAAK,CAACC,SAAS,CAACR,KAAK,CAAC,KAAKmD,IAAI,EAAE;EAC7C,CAAC;EAED,OAAO,IAAAC,iBAAO,EAAC,CACbwB,+BAA+B,CAAC,CAAC,EACjCG,sBAAsB,CAACP,oBAAoB,CAAC,EAC5CE,2BAA2B,CAAC,CAAC,CAC9B,CAAC,CAACpE,IAAI,CAAC,MAAM,CAAC;AACjB;AAEA,SAASyE,sBAAsBA,CAACP,oBAA2C,EAAU;EACnF,IAAI,CAACA,oBAAoB,EAAE,OAAO,EAAE;EAEpC,MAAMxE,KAAK,GAAG,oEAAoE;EAClF,MAAMmD,IAAI,GAAGjG,MAAM,CAAC2H,IAAI,CAACL,oBAAoB,CAAC,CAC3CtE,GAAG,CAAE4E,OAAO,IAAK;IAChB,MAAM,CAACE,IAAI,EAAEC,EAAE,CAAC,GAAGT,oBAAoB,CAACM,OAAO,CAAC;IAChD,OAAO,KAAKA,OAAO,KAAKE,IAAI,OAAOC,EAAE,EAAE;EACzC,CAAC,CAAC,CACD3E,IAAI,CAAC,IAAI,CAAC;EAEb,OAAO,GAAGC,gBAAK,CAACC,SAAS,CAACR,KAAK,CAAC,KAAKmD,IAAI,EAAE;AAC7C;;AAEA;AACA;AACA;AACA;AACO,SAAS/B,kBAAkBA,CAAC5B,UAAgC,EAAE0F,OAAO,GAAG,IAAI,EAAEC,WAAW,GAAG,KAAK,EAAU;EAChH,MAAMC,GAAG,GAAGF,OAAO,GAAG,IAAI,GAAG,EAAE;EAC/B,MAAMG,WAAW,GAAG,IAAAjC,iBAAO,EACzB5D,UAAU,CAACU,GAAG,CAAEsC,SAA6B,IAAK;IAChD,MAAMpE,IAAI,GAAG+G,WAAW,GAAG3C,SAAS,CAACpC,EAAE,CAACsC,QAAQ,CAAC,CAAC,GAAGF,SAAS,CAACpC,EAAE,CAACC,sBAAsB,CAAC,CAAC;IAC1F,MAAMiF,KAAK,GAAG,IAAAlC,iBAAO,EACnBlG,MAAM,CAAC2H,IAAI,CAACrC,SAAS,CAAC+C,WAAW,CAAC,CAACrF,GAAG,CAAEsF,IAAI,IAAK;MAC/C,IAAIhD,SAAS,CAAC+C,WAAW,CAACC,IAAI,CAAC,KAAKC,0BAAU,CAACC,SAAS,EAAE,OAAO,IAAI;MACrE,MAAMC,IAAI,GACRnD,SAAS,CAAC+C,WAAW,CAACC,IAAI,CAAC,KAAKC,0BAAU,CAAC9G,MAAM,GAC7C4B,gBAAK,CAAC+C,KAAK,CAAC,kFAAkF,CAAC,GAC/F,EAAE;MACR,OAAO,GAAG8B,GAAG,GAAGtH,MAAM,CAAC0E,SAAS,CAAC+C,WAAW,CAACC,IAAI,CAAC,CAAC,IAAIjF,gBAAK,CAACW,IAAI,CAACsE,IAAI,CAAC,IAAIG,IAAI,EAAE;IACnF,CAAC,CACH,CAAC,CAACrF,IAAI,CAAC,IAAI,CAAC;IACZ,IAAI,CAACgF,KAAK,EAAE,OAAO,IAAI;IACvB,OAAO,GAAGJ,OAAO,GAAG9G,IAAI,GAAG,EAAE,KAAKmC,gBAAK,CAACqF,IAAI,CAACN,KAAK,CAAC,EAAE;EACvD,CAAC,CACH,CAAC,CAAChF,IAAI,CAAC,MAAM,CAAC;EACd,IAAI,CAAC+E,WAAW,EAAE;IAChB,OAAO,EAAE;EACX;EACA,MAAMrF,KAAK,GAAG,KAAK6F,mCAAyB,IAAI;EAChD,OAAOtF,gBAAK,CAACC,SAAS,CAACR,KAAK,CAAC,GAAGqF,WAAW;AAC7C;AAEO,SAAS5D,qBAAqBA,CAACjC,UAAgC,EAIpE;EACA,MAAM4F,GAAG,GAAG,IAAI;EAChB,IAAI1D,oBAAoB,GAAG,CAAC;EAC5B,IAAIoE,eAAe,GAAG,CAAC;EACvB,MAAMnE,WAAW,GAAG,IAAAyB,iBAAO,EACzB5D,UAAU,CAACU,GAAG,CAAEsC,SAA6B,IAAK;IAChD,MAAMpE,IAAI,GAAGoE,SAAS,CAACpC,EAAE,CAACC,sBAAsB,CAAC,CAAC;IAClD,MAAMiF,KAAK,GAAG,IAAAlC,iBAAO,EACnBlG,MAAM,CAAC2H,IAAI,CAACrC,SAAS,CAAC+C,WAAW,CAAC,CAACrF,GAAG,CAAEsF,IAAI,IAAK;MAC/C,IAAIhD,SAAS,CAAC+C,WAAW,CAACC,IAAI,CAAC,KAAKC,0BAAU,CAAC9G,MAAM,EAAE;QACrDmH,eAAe,IAAI,CAAC;QACpB,OAAO,GAAGV,GAAG,GAAGtH,MAAM,CAAC0E,SAAS,CAAC+C,WAAW,CAACC,IAAI,CAAC,CAAC,IAAIjF,gBAAK,CAACW,IAAI,CAACsE,IAAI,CAAC,EAAE;MAC3E;MACA,OAAO,IAAI;IACb,CAAC,CACH,CAAC;IACD,IAAI,CAACF,KAAK,CAACrE,MAAM,EAAE,OAAO,IAAI;IAC9BS,oBAAoB,IAAI,CAAC;IACzB,OAAO,GAAGtD,IAAI,KAAKmC,gBAAK,CAACqF,IAAI,CAACN,KAAK,CAAChF,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE;EACnD,CAAC,CACH,CAAC,CAACA,IAAI,CAAC,IAAI,CAAC;EAEZ,OAAO;IAAEoB,oBAAoB;IAAEoE,eAAe;IAAEnE;EAAY,CAAC;AAC/D;AAEO,SAASoE,uBAAuBA,CAACC,iBAAyB,EAAE;EACjE,IAAI,CAACA,iBAAiB,EAAE,OAAO,EAAE;EACjC,MAAMhG,KAAK,GAAGO,gBAAK,CAACC,SAAS,CAAC,oBAAoB,CAAC;EACnD,MAAMyF,QAAQ,GAAG,wDAAwD;EACzE,MAAM9C,IAAI,GAAG5C,gBAAK,CAACoE,GAAG,CAACqB,iBAAiB,CAAC9G,OAAO,CAAC;EACjD,MAAMqC,UAAU,GACd,uKAAuK;EACzK,OAAO,GAAGvB,KAAK,KAAKiG,QAAQ,KAAK9C,IAAI,KAAK5B,UAAU,EAAE;AACxD;AAEO,SAAS2E,sBAAsBA,CAACC,gBAAwB,EAAE;EAC/D,IAAI,CAACA,gBAAgB,EAAE,OAAO,EAAE;EAChC,MAAMnG,KAAK,GAAGO,gBAAK,CAACC,SAAS,CAAC,mBAAmB,CAAC;EAClD,MAAMyF,QAAQ,GAAG,gDAAgD;EACjE,MAAM9C,IAAI,GAAG5C,gBAAK,CAACoE,GAAG,CAACwB,gBAAgB,CAACjH,OAAO,CAAC;EAChD,MAAMqC,UAAU,GAAG,4CAA4C;EAC/D,OAAO,GAAGvB,KAAK,KAAKiG,QAAQ,KAAK9C,IAAI,KAAK5B,UAAU,EAAE;AACxD;AAEO,SAAS8C,gBAAgBA,CAACzD,iBAAiC,EAAE;EAClE,IAAI,CAACA,iBAAiB,EAAEK,MAAM,EAAE,OAAO,EAAE;EACzC,MAAMjB,KAAK,GAAG,iBAAiBY,iBAAiB,CAACK,MAAM,iCAAiC;EACxF,MAAMkC,IAAI,GAAGvC,iBAAiB,CAACN,IAAI,CAAC,IAAI,CAAC;EACzC,OAAO,GAAGC,gBAAK,CAACC,SAAS,CAACR,KAAK,CAAC,KAAKmD,IAAI,EAAE;AAC7C;AAEO,SAASiD,cAAcA,CAACC,eAA+B,EAAE;EAC9D,IAAI,CAACA,eAAe,EAAEpF,MAAM,EAAE,OAAO,EAAE;EACvC,MAAMjB,KAAK,GAAG,iBAAiBqG,eAAe,CAACpF,MAAM,+BAA+B;EACpF,MAAMkC,IAAI,GAAGkD,eAAe,CAAC/F,IAAI,CAAC,IAAI,CAAC;EACvC,OAAO,GAAGC,gBAAK,CAACC,SAAS,CAACR,KAAK,CAAC,KAAKmD,IAAI,EAAE;AAC7C","ignoreList":[]}
1
+ {"version":3,"names":["_chalk","data","_interopRequireDefault","require","_lodash","_legacy","_bitError","_mergeVersion","e","__esModule","default","_defineProperty","r","t","_toPropertyKey","Object","defineProperty","value","enumerable","configurable","writable","i","_toPrimitive","Symbol","toPrimitive","call","TypeError","String","Number","MergeCmd","constructor","merging","configStore","name","description","COMPONENT_PATTERN_HELP","report","pattern","ours","theirs","manual","autoMergeResolve","abort","resolve","build","noSnap","verbose","message","skipDependencyInstallation","getConfigBoolean","CFG_FORCE_LOCAL_BUILD","Boolean","BitError","components","failedComponents","version","resolvedComponents","abortedComponents","mergeSnapResults","mergeSnapError","merge","title","componentsStr","map","c","id","toStringWithoutVersion","join","chalk","underline","green","mergeReport","exports","removedComponents","leftUnresolvedConflicts","configMergeResults","workspaceConfigUpdateResult","getSuccessOutput","length","bold","fileChangesReport","applyVersionReport","componentsWithConflicts","getConflictSummary","suggestion","conflictSummary","conflictSummaryReport","conflictedComponents","conflictStr","yellow","configMergeWithConflicts","filter","hasConflicts","getConfigMergeConflictSummary","comps","compIdStr","MergeConfigFilename","getSnapsOutput","snappedComponents","autoSnappedResults","outputComponents","component","componentOutput","toString","autoTag","result","triggeredBy","searchWithoutVersion","autoTagComp","a","AUTO_SNAPPED_MSG","getFailureOutput","body","compact","failedComponent","white","unchangedMessage","getSummary","merged","unchangedLegitimately","f","autoSnapped","getConflictStr","ws","workspaceDepsConflicts","mergeConfig","mergedStr","unchangedLegitimatelyStr","autoSnappedStr","removedStr","getRemovedOutput","getWorkspaceConfigUpdateOutput","workspaceConfigConflictWriteError","workspaceDepsUpdates","workspaceDepsUnchanged","getWorkspaceConflictsOutput","red","getWorkspaceUnchangedDepsOutput","keys","pkgName","getWorkspaceDepsOutput","from","to","addName","showVersion","tab","fileChanges","files","filesStatus","file","FileStatus","unchanged","note","cyan","FILE_CHANGES_CHECKOUT_MSG","conflictedFiles","installationErrorOutput","installationError","subTitle","compilationErrorOutput","compilationError","getAddedOutput","addedComponents"],"sources":["merge-cmd.ts"],"sourcesContent":["import chalk from 'chalk';\nimport { Command, CommandOptions } from '@teambit/cli';\nimport { ComponentID } from '@teambit/component-id';\nimport { compact } from 'lodash';\nimport {\n COMPONENT_PATTERN_HELP,\n AUTO_SNAPPED_MSG,\n MergeConfigFilename,\n FILE_CHANGES_CHECKOUT_MSG,\n CFG_FORCE_LOCAL_BUILD,\n} from '@teambit/legacy.constants';\nimport { ConfigMergeResult, WorkspaceConfigUpdateResult, WorkspaceDepsUpdates } from '@teambit/config-merger';\nimport { BitError } from '@teambit/bit-error';\nimport { FileStatus, MergeStrategy } from './merge-version';\nimport { ApplyVersionResults, MergingMain, ApplyVersionResult } from './merging.main.runtime';\nimport { ConfigStoreMain } from '@teambit/config-store';\n\nexport class MergeCmd implements Command {\n name = 'merge [component-pattern]';\n description = 'merge changes of the remote head into local - auto-snaps all merged components';\n helpUrl = 'reference/components/merging-changes';\n group = 'development';\n arguments = [{ name: 'component-pattern', description: COMPONENT_PATTERN_HELP }];\n extendedDescription = `merge changes of the remote head into local when they are diverged. when on a lane, merge the remote head of the lane into the local\nand creates snaps for merged components that have diverged, on the lane.\nif no ids are specified, all pending-merge components will be merged. (run \"bit status\" to list them).\noptionally use '--abort' to revert the last merge. to revert a lane merge, use \"bit lane merge-abort\" command.`;\n alias = '';\n options = [\n ['', 'ours', 'DEPRECATED. use --auto-merge-resolve. in case of a conflict, keep the local modification'],\n [\n '',\n 'theirs',\n 'DEPRECATED. use --auto-merge-resolve. in case of a conflict, override the local modification with the specified version',\n ],\n [\n '',\n 'manual',\n 'same as \"--auto-merge-resolve manual\". in case of merge conflict, write the files with the conflict markers',\n ],\n [\n 'r',\n 'auto-merge-resolve <merge-strategy>',\n 'in case of a conflict, resolve according to the strategy: [ours, theirs, manual]',\n ],\n ['', 'abort', 'in case of an unresolved merge, revert to pre-merge state'],\n ['', 'resolve', 'mark an unresolved merge as resolved and create a new snap with the changes'],\n ['', 'no-snap', 'do not auto snap even if the merge completed without conflicts'],\n ['', 'build', 'in case of snap during the merge, run the build-pipeline (similar to bit snap --build)'],\n ['', 'verbose', 'show details of components that were not merged successfully'],\n ['x', 'skip-dependency-installation', 'do not install new dependencies resulting from the merge'],\n ['m', 'message <message>', 'override the default message for the auto snap'],\n ] as CommandOptions;\n loader = true;\n\n constructor(\n private merging: MergingMain,\n private configStore: ConfigStoreMain\n ) {}\n\n async report(\n [pattern]: [string],\n {\n ours = false,\n theirs = false,\n manual = false,\n autoMergeResolve,\n abort = false,\n resolve = false,\n build = false,\n noSnap = false,\n verbose = false,\n message,\n skipDependencyInstallation = false,\n }: {\n ours?: boolean;\n theirs?: boolean;\n manual?: boolean;\n autoMergeResolve?: MergeStrategy;\n abort?: boolean;\n resolve?: boolean;\n build?: boolean;\n noSnap?: boolean;\n verbose?: boolean;\n message: string;\n skipDependencyInstallation?: boolean;\n }\n ) {\n build = this.configStore.getConfigBoolean(CFG_FORCE_LOCAL_BUILD) || Boolean(build);\n if (ours || theirs) {\n throw new BitError('the \"--ours\" and \"--theirs\" flags are deprecated. use \"--auto-merge-resolve\" instead');\n }\n if (\n autoMergeResolve &&\n autoMergeResolve !== 'ours' &&\n autoMergeResolve !== 'theirs' &&\n autoMergeResolve !== 'manual'\n ) {\n throw new BitError('--auto-merge-resolve must be one of the following: [ours, theirs, manual]');\n }\n if (manual) autoMergeResolve = 'manual';\n if (abort && resolve) throw new BitError('unable to use \"abort\" and \"resolve\" flags together');\n if (noSnap && message) throw new BitError('unable to use \"noSnap\" and \"message\" flags together');\n const {\n components,\n failedComponents,\n version,\n resolvedComponents,\n abortedComponents,\n mergeSnapResults,\n mergeSnapError,\n }: ApplyVersionResults = await this.merging.merge(\n pattern,\n autoMergeResolve as any,\n abort,\n resolve,\n noSnap,\n message,\n build,\n skipDependencyInstallation\n );\n if (resolvedComponents) {\n const title = 'successfully resolved component(s)\\n';\n const componentsStr = resolvedComponents.map((c) => c.id.toStringWithoutVersion()).join('\\n');\n return chalk.underline(title) + chalk.green(componentsStr);\n }\n if (abortedComponents) {\n const title = 'successfully aborted the merge of the following component(s)\\n';\n const componentsStr = abortedComponents.map((c) => c.id.toStringWithoutVersion()).join('\\n');\n return chalk.underline(title) + chalk.green(componentsStr);\n }\n\n return mergeReport({\n components,\n failedComponents,\n version,\n mergeSnapResults,\n mergeSnapError,\n verbose,\n });\n }\n}\n\nexport function mergeReport({\n components,\n failedComponents,\n removedComponents,\n version,\n mergeSnapResults,\n mergeSnapError,\n leftUnresolvedConflicts,\n verbose,\n configMergeResults,\n workspaceConfigUpdateResult,\n}: ApplyVersionResults & { configMergeResults?: ConfigMergeResult[] }): string {\n const getSuccessOutput = () => {\n if (!components || !components.length) return '';\n const title = `successfully merged ${components.length} components${\n version ? `from version ${chalk.bold(version)}` : ''\n }\\n`;\n const fileChangesReport = applyVersionReport(components);\n\n return chalk.bold(title) + fileChangesReport;\n };\n\n let componentsWithConflicts = 0;\n const getConflictSummary = () => {\n if (!components || !components.length || !leftUnresolvedConflicts) return '';\n const title = `files with conflicts summary\\n`;\n const suggestion = `\\n\\nmerge process not completed due to the conflicts above. fix conflicts manually and then run \"bit install\".\nonce ready, snap/tag the components to complete the merge.`;\n const conflictSummary = conflictSummaryReport(components);\n componentsWithConflicts = conflictSummary.conflictedComponents;\n return chalk.underline(title) + conflictSummary.conflictStr + chalk.yellow(suggestion);\n };\n\n const configMergeWithConflicts = configMergeResults?.filter((c) => c.hasConflicts()) || [];\n const getConfigMergeConflictSummary = () => {\n if (!configMergeWithConflicts.length) return '';\n const comps = configMergeWithConflicts.map((c) => c.compIdStr).join('\\n');\n const title = `components with config-merge conflicts\\n`;\n const suggestion = `\\nconflicts were found while trying to merge the config. fix them manually by editing the ${MergeConfigFilename} file in the workspace root.\nonce ready, snap/tag the components to complete the merge.`;\n return chalk.underline(title) + comps + chalk.yellow(suggestion);\n };\n\n const getSnapsOutput = () => {\n if (mergeSnapError) {\n return `${chalk.bold(\n 'snapping merged components failed with the following error, please fix the issues and snap manually'\n )}\n${mergeSnapError.message}\n`;\n }\n if (!mergeSnapResults || !mergeSnapResults.snappedComponents) return '';\n const { snappedComponents, autoSnappedResults } = mergeSnapResults;\n const outputComponents = (comps) => {\n return comps\n .map((component) => {\n let componentOutput = ` > ${component.id.toString()}`;\n const autoTag = autoSnappedResults.filter((result) => result.triggeredBy.searchWithoutVersion(component.id));\n if (autoTag.length) {\n const autoTagComp = autoTag.map((a) => a.component.id.toString());\n componentOutput += `\\n ${AUTO_SNAPPED_MSG}: ${autoTagComp.join(', ')}`;\n }\n return componentOutput;\n })\n .join('\\n');\n };\n\n return `${chalk.underline(\n 'merge-snapped components'\n )}\\n(${'components snapped as a result of the merge'})\\n${outputComponents(snappedComponents)}`;\n };\n\n const getFailureOutput = () => {\n if (!failedComponents || !failedComponents.length) return '';\n const title = '\\nmerge skipped for the following component(s)';\n const body = compact(\n failedComponents.map((failedComponent) => {\n // all failures here are \"unchangedLegitimately\". otherwise, it would have been thrown as an error\n if (!verbose) return null;\n return `${chalk.bold(failedComponent.id.toString())} - ${chalk.white(failedComponent.unchangedMessage)}`;\n })\n ).join('\\n');\n if (!body) {\n return `${chalk.bold(`\\nmerge skipped legitimately for ${failedComponents.length} component(s)`)}\n(use --verbose to list them next time)`;\n }\n return `${chalk.underline(title)}\\n${body}`;\n };\n\n const getSummary = () => {\n const merged = components?.length || 0;\n const unchangedLegitimately = failedComponents?.filter((f) => f.unchangedLegitimately).length || 0;\n const autoSnapped =\n (mergeSnapResults?.snappedComponents.length || 0) + (mergeSnapResults?.autoSnappedResults.length || 0);\n const getConflictStr = () => {\n const comps = componentsWithConflicts ? `${componentsWithConflicts} components` : '';\n const ws = workspaceConfigUpdateResult?.workspaceDepsConflicts ? 'workspace.jsonc file' : '';\n const mergeConfig = configMergeWithConflicts.length ? `${MergeConfigFilename} file` : '';\n return compact([comps, ws, mergeConfig]).join(', ');\n };\n\n const title = chalk.bold.underline('Merge Summary');\n const mergedStr = `\\nTotal Merged: ${chalk.bold(merged.toString())}`;\n const unchangedLegitimatelyStr = `\\nTotal Unchanged: ${chalk.bold(unchangedLegitimately.toString())}`;\n const autoSnappedStr = `\\nTotal Snapped: ${chalk.bold(autoSnapped.toString())}`;\n const removedStr = `\\nTotal Removed: ${chalk.bold(removedComponents?.length.toString() || '0')}`;\n const conflictStr = `\\nConflicts: ${chalk.bold(getConflictStr() || 'none')}`;\n\n return title + mergedStr + unchangedLegitimatelyStr + autoSnappedStr + removedStr + conflictStr;\n };\n\n return compact([\n getSuccessOutput(),\n getFailureOutput(),\n getRemovedOutput(removedComponents),\n getSnapsOutput(),\n getConfigMergeConflictSummary(),\n getWorkspaceConfigUpdateOutput(workspaceConfigUpdateResult),\n getConflictSummary(),\n getSummary(),\n ]).join('\\n\\n');\n}\n\nexport function getWorkspaceConfigUpdateOutput(workspaceConfigUpdateResult?: WorkspaceConfigUpdateResult): string {\n if (!workspaceConfigUpdateResult) return '';\n const { workspaceConfigConflictWriteError, workspaceDepsConflicts, workspaceDepsUpdates, workspaceDepsUnchanged } =\n workspaceConfigUpdateResult;\n\n const getWorkspaceConflictsOutput = () => {\n if (!workspaceDepsConflicts && !workspaceConfigConflictWriteError) return '';\n if (workspaceConfigConflictWriteError) {\n return `${chalk.red(workspaceConfigConflictWriteError.message)}`;\n }\n return chalk.yellow('workspace.jsonc has conflicts, please edit the file and fix them');\n };\n\n const getWorkspaceUnchangedDepsOutput = () => {\n if (!workspaceDepsUnchanged) return '';\n const title = '\\nworkspace.jsonc was unable to update the following dependencies';\n const body = Object.keys(workspaceDepsUnchanged)\n .map((pkgName) => {\n return ` ${pkgName}: ${workspaceDepsUnchanged[pkgName]}`;\n })\n .join('\\n');\n\n return `${chalk.underline(title)}\\n${body}`;\n };\n\n return compact([\n getWorkspaceUnchangedDepsOutput(),\n getWorkspaceDepsOutput(workspaceDepsUpdates),\n getWorkspaceConflictsOutput(),\n ]).join('\\n\\n');\n}\n\nfunction getWorkspaceDepsOutput(workspaceDepsUpdates?: WorkspaceDepsUpdates): string {\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 `${chalk.underline(title)}\\n${body}`;\n}\n\n/**\n * shows only the file-changes section.\n * if all files are \"unchanged\", it returns an empty string\n */\nexport function applyVersionReport(components: ApplyVersionResult[], addName = true, showVersion = false): string {\n const tab = addName ? '\\t' : '';\n const fileChanges = compact(\n components.map((component: ApplyVersionResult) => {\n const name = showVersion ? component.id.toString() : component.id.toStringWithoutVersion();\n const files = compact(\n Object.keys(component.filesStatus).map((file) => {\n if (component.filesStatus[file] === FileStatus.unchanged) return null;\n const note =\n component.filesStatus[file] === FileStatus.manual\n ? chalk.white('automatic merge failed. please fix conflicts manually and then run \"bit install\"')\n : '';\n return `${tab}${String(component.filesStatus[file])} ${chalk.bold(file)} ${note}`;\n })\n ).join('\\n');\n if (!files) return null;\n return `${addName ? name : ''}\\n${chalk.cyan(files)}`;\n })\n ).join('\\n\\n');\n if (!fileChanges) {\n return '';\n }\n const title = `\\n${FILE_CHANGES_CHECKOUT_MSG}\\n`;\n return chalk.underline(title) + fileChanges;\n}\n\nexport function conflictSummaryReport(components: ApplyVersionResult[]): {\n conflictedComponents: number;\n conflictedFiles: number;\n conflictStr: string;\n} {\n const tab = '\\t';\n let conflictedComponents = 0;\n let conflictedFiles = 0;\n const conflictStr = 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 conflictedFiles += 1;\n return `${tab}${String(component.filesStatus[file])} ${chalk.bold(file)}`;\n }\n return null;\n })\n );\n if (!files.length) return null;\n conflictedComponents += 1;\n return `${name}\\n${chalk.cyan(files.join('\\n'))}`;\n })\n ).join('\\n');\n\n return { conflictedComponents, conflictedFiles, conflictStr };\n}\n\nexport function installationErrorOutput(installationError?: Error) {\n if (!installationError) return '';\n const title = chalk.underline('Installation Error');\n const subTitle = 'The following error was thrown by the package manager:';\n const body = chalk.red(installationError.message);\n const suggestion =\n 'Use \"bit install\" to complete the installation, remove the imported components using \"bit remove <comp id>\" or remove the missing dependencies from their source code';\n return `${title}\\n${subTitle}\\n${body}\\n${suggestion}`;\n}\n\nexport function compilationErrorOutput(compilationError?: Error) {\n if (!compilationError) return '';\n const title = chalk.underline('Compilation Error');\n const subTitle = 'The following error was thrown by the compiler';\n const body = chalk.red(compilationError.message);\n const suggestion = 'Please fix the issue and run \"bit compile\"';\n return `${title}\\n${subTitle}\\n${body}\\n${suggestion}`;\n}\n\nexport function getRemovedOutput(removedComponents?: ComponentID[]) {\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 `${chalk.underline(title)}\\n${body}`;\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 `${chalk.underline(title)}\\n${body}`;\n}\n"],"mappings":";;;;;;;;;;;;;;AAAA,SAAAA,OAAA;EAAA,MAAAC,IAAA,GAAAC,sBAAA,CAAAC,OAAA;EAAAH,MAAA,YAAAA,CAAA;IAAA,OAAAC,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAGA,SAAAG,QAAA;EAAA,MAAAH,IAAA,GAAAE,OAAA;EAAAC,OAAA,YAAAA,CAAA;IAAA,OAAAH,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAI,QAAA;EAAA,MAAAJ,IAAA,GAAAE,OAAA;EAAAE,OAAA,YAAAA,CAAA;IAAA,OAAAJ,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAQA,SAAAK,UAAA;EAAA,MAAAL,IAAA,GAAAE,OAAA;EAAAG,SAAA,YAAAA,CAAA;IAAA,OAAAL,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAM,cAAA;EAAA,MAAAN,IAAA,GAAAE,OAAA;EAAAI,aAAA,YAAAA,CAAA;IAAA,OAAAN,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAA4D,SAAAC,uBAAAM,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAAA,SAAAG,gBAAAH,CAAA,EAAAI,CAAA,EAAAC,CAAA,YAAAD,CAAA,GAAAE,cAAA,CAAAF,CAAA,MAAAJ,CAAA,GAAAO,MAAA,CAAAC,cAAA,CAAAR,CAAA,EAAAI,CAAA,IAAAK,KAAA,EAAAJ,CAAA,EAAAK,UAAA,MAAAC,YAAA,MAAAC,QAAA,UAAAZ,CAAA,CAAAI,CAAA,IAAAC,CAAA,EAAAL,CAAA;AAAA,SAAAM,eAAAD,CAAA,QAAAQ,CAAA,GAAAC,YAAA,CAAAT,CAAA,uCAAAQ,CAAA,GAAAA,CAAA,GAAAA,CAAA;AAAA,SAAAC,aAAAT,CAAA,EAAAD,CAAA,2BAAAC,CAAA,KAAAA,CAAA,SAAAA,CAAA,MAAAL,CAAA,GAAAK,CAAA,CAAAU,MAAA,CAAAC,WAAA,kBAAAhB,CAAA,QAAAa,CAAA,GAAAb,CAAA,CAAAiB,IAAA,CAAAZ,CAAA,EAAAD,CAAA,uCAAAS,CAAA,SAAAA,CAAA,YAAAK,SAAA,yEAAAd,CAAA,GAAAe,MAAA,GAAAC,MAAA,EAAAf,CAAA;AAIrD,MAAMgB,QAAQ,CAAoB;EAsCvCC,WAAWA,CACDC,OAAoB,EACpBC,WAA4B,EACpC;IAAA,KAFQD,OAAoB,GAApBA,OAAoB;IAAA,KACpBC,WAA4B,GAA5BA,WAA4B;IAAArB,eAAA,eAvC/B,2BAA2B;IAAAA,eAAA,sBACpB,gFAAgF;IAAAA,eAAA,kBACpF,sCAAsC;IAAAA,eAAA,gBACxC,aAAa;IAAAA,eAAA,oBACT,CAAC;MAAEsB,IAAI,EAAE,mBAAmB;MAAEC,WAAW,EAAEC;IAAuB,CAAC,CAAC;IAAAxB,eAAA,8BAC1D;AACxB;AACA;AACA,+GAA+G;IAAAA,eAAA,gBACrG,EAAE;IAAAA,eAAA,kBACA,CACR,CAAC,EAAE,EAAE,MAAM,EAAE,0FAA0F,CAAC,EACxG,CACE,EAAE,EACF,QAAQ,EACR,yHAAyH,CAC1H,EACD,CACE,EAAE,EACF,QAAQ,EACR,6GAA6G,CAC9G,EACD,CACE,GAAG,EACH,qCAAqC,EACrC,kFAAkF,CACnF,EACD,CAAC,EAAE,EAAE,OAAO,EAAE,2DAA2D,CAAC,EAC1E,CAAC,EAAE,EAAE,SAAS,EAAE,6EAA6E,CAAC,EAC9F,CAAC,EAAE,EAAE,SAAS,EAAE,gEAAgE,CAAC,EACjF,CAAC,EAAE,EAAE,OAAO,EAAE,wFAAwF,CAAC,EACvG,CAAC,EAAE,EAAE,SAAS,EAAE,8DAA8D,CAAC,EAC/E,CAAC,GAAG,EAAE,8BAA8B,EAAE,0DAA0D,CAAC,EACjG,CAAC,GAAG,EAAE,mBAAmB,EAAE,gDAAgD,CAAC,CAC7E;IAAAA,eAAA,iBACQ,IAAI;EAKV;EAEH,MAAMyB,MAAMA,CACV,CAACC,OAAO,CAAW,EACnB;IACEC,IAAI,GAAG,KAAK;IACZC,MAAM,GAAG,KAAK;IACdC,MAAM,GAAG,KAAK;IACdC,gBAAgB;IAChBC,KAAK,GAAG,KAAK;IACbC,OAAO,GAAG,KAAK;IACfC,KAAK,GAAG,KAAK;IACbC,MAAM,GAAG,KAAK;IACdC,OAAO,GAAG,KAAK;IACfC,OAAO;IACPC,0BAA0B,GAAG;EAa/B,CAAC,EACD;IACAJ,KAAK,GAAG,IAAI,CAACZ,WAAW,CAACiB,gBAAgB,CAACC,+BAAqB,CAAC,IAAIC,OAAO,CAACP,KAAK,CAAC;IAClF,IAAIN,IAAI,IAAIC,MAAM,EAAE;MAClB,MAAM,KAAIa,oBAAQ,EAAC,sFAAsF,CAAC;IAC5G;IACA,IACEX,gBAAgB,IAChBA,gBAAgB,KAAK,MAAM,IAC3BA,gBAAgB,KAAK,QAAQ,IAC7BA,gBAAgB,KAAK,QAAQ,EAC7B;MACA,MAAM,KAAIW,oBAAQ,EAAC,2EAA2E,CAAC;IACjG;IACA,IAAIZ,MAAM,EAAEC,gBAAgB,GAAG,QAAQ;IACvC,IAAIC,KAAK,IAAIC,OAAO,EAAE,MAAM,KAAIS,oBAAQ,EAAC,oDAAoD,CAAC;IAC9F,IAAIP,MAAM,IAAIE,OAAO,EAAE,MAAM,KAAIK,oBAAQ,EAAC,qDAAqD,CAAC;IAChG,MAAM;MACJC,UAAU;MACVC,gBAAgB;MAChBC,OAAO;MACPC,kBAAkB;MAClBC,iBAAiB;MACjBC,gBAAgB;MAChBC;IACmB,CAAC,GAAG,MAAM,IAAI,CAAC5B,OAAO,CAAC6B,KAAK,CAC/CvB,OAAO,EACPI,gBAAgB,EAChBC,KAAK,EACLC,OAAO,EACPE,MAAM,EACNE,OAAO,EACPH,KAAK,EACLI,0BACF,CAAC;IACD,IAAIQ,kBAAkB,EAAE;MACtB,MAAMK,KAAK,GAAG,sCAAsC;MACpD,MAAMC,aAAa,GAAGN,kBAAkB,CAACO,GAAG,CAAEC,CAAC,IAAKA,CAAC,CAACC,EAAE,CAACC,sBAAsB,CAAC,CAAC,CAAC,CAACC,IAAI,CAAC,IAAI,CAAC;MAC7F,OAAOC,gBAAK,CAACC,SAAS,CAACR,KAAK,CAAC,GAAGO,gBAAK,CAACE,KAAK,CAACR,aAAa,CAAC;IAC5D;IACA,IAAIL,iBAAiB,EAAE;MACrB,MAAMI,KAAK,GAAG,gEAAgE;MAC9E,MAAMC,aAAa,GAAGL,iBAAiB,CAACM,GAAG,CAAEC,CAAC,IAAKA,CAAC,CAACC,EAAE,CAACC,sBAAsB,CAAC,CAAC,CAAC,CAACC,IAAI,CAAC,IAAI,CAAC;MAC5F,OAAOC,gBAAK,CAACC,SAAS,CAACR,KAAK,CAAC,GAAGO,gBAAK,CAACE,KAAK,CAACR,aAAa,CAAC;IAC5D;IAEA,OAAOS,WAAW,CAAC;MACjBlB,UAAU;MACVC,gBAAgB;MAChBC,OAAO;MACPG,gBAAgB;MAChBC,cAAc;MACdb;IACF,CAAC,CAAC;EACJ;AACF;AAAC0B,OAAA,CAAA3C,QAAA,GAAAA,QAAA;AAEM,SAAS0C,WAAWA,CAAC;EAC1BlB,UAAU;EACVC,gBAAgB;EAChBmB,iBAAiB;EACjBlB,OAAO;EACPG,gBAAgB;EAChBC,cAAc;EACde,uBAAuB;EACvB5B,OAAO;EACP6B,kBAAkB;EAClBC;AACkE,CAAC,EAAU;EAC7E,MAAMC,gBAAgB,GAAGA,CAAA,KAAM;IAC7B,IAAI,CAACxB,UAAU,IAAI,CAACA,UAAU,CAACyB,MAAM,EAAE,OAAO,EAAE;IAChD,MAAMjB,KAAK,GAAG,uBAAuBR,UAAU,CAACyB,MAAM,cACpDvB,OAAO,GAAG,gBAAgBa,gBAAK,CAACW,IAAI,CAACxB,OAAO,CAAC,EAAE,GAAG,EAAE,IAClD;IACJ,MAAMyB,iBAAiB,GAAGC,kBAAkB,CAAC5B,UAAU,CAAC;IAExD,OAAOe,gBAAK,CAACW,IAAI,CAAClB,KAAK,CAAC,GAAGmB,iBAAiB;EAC9C,CAAC;EAED,IAAIE,uBAAuB,GAAG,CAAC;EAC/B,MAAMC,kBAAkB,GAAGA,CAAA,KAAM;IAC/B,IAAI,CAAC9B,UAAU,IAAI,CAACA,UAAU,CAACyB,MAAM,IAAI,CAACJ,uBAAuB,EAAE,OAAO,EAAE;IAC5E,MAAMb,KAAK,GAAG,gCAAgC;IAC9C,MAAMuB,UAAU,GAAG;AACvB,2DAA2D;IACvD,MAAMC,eAAe,GAAGC,qBAAqB,CAACjC,UAAU,CAAC;IACzD6B,uBAAuB,GAAGG,eAAe,CAACE,oBAAoB;IAC9D,OAAOnB,gBAAK,CAACC,SAAS,CAACR,KAAK,CAAC,GAAGwB,eAAe,CAACG,WAAW,GAAGpB,gBAAK,CAACqB,MAAM,CAACL,UAAU,CAAC;EACxF,CAAC;EAED,MAAMM,wBAAwB,GAAGf,kBAAkB,EAAEgB,MAAM,CAAE3B,CAAC,IAAKA,CAAC,CAAC4B,YAAY,CAAC,CAAC,CAAC,IAAI,EAAE;EAC1F,MAAMC,6BAA6B,GAAGA,CAAA,KAAM;IAC1C,IAAI,CAACH,wBAAwB,CAACZ,MAAM,EAAE,OAAO,EAAE;IAC/C,MAAMgB,KAAK,GAAGJ,wBAAwB,CAAC3B,GAAG,CAAEC,CAAC,IAAKA,CAAC,CAAC+B,SAAS,CAAC,CAAC5B,IAAI,CAAC,IAAI,CAAC;IACzE,MAAMN,KAAK,GAAG,0CAA0C;IACxD,MAAMuB,UAAU,GAAG,6FAA6FY,6BAAmB;AACvI,2DAA2D;IACvD,OAAO5B,gBAAK,CAACC,SAAS,CAACR,KAAK,CAAC,GAAGiC,KAAK,GAAG1B,gBAAK,CAACqB,MAAM,CAACL,UAAU,CAAC;EAClE,CAAC;EAED,MAAMa,cAAc,GAAGA,CAAA,KAAM;IAC3B,IAAItC,cAAc,EAAE;MAClB,OAAO,GAAGS,gBAAK,CAACW,IAAI,CAClB,qGACF,CAAC;AACP,EAAEpB,cAAc,CAACZ,OAAO;AACxB,CAAC;IACG;IACA,IAAI,CAACW,gBAAgB,IAAI,CAACA,gBAAgB,CAACwC,iBAAiB,EAAE,OAAO,EAAE;IACvE,MAAM;MAAEA,iBAAiB;MAAEC;IAAmB,CAAC,GAAGzC,gBAAgB;IAClE,MAAM0C,gBAAgB,GAAIN,KAAK,IAAK;MAClC,OAAOA,KAAK,CACT/B,GAAG,CAAEsC,SAAS,IAAK;QAClB,IAAIC,eAAe,GAAG,UAAUD,SAAS,CAACpC,EAAE,CAACsC,QAAQ,CAAC,CAAC,EAAE;QACzD,MAAMC,OAAO,GAAGL,kBAAkB,CAACR,MAAM,CAAEc,MAAM,IAAKA,MAAM,CAACC,WAAW,CAACC,oBAAoB,CAACN,SAAS,CAACpC,EAAE,CAAC,CAAC;QAC5G,IAAIuC,OAAO,CAAC1B,MAAM,EAAE;UAClB,MAAM8B,WAAW,GAAGJ,OAAO,CAACzC,GAAG,CAAE8C,CAAC,IAAKA,CAAC,CAACR,SAAS,CAACpC,EAAE,CAACsC,QAAQ,CAAC,CAAC,CAAC;UACjED,eAAe,IAAI,YAAYQ,0BAAgB,KAAKF,WAAW,CAACzC,IAAI,CAAC,IAAI,CAAC,EAAE;QAC9E;QACA,OAAOmC,eAAe;MACxB,CAAC,CAAC,CACDnC,IAAI,CAAC,IAAI,CAAC;IACf,CAAC;IAED,OAAO,GAAGC,gBAAK,CAACC,SAAS,CACvB,0BACF,CAAC,MAAM,6CAA6C,MAAM+B,gBAAgB,CAACF,iBAAiB,CAAC,EAAE;EACjG,CAAC;EAED,MAAMa,gBAAgB,GAAGA,CAAA,KAAM;IAC7B,IAAI,CAACzD,gBAAgB,IAAI,CAACA,gBAAgB,CAACwB,MAAM,EAAE,OAAO,EAAE;IAC5D,MAAMjB,KAAK,GAAG,gDAAgD;IAC9D,MAAMmD,IAAI,GAAG,IAAAC,iBAAO,EAClB3D,gBAAgB,CAACS,GAAG,CAAEmD,eAAe,IAAK;MACxC;MACA,IAAI,CAACpE,OAAO,EAAE,OAAO,IAAI;MACzB,OAAO,GAAGsB,gBAAK,CAACW,IAAI,CAACmC,eAAe,CAACjD,EAAE,CAACsC,QAAQ,CAAC,CAAC,CAAC,MAAMnC,gBAAK,CAAC+C,KAAK,CAACD,eAAe,CAACE,gBAAgB,CAAC,EAAE;IAC1G,CAAC,CACH,CAAC,CAACjD,IAAI,CAAC,IAAI,CAAC;IACZ,IAAI,CAAC6C,IAAI,EAAE;MACT,OAAO,GAAG5C,gBAAK,CAACW,IAAI,CAAC,oCAAoCzB,gBAAgB,CAACwB,MAAM,eAAe,CAAC;AACtG,uCAAuC;IACnC;IACA,OAAO,GAAGV,gBAAK,CAACC,SAAS,CAACR,KAAK,CAAC,KAAKmD,IAAI,EAAE;EAC7C,CAAC;EAED,MAAMK,UAAU,GAAGA,CAAA,KAAM;IACvB,MAAMC,MAAM,GAAGjE,UAAU,EAAEyB,MAAM,IAAI,CAAC;IACtC,MAAMyC,qBAAqB,GAAGjE,gBAAgB,EAAEqC,MAAM,CAAE6B,CAAC,IAAKA,CAAC,CAACD,qBAAqB,CAAC,CAACzC,MAAM,IAAI,CAAC;IAClG,MAAM2C,WAAW,GACf,CAAC/D,gBAAgB,EAAEwC,iBAAiB,CAACpB,MAAM,IAAI,CAAC,KAAKpB,gBAAgB,EAAEyC,kBAAkB,CAACrB,MAAM,IAAI,CAAC,CAAC;IACxG,MAAM4C,cAAc,GAAGA,CAAA,KAAM;MAC3B,MAAM5B,KAAK,GAAGZ,uBAAuB,GAAG,GAAGA,uBAAuB,aAAa,GAAG,EAAE;MACpF,MAAMyC,EAAE,GAAG/C,2BAA2B,EAAEgD,sBAAsB,GAAG,sBAAsB,GAAG,EAAE;MAC5F,MAAMC,WAAW,GAAGnC,wBAAwB,CAACZ,MAAM,GAAG,GAAGkB,6BAAmB,OAAO,GAAG,EAAE;MACxF,OAAO,IAAAiB,iBAAO,EAAC,CAACnB,KAAK,EAAE6B,EAAE,EAAEE,WAAW,CAAC,CAAC,CAAC1D,IAAI,CAAC,IAAI,CAAC;IACrD,CAAC;IAED,MAAMN,KAAK,GAAGO,gBAAK,CAACW,IAAI,CAACV,SAAS,CAAC,eAAe,CAAC;IACnD,MAAMyD,SAAS,GAAG,mBAAmB1D,gBAAK,CAACW,IAAI,CAACuC,MAAM,CAACf,QAAQ,CAAC,CAAC,CAAC,EAAE;IACpE,MAAMwB,wBAAwB,GAAG,sBAAsB3D,gBAAK,CAACW,IAAI,CAACwC,qBAAqB,CAAChB,QAAQ,CAAC,CAAC,CAAC,EAAE;IACrG,MAAMyB,cAAc,GAAG,oBAAoB5D,gBAAK,CAACW,IAAI,CAAC0C,WAAW,CAAClB,QAAQ,CAAC,CAAC,CAAC,EAAE;IAC/E,MAAM0B,UAAU,GAAG,oBAAoB7D,gBAAK,CAACW,IAAI,CAACN,iBAAiB,EAAEK,MAAM,CAACyB,QAAQ,CAAC,CAAC,IAAI,GAAG,CAAC,EAAE;IAChG,MAAMf,WAAW,GAAG,gBAAgBpB,gBAAK,CAACW,IAAI,CAAC2C,cAAc,CAAC,CAAC,IAAI,MAAM,CAAC,EAAE;IAE5E,OAAO7D,KAAK,GAAGiE,SAAS,GAAGC,wBAAwB,GAAGC,cAAc,GAAGC,UAAU,GAAGzC,WAAW;EACjG,CAAC;EAED,OAAO,IAAAyB,iBAAO,EAAC,CACbpC,gBAAgB,CAAC,CAAC,EAClBkC,gBAAgB,CAAC,CAAC,EAClBmB,gBAAgB,CAACzD,iBAAiB,CAAC,EACnCwB,cAAc,CAAC,CAAC,EAChBJ,6BAA6B,CAAC,CAAC,EAC/BsC,8BAA8B,CAACvD,2BAA2B,CAAC,EAC3DO,kBAAkB,CAAC,CAAC,EACpBkC,UAAU,CAAC,CAAC,CACb,CAAC,CAAClD,IAAI,CAAC,MAAM,CAAC;AACjB;AAEO,SAASgE,8BAA8BA,CAACvD,2BAAyD,EAAU;EAChH,IAAI,CAACA,2BAA2B,EAAE,OAAO,EAAE;EAC3C,MAAM;IAAEwD,iCAAiC;IAAER,sBAAsB;IAAES,oBAAoB;IAAEC;EAAuB,CAAC,GAC/G1D,2BAA2B;EAE7B,MAAM2D,2BAA2B,GAAGA,CAAA,KAAM;IACxC,IAAI,CAACX,sBAAsB,IAAI,CAACQ,iCAAiC,EAAE,OAAO,EAAE;IAC5E,IAAIA,iCAAiC,EAAE;MACrC,OAAO,GAAGhE,gBAAK,CAACoE,GAAG,CAACJ,iCAAiC,CAACrF,OAAO,CAAC,EAAE;IAClE;IACA,OAAOqB,gBAAK,CAACqB,MAAM,CAAC,kEAAkE,CAAC;EACzF,CAAC;EAED,MAAMgD,+BAA+B,GAAGA,CAAA,KAAM;IAC5C,IAAI,CAACH,sBAAsB,EAAE,OAAO,EAAE;IACtC,MAAMzE,KAAK,GAAG,mEAAmE;IACjF,MAAMmD,IAAI,GAAGjG,MAAM,CAAC2H,IAAI,CAACJ,sBAAsB,CAAC,CAC7CvE,GAAG,CAAE4E,OAAO,IAAK;MAChB,OAAO,KAAKA,OAAO,KAAKL,sBAAsB,CAACK,OAAO,CAAC,EAAE;IAC3D,CAAC,CAAC,CACDxE,IAAI,CAAC,IAAI,CAAC;IAEb,OAAO,GAAGC,gBAAK,CAACC,SAAS,CAACR,KAAK,CAAC,KAAKmD,IAAI,EAAE;EAC7C,CAAC;EAED,OAAO,IAAAC,iBAAO,EAAC,CACbwB,+BAA+B,CAAC,CAAC,EACjCG,sBAAsB,CAACP,oBAAoB,CAAC,EAC5CE,2BAA2B,CAAC,CAAC,CAC9B,CAAC,CAACpE,IAAI,CAAC,MAAM,CAAC;AACjB;AAEA,SAASyE,sBAAsBA,CAACP,oBAA2C,EAAU;EACnF,IAAI,CAACA,oBAAoB,EAAE,OAAO,EAAE;EAEpC,MAAMxE,KAAK,GAAG,oEAAoE;EAClF,MAAMmD,IAAI,GAAGjG,MAAM,CAAC2H,IAAI,CAACL,oBAAoB,CAAC,CAC3CtE,GAAG,CAAE4E,OAAO,IAAK;IAChB,MAAM,CAACE,IAAI,EAAEC,EAAE,CAAC,GAAGT,oBAAoB,CAACM,OAAO,CAAC;IAChD,OAAO,KAAKA,OAAO,KAAKE,IAAI,OAAOC,EAAE,EAAE;EACzC,CAAC,CAAC,CACD3E,IAAI,CAAC,IAAI,CAAC;EAEb,OAAO,GAAGC,gBAAK,CAACC,SAAS,CAACR,KAAK,CAAC,KAAKmD,IAAI,EAAE;AAC7C;;AAEA;AACA;AACA;AACA;AACO,SAAS/B,kBAAkBA,CAAC5B,UAAgC,EAAE0F,OAAO,GAAG,IAAI,EAAEC,WAAW,GAAG,KAAK,EAAU;EAChH,MAAMC,GAAG,GAAGF,OAAO,GAAG,IAAI,GAAG,EAAE;EAC/B,MAAMG,WAAW,GAAG,IAAAjC,iBAAO,EACzB5D,UAAU,CAACU,GAAG,CAAEsC,SAA6B,IAAK;IAChD,MAAMpE,IAAI,GAAG+G,WAAW,GAAG3C,SAAS,CAACpC,EAAE,CAACsC,QAAQ,CAAC,CAAC,GAAGF,SAAS,CAACpC,EAAE,CAACC,sBAAsB,CAAC,CAAC;IAC1F,MAAMiF,KAAK,GAAG,IAAAlC,iBAAO,EACnBlG,MAAM,CAAC2H,IAAI,CAACrC,SAAS,CAAC+C,WAAW,CAAC,CAACrF,GAAG,CAAEsF,IAAI,IAAK;MAC/C,IAAIhD,SAAS,CAAC+C,WAAW,CAACC,IAAI,CAAC,KAAKC,0BAAU,CAACC,SAAS,EAAE,OAAO,IAAI;MACrE,MAAMC,IAAI,GACRnD,SAAS,CAAC+C,WAAW,CAACC,IAAI,CAAC,KAAKC,0BAAU,CAAC9G,MAAM,GAC7C4B,gBAAK,CAAC+C,KAAK,CAAC,kFAAkF,CAAC,GAC/F,EAAE;MACR,OAAO,GAAG8B,GAAG,GAAGtH,MAAM,CAAC0E,SAAS,CAAC+C,WAAW,CAACC,IAAI,CAAC,CAAC,IAAIjF,gBAAK,CAACW,IAAI,CAACsE,IAAI,CAAC,IAAIG,IAAI,EAAE;IACnF,CAAC,CACH,CAAC,CAACrF,IAAI,CAAC,IAAI,CAAC;IACZ,IAAI,CAACgF,KAAK,EAAE,OAAO,IAAI;IACvB,OAAO,GAAGJ,OAAO,GAAG9G,IAAI,GAAG,EAAE,KAAKmC,gBAAK,CAACqF,IAAI,CAACN,KAAK,CAAC,EAAE;EACvD,CAAC,CACH,CAAC,CAAChF,IAAI,CAAC,MAAM,CAAC;EACd,IAAI,CAAC+E,WAAW,EAAE;IAChB,OAAO,EAAE;EACX;EACA,MAAMrF,KAAK,GAAG,KAAK6F,mCAAyB,IAAI;EAChD,OAAOtF,gBAAK,CAACC,SAAS,CAACR,KAAK,CAAC,GAAGqF,WAAW;AAC7C;AAEO,SAAS5D,qBAAqBA,CAACjC,UAAgC,EAIpE;EACA,MAAM4F,GAAG,GAAG,IAAI;EAChB,IAAI1D,oBAAoB,GAAG,CAAC;EAC5B,IAAIoE,eAAe,GAAG,CAAC;EACvB,MAAMnE,WAAW,GAAG,IAAAyB,iBAAO,EACzB5D,UAAU,CAACU,GAAG,CAAEsC,SAA6B,IAAK;IAChD,MAAMpE,IAAI,GAAGoE,SAAS,CAACpC,EAAE,CAACC,sBAAsB,CAAC,CAAC;IAClD,MAAMiF,KAAK,GAAG,IAAAlC,iBAAO,EACnBlG,MAAM,CAAC2H,IAAI,CAACrC,SAAS,CAAC+C,WAAW,CAAC,CAACrF,GAAG,CAAEsF,IAAI,IAAK;MAC/C,IAAIhD,SAAS,CAAC+C,WAAW,CAACC,IAAI,CAAC,KAAKC,0BAAU,CAAC9G,MAAM,EAAE;QACrDmH,eAAe,IAAI,CAAC;QACpB,OAAO,GAAGV,GAAG,GAAGtH,MAAM,CAAC0E,SAAS,CAAC+C,WAAW,CAACC,IAAI,CAAC,CAAC,IAAIjF,gBAAK,CAACW,IAAI,CAACsE,IAAI,CAAC,EAAE;MAC3E;MACA,OAAO,IAAI;IACb,CAAC,CACH,CAAC;IACD,IAAI,CAACF,KAAK,CAACrE,MAAM,EAAE,OAAO,IAAI;IAC9BS,oBAAoB,IAAI,CAAC;IACzB,OAAO,GAAGtD,IAAI,KAAKmC,gBAAK,CAACqF,IAAI,CAACN,KAAK,CAAChF,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE;EACnD,CAAC,CACH,CAAC,CAACA,IAAI,CAAC,IAAI,CAAC;EAEZ,OAAO;IAAEoB,oBAAoB;IAAEoE,eAAe;IAAEnE;EAAY,CAAC;AAC/D;AAEO,SAASoE,uBAAuBA,CAACC,iBAAyB,EAAE;EACjE,IAAI,CAACA,iBAAiB,EAAE,OAAO,EAAE;EACjC,MAAMhG,KAAK,GAAGO,gBAAK,CAACC,SAAS,CAAC,oBAAoB,CAAC;EACnD,MAAMyF,QAAQ,GAAG,wDAAwD;EACzE,MAAM9C,IAAI,GAAG5C,gBAAK,CAACoE,GAAG,CAACqB,iBAAiB,CAAC9G,OAAO,CAAC;EACjD,MAAMqC,UAAU,GACd,uKAAuK;EACzK,OAAO,GAAGvB,KAAK,KAAKiG,QAAQ,KAAK9C,IAAI,KAAK5B,UAAU,EAAE;AACxD;AAEO,SAAS2E,sBAAsBA,CAACC,gBAAwB,EAAE;EAC/D,IAAI,CAACA,gBAAgB,EAAE,OAAO,EAAE;EAChC,MAAMnG,KAAK,GAAGO,gBAAK,CAACC,SAAS,CAAC,mBAAmB,CAAC;EAClD,MAAMyF,QAAQ,GAAG,gDAAgD;EACjE,MAAM9C,IAAI,GAAG5C,gBAAK,CAACoE,GAAG,CAACwB,gBAAgB,CAACjH,OAAO,CAAC;EAChD,MAAMqC,UAAU,GAAG,4CAA4C;EAC/D,OAAO,GAAGvB,KAAK,KAAKiG,QAAQ,KAAK9C,IAAI,KAAK5B,UAAU,EAAE;AACxD;AAEO,SAAS8C,gBAAgBA,CAACzD,iBAAiC,EAAE;EAClE,IAAI,CAACA,iBAAiB,EAAEK,MAAM,EAAE,OAAO,EAAE;EACzC,MAAMjB,KAAK,GAAG,iBAAiBY,iBAAiB,CAACK,MAAM,iCAAiC;EACxF,MAAMkC,IAAI,GAAGvC,iBAAiB,CAACN,IAAI,CAAC,IAAI,CAAC;EACzC,OAAO,GAAGC,gBAAK,CAACC,SAAS,CAACR,KAAK,CAAC,KAAKmD,IAAI,EAAE;AAC7C;AAEO,SAASiD,cAAcA,CAACC,eAA+B,EAAE;EAC9D,IAAI,CAACA,eAAe,EAAEpF,MAAM,EAAE,OAAO,EAAE;EACvC,MAAMjB,KAAK,GAAG,iBAAiBqG,eAAe,CAACpF,MAAM,+BAA+B;EACpF,MAAMkC,IAAI,GAAGkD,eAAe,CAAC/F,IAAI,CAAC,IAAI,CAAC;EACvC,OAAO,GAAGC,gBAAK,CAACC,SAAS,CAACR,KAAK,CAAC,KAAKmD,IAAI,EAAE;AAC7C","ignoreList":[]}
@@ -12,7 +12,6 @@ import { ComponentWriterMain } from '@teambit/component-writer';
12
12
  import { ConsumerComponent } from '@teambit/legacy.consumer-component';
13
13
  import { ImporterMain } from '@teambit/importer';
14
14
  import { Logger, LoggerMain } from '@teambit/logger';
15
- import { GlobalConfigMain } from '@teambit/global-config';
16
15
  import { ApplyVersionWithComps, CheckoutMain, ComponentStatusBase } from '@teambit/checkout';
17
16
  import { ConfigMergerMain, ConfigMergeResult, WorkspaceConfigUpdateResult } from '@teambit/config-merger';
18
17
  import { SnapsDistance } from '@teambit/component.snap-distance';
@@ -21,6 +20,7 @@ import { InstallMain } from '@teambit/install';
21
20
  import { ScopeMain } from '@teambit/scope';
22
21
  import { MergeStatusProviderOptions } from './merge-status-provider';
23
22
  import { MergeStrategy, FileStatus, MergeResultsThreeWay } from './merge-version';
23
+ import { ConfigStoreMain } from '@teambit/config-store';
24
24
  type ResolveUnrelatedData = {
25
25
  strategy: MergeStrategy;
26
26
  headOnCurrentLane: Ref;
@@ -142,7 +142,7 @@ export declare class MergingMain {
142
142
  static slots: never[];
143
143
  static dependencies: import("@teambit/harmony").Aspect[];
144
144
  static runtime: import("@teambit/harmony").RuntimeDefinition;
145
- static provider([cli, workspace, scope, snapping, checkout, install, loggerMain, compWriter, importer, config, remove, globalConfig, configMerger, depResolver,]: [
145
+ static provider([cli, workspace, scope, snapping, checkout, install, loggerMain, compWriter, importer, config, remove, configStore, configMerger, depResolver,]: [
146
146
  CLIMain,
147
147
  Workspace,
148
148
  ScopeMain,
@@ -154,7 +154,7 @@ export declare class MergingMain {
154
154
  ImporterMain,
155
155
  ConfigMain,
156
156
  RemoveMain,
157
- GlobalConfigMain,
157
+ ConfigStoreMain,
158
158
  ConfigMergerMain,
159
159
  DependencyResolverMain
160
160
  ]): Promise<MergingMain>;
@@ -116,13 +116,6 @@ function _logger() {
116
116
  };
117
117
  return data;
118
118
  }
119
- function _globalConfig() {
120
- const data = require("@teambit/global-config");
121
- _globalConfig = function () {
122
- return data;
123
- };
124
- return data;
125
- }
126
119
  function _lodash() {
127
120
  const data = require("lodash");
128
121
  _lodash = function () {
@@ -193,6 +186,13 @@ function _mergeVersion() {
193
186
  };
194
187
  return data;
195
188
  }
189
+ function _configStore() {
190
+ const data = require("@teambit/config-store");
191
+ _configStore = function () {
192
+ return data;
193
+ };
194
+ return data;
195
+ }
196
196
  function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
197
197
  function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
198
198
  function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -698,16 +698,16 @@ class MergingMain {
698
698
  }));
699
699
  return (0, _lodash().compact)(mergePendingComponents);
700
700
  }
701
- static async provider([cli, workspace, scope, snapping, checkout, install, loggerMain, compWriter, importer, config, remove, globalConfig, configMerger, depResolver]) {
701
+ static async provider([cli, workspace, scope, snapping, checkout, install, loggerMain, compWriter, importer, config, remove, configStore, configMerger, depResolver]) {
702
702
  const logger = loggerMain.createLogger(_merging().MergingAspect.id);
703
703
  const merging = new MergingMain(workspace, scope, install, snapping, checkout, logger, compWriter, importer, config, remove, configMerger, depResolver);
704
- cli.register(new (_mergeCmd().MergeCmd)(merging, globalConfig));
704
+ cli.register(new (_mergeCmd().MergeCmd)(merging, configStore));
705
705
  return merging;
706
706
  }
707
707
  }
708
708
  exports.MergingMain = MergingMain;
709
709
  _defineProperty(MergingMain, "slots", []);
710
- _defineProperty(MergingMain, "dependencies", [_cli().CLIAspect, _workspace().WorkspaceAspect, _scope().ScopeAspect, _snapping().SnappingAspect, _checkout().CheckoutAspect, _install().InstallAspect, _logger().LoggerAspect, _componentWriter().ComponentWriterAspect, _importer().ImporterAspect, _config().ConfigAspect, _remove().RemoveAspect, _globalConfig().GlobalConfigAspect, _configMerger().ConfigMergerAspect, _dependencyResolver().DependencyResolverAspect]);
710
+ _defineProperty(MergingMain, "dependencies", [_cli().CLIAspect, _workspace().WorkspaceAspect, _scope().ScopeAspect, _snapping().SnappingAspect, _checkout().CheckoutAspect, _install().InstallAspect, _logger().LoggerAspect, _componentWriter().ComponentWriterAspect, _importer().ImporterAspect, _config().ConfigAspect, _remove().RemoveAspect, _configStore().ConfigStoreAspect, _configMerger().ConfigMergerAspect, _dependencyResolver().DependencyResolverAspect]);
711
711
  _defineProperty(MergingMain, "runtime", _cli().MainRuntime);
712
712
  _merging().MergingAspect.addRuntime(MergingMain);
713
713
 
@@ -1 +1 @@
1
- {"version":3,"names":["_cli","data","require","_workspace","_legacy","_snapping","_pMapSeries","_interopRequireDefault","_componentId","_bitError","_laneId","_chalk","_config","_remove","_toolboxPath","_pkgModules","_componentWriter","_importer","_logger","_globalConfig","_lodash","_checkout","_configMerger","_dependencyResolver","_install","_scope","_mergeCmd","_merging","_mergeStatusProvider","_mergeVersion","e","__esModule","default","ownKeys","r","t","Object","keys","getOwnPropertySymbols","o","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","defineProperty","_toPropertyKey","value","configurable","writable","i","_toPrimitive","Symbol","toPrimitive","call","TypeError","String","Number","MergingMain","constructor","workspace","scope","install","snapping","checkout","logger","componentWriter","importer","config","remove","configMerger","depResolver","merge","pattern","mergeStrategy","abort","resolve","noAutoSnap","message","build","skipDependencyInstallation","OutsideWorkspaceError","consumer","mergeResults","resolveMerge","abortMerge","bitIds","getComponentsToMerge","mergeComponentsFromRemote","onDestroy","snapMessage","currentLaneId","getCurrentLaneId","currentLaneObject","getCurrentLaneObject","allComponentsStatus","getAllComponentsStatus","failedComponents","c","unchangedMessage","unchangedLegitimately","failureMsgs","map","failedComponent","chalk","bold","id","toString","red","join","BitError","mergeSnaps","otherLaneId","currentLane","noSnap","tag","detachHead","legacyScope","componentWithConflict","find","component","hasConflicts","getMergeStrategyInteractive","componentStatus","shouldBeRemoved","componentIdsToRemove","changeVersion","undefined","succeededComponents","currentLaneIdsBeforeMerge","toComponentIds","componentsResults","applyVersionMultiple","allConfigMerge","compact","configMergeResult","workspaceDepsUpdates","workspaceDepsConflicts","workspaceDepsUnchanged","updateWorkspaceJsoncWithDepsIfNeeded","workspaceConfigConflictWriteError","writeWorkspaceJsoncWithConflictsGracefully","generateConfigMergeConflictFileForAll","objects","add","persist","unmergedComponents","write","writeBitMap","removeFromWsJsonPolicyIfExists","compBitIdsToRemove","ComponentIdList","fromArray","deleteComponentsFiles","cleanFromBitMap","componentsHasConfigMergeConflicts","some","leftUnresolvedConflicts","dedupe","updateExisting","import","err","error","consoleFailure","updatedComponents","legacyCompToWrite","getSnapOrTagResults","idsToTag","results","tagAllLaneComponent","taggedComponents","autoTaggedResults","removedComponents","snappedComponents","autoSnappedResults","snapResolvedComponents","toLaneId","mergeSnapResults","mergeSnapError","bitMapSnapshot","bitMap","takeSnapshot","restoreFromSnapshot","components","applyVersionResult","workspaceConfigUpdateResult","newlyIntroducedIds","hasWithoutVersion","newlyIntroducedComponentIds","packages","componentIdToPackageName","isRemoved","removeFromRootPolicy","persistConfig","getMergeStatus","options","otherLane","mergeStatusProvider","MergeStatusProvider","getStatus","mapSeries","currentComponent","resolvedUnrelated","modelComponent","getModelComponent","updatedLaneId","isDefault","LaneId","from","name","applyVersion","remoteHead","getRef","version","compsToWrite","manyComponentsWriterOpts","writeConfig","reasonForBitmapChange","writeMany","filesStatus","unmergedComponent","fullName","head","laneId","addToCurrentLane","Error","isPartOfLane","isEqualWithoutVersion","addComponent","handleResolveUnrelated","headOnCurrentLane","unrelated","unrelatedHead","unrelatedLaneId","addEntry","markAllFilesAsUnchanged","files","file","pathNormalizeToLinux","relative","FileStatus","unchanged","MergeOptions","ours","strategy","remoteId","idToLoad","theirs","legacyComponent","loadComponentFromModelImportIfNeeded","getConsumerComponent","updateFileStatus","modifiedStatus","modifiedFiles","applyModifiedVersion","removeFilesIfNeeded","successfullyMergedConfig","getSuccessfullyMergedConfig","mergedConfig","manual","unmergedPaths","f","conflict","filePath","detachedHeads","setHead","markVersionAsLocal","ids","getIdsForUnmerged","reset","removeComponent","abortedComponents","snap","legacyBitIds","resolvedComponents","localLaneObject","Promise","all","bitId","remoteScopeName","remoteLaneId","remoteLanes","laneIdStr","toStringWithoutVersion","shouldSquash","getComponents","debug","ComponentID","fromObject","snapFromScope","componentId","aspects","getEntry","lane","updatedLegacyComponents","tagMessage","unmodified","componentIds","idsByPattern","entry","unresolvedComponents","u","mergePending","listMergePendingComponents","componentsList","ComponentsList","allIds","getAllIdsAvailableOnLaneIncludeRemoved","componentsFromModel","getModelComponents","duringMergeComps","listDuringMergeStateComponents","mergePendingComponents","toComponentId","divergedData","getDivergeDataForMergePending","isDiverged","diverge","provider","cli","loggerMain","compWriter","globalConfig","createLogger","MergingAspect","merging","register","MergeCmd","exports","CLIAspect","WorkspaceAspect","ScopeAspect","SnappingAspect","CheckoutAspect","InstallAspect","LoggerAspect","ComponentWriterAspect","ImporterAspect","ConfigAspect","RemoveAspect","GlobalConfigAspect","ConfigMergerAspect","DependencyResolverAspect","MainRuntime","addRuntime"],"sources":["merging.main.runtime.ts"],"sourcesContent":["import { CLIAspect, CLIMain, MainRuntime } from '@teambit/cli';\nimport { WorkspaceAspect, OutsideWorkspaceError, Workspace, AutoTagResult } from '@teambit/workspace';\nimport { Consumer } from '@teambit/legacy.consumer';\nimport { ComponentsList } from '@teambit/legacy.component-list';\nimport { SnappingAspect, SnappingMain, TagResults } from '@teambit/snapping';\nimport mapSeries from 'p-map-series';\nimport { ComponentID, ComponentIdList } from '@teambit/component-id';\nimport { BitError } from '@teambit/bit-error';\nimport { LaneId } from '@teambit/lane-id';\nimport { UnmergedComponent } from '@teambit/legacy.scope';\nimport { Ref, Lane, ModelComponent } from '@teambit/objects';\nimport chalk from 'chalk';\nimport { ConfigAspect, ConfigMain } from '@teambit/config';\nimport { RemoveAspect, RemoveMain, deleteComponentsFiles } from '@teambit/remove';\nimport { pathNormalizeToLinux } from '@teambit/toolbox.path.path';\nimport { componentIdToPackageName } from '@teambit/pkg.modules.component-package-name';\nimport { ComponentWriterAspect, ComponentWriterMain } from '@teambit/component-writer';\nimport { ConsumerComponent } from '@teambit/legacy.consumer-component';\nimport { ImporterAspect, ImporterMain } from '@teambit/importer';\nimport { Logger, LoggerAspect, LoggerMain } from '@teambit/logger';\nimport { GlobalConfigAspect, GlobalConfigMain } from '@teambit/global-config';\nimport { compact } from 'lodash';\nimport {\n ApplyVersionWithComps,\n CheckoutAspect,\n CheckoutMain,\n ComponentStatusBase,\n applyModifiedVersion,\n removeFilesIfNeeded,\n updateFileStatus,\n} from '@teambit/checkout';\nimport {\n ConfigMergerAspect,\n ConfigMergerMain,\n ConfigMergeResult,\n WorkspaceConfigUpdateResult,\n} from '@teambit/config-merger';\nimport { SnapsDistance } from '@teambit/component.snap-distance';\nimport { DependencyResolverAspect, DependencyResolverMain } from '@teambit/dependency-resolver';\nimport { InstallMain, InstallAspect } from '@teambit/install';\nimport { ScopeAspect, ScopeMain } from '@teambit/scope';\nimport { MergeCmd } from './merge-cmd';\nimport { MergingAspect } from './merging.aspect';\nimport { MergeStatusProvider, MergeStatusProviderOptions } from './merge-status-provider';\nimport {\n MergeStrategy,\n FileStatus,\n getMergeStrategyInteractive,\n MergeResultsThreeWay,\n MergeOptions,\n} from './merge-version';\n\ntype ResolveUnrelatedData = {\n strategy: MergeStrategy;\n headOnCurrentLane: Ref;\n unrelatedHead: Ref;\n unrelatedLaneId: LaneId;\n};\n\nexport type DivergedComponent = { id: ComponentID; diverge: SnapsDistance };\n\nexport type ComponentMergeStatus = ComponentStatusBase & {\n mergeResults?: MergeResultsThreeWay | null;\n divergeData?: SnapsDistance;\n resolvedUnrelated?: ResolveUnrelatedData;\n configMergeResult?: ConfigMergeResult;\n};\n\nexport type ComponentMergeStatusBeforeMergeAttempt = ComponentStatusBase & {\n divergeData?: SnapsDistance;\n resolvedUnrelated?: ResolveUnrelatedData;\n mergeProps?: {\n otherLaneHead: Ref;\n currentId: ComponentID;\n modelComponent: ModelComponent;\n };\n};\n\nexport type FailedComponents = { id: ComponentID; unchangedMessage: string; unchangedLegitimately?: boolean };\n\n// fileName is PathLinux. TS doesn't let anything else in the keys other than string and number\nexport type FilesStatus = { [fileName: string]: keyof typeof FileStatus };\n\nexport type MergeSnapResults = {\n snappedComponents: ConsumerComponent[];\n autoSnappedResults: AutoTagResult[];\n removedComponents?: ComponentIdList;\n exportedIds?: ComponentID[];\n} | null;\n\nexport type ApplyVersionResult = { id: ComponentID; filesStatus: FilesStatus };\n\nexport type ApplyVersionResults = {\n components?: ApplyVersionResult[];\n version?: string;\n failedComponents?: FailedComponents[];\n removedComponents?: ComponentID[];\n addedComponents?: ComponentID[]; // relevant when restoreMissingComponents is true (e.g. bit lane merge-abort)\n newComponents?: ComponentID[]; // relevant for \"bit stash load\". (stashedBitmapEntries is populated)\n resolvedComponents?: ConsumerComponent[]; // relevant for bit merge --resolve\n abortedComponents?: ApplyVersionResult[]; // relevant for bit merge --abort\n mergeSnapResults?: MergeSnapResults;\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 workspaceConfigUpdateResult?: WorkspaceConfigUpdateResult;\n};\n\nexport class MergingMain {\n constructor(\n private workspace: Workspace,\n private scope: ScopeMain,\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 private configMerger: ConfigMergerMain,\n private depResolver: DependencyResolverMain\n ) {}\n\n async merge(\n pattern: string,\n mergeStrategy: MergeStrategy,\n abort: boolean,\n resolve: boolean,\n noAutoSnap: 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(pattern, message, build);\n } else if (abort) {\n mergeResults = await this.abortMerge(pattern);\n } else {\n const bitIds = await this.getComponentsToMerge(pattern);\n mergeResults = await this.mergeComponentsFromRemote(\n consumer,\n bitIds,\n mergeStrategy,\n noAutoSnap,\n message,\n build,\n skipDependencyInstallation\n );\n }\n await consumer.onDestroy('merge');\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: ComponentID[],\n mergeStrategy: MergeStrategy,\n noAutoSnap: 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(\n bitIds,\n currentLaneId,\n currentLaneObject,\n mergeStrategy\n );\n const failedComponents = allComponentsStatus.filter((c) => c.unchangedMessage && !c.unchangedLegitimately);\n if (failedComponents.length) {\n const failureMsgs = failedComponents\n .map(\n (failedComponent) =>\n `${chalk.bold(failedComponent.id.toString())} - ${chalk.red(failedComponent.unchangedMessage 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 otherLaneId: currentLaneId,\n currentLane: currentLaneObject,\n noAutoSnap: noAutoSnap,\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 otherLaneId,\n currentLane,\n noAutoSnap,\n noSnap,\n tag,\n snapMessage,\n build,\n skipDependencyInstallation,\n detachHead,\n }: {\n mergeStrategy: MergeStrategy;\n allComponentsStatus: ComponentMergeStatus[];\n otherLaneId: LaneId;\n currentLane?: Lane;\n noAutoSnap?: boolean;\n noSnap?: boolean;\n tag?: boolean;\n snapMessage?: string;\n build?: boolean;\n skipDependencyInstallation?: boolean;\n detachHead?: boolean;\n }): Promise<ApplyVersionResults> {\n const consumer = this.workspace?.consumer;\n const legacyScope = this.scope.legacyScope;\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.unchangedMessage)\n .filter((componentStatus) => !componentStatus.shouldBeRemoved)\n .map((componentStatus) => ({\n id: componentStatus.id,\n unchangedMessage: componentStatus.unchangedMessage as string,\n unchangedLegitimately: componentStatus.unchangedLegitimately,\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.unchangedMessage);\n\n const currentLaneIdsBeforeMerge = currentLane?.toComponentIds();\n\n const componentsResults = await this.applyVersionMultiple(\n succeededComponents,\n otherLaneId,\n mergeStrategy,\n currentLane,\n detachHead\n );\n\n const allConfigMerge = compact(succeededComponents.map((c) => c.configMergeResult));\n\n const { workspaceDepsUpdates, workspaceDepsConflicts, workspaceDepsUnchanged } = this.workspace\n ? await this.configMerger.updateWorkspaceJsoncWithDepsIfNeeded(allConfigMerge)\n : { workspaceDepsUpdates: undefined, workspaceDepsConflicts: undefined, workspaceDepsUnchanged: undefined };\n\n let workspaceConfigConflictWriteError: Error | undefined;\n if (workspaceDepsConflicts) {\n workspaceConfigConflictWriteError =\n await this.configMerger.writeWorkspaceJsoncWithConflictsGracefully(workspaceDepsConflicts);\n }\n if (this.workspace) await this.configMerger.generateConfigMergeConflictFileForAll(allConfigMerge);\n\n if (currentLane) legacyScope.objects.add(currentLane);\n\n await legacyScope.objects.persist(); // persist anyway, if currentLane is null it should save all main heads\n\n await legacyScope.objects.unmergedComponents.write();\n\n if (this.workspace) {\n await consumer.writeBitMap(`merge ${otherLaneId.toString()}`);\n await this.removeFromWsJsonPolicyIfExists(componentsResults, currentLane, currentLaneIdsBeforeMerge);\n }\n\n if (componentIdsToRemove.length && this.workspace) {\n const compBitIdsToRemove = ComponentIdList.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.consoleFailure(\n `failed installing packages, see the log for full stacktrace. error: ${err.message}`\n );\n }\n }\n\n const updatedComponents = compact(componentsResults.map((c) => c.legacyCompToWrite));\n\n const getSnapOrTagResults = async (): Promise<MergeSnapResults> => {\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 (noAutoSnap || 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(snapMessage, build, currentLane?.toLaneId(), updatedComponents);\n };\n let mergeSnapResults: MergeSnapResults = null;\n let mergeSnapError: Error | undefined;\n const bitMapSnapshot = this.workspace ? this.workspace.bitMap.takeSnapshot() : null;\n try {\n mergeSnapResults = await getSnapOrTagResults();\n } catch (err: any) {\n this.logger.error('failed running snap. mergeSnapError:', err);\n mergeSnapError = err;\n if (bitMapSnapshot) 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 workspaceConfigUpdateResult: {\n workspaceDepsUpdates,\n workspaceDepsConflicts,\n workspaceDepsUnchanged,\n workspaceConfigConflictWriteError,\n },\n leftUnresolvedConflicts,\n };\n }\n\n async removeFromWsJsonPolicyIfExists(\n componentsResults: ApplyVersionWithComps[],\n currentLane?: Lane,\n currentLaneIdsBeforeMerge?: ComponentIdList\n ) {\n const newlyIntroducedIds = currentLane\n ?.toComponentIds()\n .filter((id) => !currentLaneIdsBeforeMerge?.hasWithoutVersion(id));\n const newlyIntroducedComponentIds = ComponentIdList.fromArray(newlyIntroducedIds || []);\n const components = compact(\n componentsResults\n .map((c) => c.legacyCompToWrite)\n .filter((c) => c && newlyIntroducedComponentIds.hasWithoutVersion(c.id))\n );\n const packages = components.map((c) => componentIdToPackageName(c));\n const isRemoved = this.depResolver.removeFromRootPolicy(packages);\n if (isRemoved) await this.depResolver.persistConfig('merge (remove packages)');\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: ComponentID[], // the id.version is the version we want to merge to the current component\n options: MergeStatusProviderOptions,\n currentLane?: Lane, // currently checked out lane. if on main, then it's null.\n otherLane?: Lane // the lane we want to merged to our lane. (null if it's \"main\").\n ): Promise<ComponentMergeStatus[]> {\n const mergeStatusProvider = new MergeStatusProvider(\n this.scope,\n this.logger,\n this.importer,\n options,\n this.workspace,\n currentLane,\n otherLane\n );\n return mergeStatusProvider.getStatus(bitIds);\n }\n\n private async applyVersionMultiple(\n succeededComponents: ComponentMergeStatus[],\n otherLaneId: LaneId,\n mergeStrategy: MergeStrategy,\n currentLane?: Lane,\n detachHead?: boolean\n ): Promise<ApplyVersionWithComps[]> {\n const componentsResults = await mapSeries(\n succeededComponents,\n async ({ currentComponent, id, mergeResults, resolvedUnrelated, configMergeResult }) => {\n const modelComponent = await this.scope.legacyScope.getModelComponent(id);\n const updatedLaneId = otherLaneId.isDefault() ? LaneId.from(otherLaneId.name, id.scope as string) : otherLaneId;\n return this.applyVersion({\n currentComponent,\n id,\n mergeResults,\n mergeStrategy,\n remoteHead: modelComponent.getRef(id.version as string) as Ref,\n otherLaneId: updatedLaneId,\n currentLane,\n resolvedUnrelated,\n configMergeResult,\n detachHead,\n });\n }\n );\n\n if (this.workspace) {\n const compsToWrite = compact(componentsResults.map((c) => c.legacyCompToWrite));\n const manyComponentsWriterOpts = {\n consumer: this.workspace.consumer,\n components: compsToWrite,\n skipDependencyInstallation: true,\n writeConfig: false, // @todo: should write if config exists before, needs to figure out how to do it.\n reasonForBitmapChange: 'merge',\n };\n await this.componentWriter.writeMany(manyComponentsWriterOpts);\n }\n\n return componentsResults;\n }\n\n private async applyVersion({\n currentComponent,\n id,\n mergeResults,\n mergeStrategy,\n remoteHead,\n otherLaneId,\n currentLane,\n resolvedUnrelated,\n configMergeResult,\n detachHead,\n }: {\n currentComponent: ConsumerComponent | null | undefined;\n id: ComponentID;\n mergeResults: MergeResultsThreeWay | null | undefined;\n mergeStrategy: MergeStrategy;\n remoteHead: Ref;\n otherLaneId: LaneId;\n currentLane?: Lane;\n resolvedUnrelated?: ResolveUnrelatedData;\n configMergeResult?: ConfigMergeResult;\n detachHead?: boolean;\n }): Promise<ApplyVersionWithComps> {\n const legacyScope = this.scope.legacyScope;\n let filesStatus = {};\n const unmergedComponent: UnmergedComponent = {\n id: { name: id.fullName, scope: id.scope },\n head: remoteHead,\n laneId: otherLaneId,\n };\n id = currentComponent ? currentComponent.id : id;\n const modelComponent = await legacyScope.getModelComponent(id);\n\n const addToCurrentLane = (head: Ref) => {\n if (!currentLane) throw new Error('currentLane must be defined when adding to the lane');\n if (otherLaneId.isDefault()) {\n const isPartOfLane = currentLane.components.find((c) => c.id.isEqualWithoutVersion(id));\n if (!isPartOfLane) return;\n }\n currentLane.addComponent({ id, head });\n };\n\n const handleResolveUnrelated = (legacyCompToWrite?: ConsumerComponent) => {\n if (!currentComponent) throw new Error('currentComponent must be defined when resolvedUnrelated');\n // because when on a main, we don't allow merging lanes with unrelated. we asks users to switch to the lane\n // first and then merge with --resolve-unrelated\n if (!currentLane) throw new Error('currentLane must be defined when resolvedUnrelated');\n if (!resolvedUnrelated) throw new Error('resolvedUnrelated must be populated');\n addToCurrentLane(resolvedUnrelated.headOnCurrentLane);\n unmergedComponent.unrelated = {\n unrelatedHead: resolvedUnrelated.unrelatedHead,\n headOnCurrentLane: resolvedUnrelated.headOnCurrentLane,\n unrelatedLaneId: resolvedUnrelated.unrelatedLaneId,\n };\n legacyScope.objects.unmergedComponents.addEntry(unmergedComponent);\n return { applyVersionResult: { id, filesStatus }, component: currentComponent, legacyCompToWrite };\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 legacyScope.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 = this.workspace\n ? await this.workspace.consumer.loadComponentFromModelImportIfNeeded(idToLoad)\n : await legacyScope.getConsumerComponent(idToLoad); // when loading from the scope, we import all needed components first, so it should be fine. otherwise, change the code to import it here\n if (mergeResults && mergeStrategy === MergeOptions.theirs) {\n // in this case, we don't want to update .bitmap with the version of the remote. we want to keep the same version\n legacyComponent.version = id.version;\n }\n const files = legacyComponent.files;\n updateFileStatus(files, filesStatus, currentComponent || undefined);\n\n if (mergeResults) {\n // update files according to the merge results\n const { filesStatus: modifiedStatus, modifiedFiles } = applyModifiedVersion(files, mergeResults, mergeStrategy);\n legacyComponent.files = modifiedFiles;\n filesStatus = { ...filesStatus, ...modifiedStatus };\n }\n\n if (this.workspace) await removeFilesIfNeeded(filesStatus, this.workspace.consumer, currentComponent || undefined);\n\n if (configMergeResult) {\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 legacyScope.objects.unmergedComponents.addEntry(unmergedComponent);\n } else if (currentLane) {\n if (resolvedUnrelated) {\n // must be \"theirs\"\n return handleResolveUnrelated(legacyComponent);\n }\n addToCurrentLane(remoteHead);\n } else {\n // this is main\n if (detachHead) {\n modelComponent.detachedHeads.setHead(remoteHead);\n } else {\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 }\n legacyScope.objects.add(modelComponent);\n }\n\n return {\n applyVersionResult: { id: idToLoad, filesStatus },\n component: currentComponent || undefined,\n legacyCompToWrite: legacyComponent,\n };\n }\n\n private async abortMerge(pattern: string): Promise<ApplyVersionResults> {\n const consumer = this.workspace.consumer;\n const ids = await this.getIdsForUnmerged(pattern);\n const results = await this.checkout.checkout({ ids, reset: true });\n ids.forEach((id) => consumer.scope.objects.unmergedComponents.removeComponent(id));\n await consumer.scope.objects.unmergedComponents.write();\n return { abortedComponents: results.components };\n }\n\n private async resolveMerge(pattern: string, snapMessage: string, build: boolean): Promise<ApplyVersionResults> {\n const ids = await this.getIdsForUnmerged(pattern);\n // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n const { snappedComponents } = await this.snapping.snap({\n legacyBitIds: ComponentIdList.fromArray(ids.map((id) => id)),\n build,\n message: snapMessage,\n });\n return { resolvedComponents: snappedComponents };\n }\n\n private async getAllComponentsStatus(\n bitIds: ComponentID[],\n laneId: LaneId,\n localLaneObject: Lane | undefined,\n mergeStrategy: MergeStrategy\n ): Promise<ComponentMergeStatus[]> {\n const ids = await Promise.all(\n bitIds.map(async (bitId) => {\n const remoteScopeName = laneId.isDefault() ? bitId.scope : laneId.scope;\n const remoteLaneId = LaneId.from(laneId.name, remoteScopeName as string);\n const remoteHead = await this.workspace.consumer.scope.objects.remoteLanes.getRef(remoteLaneId, bitId);\n const laneIdStr = remoteLaneId.toString();\n if (!remoteHead) {\n throw new BitError(`unable to find a remote head of \"${bitId.toStringWithoutVersion()}\" in \"${laneIdStr}\"`);\n }\n return bitId.changeVersion(remoteHead.toString());\n })\n );\n\n return this.getMergeStatus(ids, { shouldSquash: false, mergeStrategy }, localLaneObject, localLaneObject);\n }\n\n private async snapResolvedComponents(\n snapMessage?: string,\n build?: boolean,\n laneId?: LaneId,\n updatedComponents?: ConsumerComponent[]\n ): Promise<MergeSnapResults> {\n const unmergedComponents = this.scope.legacyScope.objects.unmergedComponents.getComponents();\n this.logger.debug(`merge-snaps, snapResolvedComponents, total ${unmergedComponents.length.toString()} components`);\n if (!unmergedComponents.length) return null;\n const ids = ComponentIdList.fromArray(unmergedComponents.map((r) => ComponentID.fromObject(r.id)));\n if (!this.workspace) {\n const results = await this.snapping.snapFromScope(\n ids.map((id) => ({\n componentId: id.toString(),\n aspects: this.scope.legacyScope.objects.unmergedComponents.getEntry(id)?.mergedConfig,\n })),\n {\n message: snapMessage,\n build,\n lane: laneId?.toString(),\n updatedLegacyComponents: updatedComponents,\n }\n );\n return { ...results, autoSnappedResults: [] };\n }\n return this.snapping.snap({\n legacyBitIds: ids,\n build,\n message: snapMessage,\n });\n }\n\n private async tagAllLaneComponent(\n idsToTag: ComponentID[],\n tagMessage?: string,\n build?: boolean\n ): 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(pattern?: string): Promise<ComponentID[]> {\n if (pattern) {\n const componentIds = await this.workspace.idsByPattern(pattern);\n componentIds.forEach((id) => {\n const entry = this.workspace.consumer.scope.objects.unmergedComponents.getEntry(id);\n if (!entry) {\n throw new BitError(`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 BitError(`all components are resolved already, nothing to do`);\n return unresolvedComponents.map((u) => ComponentID.fromObject(u.id));\n }\n\n private async getComponentsToMerge(pattern?: string): Promise<ComponentID[]> {\n if (pattern) {\n return this.workspace.idsByPattern(pattern);\n }\n const mergePending = await this.listMergePendingComponents();\n return mergePending.map((c) => c.id);\n }\n\n async listMergePendingComponents(componentsList?: ComponentsList): Promise<DivergedComponent[]> {\n const consumer = this.workspace.consumer;\n componentsList = componentsList || new ComponentsList(this.workspace);\n const allIds = consumer.bitMap.getAllIdsAvailableOnLaneIncludeRemoved();\n const componentsFromModel = await componentsList.getModelComponents();\n const duringMergeComps = componentsList.listDuringMergeStateComponents();\n const mergePendingComponents = await Promise.all(\n allIds.map(async (componentId: ComponentID) => {\n const modelComponent = componentsFromModel.find((c) => c.toComponentId().isEqualWithoutVersion(componentId));\n if (!modelComponent || duringMergeComps.hasWithoutVersion(componentId)) return null;\n const divergedData = await modelComponent.getDivergeDataForMergePending(consumer.scope.objects);\n if (!divergedData.isDiverged()) return null;\n return { id: modelComponent.toComponentId(), diverge: divergedData };\n })\n );\n return compact(mergePendingComponents);\n }\n\n static slots = [];\n static dependencies = [\n CLIAspect,\n WorkspaceAspect,\n ScopeAspect,\n SnappingAspect,\n CheckoutAspect,\n InstallAspect,\n LoggerAspect,\n ComponentWriterAspect,\n ImporterAspect,\n ConfigAspect,\n RemoveAspect,\n GlobalConfigAspect,\n ConfigMergerAspect,\n DependencyResolverAspect,\n ];\n static runtime = MainRuntime;\n static async provider([\n cli,\n workspace,\n scope,\n snapping,\n checkout,\n install,\n loggerMain,\n compWriter,\n importer,\n config,\n remove,\n globalConfig,\n configMerger,\n depResolver,\n ]: [\n CLIMain,\n Workspace,\n ScopeMain,\n SnappingMain,\n CheckoutMain,\n InstallMain,\n LoggerMain,\n ComponentWriterMain,\n ImporterMain,\n ConfigMain,\n RemoveMain,\n GlobalConfigMain,\n ConfigMergerMain,\n DependencyResolverMain,\n ]) {\n const logger = loggerMain.createLogger(MergingAspect.id);\n const merging = new MergingMain(\n workspace,\n scope,\n install,\n snapping,\n checkout,\n logger,\n compWriter,\n importer,\n config,\n remove,\n configMerger,\n depResolver\n );\n cli.register(new MergeCmd(merging, globalConfig));\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,WAAA;EAAA,MAAAF,IAAA,GAAAC,OAAA;EAAAC,UAAA,YAAAA,CAAA;IAAA,OAAAF,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAEA,SAAAG,QAAA;EAAA,MAAAH,IAAA,GAAAC,OAAA;EAAAE,OAAA,YAAAA,CAAA;IAAA,OAAAH,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAI,UAAA;EAAA,MAAAJ,IAAA,GAAAC,OAAA;EAAAG,SAAA,YAAAA,CAAA;IAAA,OAAAJ,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAK,YAAA;EAAA,MAAAL,IAAA,GAAAM,sBAAA,CAAAL,OAAA;EAAAI,WAAA,YAAAA,CAAA;IAAA,OAAAL,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAO,aAAA;EAAA,MAAAP,IAAA,GAAAC,OAAA;EAAAM,YAAA,YAAAA,CAAA;IAAA,OAAAP,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAQ,UAAA;EAAA,MAAAR,IAAA,GAAAC,OAAA;EAAAO,SAAA,YAAAA,CAAA;IAAA,OAAAR,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAS,QAAA;EAAA,MAAAT,IAAA,GAAAC,OAAA;EAAAQ,OAAA,YAAAA,CAAA;IAAA,OAAAT,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAGA,SAAAU,OAAA;EAAA,MAAAV,IAAA,GAAAM,sBAAA,CAAAL,OAAA;EAAAS,MAAA,YAAAA,CAAA;IAAA,OAAAV,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAW,QAAA;EAAA,MAAAX,IAAA,GAAAC,OAAA;EAAAU,OAAA,YAAAA,CAAA;IAAA,OAAAX,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAY,QAAA;EAAA,MAAAZ,IAAA,GAAAC,OAAA;EAAAW,OAAA,YAAAA,CAAA;IAAA,OAAAZ,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAa,aAAA;EAAA,MAAAb,IAAA,GAAAC,OAAA;EAAAY,YAAA,YAAAA,CAAA;IAAA,OAAAb,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAc,YAAA;EAAA,MAAAd,IAAA,GAAAC,OAAA;EAAAa,WAAA,YAAAA,CAAA;IAAA,OAAAd,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAe,iBAAA;EAAA,MAAAf,IAAA,GAAAC,OAAA;EAAAc,gBAAA,YAAAA,CAAA;IAAA,OAAAf,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAEA,SAAAgB,UAAA;EAAA,MAAAhB,IAAA,GAAAC,OAAA;EAAAe,SAAA,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,cAAA;EAAA,MAAAlB,IAAA,GAAAC,OAAA;EAAAiB,aAAA,YAAAA,CAAA;IAAA,OAAAlB,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAmB,QAAA;EAAA,MAAAnB,IAAA,GAAAC,OAAA;EAAAkB,OAAA,YAAAA,CAAA;IAAA,OAAAnB,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAoB,UAAA;EAAA,MAAApB,IAAA,GAAAC,OAAA;EAAAmB,SAAA,YAAAA,CAAA;IAAA,OAAApB,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AASA,SAAAqB,cAAA;EAAA,MAAArB,IAAA,GAAAC,OAAA;EAAAoB,aAAA,YAAAA,CAAA;IAAA,OAAArB,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAOA,SAAAsB,oBAAA;EAAA,MAAAtB,IAAA,GAAAC,OAAA;EAAAqB,mBAAA,YAAAA,CAAA;IAAA,OAAAtB,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAuB,SAAA;EAAA,MAAAvB,IAAA,GAAAC,OAAA;EAAAsB,QAAA,YAAAA,CAAA;IAAA,OAAAvB,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAwB,OAAA;EAAA,MAAAxB,IAAA,GAAAC,OAAA;EAAAuB,MAAA,YAAAA,CAAA;IAAA,OAAAxB,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAyB,UAAA;EAAA,MAAAzB,IAAA,GAAAC,OAAA;EAAAwB,SAAA,YAAAA,CAAA;IAAA,OAAAzB,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAA0B,SAAA;EAAA,MAAA1B,IAAA,GAAAC,OAAA;EAAAyB,QAAA,YAAAA,CAAA;IAAA,OAAA1B,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAA2B,qBAAA;EAAA,MAAA3B,IAAA,GAAAC,OAAA;EAAA0B,oBAAA,YAAAA,CAAA;IAAA,OAAA3B,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAA4B,cAAA;EAAA,MAAA5B,IAAA,GAAAC,OAAA;EAAA2B,aAAA,YAAAA,CAAA;IAAA,OAAA5B,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAMyB,SAAAM,uBAAAuB,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAAA,SAAAG,QAAAH,CAAA,EAAAI,CAAA,QAAAC,CAAA,GAAAC,MAAA,CAAAC,IAAA,CAAAP,CAAA,OAAAM,MAAA,CAAAE,qBAAA,QAAAC,CAAA,GAAAH,MAAA,CAAAE,qBAAA,CAAAR,CAAA,GAAAI,CAAA,KAAAK,CAAA,GAAAA,CAAA,CAAAC,MAAA,WAAAN,CAAA,WAAAE,MAAA,CAAAK,wBAAA,CAAAX,CAAA,EAAAI,CAAA,EAAAQ,UAAA,OAAAP,CAAA,CAAAQ,IAAA,CAAAC,KAAA,CAAAT,CAAA,EAAAI,CAAA,YAAAJ,CAAA;AAAA,SAAAU,cAAAf,CAAA,aAAAI,CAAA,MAAAA,CAAA,GAAAY,SAAA,CAAAC,MAAA,EAAAb,CAAA,UAAAC,CAAA,WAAAW,SAAA,CAAAZ,CAAA,IAAAY,SAAA,CAAAZ,CAAA,QAAAA,CAAA,OAAAD,OAAA,CAAAG,MAAA,CAAAD,CAAA,OAAAa,OAAA,WAAAd,CAAA,IAAAe,eAAA,CAAAnB,CAAA,EAAAI,CAAA,EAAAC,CAAA,CAAAD,CAAA,SAAAE,MAAA,CAAAc,yBAAA,GAAAd,MAAA,CAAAe,gBAAA,CAAArB,CAAA,EAAAM,MAAA,CAAAc,yBAAA,CAAAf,CAAA,KAAAF,OAAA,CAAAG,MAAA,CAAAD,CAAA,GAAAa,OAAA,WAAAd,CAAA,IAAAE,MAAA,CAAAgB,cAAA,CAAAtB,CAAA,EAAAI,CAAA,EAAAE,MAAA,CAAAK,wBAAA,CAAAN,CAAA,EAAAD,CAAA,iBAAAJ,CAAA;AAAA,SAAAmB,gBAAAnB,CAAA,EAAAI,CAAA,EAAAC,CAAA,YAAAD,CAAA,GAAAmB,cAAA,CAAAnB,CAAA,MAAAJ,CAAA,GAAAM,MAAA,CAAAgB,cAAA,CAAAtB,CAAA,EAAAI,CAAA,IAAAoB,KAAA,EAAAnB,CAAA,EAAAO,UAAA,MAAAa,YAAA,MAAAC,QAAA,UAAA1B,CAAA,CAAAI,CAAA,IAAAC,CAAA,EAAAL,CAAA;AAAA,SAAAuB,eAAAlB,CAAA,QAAAsB,CAAA,GAAAC,YAAA,CAAAvB,CAAA,uCAAAsB,CAAA,GAAAA,CAAA,GAAAA,CAAA;AAAA,SAAAC,aAAAvB,CAAA,EAAAD,CAAA,2BAAAC,CAAA,KAAAA,CAAA,SAAAA,CAAA,MAAAL,CAAA,GAAAK,CAAA,CAAAwB,MAAA,CAAAC,WAAA,kBAAA9B,CAAA,QAAA2B,CAAA,GAAA3B,CAAA,CAAA+B,IAAA,CAAA1B,CAAA,EAAAD,CAAA,uCAAAuB,CAAA,SAAAA,CAAA,YAAAK,SAAA,yEAAA5B,CAAA,GAAA6B,MAAA,GAAAC,MAAA,EAAA7B,CAAA;AA8BzB;;AAgCO,MAAM8B,WAAW,CAAC;EACvBC,WAAWA,CACDC,SAAoB,EACpBC,KAAgB,EAChBC,OAAoB,EACpBC,QAAsB,EACtBC,QAAsB,EACtBC,MAAc,EACdC,eAAoC,EACpCC,QAAsB,EACtBC,MAAkB,EAClBC,MAAkB,EAClBC,YAA8B,EAC9BC,WAAmC,EAC3C;IAAA,KAZQX,SAAoB,GAApBA,SAAoB;IAAA,KACpBC,KAAgB,GAAhBA,KAAgB;IAAA,KAChBC,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,KAClBC,YAA8B,GAA9BA,YAA8B;IAAA,KAC9BC,WAAmC,GAAnCA,WAAmC;EAC1C;EAEH,MAAMC,KAAKA,CACTC,OAAe,EACfC,aAA4B,EAC5BC,KAAc,EACdC,OAAgB,EAChBC,UAAmB,EACnBC,OAAe,EACfC,KAAc,EACdC,0BAAmC,EACL;IAC9B,IAAI,CAAC,IAAI,CAACpB,SAAS,EAAE,MAAM,KAAIqB,kCAAqB,EAAC,CAAC;IACtD,MAAMC,QAAkB,GAAG,IAAI,CAACtB,SAAS,CAACsB,QAAQ;IAClD,IAAIC,YAAY;IAChB,IAAIP,OAAO,EAAE;MACXO,YAAY,GAAG,MAAM,IAAI,CAACC,YAAY,CAACX,OAAO,EAAEK,OAAO,EAAEC,KAAK,CAAC;IACjE,CAAC,MAAM,IAAIJ,KAAK,EAAE;MAChBQ,YAAY,GAAG,MAAM,IAAI,CAACE,UAAU,CAACZ,OAAO,CAAC;IAC/C,CAAC,MAAM;MACL,MAAMa,MAAM,GAAG,MAAM,IAAI,CAACC,oBAAoB,CAACd,OAAO,CAAC;MACvDU,YAAY,GAAG,MAAM,IAAI,CAACK,yBAAyB,CACjDN,QAAQ,EACRI,MAAM,EACNZ,aAAa,EACbG,UAAU,EACVC,OAAO,EACPC,KAAK,EACLC,0BACF,CAAC;IACH;IACA,MAAME,QAAQ,CAACO,SAAS,CAAC,OAAO,CAAC;IACjC,OAAON,YAAY;EACrB;;EAEA;AACF;AACA;AACA;EACE,MAAMK,yBAAyBA,CAC7BN,QAAkB,EAClBI,MAAqB,EACrBZ,aAA4B,EAC5BG,UAAmB,EACnBa,WAAmB,EACnBX,KAAc,EACdC,0BAAmC,EACL;IAC9B,MAAMW,aAAa,GAAGT,QAAQ,CAACU,gBAAgB,CAAC,CAAC;IACjD,MAAMC,iBAAiB,GAAG,MAAMX,QAAQ,CAACY,oBAAoB,CAAC,CAAC;IAC/D,MAAMC,mBAAmB,GAAG,MAAM,IAAI,CAACC,sBAAsB,CAC3DV,MAAM,EACNK,aAAa,EACbE,iBAAiB,EACjBnB,aACF,CAAC;IACD,MAAMuB,gBAAgB,GAAGF,mBAAmB,CAAC9D,MAAM,CAAEiE,CAAC,IAAKA,CAAC,CAACC,gBAAgB,IAAI,CAACD,CAAC,CAACE,qBAAqB,CAAC;IAC1G,IAAIH,gBAAgB,CAACzD,MAAM,EAAE;MAC3B,MAAM6D,WAAW,GAAGJ,gBAAgB,CACjCK,GAAG,CACDC,eAAe,IACd,GAAGC,gBAAK,CAACC,IAAI,CAACF,eAAe,CAACG,EAAE,CAACC,QAAQ,CAAC,CAAC,CAAC,MAAMH,gBAAK,CAACI,GAAG,CAACL,eAAe,CAACJ,gBAA0B,CAAC,EAC3G,CAAC,CACAU,IAAI,CAAC,IAAI,CAAC;MACb,MAAM,KAAIC,oBAAQ,EAAC,mDAAmDT,WAAW,EAAE,CAAC;IACtF;IAEA,OAAO,IAAI,CAACU,UAAU,CAAC;MACrBrC,aAAa;MACbqB,mBAAmB;MACnBiB,WAAW,EAAErB,aAAa;MAC1BsB,WAAW,EAAEpB,iBAAiB;MAC9BhB,UAAU,EAAEA,UAAU;MACtBa,WAAW;MACXX,KAAK;MACLC;IACF,CAAC,CAAC;EACJ;;EAEA;AACF;AACA;EACE,MAAM+B,UAAUA,CAAC;IACfrC,aAAa;IACbqB,mBAAmB;IACnBiB,WAAW;IACXC,WAAW;IACXpC,UAAU;IACVqC,MAAM;IACNC,GAAG;IACHzB,WAAW;IACXX,KAAK;IACLC,0BAA0B;IAC1BoC;EAaF,CAAC,EAAgC;IAC/B,MAAMlC,QAAQ,GAAG,IAAI,CAACtB,SAAS,EAAEsB,QAAQ;IACzC,MAAMmC,WAAW,GAAG,IAAI,CAACxD,KAAK,CAACwD,WAAW;IAC1C,MAAMC,qBAAqB,GAAGvB,mBAAmB,CAACwB,IAAI,CACnDC,SAAS,IAAKA,SAAS,CAACrC,YAAY,IAAIqC,SAAS,CAACrC,YAAY,CAACsC,YAClE,CAAC;IACD,IAAIH,qBAAqB,IAAI,CAAC5C,aAAa,EAAE;MAC3CA,aAAa,GAAG,MAAM,IAAAgD,2CAA2B,EAAC,CAAC;IACrD;IACA,MAAMzB,gBAAoC,GAAGF,mBAAmB,CAC7D9D,MAAM,CAAE0F,eAAe,IAAKA,eAAe,CAACxB,gBAAgB,CAAC,CAC7DlE,MAAM,CAAE0F,eAAe,IAAK,CAACA,eAAe,CAACC,eAAe,CAAC,CAC7DtB,GAAG,CAAEqB,eAAe,KAAM;MACzBjB,EAAE,EAAEiB,eAAe,CAACjB,EAAE;MACtBP,gBAAgB,EAAEwB,eAAe,CAACxB,gBAA0B;MAC5DC,qBAAqB,EAAEuB,eAAe,CAACvB;IACzC,CAAC,CAAC,CAAC;IAEL,MAAMyB,oBAAoB,GAAG9B,mBAAmB,CAC7C9D,MAAM,CAAE0F,eAAe,IAAKA,eAAe,CAACC,eAAe,CAAC,CAC5DtB,GAAG,CAAEJ,CAAC,IAAKA,CAAC,CAACQ,EAAE,CAACoB,aAAa,CAACC,SAAS,CAAC,CAAC;IAE5C,MAAMC,mBAAmB,GAAGjC,mBAAmB,CAAC9D,MAAM,CAAE0F,eAAe,IAAK,CAACA,eAAe,CAACxB,gBAAgB,CAAC;IAE9G,MAAM8B,yBAAyB,GAAGhB,WAAW,EAAEiB,cAAc,CAAC,CAAC;IAE/D,MAAMC,iBAAiB,GAAG,MAAM,IAAI,CAACC,oBAAoB,CACvDJ,mBAAmB,EACnBhB,WAAW,EACXtC,aAAa,EACbuC,WAAW,EACXG,UACF,CAAC;IAED,MAAMiB,cAAc,GAAG,IAAAC,iBAAO,EAACN,mBAAmB,CAAC1B,GAAG,CAAEJ,CAAC,IAAKA,CAAC,CAACqC,iBAAiB,CAAC,CAAC;IAEnF,MAAM;MAAEC,oBAAoB;MAAEC,sBAAsB;MAAEC;IAAuB,CAAC,GAAG,IAAI,CAAC9E,SAAS,GAC3F,MAAM,IAAI,CAACU,YAAY,CAACqE,oCAAoC,CAACN,cAAc,CAAC,GAC5E;MAAEG,oBAAoB,EAAET,SAAS;MAAEU,sBAAsB,EAAEV,SAAS;MAAEW,sBAAsB,EAAEX;IAAU,CAAC;IAE7G,IAAIa,iCAAoD;IACxD,IAAIH,sBAAsB,EAAE;MAC1BG,iCAAiC,GAC/B,MAAM,IAAI,CAACtE,YAAY,CAACuE,0CAA0C,CAACJ,sBAAsB,CAAC;IAC9F;IACA,IAAI,IAAI,CAAC7E,SAAS,EAAE,MAAM,IAAI,CAACU,YAAY,CAACwE,qCAAqC,CAACT,cAAc,CAAC;IAEjG,IAAIpB,WAAW,EAAEI,WAAW,CAAC0B,OAAO,CAACC,GAAG,CAAC/B,WAAW,CAAC;IAErD,MAAMI,WAAW,CAAC0B,OAAO,CAACE,OAAO,CAAC,CAAC,CAAC,CAAC;;IAErC,MAAM5B,WAAW,CAAC0B,OAAO,CAACG,kBAAkB,CAACC,KAAK,CAAC,CAAC;IAEpD,IAAI,IAAI,CAACvF,SAAS,EAAE;MAClB,MAAMsB,QAAQ,CAACkE,WAAW,CAAC,SAASpC,WAAW,CAACL,QAAQ,CAAC,CAAC,EAAE,CAAC;MAC7D,MAAM,IAAI,CAAC0C,8BAA8B,CAAClB,iBAAiB,EAAElB,WAAW,EAAEgB,yBAAyB,CAAC;IACtG;IAEA,IAAIJ,oBAAoB,CAACrF,MAAM,IAAI,IAAI,CAACoB,SAAS,EAAE;MACjD,MAAM0F,kBAAkB,GAAGC,8BAAe,CAACC,SAAS,CAAC3B,oBAAoB,CAAC;MAC1E,MAAM,IAAA4B,+BAAqB,EAACvE,QAAQ,EAAEoE,kBAAkB,CAAC;MACzD,MAAMpE,QAAQ,CAACwE,eAAe,CAACJ,kBAAkB,CAAC;IACpD;IAEA,MAAMK,iCAAiC,GAAG5D,mBAAmB,CAAC6D,IAAI,CAAE1D,CAAC,IAAKA,CAAC,CAACqC,iBAAiB,EAAEd,YAAY,CAAC,CAAC,CAAC;IAC9G,MAAMoC,uBAAuB,GAAGvC,qBAAqB,IAAI5C,aAAa,KAAK,QAAQ;IACnF,IAAI,CAACM,0BAA0B,IAAI,CAAC6E,uBAAuB,IAAI,CAACF,iCAAiC,EAAE;MACjG,IAAI;QACF,MAAM,IAAI,CAAC7F,OAAO,CAACA,OAAO,CAACiE,SAAS,EAAE;UACpC+B,MAAM,EAAE,IAAI;UACZC,cAAc,EAAE,KAAK;UACrBC,MAAM,EAAE;QACV,CAAC,CAAC;MACJ,CAAC,CAAC,OAAOC,GAAQ,EAAE;QACjB,IAAI,CAAChG,MAAM,CAACiG,KAAK,CAAC,4BAA4B,EAAED,GAAG,CAAC;QACpD,IAAI,CAAChG,MAAM,CAACkG,cAAc,CACxB,uEAAuEF,GAAG,CAACnF,OAAO,EACpF,CAAC;MACH;IACF;IAEA,MAAMsF,iBAAiB,GAAG,IAAA9B,iBAAO,EAACH,iBAAiB,CAAC7B,GAAG,CAAEJ,CAAC,IAAKA,CAAC,CAACmE,iBAAiB,CAAC,CAAC;IAEpF,MAAMC,mBAAmB,GAAG,MAAAA,CAAA,KAAuC;MACjE;MACA;MACA,IAAIzF,UAAU,IAAIqC,MAAM,IAAI2C,uBAAuB,IAAIF,iCAAiC,EAAE;QACxF,OAAO,IAAI;MACb;MACA,IAAIxC,GAAG,EAAE;QACP,MAAMoD,QAAQ,GAAGxE,mBAAmB,CAACO,GAAG,CAAEJ,CAAC,IAAKA,CAAC,CAACQ,EAAE,CAAC;QACrD,MAAM8D,OAAO,GAAG,MAAM,IAAI,CAACC,mBAAmB,CAACF,QAAQ,EAAE7E,WAAW,EAAEX,KAAK,CAAC;QAC5E,IAAI,CAACyF,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,CAACrF,WAAW,EAAEX,KAAK,EAAEkC,WAAW,EAAE+D,QAAQ,CAAC,CAAC,EAAEZ,iBAAiB,CAAC;IACpG,CAAC;IACD,IAAIa,gBAAkC,GAAG,IAAI;IAC7C,IAAIC,cAAiC;IACrC,MAAMC,cAAc,GAAG,IAAI,CAACvH,SAAS,GAAG,IAAI,CAACA,SAAS,CAACwH,MAAM,CAACC,YAAY,CAAC,CAAC,GAAG,IAAI;IACnF,IAAI;MACFJ,gBAAgB,GAAG,MAAMX,mBAAmB,CAAC,CAAC;IAChD,CAAC,CAAC,OAAOL,GAAQ,EAAE;MACjB,IAAI,CAAChG,MAAM,CAACiG,KAAK,CAAC,sCAAsC,EAAED,GAAG,CAAC;MAC9DiB,cAAc,GAAGjB,GAAG;MACpB,IAAIkB,cAAc,EAAE,IAAI,CAACvH,SAAS,CAACwH,MAAM,CAACE,mBAAmB,CAACH,cAAc,CAAC;IAC/E;IAEA,OAAO;MACLI,UAAU,EAAEpD,iBAAiB,CAAC7B,GAAG,CAAEJ,CAAC,IAAKA,CAAC,CAACsF,kBAAkB,CAAC;MAC9DvF,gBAAgB;MAChB2E,iBAAiB,EAAE,CAAC,GAAG/C,oBAAoB,EAAE,IAAIoD,gBAAgB,EAAEL,iBAAiB,IAAI,EAAE,CAAC,CAAC;MAC5FK,gBAAgB;MAChBC,cAAc;MACdO,2BAA2B,EAAE;QAC3BjD,oBAAoB;QACpBC,sBAAsB;QACtBC,sBAAsB;QACtBE;MACF,CAAC;MACDiB;IACF,CAAC;EACH;EAEA,MAAMR,8BAA8BA,CAClClB,iBAA0C,EAC1ClB,WAAkB,EAClBgB,yBAA2C,EAC3C;IACA,MAAMyD,kBAAkB,GAAGzE,WAAW,EAClCiB,cAAc,CAAC,CAAC,CACjBjG,MAAM,CAAEyE,EAAE,IAAK,CAACuB,yBAAyB,EAAE0D,iBAAiB,CAACjF,EAAE,CAAC,CAAC;IACpE,MAAMkF,2BAA2B,GAAGrC,8BAAe,CAACC,SAAS,CAACkC,kBAAkB,IAAI,EAAE,CAAC;IACvF,MAAMH,UAAU,GAAG,IAAAjD,iBAAO,EACxBH,iBAAiB,CACd7B,GAAG,CAAEJ,CAAC,IAAKA,CAAC,CAACmE,iBAAiB,CAAC,CAC/BpI,MAAM,CAAEiE,CAAC,IAAKA,CAAC,IAAI0F,2BAA2B,CAACD,iBAAiB,CAACzF,CAAC,CAACQ,EAAE,CAAC,CAC3E,CAAC;IACD,MAAMmF,QAAQ,GAAGN,UAAU,CAACjF,GAAG,CAAEJ,CAAC,IAAK,IAAA4F,sCAAwB,EAAC5F,CAAC,CAAC,CAAC;IACnE,MAAM6F,SAAS,GAAG,IAAI,CAACxH,WAAW,CAACyH,oBAAoB,CAACH,QAAQ,CAAC;IACjE,IAAIE,SAAS,EAAE,MAAM,IAAI,CAACxH,WAAW,CAAC0H,aAAa,CAAC,yBAAyB,CAAC;EAChF;;EAEA;AACF;AACA;AACA;AACA;AACA;EACE,MAAMC,cAAcA,CAClB5G,MAAqB;EAAE;EACvB6G,OAAmC,EACnClF,WAAkB;EAAE;EACpBmF,SAAgB,EACiB;IACjC,MAAMC,mBAAmB,GAAG,KAAIC,0CAAmB,EACjD,IAAI,CAACzI,KAAK,EACV,IAAI,CAACI,MAAM,EACX,IAAI,CAACE,QAAQ,EACbgI,OAAO,EACP,IAAI,CAACvI,SAAS,EACdqD,WAAW,EACXmF,SACF,CAAC;IACD,OAAOC,mBAAmB,CAACE,SAAS,CAACjH,MAAM,CAAC;EAC9C;EAEA,MAAc8C,oBAAoBA,CAChCJ,mBAA2C,EAC3ChB,WAAmB,EACnBtC,aAA4B,EAC5BuC,WAAkB,EAClBG,UAAoB,EACc;IAClC,MAAMe,iBAAiB,GAAG,MAAM,IAAAqE,qBAAS,EACvCxE,mBAAmB,EACnB,OAAO;MAAEyE,gBAAgB;MAAE/F,EAAE;MAAEvB,YAAY;MAAEuH,iBAAiB;MAAEnE;IAAkB,CAAC,KAAK;MACtF,MAAMoE,cAAc,GAAG,MAAM,IAAI,CAAC9I,KAAK,CAACwD,WAAW,CAACuF,iBAAiB,CAAClG,EAAE,CAAC;MACzE,MAAMmG,aAAa,GAAG7F,WAAW,CAAC8F,SAAS,CAAC,CAAC,GAAGC,gBAAM,CAACC,IAAI,CAAChG,WAAW,CAACiG,IAAI,EAAEvG,EAAE,CAAC7C,KAAe,CAAC,GAAGmD,WAAW;MAC/G,OAAO,IAAI,CAACkG,YAAY,CAAC;QACvBT,gBAAgB;QAChB/F,EAAE;QACFvB,YAAY;QACZT,aAAa;QACbyI,UAAU,EAAER,cAAc,CAACS,MAAM,CAAC1G,EAAE,CAAC2G,OAAiB,CAAQ;QAC9DrG,WAAW,EAAE6F,aAAa;QAC1B5F,WAAW;QACXyF,iBAAiB;QACjBnE,iBAAiB;QACjBnB;MACF,CAAC,CAAC;IACJ,CACF,CAAC;IAED,IAAI,IAAI,CAACxD,SAAS,EAAE;MAClB,MAAM0J,YAAY,GAAG,IAAAhF,iBAAO,EAACH,iBAAiB,CAAC7B,GAAG,CAAEJ,CAAC,IAAKA,CAAC,CAACmE,iBAAiB,CAAC,CAAC;MAC/E,MAAMkD,wBAAwB,GAAG;QAC/BrI,QAAQ,EAAE,IAAI,CAACtB,SAAS,CAACsB,QAAQ;QACjCqG,UAAU,EAAE+B,YAAY;QACxBtI,0BAA0B,EAAE,IAAI;QAChCwI,WAAW,EAAE,KAAK;QAAE;QACpBC,qBAAqB,EAAE;MACzB,CAAC;MACD,MAAM,IAAI,CAACvJ,eAAe,CAACwJ,SAAS,CAACH,wBAAwB,CAAC;IAChE;IAEA,OAAOpF,iBAAiB;EAC1B;EAEA,MAAc+E,YAAYA,CAAC;IACzBT,gBAAgB;IAChB/F,EAAE;IACFvB,YAAY;IACZT,aAAa;IACbyI,UAAU;IACVnG,WAAW;IACXC,WAAW;IACXyF,iBAAiB;IACjBnE,iBAAiB;IACjBnB;EAYF,CAAC,EAAkC;IACjC,MAAMC,WAAW,GAAG,IAAI,CAACxD,KAAK,CAACwD,WAAW;IAC1C,IAAIsG,WAAW,GAAG,CAAC,CAAC;IACpB,MAAMC,iBAAoC,GAAG;MAC3ClH,EAAE,EAAE;QAAEuG,IAAI,EAAEvG,EAAE,CAACmH,QAAQ;QAAEhK,KAAK,EAAE6C,EAAE,CAAC7C;MAAM,CAAC;MAC1CiK,IAAI,EAAEX,UAAU;MAChBY,MAAM,EAAE/G;IACV,CAAC;IACDN,EAAE,GAAG+F,gBAAgB,GAAGA,gBAAgB,CAAC/F,EAAE,GAAGA,EAAE;IAChD,MAAMiG,cAAc,GAAG,MAAMtF,WAAW,CAACuF,iBAAiB,CAAClG,EAAE,CAAC;IAE9D,MAAMsH,gBAAgB,GAAIF,IAAS,IAAK;MACtC,IAAI,CAAC7G,WAAW,EAAE,MAAM,IAAIgH,KAAK,CAAC,qDAAqD,CAAC;MACxF,IAAIjH,WAAW,CAAC8F,SAAS,CAAC,CAAC,EAAE;QAC3B,MAAMoB,YAAY,GAAGjH,WAAW,CAACsE,UAAU,CAAChE,IAAI,CAAErB,CAAC,IAAKA,CAAC,CAACQ,EAAE,CAACyH,qBAAqB,CAACzH,EAAE,CAAC,CAAC;QACvF,IAAI,CAACwH,YAAY,EAAE;MACrB;MACAjH,WAAW,CAACmH,YAAY,CAAC;QAAE1H,EAAE;QAAEoH;MAAK,CAAC,CAAC;IACxC,CAAC;IAED,MAAMO,sBAAsB,GAAIhE,iBAAqC,IAAK;MACxE,IAAI,CAACoC,gBAAgB,EAAE,MAAM,IAAIwB,KAAK,CAAC,yDAAyD,CAAC;MACjG;MACA;MACA,IAAI,CAAChH,WAAW,EAAE,MAAM,IAAIgH,KAAK,CAAC,oDAAoD,CAAC;MACvF,IAAI,CAACvB,iBAAiB,EAAE,MAAM,IAAIuB,KAAK,CAAC,qCAAqC,CAAC;MAC9ED,gBAAgB,CAACtB,iBAAiB,CAAC4B,iBAAiB,CAAC;MACrDV,iBAAiB,CAACW,SAAS,GAAG;QAC5BC,aAAa,EAAE9B,iBAAiB,CAAC8B,aAAa;QAC9CF,iBAAiB,EAAE5B,iBAAiB,CAAC4B,iBAAiB;QACtDG,eAAe,EAAE/B,iBAAiB,CAAC+B;MACrC,CAAC;MACDpH,WAAW,CAAC0B,OAAO,CAACG,kBAAkB,CAACwF,QAAQ,CAACd,iBAAiB,CAAC;MAClE,OAAO;QAAEpC,kBAAkB,EAAE;UAAE9E,EAAE;UAAEiH;QAAY,CAAC;QAAEnG,SAAS,EAAEiF,gBAAgB;QAAEpC;MAAkB,CAAC;IACpG,CAAC;IAED,MAAMsE,uBAAuB,GAAGA,CAAA,KAAM;MACpC,IAAI,CAAClC,gBAAgB,EAAE,MAAM,IAAIwB,KAAK,CAAC,mDAAmDvH,EAAE,CAACC,QAAQ,CAAC,CAAC,EAAE,CAAC;MAC1G8F,gBAAgB,CAACmC,KAAK,CAACnM,OAAO,CAAEoM,IAAI,IAAK;QACvClB,WAAW,CAAC,IAAAmB,mCAAoB,EAACD,IAAI,CAACE,QAAQ,CAAC,CAAC,GAAGC,0BAAU,CAACC,SAAS;MACzE,CAAC,CAAC;IACJ,CAAC;IACD,IAAI9J,YAAY,IAAIA,YAAY,CAACsC,YAAY,IAAI/C,aAAa,KAAKwK,4BAAY,CAACC,IAAI,EAAE;MACpFR,uBAAuB,CAAC,CAAC;MACzBtH,WAAW,CAAC0B,OAAO,CAACG,kBAAkB,CAACwF,QAAQ,CAACd,iBAAiB,CAAC;MAClE,OAAO;QAAEpC,kBAAkB,EAAE;UAAE9E,EAAE;UAAEiH;QAAY,CAAC;QAAEnG,SAAS,EAAEiF,gBAAgB,IAAI1E;MAAU,CAAC;IAC9F;IACA,IAAI2E,iBAAiB,EAAE0C,QAAQ,KAAK,MAAM,EAAE;MAC1CT,uBAAuB,CAAC,CAAC;MACzB,OAAON,sBAAsB,CAAC,CAAC;IACjC;IACA,MAAMgB,QAAQ,GAAG3I,EAAE,CAACoB,aAAa,CAACqF,UAAU,CAACxG,QAAQ,CAAC,CAAC,CAAC;IACxD,MAAM2I,QAAQ,GAAG,CAACnK,YAAY,IAAIT,aAAa,KAAKwK,4BAAY,CAACK,MAAM,GAAGF,QAAQ,GAAG3I,EAAE;IACvF,MAAM8I,eAAe,GAAG,IAAI,CAAC5L,SAAS,GAClC,MAAM,IAAI,CAACA,SAAS,CAACsB,QAAQ,CAACuK,oCAAoC,CAACH,QAAQ,CAAC,GAC5E,MAAMjI,WAAW,CAACqI,oBAAoB,CAACJ,QAAQ,CAAC,CAAC,CAAC;IACtD,IAAInK,YAAY,IAAIT,aAAa,KAAKwK,4BAAY,CAACK,MAAM,EAAE;MACzD;MACAC,eAAe,CAACnC,OAAO,GAAG3G,EAAE,CAAC2G,OAAO;IACtC;IACA,MAAMuB,KAAK,GAAGY,eAAe,CAACZ,KAAK;IACnC,IAAAe,4BAAgB,EAACf,KAAK,EAAEjB,WAAW,EAAElB,gBAAgB,IAAI1E,SAAS,CAAC;IAEnE,IAAI5C,YAAY,EAAE;MAChB;MACA,MAAM;QAAEwI,WAAW,EAAEiC,cAAc;QAAEC;MAAc,CAAC,GAAG,IAAAC,gCAAoB,EAAClB,KAAK,EAAEzJ,YAAY,EAAET,aAAa,CAAC;MAC/G8K,eAAe,CAACZ,KAAK,GAAGiB,aAAa;MACrClC,WAAW,GAAArL,aAAA,CAAAA,aAAA,KAAQqL,WAAW,GAAKiC,cAAc,CAAE;IACrD;IAEA,IAAI,IAAI,CAAChM,SAAS,EAAE,MAAM,IAAAmM,+BAAmB,EAACpC,WAAW,EAAE,IAAI,CAAC/J,SAAS,CAACsB,QAAQ,EAAEuH,gBAAgB,IAAI1E,SAAS,CAAC;IAElH,IAAIQ,iBAAiB,EAAE;MACrB,MAAMyH,wBAAwB,GAAGzH,iBAAiB,CAAC0H,2BAA2B,CAAC,CAAC;MAChF,IAAID,wBAAwB,EAAE;QAC5BpC,iBAAiB,CAACsC,YAAY,GAAGF,wBAAwB;QACzD;QACA;MACF;IACF;;IAEA;IACA;IACA,IAAI7K,YAAY,EAAE;MAChB,IAAIA,YAAY,CAACsC,YAAY,IAAI/C,aAAa,KAAKwK,4BAAY,CAACiB,MAAM,EAAE;QACtEvC,iBAAiB,CAACwC,aAAa,GAAGjL,YAAY,CAAC0K,aAAa,CAAC5N,MAAM,CAAEoO,CAAC,IAAKA,CAAC,CAACC,QAAQ,CAAC,CAAChK,GAAG,CAAE+J,CAAC,IAAKA,CAAC,CAACE,QAAQ,CAAC;MAC/G;MACAlJ,WAAW,CAAC0B,OAAO,CAACG,kBAAkB,CAACwF,QAAQ,CAACd,iBAAiB,CAAC;IACpE,CAAC,MAAM,IAAI3G,WAAW,EAAE;MACtB,IAAIyF,iBAAiB,EAAE;QACrB;QACA,OAAO2B,sBAAsB,CAACmB,eAAe,CAAC;MAChD;MACAxB,gBAAgB,CAACb,UAAU,CAAC;IAC9B,CAAC,MAAM;MACL;MACA,IAAI/F,UAAU,EAAE;QACduF,cAAc,CAAC6D,aAAa,CAACC,OAAO,CAACtD,UAAU,CAAC;MAClD,CAAC,MAAM;QACLR,cAAc,CAAC8D,OAAO,CAACtD,UAAU,CAAC;QAClC;QACAR,cAAc,CAAC+D,kBAAkB,CAACvD,UAAU,CAACxG,QAAQ,CAAC,CAAC,CAAC;MAC1D;MACAU,WAAW,CAAC0B,OAAO,CAACC,GAAG,CAAC2D,cAAc,CAAC;IACzC;IAEA,OAAO;MACLnB,kBAAkB,EAAE;QAAE9E,EAAE,EAAE4I,QAAQ;QAAE3B;MAAY,CAAC;MACjDnG,SAAS,EAAEiF,gBAAgB,IAAI1E,SAAS;MACxCsC,iBAAiB,EAAEmF;IACrB,CAAC;EACH;EAEA,MAAcnK,UAAUA,CAACZ,OAAe,EAAgC;IACtE,MAAMS,QAAQ,GAAG,IAAI,CAACtB,SAAS,CAACsB,QAAQ;IACxC,MAAMyL,GAAG,GAAG,MAAM,IAAI,CAACC,iBAAiB,CAACnM,OAAO,CAAC;IACjD,MAAM+F,OAAO,GAAG,MAAM,IAAI,CAACxG,QAAQ,CAACA,QAAQ,CAAC;MAAE2M,GAAG;MAAEE,KAAK,EAAE;IAAK,CAAC,CAAC;IAClEF,GAAG,CAAClO,OAAO,CAAEiE,EAAE,IAAKxB,QAAQ,CAACrB,KAAK,CAACkF,OAAO,CAACG,kBAAkB,CAAC4H,eAAe,CAACpK,EAAE,CAAC,CAAC;IAClF,MAAMxB,QAAQ,CAACrB,KAAK,CAACkF,OAAO,CAACG,kBAAkB,CAACC,KAAK,CAAC,CAAC;IACvD,OAAO;MAAE4H,iBAAiB,EAAEvG,OAAO,CAACe;IAAW,CAAC;EAClD;EAEA,MAAcnG,YAAYA,CAACX,OAAe,EAAEiB,WAAmB,EAAEX,KAAc,EAAgC;IAC7G,MAAM4L,GAAG,GAAG,MAAM,IAAI,CAACC,iBAAiB,CAACnM,OAAO,CAAC;IACjD;IACA,MAAM;MAAEoG;IAAkB,CAAC,GAAG,MAAM,IAAI,CAAC9G,QAAQ,CAACiN,IAAI,CAAC;MACrDC,YAAY,EAAE1H,8BAAe,CAACC,SAAS,CAACmH,GAAG,CAACrK,GAAG,CAAEI,EAAE,IAAKA,EAAE,CAAC,CAAC;MAC5D3B,KAAK;MACLD,OAAO,EAAEY;IACX,CAAC,CAAC;IACF,OAAO;MAAEwL,kBAAkB,EAAErG;IAAkB,CAAC;EAClD;EAEA,MAAc7E,sBAAsBA,CAClCV,MAAqB,EACrByI,MAAc,EACdoD,eAAiC,EACjCzM,aAA4B,EACK;IACjC,MAAMiM,GAAG,GAAG,MAAMS,OAAO,CAACC,GAAG,CAC3B/L,MAAM,CAACgB,GAAG,CAAC,MAAOgL,KAAK,IAAK;MAC1B,MAAMC,eAAe,GAAGxD,MAAM,CAACjB,SAAS,CAAC,CAAC,GAAGwE,KAAK,CAACzN,KAAK,GAAGkK,MAAM,CAAClK,KAAK;MACvE,MAAM2N,YAAY,GAAGzE,gBAAM,CAACC,IAAI,CAACe,MAAM,CAACd,IAAI,EAAEsE,eAAyB,CAAC;MACxE,MAAMpE,UAAU,GAAG,MAAM,IAAI,CAACvJ,SAAS,CAACsB,QAAQ,CAACrB,KAAK,CAACkF,OAAO,CAAC0I,WAAW,CAACrE,MAAM,CAACoE,YAAY,EAAEF,KAAK,CAAC;MACtG,MAAMI,SAAS,GAAGF,YAAY,CAAC7K,QAAQ,CAAC,CAAC;MACzC,IAAI,CAACwG,UAAU,EAAE;QACf,MAAM,KAAIrG,oBAAQ,EAAC,oCAAoCwK,KAAK,CAACK,sBAAsB,CAAC,CAAC,SAASD,SAAS,GAAG,CAAC;MAC7G;MACA,OAAOJ,KAAK,CAACxJ,aAAa,CAACqF,UAAU,CAACxG,QAAQ,CAAC,CAAC,CAAC;IACnD,CAAC,CACH,CAAC;IAED,OAAO,IAAI,CAACuF,cAAc,CAACyE,GAAG,EAAE;MAAEiB,YAAY,EAAE,KAAK;MAAElN;IAAc,CAAC,EAAEyM,eAAe,EAAEA,eAAe,CAAC;EAC3G;EAEA,MAAcpG,sBAAsBA,CAClCrF,WAAoB,EACpBX,KAAe,EACfgJ,MAAe,EACf3D,iBAAuC,EACZ;IAC3B,MAAMlB,kBAAkB,GAAG,IAAI,CAACrF,KAAK,CAACwD,WAAW,CAAC0B,OAAO,CAACG,kBAAkB,CAAC2I,aAAa,CAAC,CAAC;IAC5F,IAAI,CAAC5N,MAAM,CAAC6N,KAAK,CAAC,8CAA8C5I,kBAAkB,CAAC1G,MAAM,CAACmE,QAAQ,CAAC,CAAC,aAAa,CAAC;IAClH,IAAI,CAACuC,kBAAkB,CAAC1G,MAAM,EAAE,OAAO,IAAI;IAC3C,MAAMmO,GAAG,GAAGpH,8BAAe,CAACC,SAAS,CAACN,kBAAkB,CAAC5C,GAAG,CAAE3E,CAAC,IAAKoQ,0BAAW,CAACC,UAAU,CAACrQ,CAAC,CAAC+E,EAAE,CAAC,CAAC,CAAC;IAClG,IAAI,CAAC,IAAI,CAAC9C,SAAS,EAAE;MACnB,MAAM4G,OAAO,GAAG,MAAM,IAAI,CAACzG,QAAQ,CAACkO,aAAa,CAC/CtB,GAAG,CAACrK,GAAG,CAAEI,EAAE,KAAM;QACfwL,WAAW,EAAExL,EAAE,CAACC,QAAQ,CAAC,CAAC;QAC1BwL,OAAO,EAAE,IAAI,CAACtO,KAAK,CAACwD,WAAW,CAAC0B,OAAO,CAACG,kBAAkB,CAACkJ,QAAQ,CAAC1L,EAAE,CAAC,EAAEwJ;MAC3E,CAAC,CAAC,CAAC,EACH;QACEpL,OAAO,EAAEY,WAAW;QACpBX,KAAK;QACLsN,IAAI,EAAEtE,MAAM,EAAEpH,QAAQ,CAAC,CAAC;QACxB2L,uBAAuB,EAAElI;MAC3B,CACF,CAAC;MACD,OAAA9H,aAAA,CAAAA,aAAA,KAAYkI,OAAO;QAAEM,kBAAkB,EAAE;MAAE;IAC7C;IACA,OAAO,IAAI,CAAC/G,QAAQ,CAACiN,IAAI,CAAC;MACxBC,YAAY,EAAEN,GAAG;MACjB5L,KAAK;MACLD,OAAO,EAAEY;IACX,CAAC,CAAC;EACJ;EAEA,MAAc+E,mBAAmBA,CAC/BF,QAAuB,EACvBgI,UAAmB,EACnBxN,KAAe,EACa;IAC5B,MAAM4L,GAAG,GAAGpG,QAAQ,CAACjE,GAAG,CAAEI,EAAE,IAAK;MAC/B,OAAOA,EAAE,CAACiL,sBAAsB,CAAC,CAAC;IACpC,CAAC,CAAC;IACF,IAAI,CAAC1N,MAAM,CAAC6N,KAAK,CAAC,6CAA6CvH,QAAQ,CAAC/H,MAAM,CAACmE,QAAQ,CAAC,CAAC,aAAa,CAAC;IACvG,OAAO,IAAI,CAAC5C,QAAQ,CAACoD,GAAG,CAAC;MACvBwJ,GAAG;MACH5L,KAAK;MACLD,OAAO,EAAEyN,UAAU;MACnBC,UAAU,EAAE;IACd,CAAC,CAAC;EACJ;EAEA,MAAc5B,iBAAiBA,CAACnM,OAAgB,EAA0B;IACxE,IAAIA,OAAO,EAAE;MACX,MAAMgO,YAAY,GAAG,MAAM,IAAI,CAAC7O,SAAS,CAAC8O,YAAY,CAACjO,OAAO,CAAC;MAC/DgO,YAAY,CAAChQ,OAAO,CAAEiE,EAAE,IAAK;QAC3B,MAAMiM,KAAK,GAAG,IAAI,CAAC/O,SAAS,CAACsB,QAAQ,CAACrB,KAAK,CAACkF,OAAO,CAACG,kBAAkB,CAACkJ,QAAQ,CAAC1L,EAAE,CAAC;QACnF,IAAI,CAACiM,KAAK,EAAE;UACV,MAAM,KAAI7L,oBAAQ,EAAC,2BAA2BJ,EAAE,CAACC,QAAQ,CAAC,CAAC,kCAAkC,CAAC;QAChG;MACF,CAAC,CAAC;MACF,OAAO8L,YAAY;IACrB;IACA,MAAMG,oBAAoB,GAAG,IAAI,CAAChP,SAAS,CAACsB,QAAQ,CAACrB,KAAK,CAACkF,OAAO,CAACG,kBAAkB,CAAC2I,aAAa,CAAC,CAAC;IACrG,IAAI,CAACe,oBAAoB,CAACpQ,MAAM,EAAE,MAAM,KAAIsE,oBAAQ,EAAC,oDAAoD,CAAC;IAC1G,OAAO8L,oBAAoB,CAACtM,GAAG,CAAEuM,CAAC,IAAKd,0BAAW,CAACC,UAAU,CAACa,CAAC,CAACnM,EAAE,CAAC,CAAC;EACtE;EAEA,MAAcnB,oBAAoBA,CAACd,OAAgB,EAA0B;IAC3E,IAAIA,OAAO,EAAE;MACX,OAAO,IAAI,CAACb,SAAS,CAAC8O,YAAY,CAACjO,OAAO,CAAC;IAC7C;IACA,MAAMqO,YAAY,GAAG,MAAM,IAAI,CAACC,0BAA0B,CAAC,CAAC;IAC5D,OAAOD,YAAY,CAACxM,GAAG,CAAEJ,CAAC,IAAKA,CAAC,CAACQ,EAAE,CAAC;EACtC;EAEA,MAAMqM,0BAA0BA,CAACC,cAA+B,EAAgC;IAC9F,MAAM9N,QAAQ,GAAG,IAAI,CAACtB,SAAS,CAACsB,QAAQ;IACxC8N,cAAc,GAAGA,cAAc,IAAI,KAAIC,wBAAc,EAAC,IAAI,CAACrP,SAAS,CAAC;IACrE,MAAMsP,MAAM,GAAGhO,QAAQ,CAACkG,MAAM,CAAC+H,sCAAsC,CAAC,CAAC;IACvE,MAAMC,mBAAmB,GAAG,MAAMJ,cAAc,CAACK,kBAAkB,CAAC,CAAC;IACrE,MAAMC,gBAAgB,GAAGN,cAAc,CAACO,8BAA8B,CAAC,CAAC;IACxE,MAAMC,sBAAsB,GAAG,MAAMpC,OAAO,CAACC,GAAG,CAC9C6B,MAAM,CAAC5M,GAAG,CAAC,MAAO4L,WAAwB,IAAK;MAC7C,MAAMvF,cAAc,GAAGyG,mBAAmB,CAAC7L,IAAI,CAAErB,CAAC,IAAKA,CAAC,CAACuN,aAAa,CAAC,CAAC,CAACtF,qBAAqB,CAAC+D,WAAW,CAAC,CAAC;MAC5G,IAAI,CAACvF,cAAc,IAAI2G,gBAAgB,CAAC3H,iBAAiB,CAACuG,WAAW,CAAC,EAAE,OAAO,IAAI;MACnF,MAAMwB,YAAY,GAAG,MAAM/G,cAAc,CAACgH,6BAA6B,CAACzO,QAAQ,CAACrB,KAAK,CAACkF,OAAO,CAAC;MAC/F,IAAI,CAAC2K,YAAY,CAACE,UAAU,CAAC,CAAC,EAAE,OAAO,IAAI;MAC3C,OAAO;QAAElN,EAAE,EAAEiG,cAAc,CAAC8G,aAAa,CAAC,CAAC;QAAEI,OAAO,EAAEH;MAAa,CAAC;IACtE,CAAC,CACH,CAAC;IACD,OAAO,IAAApL,iBAAO,EAACkL,sBAAsB,CAAC;EACxC;EAoBA,aAAaM,QAAQA,CAAC,CACpBC,GAAG,EACHnQ,SAAS,EACTC,KAAK,EACLE,QAAQ,EACRC,QAAQ,EACRF,OAAO,EACPkQ,UAAU,EACVC,UAAU,EACV9P,QAAQ,EACRC,MAAM,EACNC,MAAM,EACN6P,YAAY,EACZ5P,YAAY,EACZC,WAAW,CAgBZ,EAAE;IACD,MAAMN,MAAM,GAAG+P,UAAU,CAACG,YAAY,CAACC,wBAAa,CAAC1N,EAAE,CAAC;IACxD,MAAM2N,OAAO,GAAG,IAAI3Q,WAAW,CAC7BE,SAAS,EACTC,KAAK,EACLC,OAAO,EACPC,QAAQ,EACRC,QAAQ,EACRC,MAAM,EACNgQ,UAAU,EACV9P,QAAQ,EACRC,MAAM,EACNC,MAAM,EACNC,YAAY,EACZC,WACF,CAAC;IACDwP,GAAG,CAACO,QAAQ,CAAC,KAAIC,oBAAQ,EAACF,OAAO,EAAEH,YAAY,CAAC,CAAC;IACjD,OAAOG,OAAO;EAChB;AACF;AAACG,OAAA,CAAA9Q,WAAA,GAAAA,WAAA;AAAAhB,eAAA,CAzpBYgB,WAAW,WAslBP,EAAE;AAAAhB,eAAA,CAtlBNgB,WAAW,kBAulBA,CACpB+Q,gBAAS,EACTC,4BAAe,EACfC,oBAAW,EACXC,0BAAc,EACdC,0BAAc,EACdC,wBAAa,EACbC,sBAAY,EACZC,wCAAqB,EACrBC,0BAAc,EACdC,sBAAY,EACZC,sBAAY,EACZC,kCAAkB,EAClBC,kCAAkB,EAClBC,8CAAwB,CACzB;AAAA5S,eAAA,CAtmBUgB,WAAW,aAumBL6R,kBAAW;AAoD9BnB,wBAAa,CAACoB,UAAU,CAAC9R,WAAW,CAAC","ignoreList":[]}
1
+ {"version":3,"names":["_cli","data","require","_workspace","_legacy","_snapping","_pMapSeries","_interopRequireDefault","_componentId","_bitError","_laneId","_chalk","_config","_remove","_toolboxPath","_pkgModules","_componentWriter","_importer","_logger","_lodash","_checkout","_configMerger","_dependencyResolver","_install","_scope","_mergeCmd","_merging","_mergeStatusProvider","_mergeVersion","_configStore","e","__esModule","default","ownKeys","r","t","Object","keys","getOwnPropertySymbols","o","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","defineProperty","_toPropertyKey","value","configurable","writable","i","_toPrimitive","Symbol","toPrimitive","call","TypeError","String","Number","MergingMain","constructor","workspace","scope","install","snapping","checkout","logger","componentWriter","importer","config","remove","configMerger","depResolver","merge","pattern","mergeStrategy","abort","resolve","noAutoSnap","message","build","skipDependencyInstallation","OutsideWorkspaceError","consumer","mergeResults","resolveMerge","abortMerge","bitIds","getComponentsToMerge","mergeComponentsFromRemote","onDestroy","snapMessage","currentLaneId","getCurrentLaneId","currentLaneObject","getCurrentLaneObject","allComponentsStatus","getAllComponentsStatus","failedComponents","c","unchangedMessage","unchangedLegitimately","failureMsgs","map","failedComponent","chalk","bold","id","toString","red","join","BitError","mergeSnaps","otherLaneId","currentLane","noSnap","tag","detachHead","legacyScope","componentWithConflict","find","component","hasConflicts","getMergeStrategyInteractive","componentStatus","shouldBeRemoved","componentIdsToRemove","changeVersion","undefined","succeededComponents","currentLaneIdsBeforeMerge","toComponentIds","componentsResults","applyVersionMultiple","allConfigMerge","compact","configMergeResult","workspaceDepsUpdates","workspaceDepsConflicts","workspaceDepsUnchanged","updateWorkspaceJsoncWithDepsIfNeeded","workspaceConfigConflictWriteError","writeWorkspaceJsoncWithConflictsGracefully","generateConfigMergeConflictFileForAll","objects","add","persist","unmergedComponents","write","writeBitMap","removeFromWsJsonPolicyIfExists","compBitIdsToRemove","ComponentIdList","fromArray","deleteComponentsFiles","cleanFromBitMap","componentsHasConfigMergeConflicts","some","leftUnresolvedConflicts","dedupe","updateExisting","import","err","error","consoleFailure","updatedComponents","legacyCompToWrite","getSnapOrTagResults","idsToTag","results","tagAllLaneComponent","taggedComponents","autoTaggedResults","removedComponents","snappedComponents","autoSnappedResults","snapResolvedComponents","toLaneId","mergeSnapResults","mergeSnapError","bitMapSnapshot","bitMap","takeSnapshot","restoreFromSnapshot","components","applyVersionResult","workspaceConfigUpdateResult","newlyIntroducedIds","hasWithoutVersion","newlyIntroducedComponentIds","packages","componentIdToPackageName","isRemoved","removeFromRootPolicy","persistConfig","getMergeStatus","options","otherLane","mergeStatusProvider","MergeStatusProvider","getStatus","mapSeries","currentComponent","resolvedUnrelated","modelComponent","getModelComponent","updatedLaneId","isDefault","LaneId","from","name","applyVersion","remoteHead","getRef","version","compsToWrite","manyComponentsWriterOpts","writeConfig","reasonForBitmapChange","writeMany","filesStatus","unmergedComponent","fullName","head","laneId","addToCurrentLane","Error","isPartOfLane","isEqualWithoutVersion","addComponent","handleResolveUnrelated","headOnCurrentLane","unrelated","unrelatedHead","unrelatedLaneId","addEntry","markAllFilesAsUnchanged","files","file","pathNormalizeToLinux","relative","FileStatus","unchanged","MergeOptions","ours","strategy","remoteId","idToLoad","theirs","legacyComponent","loadComponentFromModelImportIfNeeded","getConsumerComponent","updateFileStatus","modifiedStatus","modifiedFiles","applyModifiedVersion","removeFilesIfNeeded","successfullyMergedConfig","getSuccessfullyMergedConfig","mergedConfig","manual","unmergedPaths","f","conflict","filePath","detachedHeads","setHead","markVersionAsLocal","ids","getIdsForUnmerged","reset","removeComponent","abortedComponents","snap","legacyBitIds","resolvedComponents","localLaneObject","Promise","all","bitId","remoteScopeName","remoteLaneId","remoteLanes","laneIdStr","toStringWithoutVersion","shouldSquash","getComponents","debug","ComponentID","fromObject","snapFromScope","componentId","aspects","getEntry","lane","updatedLegacyComponents","tagMessage","unmodified","componentIds","idsByPattern","entry","unresolvedComponents","u","mergePending","listMergePendingComponents","componentsList","ComponentsList","allIds","getAllIdsAvailableOnLaneIncludeRemoved","componentsFromModel","getModelComponents","duringMergeComps","listDuringMergeStateComponents","mergePendingComponents","toComponentId","divergedData","getDivergeDataForMergePending","isDiverged","diverge","provider","cli","loggerMain","compWriter","configStore","createLogger","MergingAspect","merging","register","MergeCmd","exports","CLIAspect","WorkspaceAspect","ScopeAspect","SnappingAspect","CheckoutAspect","InstallAspect","LoggerAspect","ComponentWriterAspect","ImporterAspect","ConfigAspect","RemoveAspect","ConfigStoreAspect","ConfigMergerAspect","DependencyResolverAspect","MainRuntime","addRuntime"],"sources":["merging.main.runtime.ts"],"sourcesContent":["import { CLIAspect, CLIMain, MainRuntime } from '@teambit/cli';\nimport { WorkspaceAspect, OutsideWorkspaceError, Workspace, AutoTagResult } from '@teambit/workspace';\nimport { Consumer } from '@teambit/legacy.consumer';\nimport { ComponentsList } from '@teambit/legacy.component-list';\nimport { SnappingAspect, SnappingMain, TagResults } from '@teambit/snapping';\nimport mapSeries from 'p-map-series';\nimport { ComponentID, ComponentIdList } from '@teambit/component-id';\nimport { BitError } from '@teambit/bit-error';\nimport { LaneId } from '@teambit/lane-id';\nimport { UnmergedComponent } from '@teambit/legacy.scope';\nimport { Ref, Lane, ModelComponent } from '@teambit/objects';\nimport chalk from 'chalk';\nimport { ConfigAspect, ConfigMain } from '@teambit/config';\nimport { RemoveAspect, RemoveMain, deleteComponentsFiles } from '@teambit/remove';\nimport { pathNormalizeToLinux } from '@teambit/toolbox.path.path';\nimport { componentIdToPackageName } from '@teambit/pkg.modules.component-package-name';\nimport { ComponentWriterAspect, ComponentWriterMain } from '@teambit/component-writer';\nimport { ConsumerComponent } from '@teambit/legacy.consumer-component';\nimport { ImporterAspect, ImporterMain } from '@teambit/importer';\nimport { Logger, LoggerAspect, LoggerMain } from '@teambit/logger';\nimport { compact } from 'lodash';\nimport {\n ApplyVersionWithComps,\n CheckoutAspect,\n CheckoutMain,\n ComponentStatusBase,\n applyModifiedVersion,\n removeFilesIfNeeded,\n updateFileStatus,\n} from '@teambit/checkout';\nimport {\n ConfigMergerAspect,\n ConfigMergerMain,\n ConfigMergeResult,\n WorkspaceConfigUpdateResult,\n} from '@teambit/config-merger';\nimport { SnapsDistance } from '@teambit/component.snap-distance';\nimport { DependencyResolverAspect, DependencyResolverMain } from '@teambit/dependency-resolver';\nimport { InstallMain, InstallAspect } from '@teambit/install';\nimport { ScopeAspect, ScopeMain } from '@teambit/scope';\nimport { MergeCmd } from './merge-cmd';\nimport { MergingAspect } from './merging.aspect';\nimport { MergeStatusProvider, MergeStatusProviderOptions } from './merge-status-provider';\nimport {\n MergeStrategy,\n FileStatus,\n getMergeStrategyInteractive,\n MergeResultsThreeWay,\n MergeOptions,\n} from './merge-version';\nimport { ConfigStoreAspect, ConfigStoreMain } from '@teambit/config-store';\n\ntype ResolveUnrelatedData = {\n strategy: MergeStrategy;\n headOnCurrentLane: Ref;\n unrelatedHead: Ref;\n unrelatedLaneId: LaneId;\n};\n\nexport type DivergedComponent = { id: ComponentID; diverge: SnapsDistance };\n\nexport type ComponentMergeStatus = ComponentStatusBase & {\n mergeResults?: MergeResultsThreeWay | null;\n divergeData?: SnapsDistance;\n resolvedUnrelated?: ResolveUnrelatedData;\n configMergeResult?: ConfigMergeResult;\n};\n\nexport type ComponentMergeStatusBeforeMergeAttempt = ComponentStatusBase & {\n divergeData?: SnapsDistance;\n resolvedUnrelated?: ResolveUnrelatedData;\n mergeProps?: {\n otherLaneHead: Ref;\n currentId: ComponentID;\n modelComponent: ModelComponent;\n };\n};\n\nexport type FailedComponents = { id: ComponentID; unchangedMessage: string; unchangedLegitimately?: boolean };\n\n// fileName is PathLinux. TS doesn't let anything else in the keys other than string and number\nexport type FilesStatus = { [fileName: string]: keyof typeof FileStatus };\n\nexport type MergeSnapResults = {\n snappedComponents: ConsumerComponent[];\n autoSnappedResults: AutoTagResult[];\n removedComponents?: ComponentIdList;\n exportedIds?: ComponentID[];\n} | null;\n\nexport type ApplyVersionResult = { id: ComponentID; filesStatus: FilesStatus };\n\nexport type ApplyVersionResults = {\n components?: ApplyVersionResult[];\n version?: string;\n failedComponents?: FailedComponents[];\n removedComponents?: ComponentID[];\n addedComponents?: ComponentID[]; // relevant when restoreMissingComponents is true (e.g. bit lane merge-abort)\n newComponents?: ComponentID[]; // relevant for \"bit stash load\". (stashedBitmapEntries is populated)\n resolvedComponents?: ConsumerComponent[]; // relevant for bit merge --resolve\n abortedComponents?: ApplyVersionResult[]; // relevant for bit merge --abort\n mergeSnapResults?: MergeSnapResults;\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 workspaceConfigUpdateResult?: WorkspaceConfigUpdateResult;\n};\n\nexport class MergingMain {\n constructor(\n private workspace: Workspace,\n private scope: ScopeMain,\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 private configMerger: ConfigMergerMain,\n private depResolver: DependencyResolverMain\n ) {}\n\n async merge(\n pattern: string,\n mergeStrategy: MergeStrategy,\n abort: boolean,\n resolve: boolean,\n noAutoSnap: 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(pattern, message, build);\n } else if (abort) {\n mergeResults = await this.abortMerge(pattern);\n } else {\n const bitIds = await this.getComponentsToMerge(pattern);\n mergeResults = await this.mergeComponentsFromRemote(\n consumer,\n bitIds,\n mergeStrategy,\n noAutoSnap,\n message,\n build,\n skipDependencyInstallation\n );\n }\n await consumer.onDestroy('merge');\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: ComponentID[],\n mergeStrategy: MergeStrategy,\n noAutoSnap: 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(\n bitIds,\n currentLaneId,\n currentLaneObject,\n mergeStrategy\n );\n const failedComponents = allComponentsStatus.filter((c) => c.unchangedMessage && !c.unchangedLegitimately);\n if (failedComponents.length) {\n const failureMsgs = failedComponents\n .map(\n (failedComponent) =>\n `${chalk.bold(failedComponent.id.toString())} - ${chalk.red(failedComponent.unchangedMessage 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 otherLaneId: currentLaneId,\n currentLane: currentLaneObject,\n noAutoSnap: noAutoSnap,\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 otherLaneId,\n currentLane,\n noAutoSnap,\n noSnap,\n tag,\n snapMessage,\n build,\n skipDependencyInstallation,\n detachHead,\n }: {\n mergeStrategy: MergeStrategy;\n allComponentsStatus: ComponentMergeStatus[];\n otherLaneId: LaneId;\n currentLane?: Lane;\n noAutoSnap?: boolean;\n noSnap?: boolean;\n tag?: boolean;\n snapMessage?: string;\n build?: boolean;\n skipDependencyInstallation?: boolean;\n detachHead?: boolean;\n }): Promise<ApplyVersionResults> {\n const consumer = this.workspace?.consumer;\n const legacyScope = this.scope.legacyScope;\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.unchangedMessage)\n .filter((componentStatus) => !componentStatus.shouldBeRemoved)\n .map((componentStatus) => ({\n id: componentStatus.id,\n unchangedMessage: componentStatus.unchangedMessage as string,\n unchangedLegitimately: componentStatus.unchangedLegitimately,\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.unchangedMessage);\n\n const currentLaneIdsBeforeMerge = currentLane?.toComponentIds();\n\n const componentsResults = await this.applyVersionMultiple(\n succeededComponents,\n otherLaneId,\n mergeStrategy,\n currentLane,\n detachHead\n );\n\n const allConfigMerge = compact(succeededComponents.map((c) => c.configMergeResult));\n\n const { workspaceDepsUpdates, workspaceDepsConflicts, workspaceDepsUnchanged } = this.workspace\n ? await this.configMerger.updateWorkspaceJsoncWithDepsIfNeeded(allConfigMerge)\n : { workspaceDepsUpdates: undefined, workspaceDepsConflicts: undefined, workspaceDepsUnchanged: undefined };\n\n let workspaceConfigConflictWriteError: Error | undefined;\n if (workspaceDepsConflicts) {\n workspaceConfigConflictWriteError =\n await this.configMerger.writeWorkspaceJsoncWithConflictsGracefully(workspaceDepsConflicts);\n }\n if (this.workspace) await this.configMerger.generateConfigMergeConflictFileForAll(allConfigMerge);\n\n if (currentLane) legacyScope.objects.add(currentLane);\n\n await legacyScope.objects.persist(); // persist anyway, if currentLane is null it should save all main heads\n\n await legacyScope.objects.unmergedComponents.write();\n\n if (this.workspace) {\n await consumer.writeBitMap(`merge ${otherLaneId.toString()}`);\n await this.removeFromWsJsonPolicyIfExists(componentsResults, currentLane, currentLaneIdsBeforeMerge);\n }\n\n if (componentIdsToRemove.length && this.workspace) {\n const compBitIdsToRemove = ComponentIdList.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.consoleFailure(\n `failed installing packages, see the log for full stacktrace. error: ${err.message}`\n );\n }\n }\n\n const updatedComponents = compact(componentsResults.map((c) => c.legacyCompToWrite));\n\n const getSnapOrTagResults = async (): Promise<MergeSnapResults> => {\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 (noAutoSnap || 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(snapMessage, build, currentLane?.toLaneId(), updatedComponents);\n };\n let mergeSnapResults: MergeSnapResults = null;\n let mergeSnapError: Error | undefined;\n const bitMapSnapshot = this.workspace ? this.workspace.bitMap.takeSnapshot() : null;\n try {\n mergeSnapResults = await getSnapOrTagResults();\n } catch (err: any) {\n this.logger.error('failed running snap. mergeSnapError:', err);\n mergeSnapError = err;\n if (bitMapSnapshot) 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 workspaceConfigUpdateResult: {\n workspaceDepsUpdates,\n workspaceDepsConflicts,\n workspaceDepsUnchanged,\n workspaceConfigConflictWriteError,\n },\n leftUnresolvedConflicts,\n };\n }\n\n async removeFromWsJsonPolicyIfExists(\n componentsResults: ApplyVersionWithComps[],\n currentLane?: Lane,\n currentLaneIdsBeforeMerge?: ComponentIdList\n ) {\n const newlyIntroducedIds = currentLane\n ?.toComponentIds()\n .filter((id) => !currentLaneIdsBeforeMerge?.hasWithoutVersion(id));\n const newlyIntroducedComponentIds = ComponentIdList.fromArray(newlyIntroducedIds || []);\n const components = compact(\n componentsResults\n .map((c) => c.legacyCompToWrite)\n .filter((c) => c && newlyIntroducedComponentIds.hasWithoutVersion(c.id))\n );\n const packages = components.map((c) => componentIdToPackageName(c));\n const isRemoved = this.depResolver.removeFromRootPolicy(packages);\n if (isRemoved) await this.depResolver.persistConfig('merge (remove packages)');\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: ComponentID[], // the id.version is the version we want to merge to the current component\n options: MergeStatusProviderOptions,\n currentLane?: Lane, // currently checked out lane. if on main, then it's null.\n otherLane?: Lane // the lane we want to merged to our lane. (null if it's \"main\").\n ): Promise<ComponentMergeStatus[]> {\n const mergeStatusProvider = new MergeStatusProvider(\n this.scope,\n this.logger,\n this.importer,\n options,\n this.workspace,\n currentLane,\n otherLane\n );\n return mergeStatusProvider.getStatus(bitIds);\n }\n\n private async applyVersionMultiple(\n succeededComponents: ComponentMergeStatus[],\n otherLaneId: LaneId,\n mergeStrategy: MergeStrategy,\n currentLane?: Lane,\n detachHead?: boolean\n ): Promise<ApplyVersionWithComps[]> {\n const componentsResults = await mapSeries(\n succeededComponents,\n async ({ currentComponent, id, mergeResults, resolvedUnrelated, configMergeResult }) => {\n const modelComponent = await this.scope.legacyScope.getModelComponent(id);\n const updatedLaneId = otherLaneId.isDefault() ? LaneId.from(otherLaneId.name, id.scope as string) : otherLaneId;\n return this.applyVersion({\n currentComponent,\n id,\n mergeResults,\n mergeStrategy,\n remoteHead: modelComponent.getRef(id.version as string) as Ref,\n otherLaneId: updatedLaneId,\n currentLane,\n resolvedUnrelated,\n configMergeResult,\n detachHead,\n });\n }\n );\n\n if (this.workspace) {\n const compsToWrite = compact(componentsResults.map((c) => c.legacyCompToWrite));\n const manyComponentsWriterOpts = {\n consumer: this.workspace.consumer,\n components: compsToWrite,\n skipDependencyInstallation: true,\n writeConfig: false, // @todo: should write if config exists before, needs to figure out how to do it.\n reasonForBitmapChange: 'merge',\n };\n await this.componentWriter.writeMany(manyComponentsWriterOpts);\n }\n\n return componentsResults;\n }\n\n private async applyVersion({\n currentComponent,\n id,\n mergeResults,\n mergeStrategy,\n remoteHead,\n otherLaneId,\n currentLane,\n resolvedUnrelated,\n configMergeResult,\n detachHead,\n }: {\n currentComponent: ConsumerComponent | null | undefined;\n id: ComponentID;\n mergeResults: MergeResultsThreeWay | null | undefined;\n mergeStrategy: MergeStrategy;\n remoteHead: Ref;\n otherLaneId: LaneId;\n currentLane?: Lane;\n resolvedUnrelated?: ResolveUnrelatedData;\n configMergeResult?: ConfigMergeResult;\n detachHead?: boolean;\n }): Promise<ApplyVersionWithComps> {\n const legacyScope = this.scope.legacyScope;\n let filesStatus = {};\n const unmergedComponent: UnmergedComponent = {\n id: { name: id.fullName, scope: id.scope },\n head: remoteHead,\n laneId: otherLaneId,\n };\n id = currentComponent ? currentComponent.id : id;\n const modelComponent = await legacyScope.getModelComponent(id);\n\n const addToCurrentLane = (head: Ref) => {\n if (!currentLane) throw new Error('currentLane must be defined when adding to the lane');\n if (otherLaneId.isDefault()) {\n const isPartOfLane = currentLane.components.find((c) => c.id.isEqualWithoutVersion(id));\n if (!isPartOfLane) return;\n }\n currentLane.addComponent({ id, head });\n };\n\n const handleResolveUnrelated = (legacyCompToWrite?: ConsumerComponent) => {\n if (!currentComponent) throw new Error('currentComponent must be defined when resolvedUnrelated');\n // because when on a main, we don't allow merging lanes with unrelated. we asks users to switch to the lane\n // first and then merge with --resolve-unrelated\n if (!currentLane) throw new Error('currentLane must be defined when resolvedUnrelated');\n if (!resolvedUnrelated) throw new Error('resolvedUnrelated must be populated');\n addToCurrentLane(resolvedUnrelated.headOnCurrentLane);\n unmergedComponent.unrelated = {\n unrelatedHead: resolvedUnrelated.unrelatedHead,\n headOnCurrentLane: resolvedUnrelated.headOnCurrentLane,\n unrelatedLaneId: resolvedUnrelated.unrelatedLaneId,\n };\n legacyScope.objects.unmergedComponents.addEntry(unmergedComponent);\n return { applyVersionResult: { id, filesStatus }, component: currentComponent, legacyCompToWrite };\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 legacyScope.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 = this.workspace\n ? await this.workspace.consumer.loadComponentFromModelImportIfNeeded(idToLoad)\n : await legacyScope.getConsumerComponent(idToLoad); // when loading from the scope, we import all needed components first, so it should be fine. otherwise, change the code to import it here\n if (mergeResults && mergeStrategy === MergeOptions.theirs) {\n // in this case, we don't want to update .bitmap with the version of the remote. we want to keep the same version\n legacyComponent.version = id.version;\n }\n const files = legacyComponent.files;\n updateFileStatus(files, filesStatus, currentComponent || undefined);\n\n if (mergeResults) {\n // update files according to the merge results\n const { filesStatus: modifiedStatus, modifiedFiles } = applyModifiedVersion(files, mergeResults, mergeStrategy);\n legacyComponent.files = modifiedFiles;\n filesStatus = { ...filesStatus, ...modifiedStatus };\n }\n\n if (this.workspace) await removeFilesIfNeeded(filesStatus, this.workspace.consumer, currentComponent || undefined);\n\n if (configMergeResult) {\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 legacyScope.objects.unmergedComponents.addEntry(unmergedComponent);\n } else if (currentLane) {\n if (resolvedUnrelated) {\n // must be \"theirs\"\n return handleResolveUnrelated(legacyComponent);\n }\n addToCurrentLane(remoteHead);\n } else {\n // this is main\n if (detachHead) {\n modelComponent.detachedHeads.setHead(remoteHead);\n } else {\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 }\n legacyScope.objects.add(modelComponent);\n }\n\n return {\n applyVersionResult: { id: idToLoad, filesStatus },\n component: currentComponent || undefined,\n legacyCompToWrite: legacyComponent,\n };\n }\n\n private async abortMerge(pattern: string): Promise<ApplyVersionResults> {\n const consumer = this.workspace.consumer;\n const ids = await this.getIdsForUnmerged(pattern);\n const results = await this.checkout.checkout({ ids, reset: true });\n ids.forEach((id) => consumer.scope.objects.unmergedComponents.removeComponent(id));\n await consumer.scope.objects.unmergedComponents.write();\n return { abortedComponents: results.components };\n }\n\n private async resolveMerge(pattern: string, snapMessage: string, build: boolean): Promise<ApplyVersionResults> {\n const ids = await this.getIdsForUnmerged(pattern);\n // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n const { snappedComponents } = await this.snapping.snap({\n legacyBitIds: ComponentIdList.fromArray(ids.map((id) => id)),\n build,\n message: snapMessage,\n });\n return { resolvedComponents: snappedComponents };\n }\n\n private async getAllComponentsStatus(\n bitIds: ComponentID[],\n laneId: LaneId,\n localLaneObject: Lane | undefined,\n mergeStrategy: MergeStrategy\n ): Promise<ComponentMergeStatus[]> {\n const ids = await Promise.all(\n bitIds.map(async (bitId) => {\n const remoteScopeName = laneId.isDefault() ? bitId.scope : laneId.scope;\n const remoteLaneId = LaneId.from(laneId.name, remoteScopeName as string);\n const remoteHead = await this.workspace.consumer.scope.objects.remoteLanes.getRef(remoteLaneId, bitId);\n const laneIdStr = remoteLaneId.toString();\n if (!remoteHead) {\n throw new BitError(`unable to find a remote head of \"${bitId.toStringWithoutVersion()}\" in \"${laneIdStr}\"`);\n }\n return bitId.changeVersion(remoteHead.toString());\n })\n );\n\n return this.getMergeStatus(ids, { shouldSquash: false, mergeStrategy }, localLaneObject, localLaneObject);\n }\n\n private async snapResolvedComponents(\n snapMessage?: string,\n build?: boolean,\n laneId?: LaneId,\n updatedComponents?: ConsumerComponent[]\n ): Promise<MergeSnapResults> {\n const unmergedComponents = this.scope.legacyScope.objects.unmergedComponents.getComponents();\n this.logger.debug(`merge-snaps, snapResolvedComponents, total ${unmergedComponents.length.toString()} components`);\n if (!unmergedComponents.length) return null;\n const ids = ComponentIdList.fromArray(unmergedComponents.map((r) => ComponentID.fromObject(r.id)));\n if (!this.workspace) {\n const results = await this.snapping.snapFromScope(\n ids.map((id) => ({\n componentId: id.toString(),\n aspects: this.scope.legacyScope.objects.unmergedComponents.getEntry(id)?.mergedConfig,\n })),\n {\n message: snapMessage,\n build,\n lane: laneId?.toString(),\n updatedLegacyComponents: updatedComponents,\n }\n );\n return { ...results, autoSnappedResults: [] };\n }\n return this.snapping.snap({\n legacyBitIds: ids,\n build,\n message: snapMessage,\n });\n }\n\n private async tagAllLaneComponent(\n idsToTag: ComponentID[],\n tagMessage?: string,\n build?: boolean\n ): 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(pattern?: string): Promise<ComponentID[]> {\n if (pattern) {\n const componentIds = await this.workspace.idsByPattern(pattern);\n componentIds.forEach((id) => {\n const entry = this.workspace.consumer.scope.objects.unmergedComponents.getEntry(id);\n if (!entry) {\n throw new BitError(`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 BitError(`all components are resolved already, nothing to do`);\n return unresolvedComponents.map((u) => ComponentID.fromObject(u.id));\n }\n\n private async getComponentsToMerge(pattern?: string): Promise<ComponentID[]> {\n if (pattern) {\n return this.workspace.idsByPattern(pattern);\n }\n const mergePending = await this.listMergePendingComponents();\n return mergePending.map((c) => c.id);\n }\n\n async listMergePendingComponents(componentsList?: ComponentsList): Promise<DivergedComponent[]> {\n const consumer = this.workspace.consumer;\n componentsList = componentsList || new ComponentsList(this.workspace);\n const allIds = consumer.bitMap.getAllIdsAvailableOnLaneIncludeRemoved();\n const componentsFromModel = await componentsList.getModelComponents();\n const duringMergeComps = componentsList.listDuringMergeStateComponents();\n const mergePendingComponents = await Promise.all(\n allIds.map(async (componentId: ComponentID) => {\n const modelComponent = componentsFromModel.find((c) => c.toComponentId().isEqualWithoutVersion(componentId));\n if (!modelComponent || duringMergeComps.hasWithoutVersion(componentId)) return null;\n const divergedData = await modelComponent.getDivergeDataForMergePending(consumer.scope.objects);\n if (!divergedData.isDiverged()) return null;\n return { id: modelComponent.toComponentId(), diverge: divergedData };\n })\n );\n return compact(mergePendingComponents);\n }\n\n static slots = [];\n static dependencies = [\n CLIAspect,\n WorkspaceAspect,\n ScopeAspect,\n SnappingAspect,\n CheckoutAspect,\n InstallAspect,\n LoggerAspect,\n ComponentWriterAspect,\n ImporterAspect,\n ConfigAspect,\n RemoveAspect,\n ConfigStoreAspect,\n ConfigMergerAspect,\n DependencyResolverAspect,\n ];\n static runtime = MainRuntime;\n static async provider([\n cli,\n workspace,\n scope,\n snapping,\n checkout,\n install,\n loggerMain,\n compWriter,\n importer,\n config,\n remove,\n configStore,\n configMerger,\n depResolver,\n ]: [\n CLIMain,\n Workspace,\n ScopeMain,\n SnappingMain,\n CheckoutMain,\n InstallMain,\n LoggerMain,\n ComponentWriterMain,\n ImporterMain,\n ConfigMain,\n RemoveMain,\n ConfigStoreMain,\n ConfigMergerMain,\n DependencyResolverMain,\n ]) {\n const logger = loggerMain.createLogger(MergingAspect.id);\n const merging = new MergingMain(\n workspace,\n scope,\n install,\n snapping,\n checkout,\n logger,\n compWriter,\n importer,\n config,\n remove,\n configMerger,\n depResolver\n );\n cli.register(new MergeCmd(merging, configStore));\n return merging;\n }\n}\n\nMergingAspect.addRuntime(MergingMain);\n"],"mappings":"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","ignoreList":[]}
package/package.json CHANGED
@@ -1,12 +1,12 @@
1
1
  {
2
2
  "name": "@teambit/merging",
3
- "version": "1.0.543",
3
+ "version": "1.0.545",
4
4
  "homepage": "https://bit.cloud/teambit/component/merging",
5
5
  "main": "dist/index.js",
6
6
  "componentId": {
7
7
  "scope": "teambit.component",
8
8
  "name": "merging",
9
- "version": "1.0.543"
9
+ "version": "1.0.545"
10
10
  },
11
11
  "dependencies": {
12
12
  "chalk": "2.4.2",
@@ -17,34 +17,34 @@
17
17
  "@teambit/component-id": "1.2.2",
18
18
  "@teambit/lane-id": "0.0.312",
19
19
  "@teambit/harmony": "0.4.6",
20
- "@teambit/cli": "0.0.1120",
21
- "@teambit/config-merger": "0.0.410",
22
- "@teambit/global-config": "0.0.1123",
23
- "@teambit/legacy.constants": "0.0.10",
24
- "@teambit/git.modules.git-executable": "0.0.11",
25
- "@teambit/legacy.logger": "0.0.12",
20
+ "@teambit/cli": "0.0.1122",
21
+ "@teambit/config-merger": "0.0.412",
22
+ "@teambit/config-store": "0.0.2",
23
+ "@teambit/legacy.constants": "0.0.11",
24
+ "@teambit/git.modules.git-executable": "0.0.12",
25
+ "@teambit/legacy.logger": "0.0.14",
26
26
  "@teambit/legacy.utils": "0.0.17",
27
- "@teambit/component.snap-distance": "0.0.32",
28
- "@teambit/importer": "1.0.543",
29
- "@teambit/legacy.consumer-component": "0.0.32",
30
- "@teambit/legacy.scope": "0.0.31",
31
- "@teambit/logger": "0.0.1213",
32
- "@teambit/objects": "0.0.50",
33
- "@teambit/scope": "1.0.543",
34
- "@teambit/workspace": "1.0.543",
35
- "@teambit/checkout": "1.0.543",
36
- "@teambit/component-writer": "1.0.543",
37
- "@teambit/config": "0.0.1294",
38
- "@teambit/dependency-resolver": "1.0.543",
39
- "@teambit/install": "1.0.543",
40
- "@teambit/legacy.component-list": "0.0.85",
41
- "@teambit/legacy.consumer": "0.0.31",
42
- "@teambit/pkg.modules.component-package-name": "0.0.38",
43
- "@teambit/remove": "1.0.543",
44
- "@teambit/snapping": "1.0.543",
27
+ "@teambit/component.snap-distance": "0.0.34",
28
+ "@teambit/importer": "1.0.545",
29
+ "@teambit/legacy.consumer-component": "0.0.34",
30
+ "@teambit/legacy.scope": "0.0.33",
31
+ "@teambit/logger": "0.0.1215",
32
+ "@teambit/objects": "0.0.52",
33
+ "@teambit/scope": "1.0.545",
34
+ "@teambit/workspace": "1.0.545",
35
+ "@teambit/checkout": "1.0.545",
36
+ "@teambit/component-writer": "1.0.545",
37
+ "@teambit/config": "0.0.1296",
38
+ "@teambit/dependency-resolver": "1.0.545",
39
+ "@teambit/install": "1.0.545",
40
+ "@teambit/legacy.component-list": "0.0.87",
41
+ "@teambit/legacy.consumer": "0.0.33",
42
+ "@teambit/pkg.modules.component-package-name": "0.0.40",
43
+ "@teambit/remove": "1.0.545",
44
+ "@teambit/snapping": "1.0.545",
45
45
  "@teambit/toolbox.path.path": "0.0.8",
46
- "@teambit/legacy.cli.prompts": "0.0.15",
47
- "@teambit/component.sources": "0.0.83",
46
+ "@teambit/legacy.cli.prompts": "0.0.16",
47
+ "@teambit/component.sources": "0.0.85",
48
48
  "@teambit/toolbox.crypto.sha1": "0.0.7",
49
49
  "@teambit/toolbox.string.eol": "0.0.5"
50
50
  },