@teambit/merging 1.0.81 → 1.0.82

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.
@@ -580,9 +580,10 @@ class MergingMain {
580
580
  consumer: this.workspace.consumer,
581
581
  components: compsToWrite,
582
582
  skipDependencyInstallation: true,
583
- writeConfig: false // @todo: should write if config exists before, needs to figure out how to do it.
583
+ writeConfig: false,
584
+ // @todo: should write if config exists before, needs to figure out how to do it.
585
+ reasonForBitmapChange: 'merge'
584
586
  };
585
-
586
587
  await this.componentWriter.writeMany(manyComponentsWriterOpts);
587
588
  return componentsResults;
588
589
  }
@@ -1 +1 @@
1
- {"version":3,"names":["_cli","data","require","_semver","_interopRequireDefault","_workspace","_interopRequireWildcard","_componentsList","_mergeVersion","_snapping","_hasWildcard","_pMapSeries","_componentId","_bitError","_generalError","_laneId","_chalk","_config","_remove","_utils","_componentWriter","_importer","_logger","_globalConfig","_lodash","_dependencyResolver","_checkout","_constants","_deleteComponentFiles","_install","_mergeCmd","_merging","_configMergeResult","_mergeStatusProvider","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","obj","ownKeys","keys","getOwnPropertySymbols","o","filter","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","key","value","_toPropertyKey","configurable","writable","arg","_toPrimitive","String","input","hint","prim","Symbol","toPrimitive","undefined","res","TypeError","Number","MergingMain","constructor","workspace","install","snapping","checkout","logger","componentWriter","importer","config","remove","merge","ids","mergeStrategy","abort","resolve","noSnap","message","build","skipDependencyInstallation","OutsideWorkspaceError","consumer","mergeResults","resolveMerge","abortMerge","bitIds","getComponentsToMerge","mergeComponentsFromRemote","onDestroy","snapMessage","currentLaneId","getCurrentLaneId","currentLaneObject","getCurrentLaneObject","allComponentsStatus","getAllComponentsStatus","failedComponents","c","unchangedMessage","unchangedLegitimately","failureMsgs","map","failedComponent","chalk","bold","id","toString","red","join","BitError","mergeSnaps","laneId","localLane","tag","_mergeSnapResults","componentWithConflict","find","component","hasConflicts","getMergeStrategyInteractive","componentStatus","shouldBeRemoved","componentIdsToRemove","changeVersion","succeededComponents","componentsResults","applyVersionMultiple","allConfigMerge","compact","configMergeResult","workspaceDepsUpdates","workspaceDepsConflicts","updateWorkspaceJsoncWithDepsIfNeeded","generateConfigMergeConflictFileForAll","scope","objects","add","persist","unmergedComponents","write","writeBitMap","compBitIdsToRemove","ComponentIdList","fromArray","deleteComponentsFiles","cleanFromBitMap","componentsHasConfigMergeConflicts","some","_c$configMergeResult","leftUnresolvedConflicts","dedupe","updateExisting","import","err","error","consoleError","getSnapOrTagResults","idsToTag","results","tagAllLaneComponent","taggedComponents","autoTaggedResults","removedComponents","snappedComponents","autoSnappedResults","snapResolvedComponents","mergeSnapResults","mergeSnapError","bitMapSnapshot","bitMap","takeSnapshot","restoreFromSnapshot","components","applyVersionResult","configMergeFile","getConflictMergeFile","workspaceConflict","ConfigMergeResult","DependencyResolverAspect","conflict","unshift","configMerge","generateMergeConflictFile","addConflict","compIdStr","hasConflict","allResults","getDepsResolverResult","nonConflictDeps","nonConflictSources","_configMerge$getDepsR","mergedConfig","mergedConfigPolicy","policy","DEPENDENCIES_FIELDS","depField","pkg","force","name","includes","version","conflictDeps","conflictDepsSources","_configMerge$getDepsR2","mergedConfigConflict","notConflictedPackages","conflictedPackages","workspaceConfig","Error","depResolver","extensions","findCoreExtension","workspaceJsonUpdates","pkgName","_policy$depField","currentVer","newVer","debug","WS_DEPS_FIELDS","workspaceJsonConflicts","dependencies","peerDependencies","conflictPackagesToRemoveFromConfigMerge","conflictRaw","currentVal","otherVal","split","_policy$depField2","currentVerInWsJson","semver","satisfies","replace","isEmpty","result","_result$conflict","_result$conflict2","dep","getMergeStatus","currentLane","otherLane","options","mergeStatusProvider","MergeStatusProvider","getStatus","mapSeries","currentComponent","resolvedUnrelated","modelComponent","getModelComponent","updatedLaneId","isDefault","LaneId","from","applyVersion","remoteHead","getRef","compsToWrite","legacyCompToWrite","manyComponentsWriterOpts","writeConfig","writeMany","filesStatus","unmergedComponent","fullName","head","handleResolveUnrelated","addComponent","headOnCurrentLane","unrelated","unrelatedHead","unrelatedLaneId","addEntry","markAllFilesAsUnchanged","files","file","pathNormalizeToLinux","relative","FileStatus","unchanged","MergeOptions","ours","strategy","remoteId","idToLoad","theirs","legacyComponent","loadComponentFromModelImportIfNeeded","updateFileStatus","modifiedStatus","modifiedFiles","applyModifiedVersion","removeFilesIfNeeded","successfullyMergedConfig","getSuccessfullyMergedConfig","manual","unmergedPaths","f","filePath","setHead","markVersionAsLocal","values","getIdsForUnmerged","reset","removeComponent","abortedComponents","snap","legacyBitIds","resolvedComponents","localLaneObject","Promise","all","bitId","remoteScopeName","remoteLaneId","remoteLanes","laneIdStr","toStringWithoutVersion","getComponents","ComponentID","fromObject","tagMessage","unmodified","idsStr","componentIds","resolveMultipleComponentIds","entry","getEntry","GeneralError","unresolvedComponents","componentsList","ComponentsList","mergePending","listMergePendingComponents","hasWildcard","listComponentsByIdsWithWildcard","getParsedId","provider","cli","loggerMain","compWriter","globalConfig","createLogger","MergingAspect","merging","register","MergeCmd","exports","CLIAspect","WorkspaceAspect","SnappingAspect","CheckoutAspect","InstallAspect","LoggerAspect","ComponentWriterAspect","ImporterAspect","ConfigAspect","RemoveAspect","GlobalConfigAspect","MainRuntime","addRuntime"],"sources":["merging.main.runtime.ts"],"sourcesContent":["import { CLIAspect, CLIMain, MainRuntime } from '@teambit/cli';\nimport semver from 'semver';\nimport WorkspaceAspect, { OutsideWorkspaceError, Workspace } from '@teambit/workspace';\nimport { Consumer } from '@teambit/legacy/dist/consumer';\nimport ComponentsList from '@teambit/legacy/dist/consumer/component/components-list';\nimport {\n MergeStrategy,\n FileStatus,\n ApplyVersionResult,\n getMergeStrategyInteractive,\n MergeOptions,\n} from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport SnappingAspect, { SnapResults, SnappingMain, TagResults } from '@teambit/snapping';\nimport hasWildcard from '@teambit/legacy/dist/utils/string/has-wildcard';\nimport mapSeries from 'p-map-series';\nimport { ComponentID, ComponentIdList } from '@teambit/component-id';\nimport { BitError } from '@teambit/bit-error';\nimport GeneralError from '@teambit/legacy/dist/error/general-error';\nimport { LaneId } from '@teambit/lane-id';\nimport { AutoTagResult } from '@teambit/legacy/dist/scope/component-ops/auto-tag';\nimport { UnmergedComponent } from '@teambit/legacy/dist/scope/lanes/unmerged-components';\nimport { Lane, ModelComponent } from '@teambit/legacy/dist/scope/models';\nimport { Ref } from '@teambit/legacy/dist/scope/objects';\nimport chalk from 'chalk';\nimport { ConfigAspect, ConfigMain } from '@teambit/config';\nimport RemoveAspect, { RemoveMain } from '@teambit/remove';\nimport { pathNormalizeToLinux } from '@teambit/legacy/dist/utils';\nimport { ComponentWriterAspect, ComponentWriterMain } from '@teambit/component-writer';\nimport ConsumerComponent from '@teambit/legacy/dist/consumer/component/consumer-component';\nimport ImporterAspect, { ImporterMain } from '@teambit/importer';\nimport { Logger, LoggerAspect, LoggerMain } from '@teambit/logger';\nimport GlobalConfigAspect, { GlobalConfigMain } from '@teambit/global-config';\nimport { compact, isEmpty } from 'lodash';\nimport { MergeResultsThreeWay } from '@teambit/legacy/dist/consumer/versions-ops/merge-version/three-way-merge';\nimport { DependencyResolverAspect, WorkspacePolicyConfigKeysNames } from '@teambit/dependency-resolver';\nimport {\n ApplyVersionWithComps,\n CheckoutAspect,\n CheckoutMain,\n ComponentStatusBase,\n applyModifiedVersion,\n removeFilesIfNeeded,\n updateFileStatus,\n} from '@teambit/checkout';\nimport { DEPENDENCIES_FIELDS } from '@teambit/legacy/dist/constants';\nimport deleteComponentsFiles from '@teambit/legacy/dist/consumer/component-ops/delete-component-files';\nimport { SnapsDistance } from '@teambit/legacy/dist/scope/component-ops/snaps-distance';\nimport { InstallMain, InstallAspect } from '@teambit/install';\nimport { MergeCmd } from './merge-cmd';\nimport { MergingAspect } from './merging.aspect';\nimport { ConfigMergeResult } from './config-merge-result';\nimport { MergeStatusProvider } from './merge-status-provider';\n\ntype ResolveUnrelatedData = {\n strategy: MergeStrategy;\n headOnCurrentLane: Ref;\n unrelatedHead: Ref;\n unrelatedLaneId: LaneId;\n};\ntype PkgEntry = { name: string; version: string; force: boolean };\n\nexport type WorkspaceDepsUpdates = { [pkgName: string]: [string, string] }; // from => to\nexport type WorkspaceDepsConflicts = Record<WorkspacePolicyConfigKeysNames, Array<{ name: string; version: string }>>; // the pkg value is in a format of CONFLICT::OURS::THEIRS\n\nexport type ComponentMergeStatus = ComponentStatusBase & {\n 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\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 resolvedComponents?: ConsumerComponent[]; // relevant for bit merge --resolve\n abortedComponents?: ApplyVersionResult[]; // relevant for bit merge --abort\n mergeSnapResults?: {\n snappedComponents: ConsumerComponent[];\n autoSnappedResults: AutoTagResult[];\n removedComponents?: ComponentIdList;\n } | null;\n mergeSnapError?: Error;\n leftUnresolvedConflicts?: boolean;\n verbose?: boolean;\n newFromLane?: string[];\n newFromLaneAdded?: boolean;\n installationError?: Error; // in case the package manager failed, it won't throw, instead, it'll return error here\n compilationError?: Error; // in case the compiler failed, it won't throw, instead, it'll return error here\n workspaceDepsUpdates?: WorkspaceDepsUpdates; // in case workspace.jsonc has been updated with dependencies versions\n};\n\nexport class MergingMain {\n constructor(\n private workspace: Workspace,\n private install: InstallMain,\n private snapping: SnappingMain,\n private checkout: CheckoutMain,\n private logger: Logger,\n private componentWriter: ComponentWriterMain,\n private importer: ImporterMain,\n private config: ConfigMain,\n private remove: RemoveMain\n ) {}\n\n async merge(\n ids: string[],\n mergeStrategy: MergeStrategy,\n abort: boolean,\n resolve: boolean,\n noSnap: boolean,\n message: string,\n build: boolean,\n skipDependencyInstallation: boolean\n ): Promise<ApplyVersionResults> {\n if (!this.workspace) throw new OutsideWorkspaceError();\n const consumer: Consumer = this.workspace.consumer;\n let mergeResults;\n if (resolve) {\n mergeResults = await this.resolveMerge(ids, message, build);\n } else if (abort) {\n mergeResults = await this.abortMerge(ids);\n } else {\n const bitIds = await this.getComponentsToMerge(consumer, ids);\n mergeResults = await this.mergeComponentsFromRemote(\n consumer,\n bitIds,\n mergeStrategy,\n noSnap,\n message,\n build,\n skipDependencyInstallation\n );\n }\n await consumer.onDestroy('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 noSnap: boolean,\n snapMessage: string,\n build: boolean,\n skipDependencyInstallation: boolean\n ): Promise<ApplyVersionResults> {\n const currentLaneId = consumer.getCurrentLaneId();\n const currentLaneObject = await consumer.getCurrentLaneObject();\n const allComponentsStatus = await this.getAllComponentsStatus(bitIds, currentLaneId, currentLaneObject);\n const failedComponents = allComponentsStatus.filter((c) => c.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 laneId: currentLaneId,\n localLane: currentLaneObject,\n noSnap,\n snapMessage,\n build,\n skipDependencyInstallation,\n });\n }\n\n /**\n * merge multiple components according to the \"allComponentsStatus\".\n */\n async mergeSnaps({\n mergeStrategy,\n allComponentsStatus,\n laneId,\n localLane,\n noSnap,\n tag,\n snapMessage,\n build,\n skipDependencyInstallation,\n }: {\n mergeStrategy: MergeStrategy;\n allComponentsStatus: ComponentMergeStatus[];\n laneId: LaneId;\n localLane: Lane | null;\n noSnap: boolean;\n tag?: boolean;\n snapMessage: string;\n build: boolean;\n skipDependencyInstallation?: boolean;\n }): Promise<ApplyVersionResults> {\n const consumer = this.workspace.consumer;\n const componentWithConflict = allComponentsStatus.find(\n (component) => component.mergeResults && component.mergeResults.hasConflicts\n );\n if (componentWithConflict && !mergeStrategy) {\n mergeStrategy = await getMergeStrategyInteractive();\n }\n const failedComponents: FailedComponents[] = allComponentsStatus\n .filter((componentStatus) => componentStatus.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 componentsResults = await this.applyVersionMultiple(succeededComponents, laneId, mergeStrategy, localLane);\n\n const allConfigMerge = compact(succeededComponents.map((c) => c.configMergeResult));\n\n const { workspaceDepsUpdates, workspaceDepsConflicts } = await this.updateWorkspaceJsoncWithDepsIfNeeded(\n allConfigMerge\n );\n\n await this.generateConfigMergeConflictFileForAll(allConfigMerge, workspaceDepsConflicts);\n\n if (localLane) consumer.scope.objects.add(localLane);\n\n await consumer.scope.objects.persist(); // persist anyway, if localLane is null it should save all main heads\n\n await consumer.scope.objects.unmergedComponents.write();\n\n await consumer.writeBitMap(`merge ${laneId.toString()}`);\n\n if (componentIdsToRemove.length) {\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.consoleError(`failed installing packages, see the log for full stacktrace. error: ${err.message}`);\n }\n }\n\n const getSnapOrTagResults = async () => {\n // if one of the component has conflict, don't snap-merge. otherwise, some of the components would be snap-merged\n // and some not. besides the fact that it could by mistake tag dependent, it's a confusing state. better not snap.\n if (noSnap || leftUnresolvedConflicts || componentsHasConfigMergeConflicts) {\n return null;\n }\n if (tag) {\n const idsToTag = allComponentsStatus.map((c) => c.id);\n const results = await this.tagAllLaneComponent(idsToTag, snapMessage, build);\n if (!results) return null;\n const { taggedComponents, autoTaggedResults, removedComponents } = results;\n return { snappedComponents: taggedComponents, autoSnappedResults: autoTaggedResults, removedComponents };\n }\n return this.snapResolvedComponents(consumer, snapMessage, build);\n };\n let mergeSnapResults: ApplyVersionResults['mergeSnapResults'] = null;\n let mergeSnapError: Error | undefined;\n const bitMapSnapshot = this.workspace.bitMap.takeSnapshot();\n try {\n mergeSnapResults = await getSnapOrTagResults();\n } catch (err: any) {\n mergeSnapError = err;\n this.workspace.bitMap.restoreFromSnapshot(bitMapSnapshot);\n }\n\n return {\n components: componentsResults.map((c) => c.applyVersionResult),\n failedComponents,\n removedComponents: [...componentIdsToRemove, ...(mergeSnapResults?.removedComponents || [])],\n mergeSnapResults,\n mergeSnapError,\n leftUnresolvedConflicts,\n workspaceDepsUpdates,\n };\n }\n\n private async generateConfigMergeConflictFileForAll(\n allConfigMerge: ConfigMergeResult[],\n workspaceDepsConflicts?: WorkspaceDepsConflicts\n ) {\n const configMergeFile = this.workspace.getConflictMergeFile();\n if (workspaceDepsConflicts) {\n const workspaceConflict = new ConfigMergeResult('WORKSPACE', 'ours', 'theirs', [\n {\n id: DependencyResolverAspect.id,\n conflict: workspaceDepsConflicts,\n },\n ]);\n allConfigMerge.unshift(workspaceConflict);\n }\n allConfigMerge.forEach((configMerge) => {\n const conflict = configMerge.generateMergeConflictFile();\n if (!conflict) return;\n configMergeFile.addConflict(configMerge.compIdStr, conflict);\n });\n if (configMergeFile.hasConflict()) {\n await configMergeFile.write();\n }\n }\n\n private async updateWorkspaceJsoncWithDepsIfNeeded(\n allConfigMerge: ConfigMergeResult[]\n ): Promise<{ workspaceDepsUpdates?: WorkspaceDepsUpdates; workspaceDepsConflicts?: WorkspaceDepsConflicts }> {\n const allResults = allConfigMerge.map((c) => c.getDepsResolverResult());\n\n // aggregate all dependencies that can be updated (not conflicting)\n const nonConflictDeps: { [pkgName: string]: string[] } = {};\n const nonConflictSources: { [pkgName: string]: string[] } = {}; // for logging/debugging purposes\n allConfigMerge.forEach((configMerge) => {\n const mergedConfig = configMerge.getDepsResolverResult()?.mergedConfig;\n if (!mergedConfig || mergedConfig === '-') return;\n const mergedConfigPolicy = mergedConfig.policy || {};\n DEPENDENCIES_FIELDS.forEach((depField) => {\n if (!mergedConfigPolicy[depField]) return;\n mergedConfigPolicy[depField].forEach((pkg: PkgEntry) => {\n if (pkg.force) return; // we only care about auto-detected dependencies\n if (nonConflictDeps[pkg.name]) {\n if (!nonConflictDeps[pkg.name].includes(pkg.version)) nonConflictDeps[pkg.name].push(pkg.version);\n nonConflictSources[pkg.name].push(configMerge.compIdStr);\n return;\n }\n nonConflictDeps[pkg.name] = [pkg.version];\n nonConflictSources[pkg.name] = [configMerge.compIdStr];\n });\n });\n });\n\n // aggregate all dependencies that have conflicts\n const conflictDeps: { [pkgName: string]: string[] } = {};\n const conflictDepsSources: { [pkgName: string]: string[] } = {}; // for logging/debugging purposes\n allConfigMerge.forEach((configMerge) => {\n const mergedConfigConflict = configMerge.getDepsResolverResult()?.conflict;\n if (!mergedConfigConflict) return;\n DEPENDENCIES_FIELDS.forEach((depField) => {\n if (!mergedConfigConflict[depField]) return;\n mergedConfigConflict[depField].forEach((pkg: PkgEntry) => {\n if (pkg.force) return; // we only care about auto-detected dependencies\n if (conflictDeps[pkg.name]) {\n if (!conflictDeps[pkg.name].includes(pkg.version)) conflictDeps[pkg.name].push(pkg.version);\n conflictDepsSources[pkg.name].push(configMerge.compIdStr);\n return;\n }\n conflictDeps[pkg.name] = [pkg.version];\n conflictDepsSources[pkg.name] = [configMerge.compIdStr];\n });\n });\n });\n\n const notConflictedPackages = Object.keys(nonConflictDeps);\n const conflictedPackages = Object.keys(conflictDeps);\n if (!notConflictedPackages.length && !conflictedPackages.length) return {};\n\n const workspaceConfig = this.config.workspaceConfig;\n if (!workspaceConfig) throw new Error(`updateWorkspaceJsoncWithDepsIfNeeded unable to get workspace config`);\n const depResolver = workspaceConfig.extensions.findCoreExtension(DependencyResolverAspect.id);\n const policy = depResolver?.config.policy;\n if (!policy) {\n return {};\n }\n\n // calculate the workspace.json updates\n const workspaceJsonUpdates = {};\n notConflictedPackages.forEach((pkgName) => {\n if (nonConflictDeps[pkgName].length > 1) {\n // we only want the deps that the other lane has them in the workspace.json and that all comps use the same dep.\n return;\n }\n DEPENDENCIES_FIELDS.forEach((depField) => {\n if (!policy[depField]?.[pkgName]) return; // doesn't exists in the workspace.json\n const currentVer = policy[depField][pkgName];\n const newVer = nonConflictDeps[pkgName][0];\n if (currentVer === newVer) return;\n workspaceJsonUpdates[pkgName] = [currentVer, newVer];\n policy[depField][pkgName] = newVer;\n this.logger.debug(\n `update workspace.jsonc: ${pkgName} from ${currentVer} to ${newVer}. Triggered by: ${nonConflictSources[\n pkgName\n ].join(', ')}`\n );\n });\n });\n\n // calculate the workspace.json conflicts\n const WS_DEPS_FIELDS = ['dependencies', 'peerDependencies'];\n const workspaceJsonConflicts = { dependencies: [], peerDependencies: [] };\n const conflictPackagesToRemoveFromConfigMerge: string[] = [];\n conflictedPackages.forEach((pkgName) => {\n if (conflictDeps[pkgName].length > 1) {\n // we only want the deps that the other lane has them in the workspace.json and that all comps use the same dep.\n return;\n }\n const conflictRaw = conflictDeps[pkgName][0];\n const [, currentVal, otherVal] = conflictRaw.split('::');\n\n WS_DEPS_FIELDS.forEach((depField) => {\n if (!policy[depField]?.[pkgName]) return;\n const currentVerInWsJson = policy[depField][pkgName];\n if (!currentVerInWsJson) return;\n // the version is coming from the workspace.jsonc\n conflictPackagesToRemoveFromConfigMerge.push(pkgName);\n if (semver.satisfies(otherVal, currentVerInWsJson)) {\n // the other version is compatible with the current version in the workspace.json\n return;\n }\n workspaceJsonConflicts[depField].push({\n name: pkgName,\n version: conflictRaw.replace(currentVal, currentVerInWsJson),\n force: false,\n });\n conflictPackagesToRemoveFromConfigMerge.push(pkgName);\n this.logger.debug(\n `conflict workspace.jsonc: ${pkgName} current: ${currentVerInWsJson}, other: ${otherVal}. Triggered by: ${conflictDepsSources[\n pkgName\n ].join(', ')}`\n );\n });\n });\n WS_DEPS_FIELDS.forEach((depField) => {\n if (isEmpty(workspaceJsonConflicts[depField])) delete workspaceJsonConflicts[depField];\n });\n\n if (conflictPackagesToRemoveFromConfigMerge.length) {\n allResults.forEach((result) => {\n if (result?.conflict) {\n DEPENDENCIES_FIELDS.forEach((depField) => {\n if (!result.conflict?.[depField]) return;\n result.conflict[depField] = result.conflict?.[depField].filter(\n (dep) => !conflictPackagesToRemoveFromConfigMerge.includes(dep.name)\n );\n if (!result.conflict[depField].length) delete result.conflict[depField];\n });\n if (isEmpty(result.conflict)) result.conflict = undefined;\n }\n });\n }\n\n if (Object.keys(workspaceJsonUpdates).length) {\n await workspaceConfig.write();\n }\n\n this.logger.debug('final workspace.jsonc updates', workspaceJsonUpdates);\n this.logger.debug('final workspace.jsonc conflicts', workspaceJsonConflicts);\n\n return {\n workspaceDepsUpdates: Object.keys(workspaceJsonUpdates).length ? workspaceJsonUpdates : undefined,\n workspaceDepsConflicts: Object.keys(workspaceJsonConflicts).length ? workspaceJsonConflicts : undefined,\n };\n }\n\n /**\n * this function gets called from two different commands:\n * 1. \"bit merge <ids...>\", when merging a component from a remote to the local.\n * in this case, the remote and local are on the same lane or both on main.\n * 2. \"bit lane merge\", when merging from one lane to another.\n */\n async getMergeStatus(\n bitIds: ComponentID[], // the id.version is the version we want to merge to the current component\n currentLane: Lane | null, // currently checked out lane. if on main, then it's null.\n otherLane?: Lane | null, // the lane we want to merged to our lane. (null if it's \"main\").\n options?: { resolveUnrelated?: MergeStrategy; ignoreConfigChanges?: boolean }\n ): Promise<ComponentMergeStatus[]> {\n const mergeStatusProvider = new MergeStatusProvider(\n this.workspace,\n this.logger,\n this.importer,\n currentLane || undefined,\n otherLane || undefined,\n options\n );\n return mergeStatusProvider.getStatus(bitIds);\n }\n\n private async applyVersionMultiple(\n succeededComponents: ComponentMergeStatus[],\n laneId: LaneId,\n mergeStrategy: MergeStrategy,\n localLane: Lane | null\n ): Promise<ApplyVersionWithComps[]> {\n const componentsResults = await mapSeries(\n succeededComponents,\n async ({ currentComponent, id, mergeResults, resolvedUnrelated, configMergeResult }) => {\n const modelComponent = await this.workspace.consumer.scope.getModelComponent(id);\n const updatedLaneId = laneId.isDefault() ? LaneId.from(laneId.name, id.scope as string) : laneId;\n return this.applyVersion({\n currentComponent,\n id,\n mergeResults,\n mergeStrategy,\n remoteHead: modelComponent.getRef(id.version as string) as Ref,\n laneId: updatedLaneId,\n localLane,\n resolvedUnrelated,\n configMergeResult,\n });\n }\n );\n\n const compsToWrite = compact(componentsResults.map((c) => c.legacyCompToWrite));\n\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 };\n await this.componentWriter.writeMany(manyComponentsWriterOpts);\n\n return componentsResults;\n }\n\n private async applyVersion({\n currentComponent,\n id,\n mergeResults,\n mergeStrategy,\n remoteHead,\n laneId,\n localLane,\n resolvedUnrelated,\n configMergeResult,\n }: {\n currentComponent: ConsumerComponent | null | undefined;\n id: ComponentID;\n mergeResults: MergeResultsThreeWay | null | undefined;\n mergeStrategy: MergeStrategy;\n remoteHead: Ref;\n laneId: LaneId;\n localLane: Lane | null;\n resolvedUnrelated?: ResolveUnrelatedData;\n configMergeResult?: ConfigMergeResult;\n }): Promise<ApplyVersionWithComps> {\n const consumer = this.workspace.consumer;\n let filesStatus = {};\n const unmergedComponent: UnmergedComponent = {\n // @ts-ignore\n id: { name: id.fullName, scope: id.scope },\n head: remoteHead,\n laneId,\n };\n id = currentComponent ? currentComponent.id : id;\n\n const modelComponent = await consumer.scope.getModelComponent(id);\n const handleResolveUnrelated = (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 (!localLane) throw new Error('localLane must be defined when resolvedUnrelated');\n if (!resolvedUnrelated) throw new Error('resolvedUnrelated must be populated');\n localLane.addComponent({ id, head: resolvedUnrelated.headOnCurrentLane });\n unmergedComponent.unrelated = {\n unrelatedHead: resolvedUnrelated.unrelatedHead,\n headOnCurrentLane: resolvedUnrelated.headOnCurrentLane,\n unrelatedLaneId: resolvedUnrelated.unrelatedLaneId,\n };\n consumer.scope.objects.unmergedComponents.addEntry(unmergedComponent);\n return { applyVersionResult: { id, filesStatus }, component: currentComponent, 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 consumer.scope.objects.unmergedComponents.addEntry(unmergedComponent);\n return { applyVersionResult: { id, filesStatus }, component: currentComponent || undefined };\n }\n if (resolvedUnrelated?.strategy === 'ours') {\n markAllFilesAsUnchanged();\n return handleResolveUnrelated();\n }\n const remoteId = id.changeVersion(remoteHead.toString());\n const idToLoad = !mergeResults || mergeStrategy === MergeOptions.theirs ? remoteId : id;\n const legacyComponent = await consumer.loadComponentFromModelImportIfNeeded(idToLoad);\n if (mergeResults && mergeStrategy === MergeOptions.theirs) {\n // in this case, we don't want to update .bitmap with the version of the remote. we want to keep the same version\n legacyComponent.version = id.version;\n }\n const files = legacyComponent.files;\n updateFileStatus(files, filesStatus, currentComponent || undefined);\n\n if (mergeResults) {\n // update files according to the merge results\n const { filesStatus: modifiedStatus, modifiedFiles } = applyModifiedVersion(files, mergeResults, mergeStrategy);\n legacyComponent.files = modifiedFiles;\n filesStatus = { ...filesStatus, ...modifiedStatus };\n }\n\n await removeFilesIfNeeded(filesStatus, currentComponent || undefined);\n\n 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 consumer.scope.objects.unmergedComponents.addEntry(unmergedComponent);\n } else if (localLane) {\n if (resolvedUnrelated) {\n // must be \"theirs\"\n return handleResolveUnrelated(legacyComponent);\n }\n localLane.addComponent({ id, head: remoteHead });\n } else {\n // this is main\n modelComponent.setHead(remoteHead);\n // mark it as local, otherwise, when importing this component from a remote, it'll override it.\n modelComponent.markVersionAsLocal(remoteHead.toString());\n consumer.scope.objects.add(modelComponent);\n }\n\n return {\n applyVersionResult: { id, filesStatus },\n component: currentComponent || undefined,\n legacyCompToWrite: legacyComponent,\n };\n }\n\n private async abortMerge(values: string[]): Promise<ApplyVersionResults> {\n const consumer = this.workspace.consumer;\n const ids = await this.getIdsForUnmerged(values);\n const results = await this.checkout.checkout({ ids, reset: true });\n ids.forEach((id) => consumer.scope.objects.unmergedComponents.removeComponent(id.fullName));\n await consumer.scope.objects.unmergedComponents.write();\n return { abortedComponents: results.components };\n }\n\n private async resolveMerge(values: string[], snapMessage: string, build: boolean): Promise<ApplyVersionResults> {\n const ids = await this.getIdsForUnmerged(values);\n // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n const { snappedComponents } = await this.snapping.snap({\n legacyBitIds: 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 | null\n ): Promise<ComponentMergeStatus[]> {\n const ids = await Promise.all(\n bitIds.map(async (bitId) => {\n const remoteScopeName = laneId.isDefault() ? bitId.scope : laneId.scope;\n const remoteLaneId = LaneId.from(laneId.name, remoteScopeName as string);\n const remoteHead = await this.workspace.consumer.scope.objects.remoteLanes.getRef(remoteLaneId, bitId);\n const laneIdStr = remoteLaneId.toString();\n if (!remoteHead) {\n throw new BitError(`unable to find a remote head of \"${bitId.toStringWithoutVersion()}\" in \"${laneIdStr}\"`);\n }\n return bitId.changeVersion(remoteHead.toString());\n })\n );\n\n return this.getMergeStatus(ids, localLaneObject, localLaneObject);\n }\n\n private async snapResolvedComponents(\n consumer: Consumer,\n snapMessage: string,\n build: boolean\n ): Promise<SnapResults | null> {\n const unmergedComponents = consumer.scope.objects.unmergedComponents.getComponents();\n this.logger.debug(`merge-snaps, snapResolvedComponents, total ${unmergedComponents.length.toString()} components`);\n if (!unmergedComponents.length) return null;\n const ids = ComponentIdList.fromArray(unmergedComponents.map((r) => ComponentID.fromObject(r.id)));\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(idsStr?: string[]): Promise<ComponentID[]> {\n if (idsStr && idsStr.length) {\n const componentIds = await this.workspace.resolveMultipleComponentIds(idsStr);\n componentIds.forEach((id) => {\n const entry = this.workspace.consumer.scope.objects.unmergedComponents.getEntry(id.fullName);\n if (!entry) {\n throw new GeneralError(`unable to merge-resolve ${id.toString()}, it is not marked as unresolved`);\n }\n });\n return componentIds;\n }\n const unresolvedComponents = this.workspace.consumer.scope.objects.unmergedComponents.getComponents();\n if (!unresolvedComponents.length) throw new GeneralError(`all components are resolved already, nothing to do`);\n return unresolvedComponents.map((u) => ComponentID.fromObject(u.id));\n }\n\n private async getComponentsToMerge(consumer: Consumer, ids: string[]): Promise<ComponentID[]> {\n const componentsList = new ComponentsList(consumer);\n if (!ids.length) {\n const mergePending = await componentsList.listMergePendingComponents();\n return mergePending.map((c) => c.id);\n }\n if (hasWildcard(ids)) {\n return componentsList.listComponentsByIdsWithWildcard(ids);\n }\n return ids.map((id) => consumer.getParsedId(id));\n }\n\n static slots = [];\n static dependencies = [\n CLIAspect,\n WorkspaceAspect,\n SnappingAspect,\n CheckoutAspect,\n InstallAspect,\n LoggerAspect,\n ComponentWriterAspect,\n ImporterAspect,\n ConfigAspect,\n RemoveAspect,\n GlobalConfigAspect,\n ];\n static runtime = MainRuntime;\n static async provider([\n cli,\n workspace,\n snapping,\n checkout,\n install,\n loggerMain,\n compWriter,\n importer,\n config,\n remove,\n globalConfig,\n ]: [\n CLIMain,\n Workspace,\n SnappingMain,\n CheckoutMain,\n InstallMain,\n LoggerMain,\n ComponentWriterMain,\n ImporterMain,\n ConfigMain,\n RemoveMain,\n GlobalConfigMain\n ]) {\n const logger = loggerMain.createLogger(MergingAspect.id);\n const merging = new MergingMain(\n workspace,\n install,\n snapping,\n checkout,\n logger,\n compWriter,\n importer,\n config,\n remove\n );\n cli.register(new MergeCmd(merging, 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,QAAA;EAAA,MAAAF,IAAA,GAAAG,sBAAA,CAAAF,OAAA;EAAAC,OAAA,YAAAA,CAAA;IAAA,OAAAF,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAI,WAAA;EAAA,MAAAJ,IAAA,GAAAK,uBAAA,CAAAJ,OAAA;EAAAG,UAAA,YAAAA,CAAA;IAAA,OAAAJ,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAEA,SAAAM,gBAAA;EAAA,MAAAN,IAAA,GAAAG,sBAAA,CAAAF,OAAA;EAAAK,eAAA,YAAAA,CAAA;IAAA,OAAAN,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAO,cAAA;EAAA,MAAAP,IAAA,GAAAC,OAAA;EAAAM,aAAA,YAAAA,CAAA;IAAA,OAAAP,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAOA,SAAAQ,UAAA;EAAA,MAAAR,IAAA,GAAAG,sBAAA,CAAAF,OAAA;EAAAO,SAAA,YAAAA,CAAA;IAAA,OAAAR,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAS,aAAA;EAAA,MAAAT,IAAA,GAAAG,sBAAA,CAAAF,OAAA;EAAAQ,YAAA,YAAAA,CAAA;IAAA,OAAAT,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAU,YAAA;EAAA,MAAAV,IAAA,GAAAG,sBAAA,CAAAF,OAAA;EAAAS,WAAA,YAAAA,CAAA;IAAA,OAAAV,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAW,aAAA;EAAA,MAAAX,IAAA,GAAAC,OAAA;EAAAU,YAAA,YAAAA,CAAA;IAAA,OAAAX,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAY,UAAA;EAAA,MAAAZ,IAAA,GAAAC,OAAA;EAAAW,SAAA,YAAAA,CAAA;IAAA,OAAAZ,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAa,cAAA;EAAA,MAAAb,IAAA,GAAAG,sBAAA,CAAAF,OAAA;EAAAY,aAAA,YAAAA,CAAA;IAAA,OAAAb,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAc,QAAA;EAAA,MAAAd,IAAA,GAAAC,OAAA;EAAAa,OAAA,YAAAA,CAAA;IAAA,OAAAd,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAKA,SAAAe,OAAA;EAAA,MAAAf,IAAA,GAAAG,sBAAA,CAAAF,OAAA;EAAAc,MAAA,YAAAA,CAAA;IAAA,OAAAf,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAgB,QAAA;EAAA,MAAAhB,IAAA,GAAAC,OAAA;EAAAe,OAAA,YAAAA,CAAA;IAAA,OAAAhB,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAiB,QAAA;EAAA,MAAAjB,IAAA,GAAAG,sBAAA,CAAAF,OAAA;EAAAgB,OAAA,YAAAA,CAAA;IAAA,OAAAjB,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAkB,OAAA;EAAA,MAAAlB,IAAA,GAAAC,OAAA;EAAAiB,MAAA,YAAAA,CAAA;IAAA,OAAAlB,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAmB,iBAAA;EAAA,MAAAnB,IAAA,GAAAC,OAAA;EAAAkB,gBAAA,YAAAA,CAAA;IAAA,OAAAnB,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAEA,SAAAoB,UAAA;EAAA,MAAApB,IAAA,GAAAG,sBAAA,CAAAF,OAAA;EAAAmB,SAAA,YAAAA,CAAA;IAAA,OAAApB,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAqB,QAAA;EAAA,MAAArB,IAAA,GAAAC,OAAA;EAAAoB,OAAA,YAAAA,CAAA;IAAA,OAAArB,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAsB,cAAA;EAAA,MAAAtB,IAAA,GAAAG,sBAAA,CAAAF,OAAA;EAAAqB,aAAA,YAAAA,CAAA;IAAA,OAAAtB,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAuB,QAAA;EAAA,MAAAvB,IAAA,GAAAC,OAAA;EAAAsB,OAAA,YAAAA,CAAA;IAAA,OAAAvB,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAEA,SAAAwB,oBAAA;EAAA,MAAAxB,IAAA,GAAAC,OAAA;EAAAuB,mBAAA,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;AASA,SAAA0B,WAAA;EAAA,MAAA1B,IAAA,GAAAC,OAAA;EAAAyB,UAAA,YAAAA,CAAA;IAAA,OAAA1B,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAA2B,sBAAA;EAAA,MAAA3B,IAAA,GAAAG,sBAAA,CAAAF,OAAA;EAAA0B,qBAAA,YAAAA,CAAA;IAAA,OAAA3B,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAEA,SAAA4B,SAAA;EAAA,MAAA5B,IAAA,GAAAC,OAAA;EAAA2B,QAAA,YAAAA,CAAA;IAAA,OAAA5B,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAA6B,UAAA;EAAA,MAAA7B,IAAA,GAAAC,OAAA;EAAA4B,SAAA,YAAAA,CAAA;IAAA,OAAA7B,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAA8B,SAAA;EAAA,MAAA9B,IAAA,GAAAC,OAAA;EAAA6B,QAAA,YAAAA,CAAA;IAAA,OAAA9B,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAA+B,mBAAA;EAAA,MAAA/B,IAAA,GAAAC,OAAA;EAAA8B,kBAAA,YAAAA,CAAA;IAAA,OAAA/B,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAgC,qBAAA;EAAA,MAAAhC,IAAA,GAAAC,OAAA;EAAA+B,oBAAA,YAAAA,CAAA;IAAA,OAAAhC,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAA8D,SAAAiC,yBAAAC,CAAA,6BAAAC,OAAA,mBAAAC,CAAA,OAAAD,OAAA,IAAAE,CAAA,OAAAF,OAAA,YAAAF,wBAAA,YAAAA,CAAAC,CAAA,WAAAA,CAAA,GAAAG,CAAA,GAAAD,CAAA,KAAAF,CAAA;AAAA,SAAA7B,wBAAA6B,CAAA,EAAAE,CAAA,SAAAA,CAAA,IAAAF,CAAA,IAAAA,CAAA,CAAAI,UAAA,SAAAJ,CAAA,eAAAA,CAAA,uBAAAA,CAAA,yBAAAA,CAAA,WAAAK,OAAA,EAAAL,CAAA,QAAAG,CAAA,GAAAJ,wBAAA,CAAAG,CAAA,OAAAC,CAAA,IAAAA,CAAA,CAAAG,GAAA,CAAAN,CAAA,UAAAG,CAAA,CAAAI,GAAA,CAAAP,CAAA,OAAAQ,CAAA,KAAAC,SAAA,UAAAC,CAAA,GAAAC,MAAA,CAAAC,cAAA,IAAAD,MAAA,CAAAE,wBAAA,WAAAC,CAAA,IAAAd,CAAA,oBAAAc,CAAA,IAAAH,MAAA,CAAAI,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAjB,CAAA,EAAAc,CAAA,SAAAI,CAAA,GAAAR,CAAA,GAAAC,MAAA,CAAAE,wBAAA,CAAAb,CAAA,EAAAc,CAAA,UAAAI,CAAA,KAAAA,CAAA,CAAAX,GAAA,IAAAW,CAAA,CAAAC,GAAA,IAAAR,MAAA,CAAAC,cAAA,CAAAJ,CAAA,EAAAM,CAAA,EAAAI,CAAA,IAAAV,CAAA,CAAAM,CAAA,IAAAd,CAAA,CAAAc,CAAA,YAAAN,CAAA,CAAAH,OAAA,GAAAL,CAAA,EAAAG,CAAA,IAAAA,CAAA,CAAAgB,GAAA,CAAAnB,CAAA,EAAAQ,CAAA,GAAAA,CAAA;AAAA,SAAAvC,uBAAAmD,GAAA,WAAAA,GAAA,IAAAA,GAAA,CAAAhB,UAAA,GAAAgB,GAAA,KAAAf,OAAA,EAAAe,GAAA;AAAA,SAAAC,QAAArB,CAAA,EAAAE,CAAA,QAAAC,CAAA,GAAAQ,MAAA,CAAAW,IAAA,CAAAtB,CAAA,OAAAW,MAAA,CAAAY,qBAAA,QAAAC,CAAA,GAAAb,MAAA,CAAAY,qBAAA,CAAAvB,CAAA,GAAAE,CAAA,KAAAsB,CAAA,GAAAA,CAAA,CAAAC,MAAA,WAAAvB,CAAA,WAAAS,MAAA,CAAAE,wBAAA,CAAAb,CAAA,EAAAE,CAAA,EAAAwB,UAAA,OAAAvB,CAAA,CAAAwB,IAAA,CAAAC,KAAA,CAAAzB,CAAA,EAAAqB,CAAA,YAAArB,CAAA;AAAA,SAAA0B,cAAA7B,CAAA,aAAAE,CAAA,MAAAA,CAAA,GAAA4B,SAAA,CAAAC,MAAA,EAAA7B,CAAA,UAAAC,CAAA,WAAA2B,SAAA,CAAA5B,CAAA,IAAA4B,SAAA,CAAA5B,CAAA,QAAAA,CAAA,OAAAmB,OAAA,CAAAV,MAAA,CAAAR,CAAA,OAAA6B,OAAA,WAAA9B,CAAA,IAAA+B,eAAA,CAAAjC,CAAA,EAAAE,CAAA,EAAAC,CAAA,CAAAD,CAAA,SAAAS,MAAA,CAAAuB,yBAAA,GAAAvB,MAAA,CAAAwB,gBAAA,CAAAnC,CAAA,EAAAW,MAAA,CAAAuB,yBAAA,CAAA/B,CAAA,KAAAkB,OAAA,CAAAV,MAAA,CAAAR,CAAA,GAAA6B,OAAA,WAAA9B,CAAA,IAAAS,MAAA,CAAAC,cAAA,CAAAZ,CAAA,EAAAE,CAAA,EAAAS,MAAA,CAAAE,wBAAA,CAAAV,CAAA,EAAAD,CAAA,iBAAAF,CAAA;AAAA,SAAAiC,gBAAAb,GAAA,EAAAgB,GAAA,EAAAC,KAAA,IAAAD,GAAA,GAAAE,cAAA,CAAAF,GAAA,OAAAA,GAAA,IAAAhB,GAAA,IAAAT,MAAA,CAAAC,cAAA,CAAAQ,GAAA,EAAAgB,GAAA,IAAAC,KAAA,EAAAA,KAAA,EAAAX,UAAA,QAAAa,YAAA,QAAAC,QAAA,oBAAApB,GAAA,CAAAgB,GAAA,IAAAC,KAAA,WAAAjB,GAAA;AAAA,SAAAkB,eAAAG,GAAA,QAAAL,GAAA,GAAAM,YAAA,CAAAD,GAAA,2BAAAL,GAAA,gBAAAA,GAAA,GAAAO,MAAA,CAAAP,GAAA;AAAA,SAAAM,aAAAE,KAAA,EAAAC,IAAA,eAAAD,KAAA,iBAAAA,KAAA,kBAAAA,KAAA,MAAAE,IAAA,GAAAF,KAAA,CAAAG,MAAA,CAAAC,WAAA,OAAAF,IAAA,KAAAG,SAAA,QAAAC,GAAA,GAAAJ,IAAA,CAAA7B,IAAA,CAAA2B,KAAA,EAAAC,IAAA,2BAAAK,GAAA,sBAAAA,GAAA,YAAAC,SAAA,4DAAAN,IAAA,gBAAAF,MAAA,GAAAS,MAAA,EAAAR,KAAA;AAUc;AAC2C;;AA4ChH,MAAMS,WAAW,CAAC;EACvBC,WAAWA,CACDC,SAAoB,EACpBC,OAAoB,EACpBC,QAAsB,EACtBC,QAAsB,EACtBC,MAAc,EACdC,eAAoC,EACpCC,QAAsB,EACtBC,MAAkB,EAClBC,MAAkB,EAC1B;IAAA,KATQR,SAAoB,GAApBA,SAAoB;IAAA,KACpBC,OAAoB,GAApBA,OAAoB;IAAA,KACpBC,QAAsB,GAAtBA,QAAsB;IAAA,KACtBC,QAAsB,GAAtBA,QAAsB;IAAA,KACtBC,MAAc,GAAdA,MAAc;IAAA,KACdC,eAAoC,GAApCA,eAAoC;IAAA,KACpCC,QAAsB,GAAtBA,QAAsB;IAAA,KACtBC,MAAkB,GAAlBA,MAAkB;IAAA,KAClBC,MAAkB,GAAlBA,MAAkB;EACzB;EAEH,MAAMC,KAAKA,CACTC,GAAa,EACbC,aAA4B,EAC5BC,KAAc,EACdC,OAAgB,EAChBC,MAAe,EACfC,OAAe,EACfC,KAAc,EACdC,0BAAmC,EACL;IAC9B,IAAI,CAAC,IAAI,CAACjB,SAAS,EAAE,MAAM,KAAIkB,kCAAqB,EAAC,CAAC;IACtD,MAAMC,QAAkB,GAAG,IAAI,CAACnB,SAAS,CAACmB,QAAQ;IAClD,IAAIC,YAAY;IAChB,IAAIP,OAAO,EAAE;MACXO,YAAY,GAAG,MAAM,IAAI,CAACC,YAAY,CAACX,GAAG,EAAEK,OAAO,EAAEC,KAAK,CAAC;IAC7D,CAAC,MAAM,IAAIJ,KAAK,EAAE;MAChBQ,YAAY,GAAG,MAAM,IAAI,CAACE,UAAU,CAACZ,GAAG,CAAC;IAC3C,CAAC,MAAM;MACL,MAAMa,MAAM,GAAG,MAAM,IAAI,CAACC,oBAAoB,CAACL,QAAQ,EAAET,GAAG,CAAC;MAC7DU,YAAY,GAAG,MAAM,IAAI,CAACK,yBAAyB,CACjDN,QAAQ,EACRI,MAAM,EACNZ,aAAa,EACbG,MAAM,EACNC,OAAO,EACPC,KAAK,EACLC,0BACF,CAAC;IACH;IACA,MAAME,QAAQ,CAACO,SAAS,CAAC,OAAO,CAAC;IACjC,OAAON,YAAY;EACrB;;EAEA;AACF;AACA;AACA;EACE,MAAMK,yBAAyBA,CAC7BN,QAAkB,EAClBI,MAAqB,EACrBZ,aAA4B,EAC5BG,MAAe,EACfa,WAAmB,EACnBX,KAAc,EACdC,0BAAmC,EACL;IAC9B,MAAMW,aAAa,GAAGT,QAAQ,CAACU,gBAAgB,CAAC,CAAC;IACjD,MAAMC,iBAAiB,GAAG,MAAMX,QAAQ,CAACY,oBAAoB,CAAC,CAAC;IAC/D,MAAMC,mBAAmB,GAAG,MAAM,IAAI,CAACC,sBAAsB,CAACV,MAAM,EAAEK,aAAa,EAAEE,iBAAiB,CAAC;IACvG,MAAMI,gBAAgB,GAAGF,mBAAmB,CAAC9D,MAAM,CAAEiE,CAAC,IAAKA,CAAC,CAACC,gBAAgB,IAAI,CAACD,CAAC,CAACE,qBAAqB,CAAC;IAC1G,IAAIH,gBAAgB,CAAC1D,MAAM,EAAE;MAC3B,MAAM8D,WAAW,GAAGJ,gBAAgB,CACjCK,GAAG,CACDC,eAAe,IACb,GAAEC,gBAAK,CAACC,IAAI,CAACF,eAAe,CAACG,EAAE,CAACC,QAAQ,CAAC,CAAC,CAAE,MAAKH,gBAAK,CAACI,GAAG,CAACL,eAAe,CAACJ,gBAA0B,CAAE,EAC5G,CAAC,CACAU,IAAI,CAAC,IAAI,CAAC;MACb,MAAM,KAAIC,oBAAQ,EAAE,mDAAkDT,WAAY,EAAC,CAAC;IACtF;IAEA,OAAO,IAAI,CAACU,UAAU,CAAC;MACrBrC,aAAa;MACbqB,mBAAmB;MACnBiB,MAAM,EAAErB,aAAa;MACrBsB,SAAS,EAAEpB,iBAAiB;MAC5BhB,MAAM;MACNa,WAAW;MACXX,KAAK;MACLC;IACF,CAAC,CAAC;EACJ;;EAEA;AACF;AACA;EACE,MAAM+B,UAAUA,CAAC;IACfrC,aAAa;IACbqB,mBAAmB;IACnBiB,MAAM;IACNC,SAAS;IACTpC,MAAM;IACNqC,GAAG;IACHxB,WAAW;IACXX,KAAK;IACLC;EAWF,CAAC,EAAgC;IAAA,IAAAmC,iBAAA;IAC/B,MAAMjC,QAAQ,GAAG,IAAI,CAACnB,SAAS,CAACmB,QAAQ;IACxC,MAAMkC,qBAAqB,GAAGrB,mBAAmB,CAACsB,IAAI,CACnDC,SAAS,IAAKA,SAAS,CAACnC,YAAY,IAAImC,SAAS,CAACnC,YAAY,CAACoC,YAClE,CAAC;IACD,IAAIH,qBAAqB,IAAI,CAAC1C,aAAa,EAAE;MAC3CA,aAAa,GAAG,MAAM,IAAA8C,2CAA2B,EAAC,CAAC;IACrD;IACA,MAAMvB,gBAAoC,GAAGF,mBAAmB,CAC7D9D,MAAM,CAAEwF,eAAe,IAAKA,eAAe,CAACtB,gBAAgB,CAAC,CAC7DlE,MAAM,CAAEwF,eAAe,IAAK,CAACA,eAAe,CAACC,eAAe,CAAC,CAC7DpB,GAAG,CAAEmB,eAAe,KAAM;MACzBf,EAAE,EAAEe,eAAe,CAACf,EAAE;MACtBP,gBAAgB,EAAEsB,eAAe,CAACtB,gBAA0B;MAC5DC,qBAAqB,EAAEqB,eAAe,CAACrB;IACzC,CAAC,CAAC,CAAC;IAEL,MAAMuB,oBAAoB,GAAG5B,mBAAmB,CAC7C9D,MAAM,CAAEwF,eAAe,IAAKA,eAAe,CAACC,eAAe,CAAC,CAC5DpB,GAAG,CAAEJ,CAAC,IAAKA,CAAC,CAACQ,EAAE,CAACkB,aAAa,CAACnE,SAAS,CAAC,CAAC;IAE5C,MAAMoE,mBAAmB,GAAG9B,mBAAmB,CAAC9D,MAAM,CAAEwF,eAAe,IAAK,CAACA,eAAe,CAACtB,gBAAgB,CAAC;IAE9G,MAAM2B,iBAAiB,GAAG,MAAM,IAAI,CAACC,oBAAoB,CAACF,mBAAmB,EAAEb,MAAM,EAAEtC,aAAa,EAAEuC,SAAS,CAAC;IAEhH,MAAMe,cAAc,GAAG,IAAAC,iBAAO,EAACJ,mBAAmB,CAACvB,GAAG,CAAEJ,CAAC,IAAKA,CAAC,CAACgC,iBAAiB,CAAC,CAAC;IAEnF,MAAM;MAAEC,oBAAoB;MAAEC;IAAuB,CAAC,GAAG,MAAM,IAAI,CAACC,oCAAoC,CACtGL,cACF,CAAC;IAED,MAAM,IAAI,CAACM,qCAAqC,CAACN,cAAc,EAAEI,sBAAsB,CAAC;IAExF,IAAInB,SAAS,EAAE/B,QAAQ,CAACqD,KAAK,CAACC,OAAO,CAACC,GAAG,CAACxB,SAAS,CAAC;IAEpD,MAAM/B,QAAQ,CAACqD,KAAK,CAACC,OAAO,CAACE,OAAO,CAAC,CAAC,CAAC,CAAC;;IAExC,MAAMxD,QAAQ,CAACqD,KAAK,CAACC,OAAO,CAACG,kBAAkB,CAACC,KAAK,CAAC,CAAC;IAEvD,MAAM1D,QAAQ,CAAC2D,WAAW,CAAE,SAAQ7B,MAAM,CAACL,QAAQ,CAAC,CAAE,EAAC,CAAC;IAExD,IAAIgB,oBAAoB,CAACpF,MAAM,EAAE;MAC/B,MAAMuG,kBAAkB,GAAGC,8BAAe,CAACC,SAAS,CAACrB,oBAAoB,CAAC;MAC1E,MAAM,IAAAsB,+BAAqB,EAAC/D,QAAQ,EAAE4D,kBAAkB,CAAC;MACzD,MAAM5D,QAAQ,CAACgE,eAAe,CAACJ,kBAAkB,CAAC;IACpD;IAEA,MAAMK,iCAAiC,GAAGpD,mBAAmB,CAACqD,IAAI,CAAElD,CAAC;MAAA,IAAAmD,oBAAA;MAAA,QAAAA,oBAAA,GAAKnD,CAAC,CAACgC,iBAAiB,cAAAmB,oBAAA,uBAAnBA,oBAAA,CAAqB9B,YAAY,CAAC,CAAC;IAAA,EAAC;IAC9G,MAAM+B,uBAAuB,GAAGlC,qBAAqB,IAAI1C,aAAa,KAAK,QAAQ;IACnF,IAAI,CAACM,0BAA0B,IAAI,CAACsE,uBAAuB,IAAI,CAACH,iCAAiC,EAAE;MACjG,IAAI;QACF,MAAM,IAAI,CAACnF,OAAO,CAACA,OAAO,CAACP,SAAS,EAAE;UACpC8F,MAAM,EAAE,IAAI;UACZC,cAAc,EAAE,KAAK;UACrBC,MAAM,EAAE;QACV,CAAC,CAAC;MACJ,CAAC,CAAC,OAAOC,GAAQ,EAAE;QACjB,IAAI,CAACvF,MAAM,CAACwF,KAAK,CAAE,4BAA2B,EAAED,GAAG,CAAC;QACpD,IAAI,CAACvF,MAAM,CAACyF,YAAY,CAAE,uEAAsEF,GAAG,CAAC5E,OAAQ,EAAC,CAAC;MAChH;IACF;IAEA,MAAM+E,mBAAmB,GAAG,MAAAA,CAAA,KAAY;MACtC;MACA;MACA,IAAIhF,MAAM,IAAIyE,uBAAuB,IAAIH,iCAAiC,EAAE;QAC1E,OAAO,IAAI;MACb;MACA,IAAIjC,GAAG,EAAE;QACP,MAAM4C,QAAQ,GAAG/D,mBAAmB,CAACO,GAAG,CAAEJ,CAAC,IAAKA,CAAC,CAACQ,EAAE,CAAC;QACrD,MAAMqD,OAAO,GAAG,MAAM,IAAI,CAACC,mBAAmB,CAACF,QAAQ,EAAEpE,WAAW,EAAEX,KAAK,CAAC;QAC5E,IAAI,CAACgF,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,CAACpF,QAAQ,EAAEQ,WAAW,EAAEX,KAAK,CAAC;IAClE,CAAC;IACD,IAAIwF,gBAAyD,GAAG,IAAI;IACpE,IAAIC,cAAiC;IACrC,MAAMC,cAAc,GAAG,IAAI,CAAC1G,SAAS,CAAC2G,MAAM,CAACC,YAAY,CAAC,CAAC;IAC3D,IAAI;MACFJ,gBAAgB,GAAG,MAAMV,mBAAmB,CAAC,CAAC;IAChD,CAAC,CAAC,OAAOH,GAAQ,EAAE;MACjBc,cAAc,GAAGd,GAAG;MACpB,IAAI,CAAC3F,SAAS,CAAC2G,MAAM,CAACE,mBAAmB,CAACH,cAAc,CAAC;IAC3D;IAEA,OAAO;MACLI,UAAU,EAAE/C,iBAAiB,CAACxB,GAAG,CAAEJ,CAAC,IAAKA,CAAC,CAAC4E,kBAAkB,CAAC;MAC9D7E,gBAAgB;MAChBkE,iBAAiB,EAAE,CAAC,GAAGxC,oBAAoB,EAAE,IAAI,EAAAR,iBAAA,GAAAoD,gBAAgB,cAAApD,iBAAA,uBAAhBA,iBAAA,CAAkBgD,iBAAiB,KAAI,EAAE,CAAC,CAAC;MAC5FI,gBAAgB;MAChBC,cAAc;MACdlB,uBAAuB;MACvBnB;IACF,CAAC;EACH;EAEA,MAAcG,qCAAqCA,CACjDN,cAAmC,EACnCI,sBAA+C,EAC/C;IACA,MAAM2C,eAAe,GAAG,IAAI,CAAChH,SAAS,CAACiH,oBAAoB,CAAC,CAAC;IAC7D,IAAI5C,sBAAsB,EAAE;MAC1B,MAAM6C,iBAAiB,GAAG,KAAIC,sCAAiB,EAAC,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,CAC7E;QACExE,EAAE,EAAEyE,8CAAwB,CAACzE,EAAE;QAC/B0E,QAAQ,EAAEhD;MACZ,CAAC,CACF,CAAC;MACFJ,cAAc,CAACqD,OAAO,CAACJ,iBAAiB,CAAC;IAC3C;IACAjD,cAAc,CAACxF,OAAO,CAAE8I,WAAW,IAAK;MACtC,MAAMF,QAAQ,GAAGE,WAAW,CAACC,yBAAyB,CAAC,CAAC;MACxD,IAAI,CAACH,QAAQ,EAAE;MACfL,eAAe,CAACS,WAAW,CAACF,WAAW,CAACG,SAAS,EAAEL,QAAQ,CAAC;IAC9D,CAAC,CAAC;IACF,IAAIL,eAAe,CAACW,WAAW,CAAC,CAAC,EAAE;MACjC,MAAMX,eAAe,CAACnC,KAAK,CAAC,CAAC;IAC/B;EACF;EAEA,MAAcP,oCAAoCA,CAChDL,cAAmC,EACwE;IAC3G,MAAM2D,UAAU,GAAG3D,cAAc,CAAC1B,GAAG,CAAEJ,CAAC,IAAKA,CAAC,CAAC0F,qBAAqB,CAAC,CAAC,CAAC;;IAEvE;IACA,MAAMC,eAAgD,GAAG,CAAC,CAAC;IAC3D,MAAMC,kBAAmD,GAAG,CAAC,CAAC,CAAC,CAAC;IAChE9D,cAAc,CAACxF,OAAO,CAAE8I,WAAW,IAAK;MAAA,IAAAS,qBAAA;MACtC,MAAMC,YAAY,IAAAD,qBAAA,GAAGT,WAAW,CAACM,qBAAqB,CAAC,CAAC,cAAAG,qBAAA,uBAAnCA,qBAAA,CAAqCC,YAAY;MACtE,IAAI,CAACA,YAAY,IAAIA,YAAY,KAAK,GAAG,EAAE;MAC3C,MAAMC,kBAAkB,GAAGD,YAAY,CAACE,MAAM,IAAI,CAAC,CAAC;MACpDC,gCAAmB,CAAC3J,OAAO,CAAE4J,QAAQ,IAAK;QACxC,IAAI,CAACH,kBAAkB,CAACG,QAAQ,CAAC,EAAE;QACnCH,kBAAkB,CAACG,QAAQ,CAAC,CAAC5J,OAAO,CAAE6J,GAAa,IAAK;UACtD,IAAIA,GAAG,CAACC,KAAK,EAAE,OAAO,CAAC;UACvB,IAAIT,eAAe,CAACQ,GAAG,CAACE,IAAI,CAAC,EAAE;YAC7B,IAAI,CAACV,eAAe,CAACQ,GAAG,CAACE,IAAI,CAAC,CAACC,QAAQ,CAACH,GAAG,CAACI,OAAO,CAAC,EAAEZ,eAAe,CAACQ,GAAG,CAACE,IAAI,CAAC,CAACpK,IAAI,CAACkK,GAAG,CAACI,OAAO,CAAC;YACjGX,kBAAkB,CAACO,GAAG,CAACE,IAAI,CAAC,CAACpK,IAAI,CAACmJ,WAAW,CAACG,SAAS,CAAC;YACxD;UACF;UACAI,eAAe,CAACQ,GAAG,CAACE,IAAI,CAAC,GAAG,CAACF,GAAG,CAACI,OAAO,CAAC;UACzCX,kBAAkB,CAACO,GAAG,CAACE,IAAI,CAAC,GAAG,CAACjB,WAAW,CAACG,SAAS,CAAC;QACxD,CAAC,CAAC;MACJ,CAAC,CAAC;IACJ,CAAC,CAAC;;IAEF;IACA,MAAMiB,YAA6C,GAAG,CAAC,CAAC;IACxD,MAAMC,mBAAoD,GAAG,CAAC,CAAC,CAAC,CAAC;IACjE3E,cAAc,CAACxF,OAAO,CAAE8I,WAAW,IAAK;MAAA,IAAAsB,sBAAA;MACtC,MAAMC,oBAAoB,IAAAD,sBAAA,GAAGtB,WAAW,CAACM,qBAAqB,CAAC,CAAC,cAAAgB,sBAAA,uBAAnCA,sBAAA,CAAqCxB,QAAQ;MAC1E,IAAI,CAACyB,oBAAoB,EAAE;MAC3BV,gCAAmB,CAAC3J,OAAO,CAAE4J,QAAQ,IAAK;QACxC,IAAI,CAACS,oBAAoB,CAACT,QAAQ,CAAC,EAAE;QACrCS,oBAAoB,CAACT,QAAQ,CAAC,CAAC5J,OAAO,CAAE6J,GAAa,IAAK;UACxD,IAAIA,GAAG,CAACC,KAAK,EAAE,OAAO,CAAC;UACvB,IAAII,YAAY,CAACL,GAAG,CAACE,IAAI,CAAC,EAAE;YAC1B,IAAI,CAACG,YAAY,CAACL,GAAG,CAACE,IAAI,CAAC,CAACC,QAAQ,CAACH,GAAG,CAACI,OAAO,CAAC,EAAEC,YAAY,CAACL,GAAG,CAACE,IAAI,CAAC,CAACpK,IAAI,CAACkK,GAAG,CAACI,OAAO,CAAC;YAC3FE,mBAAmB,CAACN,GAAG,CAACE,IAAI,CAAC,CAACpK,IAAI,CAACmJ,WAAW,CAACG,SAAS,CAAC;YACzD;UACF;UACAiB,YAAY,CAACL,GAAG,CAACE,IAAI,CAAC,GAAG,CAACF,GAAG,CAACI,OAAO,CAAC;UACtCE,mBAAmB,CAACN,GAAG,CAACE,IAAI,CAAC,GAAG,CAACjB,WAAW,CAACG,SAAS,CAAC;QACzD,CAAC,CAAC;MACJ,CAAC,CAAC;IACJ,CAAC,CAAC;IAEF,MAAMqB,qBAAqB,GAAG3L,MAAM,CAACW,IAAI,CAAC+J,eAAe,CAAC;IAC1D,MAAMkB,kBAAkB,GAAG5L,MAAM,CAACW,IAAI,CAAC4K,YAAY,CAAC;IACpD,IAAI,CAACI,qBAAqB,CAACvK,MAAM,IAAI,CAACwK,kBAAkB,CAACxK,MAAM,EAAE,OAAO,CAAC,CAAC;IAE1E,MAAMyK,eAAe,GAAG,IAAI,CAAC1I,MAAM,CAAC0I,eAAe;IACnD,IAAI,CAACA,eAAe,EAAE,MAAM,IAAIC,KAAK,CAAE,qEAAoE,CAAC;IAC5G,MAAMC,WAAW,GAAGF,eAAe,CAACG,UAAU,CAACC,iBAAiB,CAACjC,8CAAwB,CAACzE,EAAE,CAAC;IAC7F,MAAMwF,MAAM,GAAGgB,WAAW,aAAXA,WAAW,uBAAXA,WAAW,CAAE5I,MAAM,CAAC4H,MAAM;IACzC,IAAI,CAACA,MAAM,EAAE;MACX,OAAO,CAAC,CAAC;IACX;;IAEA;IACA,MAAMmB,oBAAoB,GAAG,CAAC,CAAC;IAC/BP,qBAAqB,CAACtK,OAAO,CAAE8K,OAAO,IAAK;MACzC,IAAIzB,eAAe,CAACyB,OAAO,CAAC,CAAC/K,MAAM,GAAG,CAAC,EAAE;QACvC;QACA;MACF;MACA4J,gCAAmB,CAAC3J,OAAO,CAAE4J,QAAQ,IAAK;QAAA,IAAAmB,gBAAA;QACxC,IAAI,GAAAA,gBAAA,GAACrB,MAAM,CAACE,QAAQ,CAAC,cAAAmB,gBAAA,eAAhBA,gBAAA,CAAmBD,OAAO,CAAC,GAAE,OAAO,CAAC;QAC1C,MAAME,UAAU,GAAGtB,MAAM,CAACE,QAAQ,CAAC,CAACkB,OAAO,CAAC;QAC5C,MAAMG,MAAM,GAAG5B,eAAe,CAACyB,OAAO,CAAC,CAAC,CAAC,CAAC;QAC1C,IAAIE,UAAU,KAAKC,MAAM,EAAE;QAC3BJ,oBAAoB,CAACC,OAAO,CAAC,GAAG,CAACE,UAAU,EAAEC,MAAM,CAAC;QACpDvB,MAAM,CAACE,QAAQ,CAAC,CAACkB,OAAO,CAAC,GAAGG,MAAM;QAClC,IAAI,CAACtJ,MAAM,CAACuJ,KAAK,CACd,2BAA0BJ,OAAQ,SAAQE,UAAW,OAAMC,MAAO,mBAAkB3B,kBAAkB,CACrGwB,OAAO,CACR,CAACzG,IAAI,CAAC,IAAI,CAAE,EACf,CAAC;MACH,CAAC,CAAC;IACJ,CAAC,CAAC;;IAEF;IACA,MAAM8G,cAAc,GAAG,CAAC,cAAc,EAAE,kBAAkB,CAAC;IAC3D,MAAMC,sBAAsB,GAAG;MAAEC,YAAY,EAAE,EAAE;MAAEC,gBAAgB,EAAE;IAAG,CAAC;IACzE,MAAMC,uCAAiD,GAAG,EAAE;IAC5DhB,kBAAkB,CAACvK,OAAO,CAAE8K,OAAO,IAAK;MACtC,IAAIZ,YAAY,CAACY,OAAO,CAAC,CAAC/K,MAAM,GAAG,CAAC,EAAE;QACpC;QACA;MACF;MACA,MAAMyL,WAAW,GAAGtB,YAAY,CAACY,OAAO,CAAC,CAAC,CAAC,CAAC;MAC5C,MAAM,GAAGW,UAAU,EAAEC,QAAQ,CAAC,GAAGF,WAAW,CAACG,KAAK,CAAC,IAAI,CAAC;MAExDR,cAAc,CAACnL,OAAO,CAAE4J,QAAQ,IAAK;QAAA,IAAAgC,iBAAA;QACnC,IAAI,GAAAA,iBAAA,GAAClC,MAAM,CAACE,QAAQ,CAAC,cAAAgC,iBAAA,eAAhBA,iBAAA,CAAmBd,OAAO,CAAC,GAAE;QAClC,MAAMe,kBAAkB,GAAGnC,MAAM,CAACE,QAAQ,CAAC,CAACkB,OAAO,CAAC;QACpD,IAAI,CAACe,kBAAkB,EAAE;QACzB;QACAN,uCAAuC,CAAC5L,IAAI,CAACmL,OAAO,CAAC;QACrD,IAAIgB,iBAAM,CAACC,SAAS,CAACL,QAAQ,EAAEG,kBAAkB,CAAC,EAAE;UAClD;UACA;QACF;QACAT,sBAAsB,CAACxB,QAAQ,CAAC,CAACjK,IAAI,CAAC;UACpCoK,IAAI,EAAEe,OAAO;UACbb,OAAO,EAAEuB,WAAW,CAACQ,OAAO,CAACP,UAAU,EAAEI,kBAAkB,CAAC;UAC5D/B,KAAK,EAAE;QACT,CAAC,CAAC;QACFyB,uCAAuC,CAAC5L,IAAI,CAACmL,OAAO,CAAC;QACrD,IAAI,CAACnJ,MAAM,CAACuJ,KAAK,CACd,6BAA4BJ,OAAQ,aAAYe,kBAAmB,YAAWH,QAAS,mBAAkBvB,mBAAmB,CAC3HW,OAAO,CACR,CAACzG,IAAI,CAAC,IAAI,CAAE,EACf,CAAC;MACH,CAAC,CAAC;IACJ,CAAC,CAAC;IACF8G,cAAc,CAACnL,OAAO,CAAE4J,QAAQ,IAAK;MACnC,IAAI,IAAAqC,iBAAO,EAACb,sBAAsB,CAACxB,QAAQ,CAAC,CAAC,EAAE,OAAOwB,sBAAsB,CAACxB,QAAQ,CAAC;IACxF,CAAC,CAAC;IAEF,IAAI2B,uCAAuC,CAACxL,MAAM,EAAE;MAClDoJ,UAAU,CAACnJ,OAAO,CAAEkM,MAAM,IAAK;QAC7B,IAAIA,MAAM,aAANA,MAAM,eAANA,MAAM,CAAEtD,QAAQ,EAAE;UACpBe,gCAAmB,CAAC3J,OAAO,CAAE4J,QAAQ,IAAK;YAAA,IAAAuC,gBAAA,EAAAC,iBAAA;YACxC,IAAI,GAAAD,gBAAA,GAACD,MAAM,CAACtD,QAAQ,cAAAuD,gBAAA,eAAfA,gBAAA,CAAkBvC,QAAQ,CAAC,GAAE;YAClCsC,MAAM,CAACtD,QAAQ,CAACgB,QAAQ,CAAC,IAAAwC,iBAAA,GAAGF,MAAM,CAACtD,QAAQ,cAAAwD,iBAAA,uBAAfA,iBAAA,CAAkBxC,QAAQ,CAAC,CAACnK,MAAM,CAC3D4M,GAAG,IAAK,CAACd,uCAAuC,CAACvB,QAAQ,CAACqC,GAAG,CAACtC,IAAI,CACrE,CAAC;YACD,IAAI,CAACmC,MAAM,CAACtD,QAAQ,CAACgB,QAAQ,CAAC,CAAC7J,MAAM,EAAE,OAAOmM,MAAM,CAACtD,QAAQ,CAACgB,QAAQ,CAAC;UACzE,CAAC,CAAC;UACF,IAAI,IAAAqC,iBAAO,EAACC,MAAM,CAACtD,QAAQ,CAAC,EAAEsD,MAAM,CAACtD,QAAQ,GAAG3H,SAAS;QAC3D;MACF,CAAC,CAAC;IACJ;IAEA,IAAItC,MAAM,CAACW,IAAI,CAACuL,oBAAoB,CAAC,CAAC9K,MAAM,EAAE;MAC5C,MAAMyK,eAAe,CAACpE,KAAK,CAAC,CAAC;IAC/B;IAEA,IAAI,CAACzE,MAAM,CAACuJ,KAAK,CAAC,+BAA+B,EAAEL,oBAAoB,CAAC;IACxE,IAAI,CAAClJ,MAAM,CAACuJ,KAAK,CAAC,iCAAiC,EAAEE,sBAAsB,CAAC;IAE5E,OAAO;MACLzF,oBAAoB,EAAEhH,MAAM,CAACW,IAAI,CAACuL,oBAAoB,CAAC,CAAC9K,MAAM,GAAG8K,oBAAoB,GAAG5J,SAAS;MACjG2E,sBAAsB,EAAEjH,MAAM,CAACW,IAAI,CAAC8L,sBAAsB,CAAC,CAACrL,MAAM,GAAGqL,sBAAsB,GAAGnK;IAChG,CAAC;EACH;;EAEA;AACF;AACA;AACA;AACA;AACA;EACE,MAAMqL,cAAcA,CAClBxJ,MAAqB;EAAE;EACvByJ,WAAwB;EAAE;EAC1BC,SAAuB;EAAE;EACzBC,OAA6E,EAC5C;IACjC,MAAMC,mBAAmB,GAAG,KAAIC,0CAAmB,EACjD,IAAI,CAACpL,SAAS,EACd,IAAI,CAACI,MAAM,EACX,IAAI,CAACE,QAAQ,EACb0K,WAAW,IAAItL,SAAS,EACxBuL,SAAS,IAAIvL,SAAS,EACtBwL,OACF,CAAC;IACD,OAAOC,mBAAmB,CAACE,SAAS,CAAC9J,MAAM,CAAC;EAC9C;EAEA,MAAcyC,oBAAoBA,CAChCF,mBAA2C,EAC3Cb,MAAc,EACdtC,aAA4B,EAC5BuC,SAAsB,EACY;IAClC,MAAMa,iBAAiB,GAAG,MAAM,IAAAuH,qBAAS,EACvCxH,mBAAmB,EACnB,OAAO;MAAEyH,gBAAgB;MAAE5I,EAAE;MAAEvB,YAAY;MAAEoK,iBAAiB;MAAErH;IAAkB,CAAC,KAAK;MACtF,MAAMsH,cAAc,GAAG,MAAM,IAAI,CAACzL,SAAS,CAACmB,QAAQ,CAACqD,KAAK,CAACkH,iBAAiB,CAAC/I,EAAE,CAAC;MAChF,MAAMgJ,aAAa,GAAG1I,MAAM,CAAC2I,SAAS,CAAC,CAAC,GAAGC,gBAAM,CAACC,IAAI,CAAC7I,MAAM,CAACuF,IAAI,EAAE7F,EAAE,CAAC6B,KAAe,CAAC,GAAGvB,MAAM;MAChG,OAAO,IAAI,CAAC8I,YAAY,CAAC;QACvBR,gBAAgB;QAChB5I,EAAE;QACFvB,YAAY;QACZT,aAAa;QACbqL,UAAU,EAAEP,cAAc,CAACQ,MAAM,CAACtJ,EAAE,CAAC+F,OAAiB,CAAQ;QAC9DzF,MAAM,EAAE0I,aAAa;QACrBzI,SAAS;QACTsI,iBAAiB;QACjBrH;MACF,CAAC,CAAC;IACJ,CACF,CAAC;IAED,MAAM+H,YAAY,GAAG,IAAAhI,iBAAO,EAACH,iBAAiB,CAACxB,GAAG,CAAEJ,CAAC,IAAKA,CAAC,CAACgK,iBAAiB,CAAC,CAAC;IAE/E,MAAMC,wBAAwB,GAAG;MAC/BjL,QAAQ,EAAE,IAAI,CAACnB,SAAS,CAACmB,QAAQ;MACjC2F,UAAU,EAAEoF,YAAY;MACxBjL,0BAA0B,EAAE,IAAI;MAChCoL,WAAW,EAAE,KAAK,CAAE;IACtB,CAAC;;IACD,MAAM,IAAI,CAAChM,eAAe,CAACiM,SAAS,CAACF,wBAAwB,CAAC;IAE9D,OAAOrI,iBAAiB;EAC1B;EAEA,MAAcgI,YAAYA,CAAC;IACzBR,gBAAgB;IAChB5I,EAAE;IACFvB,YAAY;IACZT,aAAa;IACbqL,UAAU;IACV/I,MAAM;IACNC,SAAS;IACTsI,iBAAiB;IACjBrH;EAWF,CAAC,EAAkC;IACjC,MAAMhD,QAAQ,GAAG,IAAI,CAACnB,SAAS,CAACmB,QAAQ;IACxC,IAAIoL,WAAW,GAAG,CAAC,CAAC;IACpB,MAAMC,iBAAoC,GAAG;MAC3C;MACA7J,EAAE,EAAE;QAAE6F,IAAI,EAAE7F,EAAE,CAAC8J,QAAQ;QAAEjI,KAAK,EAAE7B,EAAE,CAAC6B;MAAM,CAAC;MAC1CkI,IAAI,EAAEV,UAAU;MAChB/I;IACF,CAAC;IACDN,EAAE,GAAG4I,gBAAgB,GAAGA,gBAAgB,CAAC5I,EAAE,GAAGA,EAAE;IAEhD,MAAM8I,cAAc,GAAG,MAAMtK,QAAQ,CAACqD,KAAK,CAACkH,iBAAiB,CAAC/I,EAAE,CAAC;IACjE,MAAMgK,sBAAsB,GAAIR,iBAAqC,IAAK;MACxE,IAAI,CAACZ,gBAAgB,EAAE,MAAM,IAAIrC,KAAK,CAAC,yDAAyD,CAAC;MACjG;MACA;MACA,IAAI,CAAChG,SAAS,EAAE,MAAM,IAAIgG,KAAK,CAAC,kDAAkD,CAAC;MACnF,IAAI,CAACsC,iBAAiB,EAAE,MAAM,IAAItC,KAAK,CAAC,qCAAqC,CAAC;MAC9EhG,SAAS,CAAC0J,YAAY,CAAC;QAAEjK,EAAE;QAAE+J,IAAI,EAAElB,iBAAiB,CAACqB;MAAkB,CAAC,CAAC;MACzEL,iBAAiB,CAACM,SAAS,GAAG;QAC5BC,aAAa,EAAEvB,iBAAiB,CAACuB,aAAa;QAC9CF,iBAAiB,EAAErB,iBAAiB,CAACqB,iBAAiB;QACtDG,eAAe,EAAExB,iBAAiB,CAACwB;MACrC,CAAC;MACD7L,QAAQ,CAACqD,KAAK,CAACC,OAAO,CAACG,kBAAkB,CAACqI,QAAQ,CAACT,iBAAiB,CAAC;MACrE,OAAO;QAAEzF,kBAAkB,EAAE;UAAEpE,EAAE;UAAE4J;QAAY,CAAC;QAAEhJ,SAAS,EAAEgI,gBAAgB;QAAEY;MAAkB,CAAC;IACpG,CAAC;IAED,MAAMe,uBAAuB,GAAGA,CAAA,KAAM;MACpC,IAAI,CAAC3B,gBAAgB,EAAE,MAAM,IAAIrC,KAAK,CAAE,mDAAkDvG,EAAE,CAACC,QAAQ,CAAC,CAAE,EAAC,CAAC;MAC1G2I,gBAAgB,CAAC4B,KAAK,CAAC1O,OAAO,CAAE2O,IAAI,IAAK;QACvCb,WAAW,CAAC,IAAAc,6BAAoB,EAACD,IAAI,CAACE,QAAQ,CAAC,CAAC,GAAGC,0BAAU,CAACC,SAAS;MACzE,CAAC,CAAC;IACJ,CAAC;IACD,IAAIpM,YAAY,IAAIA,YAAY,CAACoC,YAAY,IAAI7C,aAAa,KAAK8M,4BAAY,CAACC,IAAI,EAAE;MACpFR,uBAAuB,CAAC,CAAC;MACzB/L,QAAQ,CAACqD,KAAK,CAACC,OAAO,CAACG,kBAAkB,CAACqI,QAAQ,CAACT,iBAAiB,CAAC;MACrE,OAAO;QAAEzF,kBAAkB,EAAE;UAAEpE,EAAE;UAAE4J;QAAY,CAAC;QAAEhJ,SAAS,EAAEgI,gBAAgB,IAAI7L;MAAU,CAAC;IAC9F;IACA,IAAI,CAAA8L,iBAAiB,aAAjBA,iBAAiB,uBAAjBA,iBAAiB,CAAEmC,QAAQ,MAAK,MAAM,EAAE;MAC1CT,uBAAuB,CAAC,CAAC;MACzB,OAAOP,sBAAsB,CAAC,CAAC;IACjC;IACA,MAAMiB,QAAQ,GAAGjL,EAAE,CAACkB,aAAa,CAACmI,UAAU,CAACpJ,QAAQ,CAAC,CAAC,CAAC;IACxD,MAAMiL,QAAQ,GAAG,CAACzM,YAAY,IAAIT,aAAa,KAAK8M,4BAAY,CAACK,MAAM,GAAGF,QAAQ,GAAGjL,EAAE;IACvF,MAAMoL,eAAe,GAAG,MAAM5M,QAAQ,CAAC6M,oCAAoC,CAACH,QAAQ,CAAC;IACrF,IAAIzM,YAAY,IAAIT,aAAa,KAAK8M,4BAAY,CAACK,MAAM,EAAE;MACzD;MACAC,eAAe,CAACrF,OAAO,GAAG/F,EAAE,CAAC+F,OAAO;IACtC;IACA,MAAMyE,KAAK,GAAGY,eAAe,CAACZ,KAAK;IACnC,IAAAc,4BAAgB,EAACd,KAAK,EAAEZ,WAAW,EAAEhB,gBAAgB,IAAI7L,SAAS,CAAC;IAEnE,IAAI0B,YAAY,EAAE;MAChB;MACA,MAAM;QAAEmL,WAAW,EAAE2B,cAAc;QAAEC;MAAc,CAAC,GAAG,IAAAC,gCAAoB,EAACjB,KAAK,EAAE/L,YAAY,EAAET,aAAa,CAAC;MAC/GoN,eAAe,CAACZ,KAAK,GAAGgB,aAAa;MACrC5B,WAAW,GAAAjO,aAAA,CAAAA,aAAA,KAAQiO,WAAW,GAAK2B,cAAc,CAAE;IACrD;IAEA,MAAM,IAAAG,+BAAmB,EAAC9B,WAAW,EAAEhB,gBAAgB,IAAI7L,SAAS,CAAC;IAErE,IAAIyE,iBAAiB,EAAE;MACrB,MAAMmK,wBAAwB,GAAGnK,iBAAiB,CAACoK,2BAA2B,CAAC,CAAC;MAChF,IAAID,wBAAwB,EAAE;QAC5B9B,iBAAiB,CAACvE,YAAY,GAAGqG,wBAAwB;QACzD;QACA;MACF;IACF;;IAEA;IACA;IACA,IAAIlN,YAAY,EAAE;MAChB,IAAIA,YAAY,CAACoC,YAAY,IAAI7C,aAAa,KAAK8M,4BAAY,CAACe,MAAM,EAAE;QACtEhC,iBAAiB,CAACiC,aAAa,GAAGrN,YAAY,CAAC+M,aAAa,CAACjQ,MAAM,CAAEwQ,CAAC,IAAKA,CAAC,CAACrH,QAAQ,CAAC,CAAC9E,GAAG,CAAEmM,CAAC,IAAKA,CAAC,CAACC,QAAQ,CAAC;MAC/G;MACAxN,QAAQ,CAACqD,KAAK,CAACC,OAAO,CAACG,kBAAkB,CAACqI,QAAQ,CAACT,iBAAiB,CAAC;IACvE,CAAC,MAAM,IAAItJ,SAAS,EAAE;MACpB,IAAIsI,iBAAiB,EAAE;QACrB;QACA,OAAOmB,sBAAsB,CAACoB,eAAe,CAAC;MAChD;MACA7K,SAAS,CAAC0J,YAAY,CAAC;QAAEjK,EAAE;QAAE+J,IAAI,EAAEV;MAAW,CAAC,CAAC;IAClD,CAAC,MAAM;MACL;MACAP,cAAc,CAACmD,OAAO,CAAC5C,UAAU,CAAC;MAClC;MACAP,cAAc,CAACoD,kBAAkB,CAAC7C,UAAU,CAACpJ,QAAQ,CAAC,CAAC,CAAC;MACxDzB,QAAQ,CAACqD,KAAK,CAACC,OAAO,CAACC,GAAG,CAAC+G,cAAc,CAAC;IAC5C;IAEA,OAAO;MACL1E,kBAAkB,EAAE;QAAEpE,EAAE;QAAE4J;MAAY,CAAC;MACvChJ,SAAS,EAAEgI,gBAAgB,IAAI7L,SAAS;MACxCyM,iBAAiB,EAAE4B;IACrB,CAAC;EACH;EAEA,MAAczM,UAAUA,CAACwN,MAAgB,EAAgC;IACvE,MAAM3N,QAAQ,GAAG,IAAI,CAACnB,SAAS,CAACmB,QAAQ;IACxC,MAAMT,GAAG,GAAG,MAAM,IAAI,CAACqO,iBAAiB,CAACD,MAAM,CAAC;IAChD,MAAM9I,OAAO,GAAG,MAAM,IAAI,CAAC7F,QAAQ,CAACA,QAAQ,CAAC;MAAEO,GAAG;MAAEsO,KAAK,EAAE;IAAK,CAAC,CAAC;IAClEtO,GAAG,CAACjC,OAAO,CAAEkE,EAAE,IAAKxB,QAAQ,CAACqD,KAAK,CAACC,OAAO,CAACG,kBAAkB,CAACqK,eAAe,CAACtM,EAAE,CAAC8J,QAAQ,CAAC,CAAC;IAC3F,MAAMtL,QAAQ,CAACqD,KAAK,CAACC,OAAO,CAACG,kBAAkB,CAACC,KAAK,CAAC,CAAC;IACvD,OAAO;MAAEqK,iBAAiB,EAAElJ,OAAO,CAACc;IAAW,CAAC;EAClD;EAEA,MAAczF,YAAYA,CAACyN,MAAgB,EAAEnN,WAAmB,EAAEX,KAAc,EAAgC;IAC9G,MAAMN,GAAG,GAAG,MAAM,IAAI,CAACqO,iBAAiB,CAACD,MAAM,CAAC;IAChD;IACA,MAAM;MAAEzI;IAAkB,CAAC,GAAG,MAAM,IAAI,CAACnG,QAAQ,CAACiP,IAAI,CAAC;MACrDC,YAAY,EAAEpK,8BAAe,CAACC,SAAS,CAACvE,GAAG,CAAC6B,GAAG,CAAEI,EAAE,IAAKA,EAAE,CAAC,CAAC;MAC5D3B,KAAK;MACLD,OAAO,EAAEY;IACX,CAAC,CAAC;IACF,OAAO;MAAE0N,kBAAkB,EAAEhJ;IAAkB,CAAC;EAClD;EAEA,MAAcpE,sBAAsBA,CAClCV,MAAqB,EACrB0B,MAAc,EACdqM,eAA4B,EACK;IACjC,MAAM5O,GAAG,GAAG,MAAM6O,OAAO,CAACC,GAAG,CAC3BjO,MAAM,CAACgB,GAAG,CAAC,MAAOkN,KAAK,IAAK;MAC1B,MAAMC,eAAe,GAAGzM,MAAM,CAAC2I,SAAS,CAAC,CAAC,GAAG6D,KAAK,CAACjL,KAAK,GAAGvB,MAAM,CAACuB,KAAK;MACvE,MAAMmL,YAAY,GAAG9D,gBAAM,CAACC,IAAI,CAAC7I,MAAM,CAACuF,IAAI,EAAEkH,eAAyB,CAAC;MACxE,MAAM1D,UAAU,GAAG,MAAM,IAAI,CAAChM,SAAS,CAACmB,QAAQ,CAACqD,KAAK,CAACC,OAAO,CAACmL,WAAW,CAAC3D,MAAM,CAAC0D,YAAY,EAAEF,KAAK,CAAC;MACtG,MAAMI,SAAS,GAAGF,YAAY,CAAC/M,QAAQ,CAAC,CAAC;MACzC,IAAI,CAACoJ,UAAU,EAAE;QACf,MAAM,KAAIjJ,oBAAQ,EAAE,oCAAmC0M,KAAK,CAACK,sBAAsB,CAAC,CAAE,SAAQD,SAAU,GAAE,CAAC;MAC7G;MACA,OAAOJ,KAAK,CAAC5L,aAAa,CAACmI,UAAU,CAACpJ,QAAQ,CAAC,CAAC,CAAC;IACnD,CAAC,CACH,CAAC;IAED,OAAO,IAAI,CAACmI,cAAc,CAACrK,GAAG,EAAE4O,eAAe,EAAEA,eAAe,CAAC;EACnE;EAEA,MAAc/I,sBAAsBA,CAClCpF,QAAkB,EAClBQ,WAAmB,EACnBX,KAAc,EACe;IAC7B,MAAM4D,kBAAkB,GAAGzD,QAAQ,CAACqD,KAAK,CAACC,OAAO,CAACG,kBAAkB,CAACmL,aAAa,CAAC,CAAC;IACpF,IAAI,CAAC3P,MAAM,CAACuJ,KAAK,CAAE,8CAA6C/E,kBAAkB,CAACpG,MAAM,CAACoE,QAAQ,CAAC,CAAE,aAAY,CAAC;IAClH,IAAI,CAACgC,kBAAkB,CAACpG,MAAM,EAAE,OAAO,IAAI;IAC3C,MAAMkC,GAAG,GAAGsE,8BAAe,CAACC,SAAS,CAACL,kBAAkB,CAACrC,GAAG,CAAE5F,CAAC,IAAKqT,0BAAW,CAACC,UAAU,CAACtT,CAAC,CAACgG,EAAE,CAAC,CAAC,CAAC;IAClG,OAAO,IAAI,CAACzC,QAAQ,CAACiP,IAAI,CAAC;MACxBC,YAAY,EAAE1O,GAAG;MACjBM,KAAK;MACLD,OAAO,EAAEY;IACX,CAAC,CAAC;EACJ;EAEA,MAAcsE,mBAAmBA,CAC/BF,QAAuB,EACvBmK,UAAkB,EAClBlP,KAAc,EACc;IAC5B,MAAMN,GAAG,GAAGqF,QAAQ,CAACxD,GAAG,CAAEI,EAAE,IAAK;MAC/B,OAAOA,EAAE,CAACmN,sBAAsB,CAAC,CAAC;IACpC,CAAC,CAAC;IACF,IAAI,CAAC1P,MAAM,CAACuJ,KAAK,CAAE,6CAA4C5D,QAAQ,CAACvH,MAAM,CAACoE,QAAQ,CAAC,CAAE,aAAY,CAAC;IACvG,OAAO,IAAI,CAAC1C,QAAQ,CAACiD,GAAG,CAAC;MACvBzC,GAAG;MACHM,KAAK;MACLD,OAAO,EAAEmP,UAAU;MACnBC,UAAU,EAAE;IACd,CAAC,CAAC;EACJ;EAEA,MAAcpB,iBAAiBA,CAACqB,MAAiB,EAA0B;IACzE,IAAIA,MAAM,IAAIA,MAAM,CAAC5R,MAAM,EAAE;MAC3B,MAAM6R,YAAY,GAAG,MAAM,IAAI,CAACrQ,SAAS,CAACsQ,2BAA2B,CAACF,MAAM,CAAC;MAC7EC,YAAY,CAAC5R,OAAO,CAAEkE,EAAE,IAAK;QAC3B,MAAM4N,KAAK,GAAG,IAAI,CAACvQ,SAAS,CAACmB,QAAQ,CAACqD,KAAK,CAACC,OAAO,CAACG,kBAAkB,CAAC4L,QAAQ,CAAC7N,EAAE,CAAC8J,QAAQ,CAAC;QAC5F,IAAI,CAAC8D,KAAK,EAAE;UACV,MAAM,KAAIE,uBAAY,EAAE,2BAA0B9N,EAAE,CAACC,QAAQ,CAAC,CAAE,kCAAiC,CAAC;QACpG;MACF,CAAC,CAAC;MACF,OAAOyN,YAAY;IACrB;IACA,MAAMK,oBAAoB,GAAG,IAAI,CAAC1Q,SAAS,CAACmB,QAAQ,CAACqD,KAAK,CAACC,OAAO,CAACG,kBAAkB,CAACmL,aAAa,CAAC,CAAC;IACrG,IAAI,CAACW,oBAAoB,CAAClS,MAAM,EAAE,MAAM,KAAIiS,uBAAY,EAAE,oDAAmD,CAAC;IAC9G,OAAOC,oBAAoB,CAACnO,GAAG,CAAEhF,CAAC,IAAKyS,0BAAW,CAACC,UAAU,CAAC1S,CAAC,CAACoF,EAAE,CAAC,CAAC;EACtE;EAEA,MAAcnB,oBAAoBA,CAACL,QAAkB,EAAET,GAAa,EAA0B;IAC5F,MAAMiQ,cAAc,GAAG,KAAIC,yBAAc,EAACzP,QAAQ,CAAC;IACnD,IAAI,CAACT,GAAG,CAAClC,MAAM,EAAE;MACf,MAAMqS,YAAY,GAAG,MAAMF,cAAc,CAACG,0BAA0B,CAAC,CAAC;MACtE,OAAOD,YAAY,CAACtO,GAAG,CAAEJ,CAAC,IAAKA,CAAC,CAACQ,EAAE,CAAC;IACtC;IACA,IAAI,IAAAoO,sBAAW,EAACrQ,GAAG,CAAC,EAAE;MACpB,OAAOiQ,cAAc,CAACK,+BAA+B,CAACtQ,GAAG,CAAC;IAC5D;IACA,OAAOA,GAAG,CAAC6B,GAAG,CAAEI,EAAE,IAAKxB,QAAQ,CAAC8P,WAAW,CAACtO,EAAE,CAAC,CAAC;EAClD;EAiBA,aAAauO,QAAQA,CAAC,CACpBC,GAAG,EACHnR,SAAS,EACTE,QAAQ,EACRC,QAAQ,EACRF,OAAO,EACPmR,UAAU,EACVC,UAAU,EACV/Q,QAAQ,EACRC,MAAM,EACNC,MAAM,EACN8Q,YAAY,CAab,EAAE;IACD,MAAMlR,MAAM,GAAGgR,UAAU,CAACG,YAAY,CAACC,wBAAa,CAAC7O,EAAE,CAAC;IACxD,MAAM8O,OAAO,GAAG,IAAI3R,WAAW,CAC7BE,SAAS,EACTC,OAAO,EACPC,QAAQ,EACRC,QAAQ,EACRC,MAAM,EACNiR,UAAU,EACV/Q,QAAQ,EACRC,MAAM,EACNC,MACF,CAAC;IACD2Q,GAAG,CAACO,QAAQ,CAAC,KAAIC,oBAAQ,EAACF,OAAO,EAAEH,YAAY,CAAC,CAAC;IACjD,OAAOG,OAAO;EAChB;AACF;AAACG,OAAA,CAAA9R,WAAA,GAAAA,WAAA;AAAApB,eAAA,CA5sBYoB,WAAW,WAqpBP,EAAE;AAAApB,eAAA,CArpBNoB,WAAW,kBAspBA,CACpB+R,gBAAS,EACTC,oBAAe,EACfC,mBAAc,EACdC,0BAAc,EACdC,wBAAa,EACbC,sBAAY,EACZC,wCAAqB,EACrBC,mBAAc,EACdC,sBAAY,EACZC,iBAAY,EACZC,uBAAkB,CACnB;AAAA7T,eAAA,CAlqBUoB,WAAW,aAmqBL0S,kBAAW;AA2C9BhB,wBAAa,CAACiB,UAAU,CAAC3S,WAAW,CAAC"}
1
+ {"version":3,"names":["_cli","data","require","_semver","_interopRequireDefault","_workspace","_interopRequireWildcard","_componentsList","_mergeVersion","_snapping","_hasWildcard","_pMapSeries","_componentId","_bitError","_generalError","_laneId","_chalk","_config","_remove","_utils","_componentWriter","_importer","_logger","_globalConfig","_lodash","_dependencyResolver","_checkout","_constants","_deleteComponentFiles","_install","_mergeCmd","_merging","_configMergeResult","_mergeStatusProvider","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","obj","ownKeys","keys","getOwnPropertySymbols","o","filter","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","key","value","_toPropertyKey","configurable","writable","arg","_toPrimitive","String","input","hint","prim","Symbol","toPrimitive","undefined","res","TypeError","Number","MergingMain","constructor","workspace","install","snapping","checkout","logger","componentWriter","importer","config","remove","merge","ids","mergeStrategy","abort","resolve","noSnap","message","build","skipDependencyInstallation","OutsideWorkspaceError","consumer","mergeResults","resolveMerge","abortMerge","bitIds","getComponentsToMerge","mergeComponentsFromRemote","onDestroy","snapMessage","currentLaneId","getCurrentLaneId","currentLaneObject","getCurrentLaneObject","allComponentsStatus","getAllComponentsStatus","failedComponents","c","unchangedMessage","unchangedLegitimately","failureMsgs","map","failedComponent","chalk","bold","id","toString","red","join","BitError","mergeSnaps","laneId","localLane","tag","_mergeSnapResults","componentWithConflict","find","component","hasConflicts","getMergeStrategyInteractive","componentStatus","shouldBeRemoved","componentIdsToRemove","changeVersion","succeededComponents","componentsResults","applyVersionMultiple","allConfigMerge","compact","configMergeResult","workspaceDepsUpdates","workspaceDepsConflicts","updateWorkspaceJsoncWithDepsIfNeeded","generateConfigMergeConflictFileForAll","scope","objects","add","persist","unmergedComponents","write","writeBitMap","compBitIdsToRemove","ComponentIdList","fromArray","deleteComponentsFiles","cleanFromBitMap","componentsHasConfigMergeConflicts","some","_c$configMergeResult","leftUnresolvedConflicts","dedupe","updateExisting","import","err","error","consoleError","getSnapOrTagResults","idsToTag","results","tagAllLaneComponent","taggedComponents","autoTaggedResults","removedComponents","snappedComponents","autoSnappedResults","snapResolvedComponents","mergeSnapResults","mergeSnapError","bitMapSnapshot","bitMap","takeSnapshot","restoreFromSnapshot","components","applyVersionResult","configMergeFile","getConflictMergeFile","workspaceConflict","ConfigMergeResult","DependencyResolverAspect","conflict","unshift","configMerge","generateMergeConflictFile","addConflict","compIdStr","hasConflict","allResults","getDepsResolverResult","nonConflictDeps","nonConflictSources","_configMerge$getDepsR","mergedConfig","mergedConfigPolicy","policy","DEPENDENCIES_FIELDS","depField","pkg","force","name","includes","version","conflictDeps","conflictDepsSources","_configMerge$getDepsR2","mergedConfigConflict","notConflictedPackages","conflictedPackages","workspaceConfig","Error","depResolver","extensions","findCoreExtension","workspaceJsonUpdates","pkgName","_policy$depField","currentVer","newVer","debug","WS_DEPS_FIELDS","workspaceJsonConflicts","dependencies","peerDependencies","conflictPackagesToRemoveFromConfigMerge","conflictRaw","currentVal","otherVal","split","_policy$depField2","currentVerInWsJson","semver","satisfies","replace","isEmpty","result","_result$conflict","_result$conflict2","dep","getMergeStatus","currentLane","otherLane","options","mergeStatusProvider","MergeStatusProvider","getStatus","mapSeries","currentComponent","resolvedUnrelated","modelComponent","getModelComponent","updatedLaneId","isDefault","LaneId","from","applyVersion","remoteHead","getRef","compsToWrite","legacyCompToWrite","manyComponentsWriterOpts","writeConfig","reasonForBitmapChange","writeMany","filesStatus","unmergedComponent","fullName","head","handleResolveUnrelated","addComponent","headOnCurrentLane","unrelated","unrelatedHead","unrelatedLaneId","addEntry","markAllFilesAsUnchanged","files","file","pathNormalizeToLinux","relative","FileStatus","unchanged","MergeOptions","ours","strategy","remoteId","idToLoad","theirs","legacyComponent","loadComponentFromModelImportIfNeeded","updateFileStatus","modifiedStatus","modifiedFiles","applyModifiedVersion","removeFilesIfNeeded","successfullyMergedConfig","getSuccessfullyMergedConfig","manual","unmergedPaths","f","filePath","setHead","markVersionAsLocal","values","getIdsForUnmerged","reset","removeComponent","abortedComponents","snap","legacyBitIds","resolvedComponents","localLaneObject","Promise","all","bitId","remoteScopeName","remoteLaneId","remoteLanes","laneIdStr","toStringWithoutVersion","getComponents","ComponentID","fromObject","tagMessage","unmodified","idsStr","componentIds","resolveMultipleComponentIds","entry","getEntry","GeneralError","unresolvedComponents","componentsList","ComponentsList","mergePending","listMergePendingComponents","hasWildcard","listComponentsByIdsWithWildcard","getParsedId","provider","cli","loggerMain","compWriter","globalConfig","createLogger","MergingAspect","merging","register","MergeCmd","exports","CLIAspect","WorkspaceAspect","SnappingAspect","CheckoutAspect","InstallAspect","LoggerAspect","ComponentWriterAspect","ImporterAspect","ConfigAspect","RemoveAspect","GlobalConfigAspect","MainRuntime","addRuntime"],"sources":["merging.main.runtime.ts"],"sourcesContent":["import { CLIAspect, CLIMain, MainRuntime } from '@teambit/cli';\nimport semver from 'semver';\nimport WorkspaceAspect, { OutsideWorkspaceError, Workspace } from '@teambit/workspace';\nimport { Consumer } from '@teambit/legacy/dist/consumer';\nimport ComponentsList from '@teambit/legacy/dist/consumer/component/components-list';\nimport {\n MergeStrategy,\n FileStatus,\n ApplyVersionResult,\n getMergeStrategyInteractive,\n MergeOptions,\n} from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport SnappingAspect, { SnapResults, SnappingMain, TagResults } from '@teambit/snapping';\nimport hasWildcard from '@teambit/legacy/dist/utils/string/has-wildcard';\nimport mapSeries from 'p-map-series';\nimport { ComponentID, ComponentIdList } from '@teambit/component-id';\nimport { BitError } from '@teambit/bit-error';\nimport GeneralError from '@teambit/legacy/dist/error/general-error';\nimport { LaneId } from '@teambit/lane-id';\nimport { AutoTagResult } from '@teambit/legacy/dist/scope/component-ops/auto-tag';\nimport { UnmergedComponent } from '@teambit/legacy/dist/scope/lanes/unmerged-components';\nimport { Lane, ModelComponent } from '@teambit/legacy/dist/scope/models';\nimport { Ref } from '@teambit/legacy/dist/scope/objects';\nimport chalk from 'chalk';\nimport { ConfigAspect, ConfigMain } from '@teambit/config';\nimport RemoveAspect, { RemoveMain } from '@teambit/remove';\nimport { pathNormalizeToLinux } from '@teambit/legacy/dist/utils';\nimport { ComponentWriterAspect, ComponentWriterMain } from '@teambit/component-writer';\nimport ConsumerComponent from '@teambit/legacy/dist/consumer/component/consumer-component';\nimport ImporterAspect, { ImporterMain } from '@teambit/importer';\nimport { Logger, LoggerAspect, LoggerMain } from '@teambit/logger';\nimport GlobalConfigAspect, { GlobalConfigMain } from '@teambit/global-config';\nimport { compact, isEmpty } from 'lodash';\nimport { MergeResultsThreeWay } from '@teambit/legacy/dist/consumer/versions-ops/merge-version/three-way-merge';\nimport { DependencyResolverAspect, WorkspacePolicyConfigKeysNames } from '@teambit/dependency-resolver';\nimport {\n ApplyVersionWithComps,\n CheckoutAspect,\n CheckoutMain,\n ComponentStatusBase,\n applyModifiedVersion,\n removeFilesIfNeeded,\n updateFileStatus,\n} from '@teambit/checkout';\nimport { DEPENDENCIES_FIELDS } from '@teambit/legacy/dist/constants';\nimport deleteComponentsFiles from '@teambit/legacy/dist/consumer/component-ops/delete-component-files';\nimport { SnapsDistance } from '@teambit/legacy/dist/scope/component-ops/snaps-distance';\nimport { InstallMain, InstallAspect } from '@teambit/install';\nimport { MergeCmd } from './merge-cmd';\nimport { MergingAspect } from './merging.aspect';\nimport { ConfigMergeResult } from './config-merge-result';\nimport { MergeStatusProvider } from './merge-status-provider';\n\ntype ResolveUnrelatedData = {\n strategy: MergeStrategy;\n headOnCurrentLane: Ref;\n unrelatedHead: Ref;\n unrelatedLaneId: LaneId;\n};\ntype PkgEntry = { name: string; version: string; force: boolean };\n\nexport type WorkspaceDepsUpdates = { [pkgName: string]: [string, string] }; // from => to\nexport type WorkspaceDepsConflicts = Record<WorkspacePolicyConfigKeysNames, Array<{ name: string; version: string }>>; // the pkg value is in a format of CONFLICT::OURS::THEIRS\n\nexport type ComponentMergeStatus = ComponentStatusBase & {\n 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\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 resolvedComponents?: ConsumerComponent[]; // relevant for bit merge --resolve\n abortedComponents?: ApplyVersionResult[]; // relevant for bit merge --abort\n mergeSnapResults?: {\n snappedComponents: ConsumerComponent[];\n autoSnappedResults: AutoTagResult[];\n removedComponents?: ComponentIdList;\n } | null;\n mergeSnapError?: Error;\n leftUnresolvedConflicts?: boolean;\n verbose?: boolean;\n newFromLane?: string[];\n newFromLaneAdded?: boolean;\n installationError?: Error; // in case the package manager failed, it won't throw, instead, it'll return error here\n compilationError?: Error; // in case the compiler failed, it won't throw, instead, it'll return error here\n workspaceDepsUpdates?: WorkspaceDepsUpdates; // in case workspace.jsonc has been updated with dependencies versions\n};\n\nexport class MergingMain {\n constructor(\n private workspace: Workspace,\n private install: InstallMain,\n private snapping: SnappingMain,\n private checkout: CheckoutMain,\n private logger: Logger,\n private componentWriter: ComponentWriterMain,\n private importer: ImporterMain,\n private config: ConfigMain,\n private remove: RemoveMain\n ) {}\n\n async merge(\n ids: string[],\n mergeStrategy: MergeStrategy,\n abort: boolean,\n resolve: boolean,\n noSnap: boolean,\n message: string,\n build: boolean,\n skipDependencyInstallation: boolean\n ): Promise<ApplyVersionResults> {\n if (!this.workspace) throw new OutsideWorkspaceError();\n const consumer: Consumer = this.workspace.consumer;\n let mergeResults;\n if (resolve) {\n mergeResults = await this.resolveMerge(ids, message, build);\n } else if (abort) {\n mergeResults = await this.abortMerge(ids);\n } else {\n const bitIds = await this.getComponentsToMerge(consumer, ids);\n mergeResults = await this.mergeComponentsFromRemote(\n consumer,\n bitIds,\n mergeStrategy,\n noSnap,\n message,\n build,\n skipDependencyInstallation\n );\n }\n await consumer.onDestroy('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 noSnap: boolean,\n snapMessage: string,\n build: boolean,\n skipDependencyInstallation: boolean\n ): Promise<ApplyVersionResults> {\n const currentLaneId = consumer.getCurrentLaneId();\n const currentLaneObject = await consumer.getCurrentLaneObject();\n const allComponentsStatus = await this.getAllComponentsStatus(bitIds, currentLaneId, currentLaneObject);\n const failedComponents = allComponentsStatus.filter((c) => c.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 laneId: currentLaneId,\n localLane: currentLaneObject,\n noSnap,\n snapMessage,\n build,\n skipDependencyInstallation,\n });\n }\n\n /**\n * merge multiple components according to the \"allComponentsStatus\".\n */\n async mergeSnaps({\n mergeStrategy,\n allComponentsStatus,\n laneId,\n localLane,\n noSnap,\n tag,\n snapMessage,\n build,\n skipDependencyInstallation,\n }: {\n mergeStrategy: MergeStrategy;\n allComponentsStatus: ComponentMergeStatus[];\n laneId: LaneId;\n localLane: Lane | null;\n noSnap: boolean;\n tag?: boolean;\n snapMessage: string;\n build: boolean;\n skipDependencyInstallation?: boolean;\n }): Promise<ApplyVersionResults> {\n const consumer = this.workspace.consumer;\n const componentWithConflict = allComponentsStatus.find(\n (component) => component.mergeResults && component.mergeResults.hasConflicts\n );\n if (componentWithConflict && !mergeStrategy) {\n mergeStrategy = await getMergeStrategyInteractive();\n }\n const failedComponents: FailedComponents[] = allComponentsStatus\n .filter((componentStatus) => componentStatus.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 componentsResults = await this.applyVersionMultiple(succeededComponents, laneId, mergeStrategy, localLane);\n\n const allConfigMerge = compact(succeededComponents.map((c) => c.configMergeResult));\n\n const { workspaceDepsUpdates, workspaceDepsConflicts } = await this.updateWorkspaceJsoncWithDepsIfNeeded(\n allConfigMerge\n );\n\n await this.generateConfigMergeConflictFileForAll(allConfigMerge, workspaceDepsConflicts);\n\n if (localLane) consumer.scope.objects.add(localLane);\n\n await consumer.scope.objects.persist(); // persist anyway, if localLane is null it should save all main heads\n\n await consumer.scope.objects.unmergedComponents.write();\n\n await consumer.writeBitMap(`merge ${laneId.toString()}`);\n\n if (componentIdsToRemove.length) {\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.consoleError(`failed installing packages, see the log for full stacktrace. error: ${err.message}`);\n }\n }\n\n const getSnapOrTagResults = async () => {\n // if one of the component has conflict, don't snap-merge. otherwise, some of the components would be snap-merged\n // and some not. besides the fact that it could by mistake tag dependent, it's a confusing state. better not snap.\n if (noSnap || leftUnresolvedConflicts || componentsHasConfigMergeConflicts) {\n return null;\n }\n if (tag) {\n const idsToTag = allComponentsStatus.map((c) => c.id);\n const results = await this.tagAllLaneComponent(idsToTag, snapMessage, build);\n if (!results) return null;\n const { taggedComponents, autoTaggedResults, removedComponents } = results;\n return { snappedComponents: taggedComponents, autoSnappedResults: autoTaggedResults, removedComponents };\n }\n return this.snapResolvedComponents(consumer, snapMessage, build);\n };\n let mergeSnapResults: ApplyVersionResults['mergeSnapResults'] = null;\n let mergeSnapError: Error | undefined;\n const bitMapSnapshot = this.workspace.bitMap.takeSnapshot();\n try {\n mergeSnapResults = await getSnapOrTagResults();\n } catch (err: any) {\n mergeSnapError = err;\n this.workspace.bitMap.restoreFromSnapshot(bitMapSnapshot);\n }\n\n return {\n components: componentsResults.map((c) => c.applyVersionResult),\n failedComponents,\n removedComponents: [...componentIdsToRemove, ...(mergeSnapResults?.removedComponents || [])],\n mergeSnapResults,\n mergeSnapError,\n leftUnresolvedConflicts,\n workspaceDepsUpdates,\n };\n }\n\n private async generateConfigMergeConflictFileForAll(\n allConfigMerge: ConfigMergeResult[],\n workspaceDepsConflicts?: WorkspaceDepsConflicts\n ) {\n const configMergeFile = this.workspace.getConflictMergeFile();\n if (workspaceDepsConflicts) {\n const workspaceConflict = new ConfigMergeResult('WORKSPACE', 'ours', 'theirs', [\n {\n id: DependencyResolverAspect.id,\n conflict: workspaceDepsConflicts,\n },\n ]);\n allConfigMerge.unshift(workspaceConflict);\n }\n allConfigMerge.forEach((configMerge) => {\n const conflict = configMerge.generateMergeConflictFile();\n if (!conflict) return;\n configMergeFile.addConflict(configMerge.compIdStr, conflict);\n });\n if (configMergeFile.hasConflict()) {\n await configMergeFile.write();\n }\n }\n\n private async updateWorkspaceJsoncWithDepsIfNeeded(\n allConfigMerge: ConfigMergeResult[]\n ): Promise<{ workspaceDepsUpdates?: WorkspaceDepsUpdates; workspaceDepsConflicts?: WorkspaceDepsConflicts }> {\n const allResults = allConfigMerge.map((c) => c.getDepsResolverResult());\n\n // aggregate all dependencies that can be updated (not conflicting)\n const nonConflictDeps: { [pkgName: string]: string[] } = {};\n const nonConflictSources: { [pkgName: string]: string[] } = {}; // for logging/debugging purposes\n allConfigMerge.forEach((configMerge) => {\n const mergedConfig = configMerge.getDepsResolverResult()?.mergedConfig;\n if (!mergedConfig || mergedConfig === '-') return;\n const mergedConfigPolicy = mergedConfig.policy || {};\n DEPENDENCIES_FIELDS.forEach((depField) => {\n if (!mergedConfigPolicy[depField]) return;\n mergedConfigPolicy[depField].forEach((pkg: PkgEntry) => {\n if (pkg.force) return; // we only care about auto-detected dependencies\n if (nonConflictDeps[pkg.name]) {\n if (!nonConflictDeps[pkg.name].includes(pkg.version)) nonConflictDeps[pkg.name].push(pkg.version);\n nonConflictSources[pkg.name].push(configMerge.compIdStr);\n return;\n }\n nonConflictDeps[pkg.name] = [pkg.version];\n nonConflictSources[pkg.name] = [configMerge.compIdStr];\n });\n });\n });\n\n // aggregate all dependencies that have conflicts\n const conflictDeps: { [pkgName: string]: string[] } = {};\n const conflictDepsSources: { [pkgName: string]: string[] } = {}; // for logging/debugging purposes\n allConfigMerge.forEach((configMerge) => {\n const mergedConfigConflict = configMerge.getDepsResolverResult()?.conflict;\n if (!mergedConfigConflict) return;\n DEPENDENCIES_FIELDS.forEach((depField) => {\n if (!mergedConfigConflict[depField]) return;\n mergedConfigConflict[depField].forEach((pkg: PkgEntry) => {\n if (pkg.force) return; // we only care about auto-detected dependencies\n if (conflictDeps[pkg.name]) {\n if (!conflictDeps[pkg.name].includes(pkg.version)) conflictDeps[pkg.name].push(pkg.version);\n conflictDepsSources[pkg.name].push(configMerge.compIdStr);\n return;\n }\n conflictDeps[pkg.name] = [pkg.version];\n conflictDepsSources[pkg.name] = [configMerge.compIdStr];\n });\n });\n });\n\n const notConflictedPackages = Object.keys(nonConflictDeps);\n const conflictedPackages = Object.keys(conflictDeps);\n if (!notConflictedPackages.length && !conflictedPackages.length) return {};\n\n const workspaceConfig = this.config.workspaceConfig;\n if (!workspaceConfig) throw new Error(`updateWorkspaceJsoncWithDepsIfNeeded unable to get workspace config`);\n const depResolver = workspaceConfig.extensions.findCoreExtension(DependencyResolverAspect.id);\n const policy = depResolver?.config.policy;\n if (!policy) {\n return {};\n }\n\n // calculate the workspace.json updates\n const workspaceJsonUpdates = {};\n notConflictedPackages.forEach((pkgName) => {\n if (nonConflictDeps[pkgName].length > 1) {\n // we only want the deps that the other lane has them in the workspace.json and that all comps use the same dep.\n return;\n }\n DEPENDENCIES_FIELDS.forEach((depField) => {\n if (!policy[depField]?.[pkgName]) return; // doesn't exists in the workspace.json\n const currentVer = policy[depField][pkgName];\n const newVer = nonConflictDeps[pkgName][0];\n if (currentVer === newVer) return;\n workspaceJsonUpdates[pkgName] = [currentVer, newVer];\n policy[depField][pkgName] = newVer;\n this.logger.debug(\n `update workspace.jsonc: ${pkgName} from ${currentVer} to ${newVer}. Triggered by: ${nonConflictSources[\n pkgName\n ].join(', ')}`\n );\n });\n });\n\n // calculate the workspace.json conflicts\n const WS_DEPS_FIELDS = ['dependencies', 'peerDependencies'];\n const workspaceJsonConflicts = { dependencies: [], peerDependencies: [] };\n const conflictPackagesToRemoveFromConfigMerge: string[] = [];\n conflictedPackages.forEach((pkgName) => {\n if (conflictDeps[pkgName].length > 1) {\n // we only want the deps that the other lane has them in the workspace.json and that all comps use the same dep.\n return;\n }\n const conflictRaw = conflictDeps[pkgName][0];\n const [, currentVal, otherVal] = conflictRaw.split('::');\n\n WS_DEPS_FIELDS.forEach((depField) => {\n if (!policy[depField]?.[pkgName]) return;\n const currentVerInWsJson = policy[depField][pkgName];\n if (!currentVerInWsJson) return;\n // the version is coming from the workspace.jsonc\n conflictPackagesToRemoveFromConfigMerge.push(pkgName);\n if (semver.satisfies(otherVal, currentVerInWsJson)) {\n // the other version is compatible with the current version in the workspace.json\n return;\n }\n workspaceJsonConflicts[depField].push({\n name: pkgName,\n version: conflictRaw.replace(currentVal, currentVerInWsJson),\n force: false,\n });\n conflictPackagesToRemoveFromConfigMerge.push(pkgName);\n this.logger.debug(\n `conflict workspace.jsonc: ${pkgName} current: ${currentVerInWsJson}, other: ${otherVal}. Triggered by: ${conflictDepsSources[\n pkgName\n ].join(', ')}`\n );\n });\n });\n WS_DEPS_FIELDS.forEach((depField) => {\n if (isEmpty(workspaceJsonConflicts[depField])) delete workspaceJsonConflicts[depField];\n });\n\n if (conflictPackagesToRemoveFromConfigMerge.length) {\n allResults.forEach((result) => {\n if (result?.conflict) {\n DEPENDENCIES_FIELDS.forEach((depField) => {\n if (!result.conflict?.[depField]) return;\n result.conflict[depField] = result.conflict?.[depField].filter(\n (dep) => !conflictPackagesToRemoveFromConfigMerge.includes(dep.name)\n );\n if (!result.conflict[depField].length) delete result.conflict[depField];\n });\n if (isEmpty(result.conflict)) result.conflict = undefined;\n }\n });\n }\n\n if (Object.keys(workspaceJsonUpdates).length) {\n await workspaceConfig.write();\n }\n\n this.logger.debug('final workspace.jsonc updates', workspaceJsonUpdates);\n this.logger.debug('final workspace.jsonc conflicts', workspaceJsonConflicts);\n\n return {\n workspaceDepsUpdates: Object.keys(workspaceJsonUpdates).length ? workspaceJsonUpdates : undefined,\n workspaceDepsConflicts: Object.keys(workspaceJsonConflicts).length ? workspaceJsonConflicts : undefined,\n };\n }\n\n /**\n * this function gets called from two different commands:\n * 1. \"bit merge <ids...>\", when merging a component from a remote to the local.\n * in this case, the remote and local are on the same lane or both on main.\n * 2. \"bit lane merge\", when merging from one lane to another.\n */\n async getMergeStatus(\n bitIds: ComponentID[], // the id.version is the version we want to merge to the current component\n currentLane: Lane | null, // currently checked out lane. if on main, then it's null.\n otherLane?: Lane | null, // the lane we want to merged to our lane. (null if it's \"main\").\n options?: { resolveUnrelated?: MergeStrategy; ignoreConfigChanges?: boolean }\n ): Promise<ComponentMergeStatus[]> {\n const mergeStatusProvider = new MergeStatusProvider(\n this.workspace,\n this.logger,\n this.importer,\n currentLane || undefined,\n otherLane || undefined,\n options\n );\n return mergeStatusProvider.getStatus(bitIds);\n }\n\n private async applyVersionMultiple(\n succeededComponents: ComponentMergeStatus[],\n laneId: LaneId,\n mergeStrategy: MergeStrategy,\n localLane: Lane | null\n ): Promise<ApplyVersionWithComps[]> {\n const componentsResults = await mapSeries(\n succeededComponents,\n async ({ currentComponent, id, mergeResults, resolvedUnrelated, configMergeResult }) => {\n const modelComponent = await this.workspace.consumer.scope.getModelComponent(id);\n const updatedLaneId = laneId.isDefault() ? LaneId.from(laneId.name, id.scope as string) : laneId;\n return this.applyVersion({\n currentComponent,\n id,\n mergeResults,\n mergeStrategy,\n remoteHead: modelComponent.getRef(id.version as string) as Ref,\n laneId: updatedLaneId,\n localLane,\n resolvedUnrelated,\n configMergeResult,\n });\n }\n );\n\n const compsToWrite = compact(componentsResults.map((c) => c.legacyCompToWrite));\n\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 return componentsResults;\n }\n\n private async applyVersion({\n currentComponent,\n id,\n mergeResults,\n mergeStrategy,\n remoteHead,\n laneId,\n localLane,\n resolvedUnrelated,\n configMergeResult,\n }: {\n currentComponent: ConsumerComponent | null | undefined;\n id: ComponentID;\n mergeResults: MergeResultsThreeWay | null | undefined;\n mergeStrategy: MergeStrategy;\n remoteHead: Ref;\n laneId: LaneId;\n localLane: Lane | null;\n resolvedUnrelated?: ResolveUnrelatedData;\n configMergeResult?: ConfigMergeResult;\n }): Promise<ApplyVersionWithComps> {\n const consumer = this.workspace.consumer;\n let filesStatus = {};\n const unmergedComponent: UnmergedComponent = {\n // @ts-ignore\n id: { name: id.fullName, scope: id.scope },\n head: remoteHead,\n laneId,\n };\n id = currentComponent ? currentComponent.id : id;\n\n const modelComponent = await consumer.scope.getModelComponent(id);\n const handleResolveUnrelated = (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 (!localLane) throw new Error('localLane must be defined when resolvedUnrelated');\n if (!resolvedUnrelated) throw new Error('resolvedUnrelated must be populated');\n localLane.addComponent({ id, head: resolvedUnrelated.headOnCurrentLane });\n unmergedComponent.unrelated = {\n unrelatedHead: resolvedUnrelated.unrelatedHead,\n headOnCurrentLane: resolvedUnrelated.headOnCurrentLane,\n unrelatedLaneId: resolvedUnrelated.unrelatedLaneId,\n };\n consumer.scope.objects.unmergedComponents.addEntry(unmergedComponent);\n return { applyVersionResult: { id, filesStatus }, component: currentComponent, 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 consumer.scope.objects.unmergedComponents.addEntry(unmergedComponent);\n return { applyVersionResult: { id, filesStatus }, component: currentComponent || undefined };\n }\n if (resolvedUnrelated?.strategy === 'ours') {\n markAllFilesAsUnchanged();\n return handleResolveUnrelated();\n }\n const remoteId = id.changeVersion(remoteHead.toString());\n const idToLoad = !mergeResults || mergeStrategy === MergeOptions.theirs ? remoteId : id;\n const legacyComponent = await consumer.loadComponentFromModelImportIfNeeded(idToLoad);\n if (mergeResults && mergeStrategy === MergeOptions.theirs) {\n // in this case, we don't want to update .bitmap with the version of the remote. we want to keep the same version\n legacyComponent.version = id.version;\n }\n const files = legacyComponent.files;\n updateFileStatus(files, filesStatus, currentComponent || undefined);\n\n if (mergeResults) {\n // update files according to the merge results\n const { filesStatus: modifiedStatus, modifiedFiles } = applyModifiedVersion(files, mergeResults, mergeStrategy);\n legacyComponent.files = modifiedFiles;\n filesStatus = { ...filesStatus, ...modifiedStatus };\n }\n\n await removeFilesIfNeeded(filesStatus, currentComponent || undefined);\n\n 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 consumer.scope.objects.unmergedComponents.addEntry(unmergedComponent);\n } else if (localLane) {\n if (resolvedUnrelated) {\n // must be \"theirs\"\n return handleResolveUnrelated(legacyComponent);\n }\n localLane.addComponent({ id, head: remoteHead });\n } else {\n // this is main\n modelComponent.setHead(remoteHead);\n // mark it as local, otherwise, when importing this component from a remote, it'll override it.\n modelComponent.markVersionAsLocal(remoteHead.toString());\n consumer.scope.objects.add(modelComponent);\n }\n\n return {\n applyVersionResult: { id, filesStatus },\n component: currentComponent || undefined,\n legacyCompToWrite: legacyComponent,\n };\n }\n\n private async abortMerge(values: string[]): Promise<ApplyVersionResults> {\n const consumer = this.workspace.consumer;\n const ids = await this.getIdsForUnmerged(values);\n const results = await this.checkout.checkout({ ids, reset: true });\n ids.forEach((id) => consumer.scope.objects.unmergedComponents.removeComponent(id.fullName));\n await consumer.scope.objects.unmergedComponents.write();\n return { abortedComponents: results.components };\n }\n\n private async resolveMerge(values: string[], snapMessage: string, build: boolean): Promise<ApplyVersionResults> {\n const ids = await this.getIdsForUnmerged(values);\n // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n const { snappedComponents } = await this.snapping.snap({\n legacyBitIds: 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 | null\n ): Promise<ComponentMergeStatus[]> {\n const ids = await Promise.all(\n bitIds.map(async (bitId) => {\n const remoteScopeName = laneId.isDefault() ? bitId.scope : laneId.scope;\n const remoteLaneId = LaneId.from(laneId.name, remoteScopeName as string);\n const remoteHead = await this.workspace.consumer.scope.objects.remoteLanes.getRef(remoteLaneId, bitId);\n const laneIdStr = remoteLaneId.toString();\n if (!remoteHead) {\n throw new BitError(`unable to find a remote head of \"${bitId.toStringWithoutVersion()}\" in \"${laneIdStr}\"`);\n }\n return bitId.changeVersion(remoteHead.toString());\n })\n );\n\n return this.getMergeStatus(ids, localLaneObject, localLaneObject);\n }\n\n private async snapResolvedComponents(\n consumer: Consumer,\n snapMessage: string,\n build: boolean\n ): Promise<SnapResults | null> {\n const unmergedComponents = consumer.scope.objects.unmergedComponents.getComponents();\n this.logger.debug(`merge-snaps, snapResolvedComponents, total ${unmergedComponents.length.toString()} components`);\n if (!unmergedComponents.length) return null;\n const ids = ComponentIdList.fromArray(unmergedComponents.map((r) => ComponentID.fromObject(r.id)));\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(idsStr?: string[]): Promise<ComponentID[]> {\n if (idsStr && idsStr.length) {\n const componentIds = await this.workspace.resolveMultipleComponentIds(idsStr);\n componentIds.forEach((id) => {\n const entry = this.workspace.consumer.scope.objects.unmergedComponents.getEntry(id.fullName);\n if (!entry) {\n throw new GeneralError(`unable to merge-resolve ${id.toString()}, it is not marked as unresolved`);\n }\n });\n return componentIds;\n }\n const unresolvedComponents = this.workspace.consumer.scope.objects.unmergedComponents.getComponents();\n if (!unresolvedComponents.length) throw new GeneralError(`all components are resolved already, nothing to do`);\n return unresolvedComponents.map((u) => ComponentID.fromObject(u.id));\n }\n\n private async getComponentsToMerge(consumer: Consumer, ids: string[]): Promise<ComponentID[]> {\n const componentsList = new ComponentsList(consumer);\n if (!ids.length) {\n const mergePending = await componentsList.listMergePendingComponents();\n return mergePending.map((c) => c.id);\n }\n if (hasWildcard(ids)) {\n return componentsList.listComponentsByIdsWithWildcard(ids);\n }\n return ids.map((id) => consumer.getParsedId(id));\n }\n\n static slots = [];\n static dependencies = [\n CLIAspect,\n WorkspaceAspect,\n SnappingAspect,\n CheckoutAspect,\n InstallAspect,\n LoggerAspect,\n ComponentWriterAspect,\n ImporterAspect,\n ConfigAspect,\n RemoveAspect,\n GlobalConfigAspect,\n ];\n static runtime = MainRuntime;\n static async provider([\n cli,\n workspace,\n snapping,\n checkout,\n install,\n loggerMain,\n compWriter,\n importer,\n config,\n remove,\n globalConfig,\n ]: [\n CLIMain,\n Workspace,\n SnappingMain,\n CheckoutMain,\n InstallMain,\n LoggerMain,\n ComponentWriterMain,\n ImporterMain,\n ConfigMain,\n RemoveMain,\n GlobalConfigMain\n ]) {\n const logger = loggerMain.createLogger(MergingAspect.id);\n const merging = new MergingMain(\n workspace,\n install,\n snapping,\n checkout,\n logger,\n compWriter,\n importer,\n config,\n remove\n );\n cli.register(new MergeCmd(merging, globalConfig));\n return merging;\n }\n}\n\nMergingAspect.addRuntime(MergingMain);\n"],"mappings":"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"}
package/package.json CHANGED
@@ -1,12 +1,12 @@
1
1
  {
2
2
  "name": "@teambit/merging",
3
- "version": "1.0.81",
3
+ "version": "1.0.82",
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.81"
9
+ "version": "1.0.82"
10
10
  },
11
11
  "dependencies": {
12
12
  "lodash": "4.17.21",
@@ -20,20 +20,20 @@
20
20
  "@teambit/bit-error": "0.0.404",
21
21
  "@teambit/lane-id": "0.0.311",
22
22
  "@teambit/harmony": "0.4.6",
23
- "@teambit/dependency-resolver": "1.0.81",
24
- "@teambit/builder": "1.0.81",
25
- "@teambit/envs": "1.0.81",
26
- "@teambit/logger": "0.0.920",
27
- "@teambit/cli": "0.0.827",
28
- "@teambit/global-config": "0.0.829",
29
- "@teambit/importer": "1.0.81",
30
- "@teambit/workspace": "1.0.81",
31
- "@teambit/checkout": "1.0.81",
32
- "@teambit/component-writer": "1.0.81",
33
- "@teambit/config": "0.0.843",
34
- "@teambit/install": "1.0.81",
35
- "@teambit/remove": "1.0.81",
36
- "@teambit/snapping": "1.0.81"
23
+ "@teambit/dependency-resolver": "1.0.82",
24
+ "@teambit/builder": "1.0.82",
25
+ "@teambit/envs": "1.0.82",
26
+ "@teambit/logger": "0.0.921",
27
+ "@teambit/cli": "0.0.828",
28
+ "@teambit/global-config": "0.0.830",
29
+ "@teambit/importer": "1.0.82",
30
+ "@teambit/workspace": "1.0.82",
31
+ "@teambit/checkout": "1.0.82",
32
+ "@teambit/component-writer": "1.0.82",
33
+ "@teambit/config": "0.0.844",
34
+ "@teambit/install": "1.0.82",
35
+ "@teambit/remove": "1.0.82",
36
+ "@teambit/snapping": "1.0.82"
37
37
  },
38
38
  "devDependencies": {
39
39
  "@types/lodash": "4.14.165",
@@ -47,7 +47,7 @@
47
47
  "@types/testing-library__jest-dom": "5.9.5"
48
48
  },
49
49
  "peerDependencies": {
50
- "@teambit/legacy": "1.0.611",
50
+ "@teambit/legacy": "1.0.612",
51
51
  "react": "^16.8.0 || ^17.0.0",
52
52
  "react-dom": "^16.8.0 || ^17.0.0"
53
53
  },