@teambit/merging 1.0.150 → 1.0.152

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.
Files changed (5) hide show
  1. package/artifacts/__bit_junit.xml +1 -1
  2. package/dist/merging.main.runtime.js +2 -9
  3. package/dist/merging.main.runtime.js.map +1 -1
  4. package/package.json +14 -14
  5. /package/dist/{preview-1706671044097.js → preview-1706757518460.js} +0 -0
package/artifacts/__bit_junit.xml CHANGED
@@ -1,4 +1,4 @@
1
1
  <?xml version="1.0" encoding="UTF-8"?>
2
2
  <testsuites>
3
- <testsuite name="teambit.component/merging@1.0.150" tests="0" failures="0" errors="0" skipped="0"/>
3
+ <testsuite name="teambit.component/merging@1.0.152" tests="0" failures="0" errors="0" skipped="0"/>
4
4
  </testsuites>
package/dist/merging.main.runtime.js CHANGED
@@ -67,13 +67,6 @@ function _bitError() {
67
67
  };
68
68
  return data;
69
69
  }
70
- function _generalError() {
71
- const data = _interopRequireDefault(require("@teambit/legacy/dist/error/general-error"));
72
- _generalError = function () {
73
- return data;
74
- };
75
- return data;
76
- }
77
70
  function _laneId() {
78
71
  const data = require("@teambit/lane-id");
79
72
  _laneId = function () {
@@ -619,13 +612,13 @@ class MergingMain {
619
612
  componentIds.forEach(id => {
620
613
  const entry = this.workspace.consumer.scope.objects.unmergedComponents.getEntry(id);
621
614
  if (!entry) {
622
- throw new (_generalError().default)(`unable to merge-resolve ${id.toString()}, it is not marked as unresolved`);
615
+ throw new (_bitError().BitError)(`unable to merge-resolve ${id.toString()}, it is not marked as unresolved`);
623
616
  }
624
617
  });
625
618
  return componentIds;
626
619
  }
627
620
  const unresolvedComponents = this.workspace.consumer.scope.objects.unmergedComponents.getComponents();
628
- if (!unresolvedComponents.length) throw new (_generalError().default)(`all components are resolved already, nothing to do`);
621
+ if (!unresolvedComponents.length) throw new (_bitError().BitError)(`all components are resolved already, nothing to do`);
629
622
  return unresolvedComponents.map(u => _componentId().ComponentID.fromObject(u.id));
630
623
  }
631
624
  async getComponentsToMerge(consumer, ids) {
package/dist/merging.main.runtime.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"names":["_cli","data","require","_workspace","_interopRequireWildcard","_componentsList","_interopRequireDefault","_mergeVersion","_snapping","_hasWildcard","_pMapSeries","_componentId","_bitError","_generalError","_laneId","_chalk","_config","_remove","_utils","_componentWriter","_importer","_logger","_globalConfig","_lodash","_checkout","_deleteComponentFiles","_configMerger","_install","_mergeCmd","_merging","_mergeStatusProvider","obj","__esModule","default","_getRequireWildcardCache","e","WeakMap","r","t","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","ownKeys","keys","getOwnPropertySymbols","o","filter","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","key","value","_toPropertyKey","configurable","writable","_toPrimitive","String","Symbol","toPrimitive","TypeError","Number","MergingMain","constructor","workspace","install","snapping","checkout","logger","componentWriter","importer","config","remove","configMerger","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","otherLaneId","currentLane","tag","componentWithConflict","find","component","hasConflicts","getMergeStrategyInteractive","componentStatus","shouldBeRemoved","componentIdsToRemove","changeVersion","undefined","succeededComponents","componentsResults","applyVersionMultiple","allConfigMerge","compact","configMergeResult","workspaceDepsUpdates","workspaceDepsConflicts","updateWorkspaceJsoncWithDepsIfNeeded","workspaceConfigConflictWriteError","writeWorkspaceJsoncWithConflictsGracefully","generateConfigMergeConflictFileForAll","scope","objects","add","persist","unmergedComponents","write","writeBitMap","compBitIdsToRemove","ComponentIdList","fromArray","deleteComponentsFiles","cleanFromBitMap","componentsHasConfigMergeConflicts","some","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","workspaceConfigUpdateResult","getMergeStatus","options","otherLane","mergeStatusProvider","MergeStatusProvider","getStatus","mapSeries","currentComponent","resolvedUnrelated","modelComponent","getModelComponent","updatedLaneId","isDefault","LaneId","from","name","applyVersion","remoteHead","getRef","version","compsToWrite","legacyCompToWrite","manyComponentsWriterOpts","writeConfig","reasonForBitmapChange","writeMany","filesStatus","unmergedComponent","fullName","head","laneId","addToCurrentLane","Error","isPartOfLane","isEqualWithoutVersion","addComponent","handleResolveUnrelated","headOnCurrentLane","unrelated","unrelatedHead","unrelatedLaneId","addEntry","markAllFilesAsUnchanged","files","file","pathNormalizeToLinux","relative","FileStatus","unchanged","MergeOptions","ours","strategy","remoteId","idToLoad","theirs","legacyComponent","loadComponentFromModelImportIfNeeded","updateFileStatus","modifiedStatus","modifiedFiles","applyModifiedVersion","removeFilesIfNeeded","successfullyMergedConfig","getSuccessfullyMergedConfig","mergedConfig","manual","unmergedPaths","f","conflict","filePath","setHead","markVersionAsLocal","values","getIdsForUnmerged","reset","removeComponent","abortedComponents","snap","legacyBitIds","resolvedComponents","localLaneObject","Promise","all","bitId","remoteScopeName","remoteLaneId","remoteLanes","laneIdStr","toStringWithoutVersion","shouldSquash","getComponents","debug","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","ConfigMergerAspect","MainRuntime","addRuntime"],"sources":["merging.main.runtime.ts"],"sourcesContent":["import { CLIAspect, CLIMain, MainRuntime } from '@teambit/cli';\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 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 } from 'lodash';\nimport { MergeResultsThreeWay } from '@teambit/legacy/dist/consumer/versions-ops/merge-version/three-way-merge';\nimport {\n ApplyVersionWithComps,\n CheckoutAspect,\n CheckoutMain,\n ComponentStatusBase,\n applyModifiedVersion,\n removeFilesIfNeeded,\n updateFileStatus,\n} from '@teambit/checkout';\nimport deleteComponentsFiles from '@teambit/legacy/dist/consumer/component-ops/delete-component-files';\nimport {\n ConfigMergerAspect,\n ConfigMergerMain,\n ConfigMergeResult,\n WorkspaceConfigUpdateResult,\n} from '@teambit/config-merger';\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 { MergeStatusProvider, MergeStatusProviderOptions } from './merge-status-provider';\n\ntype ResolveUnrelatedData = {\n strategy: MergeStrategy;\n headOnCurrentLane: Ref;\n unrelatedHead: Ref;\n unrelatedLaneId: LaneId;\n};\n\nexport type ComponentMergeStatus = ComponentStatusBase & {\n mergeResults?: MergeResultsThreeWay | null;\n divergeData?: SnapsDistance;\n resolvedUnrelated?: ResolveUnrelatedData;\n configMergeResult?: ConfigMergeResult;\n};\n\nexport type ComponentMergeStatusBeforeMergeAttempt = ComponentStatusBase & {\n divergeData?: SnapsDistance;\n resolvedUnrelated?: ResolveUnrelatedData;\n mergeProps?: {\n otherLaneHead: Ref;\n currentId: ComponentID;\n modelComponent: ModelComponent;\n };\n};\n\nexport type FailedComponents = { id: ComponentID; unchangedMessage: string; unchangedLegitimately?: boolean };\n\n// fileName is PathLinux. TS doesn't let anything else in the keys other than string and number\nexport type FilesStatus = { [fileName: string]: keyof typeof FileStatus };\n\nexport type ApplyVersionResult = { id: ComponentID; filesStatus: FilesStatus };\n\nexport type ApplyVersionResults = {\n components?: ApplyVersionResult[];\n version?: string;\n failedComponents?: FailedComponents[];\n removedComponents?: ComponentID[];\n addedComponents?: ComponentID[]; // relevant when restoreMissingComponents is true (e.g. bit lane merge-abort)\n 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 workspaceConfigUpdateResult?: WorkspaceConfigUpdateResult;\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 private configMerger: ConfigMergerMain\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(\n bitIds,\n currentLaneId,\n currentLaneObject,\n mergeStrategy\n );\n const failedComponents = allComponentsStatus.filter((c) => c.unchangedMessage && !c.unchangedLegitimately);\n if (failedComponents.length) {\n const failureMsgs = failedComponents\n .map(\n (failedComponent) =>\n `${chalk.bold(failedComponent.id.toString())} - ${chalk.red(failedComponent.unchangedMessage as string)}`\n )\n .join('\\n');\n throw new BitError(`unable to merge due to the following failures:\\n${failureMsgs}`);\n }\n\n return this.mergeSnaps({\n mergeStrategy,\n allComponentsStatus,\n otherLaneId: currentLaneId,\n currentLane: currentLaneObject,\n 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 otherLaneId,\n currentLane,\n noSnap,\n tag,\n snapMessage,\n build,\n skipDependencyInstallation,\n }: {\n mergeStrategy: MergeStrategy;\n allComponentsStatus: ComponentMergeStatus[];\n otherLaneId: LaneId;\n currentLane: 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(\n succeededComponents,\n otherLaneId,\n mergeStrategy,\n currentLane\n );\n\n const allConfigMerge = compact(succeededComponents.map((c) => c.configMergeResult));\n\n const { workspaceDepsUpdates, workspaceDepsConflicts } =\n await this.configMerger.updateWorkspaceJsoncWithDepsIfNeeded(allConfigMerge);\n\n let workspaceConfigConflictWriteError: Error | undefined;\n if (workspaceDepsConflicts) {\n workspaceConfigConflictWriteError = await this.configMerger.writeWorkspaceJsoncWithConflictsGracefully(\n workspaceDepsConflicts\n );\n }\n await this.configMerger.generateConfigMergeConflictFileForAll(allConfigMerge);\n\n if (currentLane) consumer.scope.objects.add(currentLane);\n\n await consumer.scope.objects.persist(); // persist anyway, if currentLane is null it should save all main heads\n\n await consumer.scope.objects.unmergedComponents.write();\n\n await consumer.writeBitMap(`merge ${otherLaneId.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 workspaceConfigUpdateResult: {\n workspaceDepsUpdates,\n workspaceDepsConflicts,\n workspaceConfigConflictWriteError,\n },\n leftUnresolvedConflicts,\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 options: MergeStatusProviderOptions,\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 ): Promise<ComponentMergeStatus[]> {\n const mergeStatusProvider = new MergeStatusProvider(\n this.workspace,\n this.logger,\n this.importer,\n options,\n currentLane || undefined,\n otherLane || undefined\n );\n return mergeStatusProvider.getStatus(bitIds);\n }\n\n private async applyVersionMultiple(\n succeededComponents: ComponentMergeStatus[],\n otherLaneId: LaneId,\n mergeStrategy: MergeStrategy,\n currentLane: 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 = otherLaneId.isDefault() ? LaneId.from(otherLaneId.name, id.scope as string) : otherLaneId;\n return this.applyVersion({\n currentComponent,\n id,\n mergeResults,\n mergeStrategy,\n remoteHead: modelComponent.getRef(id.version as string) as Ref,\n otherLaneId: updatedLaneId,\n currentLane,\n resolvedUnrelated,\n configMergeResult,\n });\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 otherLaneId,\n currentLane,\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 otherLaneId: LaneId;\n currentLane: 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 id: { name: id.fullName, scope: id.scope },\n head: remoteHead,\n laneId: otherLaneId,\n };\n id = currentComponent ? currentComponent.id : id;\n\n const modelComponent = await consumer.scope.getModelComponent(id);\n\n const addToCurrentLane = (head: Ref) => {\n if (!currentLane) throw new Error('currentLane must be defined when adding to the lane');\n if (otherLaneId.isDefault()) {\n const isPartOfLane = currentLane.components.find((c) => c.id.isEqualWithoutVersion(id));\n if (!isPartOfLane) return;\n }\n currentLane.addComponent({ id, head });\n };\n\n const handleResolveUnrelated = (legacyCompToWrite?: ConsumerComponent) => {\n if (!currentComponent) throw new Error('currentComponent must be defined when resolvedUnrelated');\n // because when on a main, we don't allow merging lanes with unrelated. we asks users to switch to the lane\n // first and then merge with --resolve-unrelated\n if (!currentLane) throw new Error('currentLane must be defined when resolvedUnrelated');\n if (!resolvedUnrelated) throw new Error('resolvedUnrelated must be populated');\n addToCurrentLane(resolvedUnrelated.headOnCurrentLane);\n unmergedComponent.unrelated = {\n unrelatedHead: resolvedUnrelated.unrelatedHead,\n headOnCurrentLane: resolvedUnrelated.headOnCurrentLane,\n unrelatedLaneId: resolvedUnrelated.unrelatedLaneId,\n };\n 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, consumer, currentComponent || undefined);\n\n if (configMergeResult) {\n const successfullyMergedConfig = configMergeResult.getSuccessfullyMergedConfig();\n if (successfullyMergedConfig) {\n unmergedComponent.mergedConfig = successfullyMergedConfig;\n // no need to `unmergedComponents.addEntry` here. it'll be added in the next lines inside `if (mergeResults)`.\n // because if `configMergeResult` is set, `mergeResults` must be set as well. both happen on diverge.\n }\n }\n\n // if mergeResults, the head snap is going to be updated on a later phase when snapping with two parents\n // otherwise, update the head of the current lane or main\n if (mergeResults) {\n if (mergeResults.hasConflicts && mergeStrategy === MergeOptions.manual) {\n unmergedComponent.unmergedPaths = mergeResults.modifiedFiles.filter((f) => f.conflict).map((f) => f.filePath);\n }\n consumer.scope.objects.unmergedComponents.addEntry(unmergedComponent);\n } else if (currentLane) {\n if (resolvedUnrelated) {\n // must be \"theirs\"\n return handleResolveUnrelated(legacyComponent);\n }\n addToCurrentLane(remoteHead);\n } else {\n // this is main\n 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));\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 mergeStrategy: MergeStrategy\n ): Promise<ComponentMergeStatus[]> {\n const ids = await Promise.all(\n bitIds.map(async (bitId) => {\n const remoteScopeName = laneId.isDefault() ? bitId.scope : laneId.scope;\n const remoteLaneId = LaneId.from(laneId.name, remoteScopeName as string);\n const remoteHead = await this.workspace.consumer.scope.objects.remoteLanes.getRef(remoteLaneId, bitId);\n const laneIdStr = remoteLaneId.toString();\n if (!remoteHead) {\n throw new BitError(`unable to find a remote head of \"${bitId.toStringWithoutVersion()}\" in \"${laneIdStr}\"`);\n }\n return bitId.changeVersion(remoteHead.toString());\n })\n );\n\n return this.getMergeStatus(ids, { shouldSquash: false, mergeStrategy }, localLaneObject, localLaneObject);\n }\n\n private async snapResolvedComponents(\n 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);\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 ConfigMergerAspect,\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 configMerger,\n ]: [\n CLIMain,\n Workspace,\n SnappingMain,\n CheckoutMain,\n InstallMain,\n LoggerMain,\n ComponentWriterMain,\n ImporterMain,\n ConfigMain,\n RemoveMain,\n GlobalConfigMain,\n ConfigMergerMain\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 configMerger\n );\n cli.register(new MergeCmd(merging, globalConfig));\n return merging;\n }\n}\n\nMergingAspect.addRuntime(MergingMain);\n"],"mappings":";;;;;;AAAA,SAAAA,KAAA;EAAA,MAAAC,IAAA,GAAAC,OAAA;EAAAF,IAAA,YAAAA,CAAA;IAAA,OAAAC,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAE,WAAA;EAAA,MAAAF,IAAA,GAAAG,uBAAA,CAAAF,OAAA;EAAAC,UAAA,YAAAA,CAAA;IAAA,OAAAF,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAEA,SAAAI,gBAAA;EAAA,MAAAJ,IAAA,GAAAK,sBAAA,CAAAJ,OAAA;EAAAG,eAAA,YAAAA,CAAA;IAAA,OAAAJ,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAM,cAAA;EAAA,MAAAN,IAAA,GAAAC,OAAA;EAAAK,aAAA,YAAAA,CAAA;IAAA,OAAAN,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAMA,SAAAO,UAAA;EAAA,MAAAP,IAAA,GAAAK,sBAAA,CAAAJ,OAAA;EAAAM,SAAA,YAAAA,CAAA;IAAA,OAAAP,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAQ,aAAA;EAAA,MAAAR,IAAA,GAAAK,sBAAA,CAAAJ,OAAA;EAAAO,YAAA,YAAAA,CAAA;IAAA,OAAAR,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAS,YAAA;EAAA,MAAAT,IAAA,GAAAK,sBAAA,CAAAJ,OAAA;EAAAQ,WAAA,YAAAA,CAAA;IAAA,OAAAT,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAU,aAAA;EAAA,MAAAV,IAAA,GAAAC,OAAA;EAAAS,YAAA,YAAAA,CAAA;IAAA,OAAAV,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAW,UAAA;EAAA,MAAAX,IAAA,GAAAC,OAAA;EAAAU,SAAA,YAAAA,CAAA;IAAA,OAAAX,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAY,cAAA;EAAA,MAAAZ,IAAA,GAAAK,sBAAA,CAAAJ,OAAA;EAAAW,aAAA,YAAAA,CAAA;IAAA,OAAAZ,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAa,QAAA;EAAA,MAAAb,IAAA,GAAAC,OAAA;EAAAY,OAAA,YAAAA,CAAA;IAAA,OAAAb,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAKA,SAAAc,OAAA;EAAA,MAAAd,IAAA,GAAAK,sBAAA,CAAAJ,OAAA;EAAAa,MAAA,YAAAA,CAAA;IAAA,OAAAd,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAe,QAAA;EAAA,MAAAf,IAAA,GAAAC,OAAA;EAAAc,OAAA,YAAAA,CAAA;IAAA,OAAAf,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAgB,QAAA;EAAA,MAAAhB,IAAA,GAAAK,sBAAA,CAAAJ,OAAA;EAAAe,OAAA,YAAAA,CAAA;IAAA,OAAAhB,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAiB,OAAA;EAAA,MAAAjB,IAAA,GAAAC,OAAA;EAAAgB,MAAA,YAAAA,CAAA;IAAA,OAAAjB,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAkB,iBAAA;EAAA,MAAAlB,IAAA,GAAAC,OAAA;EAAAiB,gBAAA,YAAAA,CAAA;IAAA,OAAAlB,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAEA,SAAAmB,UAAA;EAAA,MAAAnB,IAAA,GAAAK,sBAAA,CAAAJ,OAAA;EAAAkB,SAAA,YAAAA,CAAA;IAAA,OAAAnB,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAoB,QAAA;EAAA,MAAApB,IAAA,GAAAC,OAAA;EAAAmB,OAAA,YAAAA,CAAA;IAAA,OAAApB,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAqB,cAAA;EAAA,MAAArB,IAAA,GAAAK,sBAAA,CAAAJ,OAAA;EAAAoB,aAAA,YAAAA,CAAA;IAAA,OAAArB,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAsB,QAAA;EAAA,MAAAtB,IAAA,GAAAC,OAAA;EAAAqB,OAAA,YAAAA,CAAA;IAAA,OAAAtB,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAEA,SAAAuB,UAAA;EAAA,MAAAvB,IAAA,GAAAC,OAAA;EAAAsB,SAAA,YAAAA,CAAA;IAAA,OAAAvB,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AASA,SAAAwB,sBAAA;EAAA,MAAAxB,IAAA,GAAAK,sBAAA,CAAAJ,OAAA;EAAAuB,qBAAA,YAAAA,CAAA;IAAA,OAAAxB,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAyB,cAAA;EAAA,MAAAzB,IAAA,GAAAC,OAAA;EAAAwB,aAAA,YAAAA,CAAA;IAAA,OAAAzB,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAOA,SAAA0B,SAAA;EAAA,MAAA1B,IAAA,GAAAC,OAAA;EAAAyB,QAAA,YAAAA,CAAA;IAAA,OAAA1B,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAA2B,UAAA;EAAA,MAAA3B,IAAA,GAAAC,OAAA;EAAA0B,SAAA,YAAAA,CAAA;IAAA,OAAA3B,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAA4B,SAAA;EAAA,MAAA5B,IAAA,GAAAC,OAAA;EAAA2B,QAAA,YAAAA,CAAA;IAAA,OAAA5B,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAA6B,qBAAA;EAAA,MAAA7B,IAAA,GAAAC,OAAA;EAAA4B,oBAAA,YAAAA,CAAA;IAAA,OAAA7B,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAA0F,SAAAK,uBAAAyB,GAAA,WAAAA,GAAA,IAAAA,GAAA,CAAAC,UAAA,GAAAD,GAAA,KAAAE,OAAA,EAAAF,GAAA;AAAA,SAAAG,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,SAAA/B,wBAAA+B,CAAA,EAAAE,CAAA,SAAAA,CAAA,IAAAF,CAAA,IAAAA,CAAA,CAAAH,UAAA,SAAAG,CAAA,eAAAA,CAAA,uBAAAA,CAAA,yBAAAA,CAAA,WAAAF,OAAA,EAAAE,CAAA,QAAAG,CAAA,GAAAJ,wBAAA,CAAAG,CAAA,OAAAC,CAAA,IAAAA,CAAA,CAAAC,GAAA,CAAAJ,CAAA,UAAAG,CAAA,CAAAE,GAAA,CAAAL,CAAA,OAAAM,CAAA,KAAAC,SAAA,UAAAC,CAAA,GAAAC,MAAA,CAAAC,cAAA,IAAAD,MAAA,CAAAE,wBAAA,WAAAC,CAAA,IAAAZ,CAAA,oBAAAY,CAAA,IAAAH,MAAA,CAAAI,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAf,CAAA,EAAAY,CAAA,SAAAI,CAAA,GAAAR,CAAA,GAAAC,MAAA,CAAAE,wBAAA,CAAAX,CAAA,EAAAY,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,IAAAZ,CAAA,CAAAY,CAAA,YAAAN,CAAA,CAAAR,OAAA,GAAAE,CAAA,EAAAG,CAAA,IAAAA,CAAA,CAAAc,GAAA,CAAAjB,CAAA,EAAAM,CAAA,GAAAA,CAAA;AAAA,SAAAY,QAAAlB,CAAA,EAAAE,CAAA,QAAAC,CAAA,GAAAM,MAAA,CAAAU,IAAA,CAAAnB,CAAA,OAAAS,MAAA,CAAAW,qBAAA,QAAAC,CAAA,GAAAZ,MAAA,CAAAW,qBAAA,CAAApB,CAAA,GAAAE,CAAA,KAAAmB,CAAA,GAAAA,CAAA,CAAAC,MAAA,WAAApB,CAAA,WAAAO,MAAA,CAAAE,wBAAA,CAAAX,CAAA,EAAAE,CAAA,EAAAqB,UAAA,OAAApB,CAAA,CAAAqB,IAAA,CAAAC,KAAA,CAAAtB,CAAA,EAAAkB,CAAA,YAAAlB,CAAA;AAAA,SAAAuB,cAAA1B,CAAA,aAAAE,CAAA,MAAAA,CAAA,GAAAyB,SAAA,CAAAC,MAAA,EAAA1B,CAAA,UAAAC,CAAA,WAAAwB,SAAA,CAAAzB,CAAA,IAAAyB,SAAA,CAAAzB,CAAA,QAAAA,CAAA,OAAAgB,OAAA,CAAAT,MAAA,CAAAN,CAAA,OAAA0B,OAAA,WAAA3B,CAAA,IAAA4B,eAAA,CAAA9B,CAAA,EAAAE,CAAA,EAAAC,CAAA,CAAAD,CAAA,SAAAO,MAAA,CAAAsB,yBAAA,GAAAtB,MAAA,CAAAuB,gBAAA,CAAAhC,CAAA,EAAAS,MAAA,CAAAsB,yBAAA,CAAA5B,CAAA,KAAAe,OAAA,CAAAT,MAAA,CAAAN,CAAA,GAAA0B,OAAA,WAAA3B,CAAA,IAAAO,MAAA,CAAAC,cAAA,CAAAV,CAAA,EAAAE,CAAA,EAAAO,MAAA,CAAAE,wBAAA,CAAAR,CAAA,EAAAD,CAAA,iBAAAF,CAAA;AAAA,SAAA8B,gBAAAlC,GAAA,EAAAqC,GAAA,EAAAC,KAAA,IAAAD,GAAA,GAAAE,cAAA,CAAAF,GAAA,OAAAA,GAAA,IAAArC,GAAA,IAAAa,MAAA,CAAAC,cAAA,CAAAd,GAAA,EAAAqC,GAAA,IAAAC,KAAA,EAAAA,KAAA,EAAAX,UAAA,QAAAa,YAAA,QAAAC,QAAA,oBAAAzC,GAAA,CAAAqC,GAAA,IAAAC,KAAA,WAAAtC,GAAA;AAAA,SAAAuC,eAAAhC,CAAA,QAAAa,CAAA,GAAAsB,YAAA,CAAAnC,CAAA,uCAAAa,CAAA,GAAAA,CAAA,GAAAuB,MAAA,CAAAvB,CAAA;AAAA,SAAAsB,aAAAnC,CAAA,EAAAD,CAAA,2BAAAC,CAAA,KAAAA,CAAA,SAAAA,CAAA,MAAAH,CAAA,GAAAG,CAAA,CAAAqC,MAAA,CAAAC,WAAA,kBAAAzC,CAAA,QAAAgB,CAAA,GAAAhB,CAAA,CAAAe,IAAA,CAAAZ,CAAA,EAAAD,CAAA,uCAAAc,CAAA,SAAAA,CAAA,YAAA0B,SAAA,yEAAAxC,CAAA,GAAAqC,MAAA,GAAAI,MAAA,EAAAxC,CAAA;AA4B1F;;AA4BO,MAAMyC,WAAW,CAAC;EACvBC,WAAWA,CACDC,SAAoB,EACpBC,OAAoB,EACpBC,QAAsB,EACtBC,QAAsB,EACtBC,MAAc,EACdC,eAAoC,EACpCC,QAAsB,EACtBC,MAAkB,EAClBC,MAAkB,EAClBC,YAA8B,EACtC;IAAA,KAVQT,SAAoB,GAApBA,SAAoB;IAAA,KACpBC,OAAoB,GAApBA,OAAoB;IAAA,KACpBC,QAAsB,GAAtBA,QAAsB;IAAA,KACtBC,QAAsB,GAAtBA,QAAsB;IAAA,KACtBC,MAAc,GAAdA,MAAc;IAAA,KACdC,eAAoC,GAApCA,eAAoC;IAAA,KACpCC,QAAsB,GAAtBA,QAAsB;IAAA,KACtBC,MAAkB,GAAlBA,MAAkB;IAAA,KAClBC,MAAkB,GAAlBA,MAAkB;IAAA,KAClBC,YAA8B,GAA9BA,YAA8B;EACrC;EAEH,MAAMC,KAAKA,CACTC,GAAa,EACbC,aAA4B,EAC5BC,KAAc,EACdC,OAAgB,EAChBC,MAAe,EACfC,OAAe,EACfC,KAAc,EACdC,0BAAmC,EACL;IAC9B,IAAI,CAAC,IAAI,CAAClB,SAAS,EAAE,MAAM,KAAImB,kCAAqB,EAAC,CAAC;IACtD,MAAMC,QAAkB,GAAG,IAAI,CAACpB,SAAS,CAACoB,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,CAC3DV,MAAM,EACNK,aAAa,EACbE,iBAAiB,EACjBnB,aACF,CAAC;IACD,MAAMuB,gBAAgB,GAAGF,mBAAmB,CAACzD,MAAM,CAAE4D,CAAC,IAAKA,CAAC,CAACC,gBAAgB,IAAI,CAACD,CAAC,CAACE,qBAAqB,CAAC;IAC1G,IAAIH,gBAAgB,CAACrD,MAAM,EAAE;MAC3B,MAAMyD,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,WAAW,EAAErB,aAAa;MAC1BsB,WAAW,EAAEpB,iBAAiB;MAC9BhB,MAAM;MACNa,WAAW;MACXX,KAAK;MACLC;IACF,CAAC,CAAC;EACJ;;EAEA;AACF;AACA;EACE,MAAM+B,UAAUA,CAAC;IACfrC,aAAa;IACbqB,mBAAmB;IACnBiB,WAAW;IACXC,WAAW;IACXpC,MAAM;IACNqC,GAAG;IACHxB,WAAW;IACXX,KAAK;IACLC;EAWF,CAAC,EAAgC;IAC/B,MAAME,QAAQ,GAAG,IAAI,CAACpB,SAAS,CAACoB,QAAQ;IACxC,MAAMiC,qBAAqB,GAAGpB,mBAAmB,CAACqB,IAAI,CACnDC,SAAS,IAAKA,SAAS,CAAClC,YAAY,IAAIkC,SAAS,CAAClC,YAAY,CAACmC,YAClE,CAAC;IACD,IAAIH,qBAAqB,IAAI,CAACzC,aAAa,EAAE;MAC3CA,aAAa,GAAG,MAAM,IAAA6C,2CAA2B,EAAC,CAAC;IACrD;IACA,MAAMtB,gBAAoC,GAAGF,mBAAmB,CAC7DzD,MAAM,CAAEkF,eAAe,IAAKA,eAAe,CAACrB,gBAAgB,CAAC,CAC7D7D,MAAM,CAAEkF,eAAe,IAAK,CAACA,eAAe,CAACC,eAAe,CAAC,CAC7DnB,GAAG,CAAEkB,eAAe,KAAM;MACzBd,EAAE,EAAEc,eAAe,CAACd,EAAE;MACtBP,gBAAgB,EAAEqB,eAAe,CAACrB,gBAA0B;MAC5DC,qBAAqB,EAAEoB,eAAe,CAACpB;IACzC,CAAC,CAAC,CAAC;IAEL,MAAMsB,oBAAoB,GAAG3B,mBAAmB,CAC7CzD,MAAM,CAAEkF,eAAe,IAAKA,eAAe,CAACC,eAAe,CAAC,CAC5DnB,GAAG,CAAEJ,CAAC,IAAKA,CAAC,CAACQ,EAAE,CAACiB,aAAa,CAACC,SAAS,CAAC,CAAC;IAE5C,MAAMC,mBAAmB,GAAG9B,mBAAmB,CAACzD,MAAM,CAAEkF,eAAe,IAAK,CAACA,eAAe,CAACrB,gBAAgB,CAAC;IAE9G,MAAM2B,iBAAiB,GAAG,MAAM,IAAI,CAACC,oBAAoB,CACvDF,mBAAmB,EACnBb,WAAW,EACXtC,aAAa,EACbuC,WACF,CAAC;IAED,MAAMe,cAAc,GAAG,IAAAC,iBAAO,EAACJ,mBAAmB,CAACvB,GAAG,CAAEJ,CAAC,IAAKA,CAAC,CAACgC,iBAAiB,CAAC,CAAC;IAEnF,MAAM;MAAEC,oBAAoB;MAAEC;IAAuB,CAAC,GACpD,MAAM,IAAI,CAAC7D,YAAY,CAAC8D,oCAAoC,CAACL,cAAc,CAAC;IAE9E,IAAIM,iCAAoD;IACxD,IAAIF,sBAAsB,EAAE;MAC1BE,iCAAiC,GAAG,MAAM,IAAI,CAAC/D,YAAY,CAACgE,0CAA0C,CACpGH,sBACF,CAAC;IACH;IACA,MAAM,IAAI,CAAC7D,YAAY,CAACiE,qCAAqC,CAACR,cAAc,CAAC;IAE7E,IAAIf,WAAW,EAAE/B,QAAQ,CAACuD,KAAK,CAACC,OAAO,CAACC,GAAG,CAAC1B,WAAW,CAAC;IAExD,MAAM/B,QAAQ,CAACuD,KAAK,CAACC,OAAO,CAACE,OAAO,CAAC,CAAC,CAAC,CAAC;;IAExC,MAAM1D,QAAQ,CAACuD,KAAK,CAACC,OAAO,CAACG,kBAAkB,CAACC,KAAK,CAAC,CAAC;IAEvD,MAAM5D,QAAQ,CAAC6D,WAAW,CAAE,SAAQ/B,WAAW,CAACL,QAAQ,CAAC,CAAE,EAAC,CAAC;IAE7D,IAAIe,oBAAoB,CAAC9E,MAAM,EAAE;MAC/B,MAAMoG,kBAAkB,GAAGC,8BAAe,CAACC,SAAS,CAACxB,oBAAoB,CAAC;MAC1E,MAAM,IAAAyB,+BAAqB,EAACjE,QAAQ,EAAE8D,kBAAkB,CAAC;MACzD,MAAM9D,QAAQ,CAACkE,eAAe,CAACJ,kBAAkB,CAAC;IACpD;IAEA,MAAMK,iCAAiC,GAAGtD,mBAAmB,CAACuD,IAAI,CAAEpD,CAAC,IAAKA,CAAC,CAACgC,iBAAiB,EAAEZ,YAAY,CAAC,CAAC,CAAC;IAC9G,MAAMiC,uBAAuB,GAAGpC,qBAAqB,IAAIzC,aAAa,KAAK,QAAQ;IACnF,IAAI,CAACM,0BAA0B,IAAI,CAACuE,uBAAuB,IAAI,CAACF,iCAAiC,EAAE;MACjG,IAAI;QACF,MAAM,IAAI,CAACtF,OAAO,CAACA,OAAO,CAAC6D,SAAS,EAAE;UACpC4B,MAAM,EAAE,IAAI;UACZC,cAAc,EAAE,KAAK;UACrBC,MAAM,EAAE;QACV,CAAC,CAAC;MACJ,CAAC,CAAC,OAAOC,GAAQ,EAAE;QACjB,IAAI,CAACzF,MAAM,CAAC0F,KAAK,CAAE,4BAA2B,EAAED,GAAG,CAAC;QACpD,IAAI,CAACzF,MAAM,CAAC2F,YAAY,CAAE,uEAAsEF,GAAG,CAAC7E,OAAQ,EAAC,CAAC;MAChH;IACF;IAEA,MAAMgF,mBAAmB,GAAG,MAAAA,CAAA,KAAY;MACtC;MACA;MACA,IAAIjF,MAAM,IAAI0E,uBAAuB,IAAIF,iCAAiC,EAAE;QAC1E,OAAO,IAAI;MACb;MACA,IAAInC,GAAG,EAAE;QACP,MAAM6C,QAAQ,GAAGhE,mBAAmB,CAACO,GAAG,CAAEJ,CAAC,IAAKA,CAAC,CAACQ,EAAE,CAAC;QACrD,MAAMsD,OAAO,GAAG,MAAM,IAAI,CAACC,mBAAmB,CAACF,QAAQ,EAAErE,WAAW,EAAEX,KAAK,CAAC;QAC5E,IAAI,CAACiF,OAAO,EAAE,OAAO,IAAI;QACzB,MAAM;UAAEE,gBAAgB;UAAEC,iBAAiB;UAAEC;QAAkB,CAAC,GAAGJ,OAAO;QAC1E,OAAO;UAAEK,iBAAiB,EAAEH,gBAAgB;UAAEI,kBAAkB,EAAEH,iBAAiB;UAAEC;QAAkB,CAAC;MAC1G;MACA,OAAO,IAAI,CAACG,sBAAsB,CAACrF,QAAQ,EAAEQ,WAAW,EAAEX,KAAK,CAAC;IAClE,CAAC;IACD,IAAIyF,gBAAyD,GAAG,IAAI;IACpE,IAAIC,cAAiC;IACrC,MAAMC,cAAc,GAAG,IAAI,CAAC5G,SAAS,CAAC6G,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,CAAC7F,SAAS,CAAC6G,MAAM,CAACE,mBAAmB,CAACH,cAAc,CAAC;IAC3D;IAEA,OAAO;MACLI,UAAU,EAAEhD,iBAAiB,CAACxB,GAAG,CAAEJ,CAAC,IAAKA,CAAC,CAAC6E,kBAAkB,CAAC;MAC9D9E,gBAAgB;MAChBmE,iBAAiB,EAAE,CAAC,GAAG1C,oBAAoB,EAAE,IAAI8C,gBAAgB,EAAEJ,iBAAiB,IAAI,EAAE,CAAC,CAAC;MAC5FI,gBAAgB;MAChBC,cAAc;MACdO,2BAA2B,EAAE;QAC3B7C,oBAAoB;QACpBC,sBAAsB;QACtBE;MACF,CAAC;MACDiB;IACF,CAAC;EACH;;EAEA;AACF;AACA;AACA;AACA;AACA;EACE,MAAM0B,cAAcA,CAClB3F,MAAqB;EAAE;EACvB4F,OAAmC,EACnCjE,WAAwB;EAAE;EAC1BkE,SAAuB,EACU;IACjC,MAAMC,mBAAmB,GAAG,KAAIC,0CAAmB,EACjD,IAAI,CAACvH,SAAS,EACd,IAAI,CAACI,MAAM,EACX,IAAI,CAACE,QAAQ,EACb8G,OAAO,EACPjE,WAAW,IAAIW,SAAS,EACxBuD,SAAS,IAAIvD,SACf,CAAC;IACD,OAAOwD,mBAAmB,CAACE,SAAS,CAAChG,MAAM,CAAC;EAC9C;EAEA,MAAcyC,oBAAoBA,CAChCF,mBAA2C,EAC3Cb,WAAmB,EACnBtC,aAA4B,EAC5BuC,WAAwB,EACU;IAClC,MAAMa,iBAAiB,GAAG,MAAM,IAAAyD,qBAAS,EACvC1D,mBAAmB,EACnB,OAAO;MAAE2D,gBAAgB;MAAE9E,EAAE;MAAEvB,YAAY;MAAEsG,iBAAiB;MAAEvD;IAAkB,CAAC,KAAK;MACtF,MAAMwD,cAAc,GAAG,MAAM,IAAI,CAAC5H,SAAS,CAACoB,QAAQ,CAACuD,KAAK,CAACkD,iBAAiB,CAACjF,EAAE,CAAC;MAChF,MAAMkF,aAAa,GAAG5E,WAAW,CAAC6E,SAAS,CAAC,CAAC,GAAGC,gBAAM,CAACC,IAAI,CAAC/E,WAAW,CAACgF,IAAI,EAAEtF,EAAE,CAAC+B,KAAe,CAAC,GAAGzB,WAAW;MAC/G,OAAO,IAAI,CAACiF,YAAY,CAAC;QACvBT,gBAAgB;QAChB9E,EAAE;QACFvB,YAAY;QACZT,aAAa;QACbwH,UAAU,EAAER,cAAc,CAACS,MAAM,CAACzF,EAAE,CAAC0F,OAAiB,CAAQ;QAC9DpF,WAAW,EAAE4E,aAAa;QAC1B3E,WAAW;QACXwE,iBAAiB;QACjBvD;MACF,CAAC,CAAC;IACJ,CACF,CAAC;IAED,MAAMmE,YAAY,GAAG,IAAApE,iBAAO,EAACH,iBAAiB,CAACxB,GAAG,CAAEJ,CAAC,IAAKA,CAAC,CAACoG,iBAAiB,CAAC,CAAC;IAE/E,MAAMC,wBAAwB,GAAG;MAC/BrH,QAAQ,EAAE,IAAI,CAACpB,SAAS,CAACoB,QAAQ;MACjC4F,UAAU,EAAEuB,YAAY;MACxBrH,0BAA0B,EAAE,IAAI;MAChCwH,WAAW,EAAE,KAAK;MAAE;MACpBC,qBAAqB,EAAE;IACzB,CAAC;IACD,MAAM,IAAI,CAACtI,eAAe,CAACuI,SAAS,CAACH,wBAAwB,CAAC;IAE9D,OAAOzE,iBAAiB;EAC1B;EAEA,MAAcmE,YAAYA,CAAC;IACzBT,gBAAgB;IAChB9E,EAAE;IACFvB,YAAY;IACZT,aAAa;IACbwH,UAAU;IACVlF,WAAW;IACXC,WAAW;IACXwE,iBAAiB;IACjBvD;EAWF,CAAC,EAAkC;IACjC,MAAMhD,QAAQ,GAAG,IAAI,CAACpB,SAAS,CAACoB,QAAQ;IACxC,IAAIyH,WAAW,GAAG,CAAC,CAAC;IACpB,MAAMC,iBAAoC,GAAG;MAC3ClG,EAAE,EAAE;QAAEsF,IAAI,EAAEtF,EAAE,CAACmG,QAAQ;QAAEpE,KAAK,EAAE/B,EAAE,CAAC+B;MAAM,CAAC;MAC1CqE,IAAI,EAAEZ,UAAU;MAChBa,MAAM,EAAE/F;IACV,CAAC;IACDN,EAAE,GAAG8E,gBAAgB,GAAGA,gBAAgB,CAAC9E,EAAE,GAAGA,EAAE;IAEhD,MAAMgF,cAAc,GAAG,MAAMxG,QAAQ,CAACuD,KAAK,CAACkD,iBAAiB,CAACjF,EAAE,CAAC;IAEjE,MAAMsG,gBAAgB,GAAIF,IAAS,IAAK;MACtC,IAAI,CAAC7F,WAAW,EAAE,MAAM,IAAIgG,KAAK,CAAC,qDAAqD,CAAC;MACxF,IAAIjG,WAAW,CAAC6E,SAAS,CAAC,CAAC,EAAE;QAC3B,MAAMqB,YAAY,GAAGjG,WAAW,CAAC6D,UAAU,CAAC1D,IAAI,CAAElB,CAAC,IAAKA,CAAC,CAACQ,EAAE,CAACyG,qBAAqB,CAACzG,EAAE,CAAC,CAAC;QACvF,IAAI,CAACwG,YAAY,EAAE;MACrB;MACAjG,WAAW,CAACmG,YAAY,CAAC;QAAE1G,EAAE;QAAEoG;MAAK,CAAC,CAAC;IACxC,CAAC;IAED,MAAMO,sBAAsB,GAAIf,iBAAqC,IAAK;MACxE,IAAI,CAACd,gBAAgB,EAAE,MAAM,IAAIyB,KAAK,CAAC,yDAAyD,CAAC;MACjG;MACA;MACA,IAAI,CAAChG,WAAW,EAAE,MAAM,IAAIgG,KAAK,CAAC,oDAAoD,CAAC;MACvF,IAAI,CAACxB,iBAAiB,EAAE,MAAM,IAAIwB,KAAK,CAAC,qCAAqC,CAAC;MAC9ED,gBAAgB,CAACvB,iBAAiB,CAAC6B,iBAAiB,CAAC;MACrDV,iBAAiB,CAACW,SAAS,GAAG;QAC5BC,aAAa,EAAE/B,iBAAiB,CAAC+B,aAAa;QAC9CF,iBAAiB,EAAE7B,iBAAiB,CAAC6B,iBAAiB;QACtDG,eAAe,EAAEhC,iBAAiB,CAACgC;MACrC,CAAC;MACDvI,QAAQ,CAACuD,KAAK,CAACC,OAAO,CAACG,kBAAkB,CAAC6E,QAAQ,CAACd,iBAAiB,CAAC;MACrE,OAAO;QAAE7B,kBAAkB,EAAE;UAAErE,EAAE;UAAEiG;QAAY,CAAC;QAAEtF,SAAS,EAAEmE,gBAAgB;QAAEc;MAAkB,CAAC;IACpG,CAAC;IAED,MAAMqB,uBAAuB,GAAGA,CAAA,KAAM;MACpC,IAAI,CAACnC,gBAAgB,EAAE,MAAM,IAAIyB,KAAK,CAAE,mDAAkDvG,EAAE,CAACC,QAAQ,CAAC,CAAE,EAAC,CAAC;MAC1G6E,gBAAgB,CAACoC,KAAK,CAAC/K,OAAO,CAAEgL,IAAI,IAAK;QACvClB,WAAW,CAAC,IAAAmB,6BAAoB,EAACD,IAAI,CAACE,QAAQ,CAAC,CAAC,GAAGC,0BAAU,CAACC,SAAS;MACzE,CAAC,CAAC;IACJ,CAAC;IACD,IAAI9I,YAAY,IAAIA,YAAY,CAACmC,YAAY,IAAI5C,aAAa,KAAKwJ,4BAAY,CAACC,IAAI,EAAE;MACpFR,uBAAuB,CAAC,CAAC;MACzBzI,QAAQ,CAACuD,KAAK,CAACC,OAAO,CAACG,kBAAkB,CAAC6E,QAAQ,CAACd,iBAAiB,CAAC;MACrE,OAAO;QAAE7B,kBAAkB,EAAE;UAAErE,EAAE;UAAEiG;QAAY,CAAC;QAAEtF,SAAS,EAAEmE,gBAAgB,IAAI5D;MAAU,CAAC;IAC9F;IACA,IAAI6D,iBAAiB,EAAE2C,QAAQ,KAAK,MAAM,EAAE;MAC1CT,uBAAuB,CAAC,CAAC;MACzB,OAAON,sBAAsB,CAAC,CAAC;IACjC;IACA,MAAMgB,QAAQ,GAAG3H,EAAE,CAACiB,aAAa,CAACuE,UAAU,CAACvF,QAAQ,CAAC,CAAC,CAAC;IACxD,MAAM2H,QAAQ,GAAG,CAACnJ,YAAY,IAAIT,aAAa,KAAKwJ,4BAAY,CAACK,MAAM,GAAGF,QAAQ,GAAG3H,EAAE;IACvF,MAAM8H,eAAe,GAAG,MAAMtJ,QAAQ,CAACuJ,oCAAoC,CAACH,QAAQ,CAAC;IACrF,IAAInJ,YAAY,IAAIT,aAAa,KAAKwJ,4BAAY,CAACK,MAAM,EAAE;MACzD;MACAC,eAAe,CAACpC,OAAO,GAAG1F,EAAE,CAAC0F,OAAO;IACtC;IACA,MAAMwB,KAAK,GAAGY,eAAe,CAACZ,KAAK;IACnC,IAAAc,4BAAgB,EAACd,KAAK,EAAEjB,WAAW,EAAEnB,gBAAgB,IAAI5D,SAAS,CAAC;IAEnE,IAAIzC,YAAY,EAAE;MAChB;MACA,MAAM;QAAEwH,WAAW,EAAEgC,cAAc;QAAEC;MAAc,CAAC,GAAG,IAAAC,gCAAoB,EAACjB,KAAK,EAAEzI,YAAY,EAAET,aAAa,CAAC;MAC/G8J,eAAe,CAACZ,KAAK,GAAGgB,aAAa;MACrCjC,WAAW,GAAAjK,aAAA,CAAAA,aAAA,KAAQiK,WAAW,GAAKgC,cAAc,CAAE;IACrD;IAEA,MAAM,IAAAG,+BAAmB,EAACnC,WAAW,EAAEzH,QAAQ,EAAEsG,gBAAgB,IAAI5D,SAAS,CAAC;IAE/E,IAAIM,iBAAiB,EAAE;MACrB,MAAM6G,wBAAwB,GAAG7G,iBAAiB,CAAC8G,2BAA2B,CAAC,CAAC;MAChF,IAAID,wBAAwB,EAAE;QAC5BnC,iBAAiB,CAACqC,YAAY,GAAGF,wBAAwB;QACzD;QACA;MACF;IACF;;IAEA;IACA;IACA,IAAI5J,YAAY,EAAE;MAChB,IAAIA,YAAY,CAACmC,YAAY,IAAI5C,aAAa,KAAKwJ,4BAAY,CAACgB,MAAM,EAAE;QACtEtC,iBAAiB,CAACuC,aAAa,GAAGhK,YAAY,CAACyJ,aAAa,CAACtM,MAAM,CAAE8M,CAAC,IAAKA,CAAC,CAACC,QAAQ,CAAC,CAAC/I,GAAG,CAAE8I,CAAC,IAAKA,CAAC,CAACE,QAAQ,CAAC;MAC/G;MACApK,QAAQ,CAACuD,KAAK,CAACC,OAAO,CAACG,kBAAkB,CAAC6E,QAAQ,CAACd,iBAAiB,CAAC;IACvE,CAAC,MAAM,IAAI3F,WAAW,EAAE;MACtB,IAAIwE,iBAAiB,EAAE;QACrB;QACA,OAAO4B,sBAAsB,CAACmB,eAAe,CAAC;MAChD;MACAxB,gBAAgB,CAACd,UAAU,CAAC;IAC9B,CAAC,MAAM;MACL;MACAR,cAAc,CAAC6D,OAAO,CAACrD,UAAU,CAAC;MAClC;MACAR,cAAc,CAAC8D,kBAAkB,CAACtD,UAAU,CAACvF,QAAQ,CAAC,CAAC,CAAC;MACxDzB,QAAQ,CAACuD,KAAK,CAACC,OAAO,CAACC,GAAG,CAAC+C,cAAc,CAAC;IAC5C;IAEA,OAAO;MACLX,kBAAkB,EAAE;QAAErE,EAAE;QAAEiG;MAAY,CAAC;MACvCtF,SAAS,EAAEmE,gBAAgB,IAAI5D,SAAS;MACxC0E,iBAAiB,EAAEkC;IACrB,CAAC;EACH;EAEA,MAAcnJ,UAAUA,CAACoK,MAAgB,EAAgC;IACvE,MAAMvK,QAAQ,GAAG,IAAI,CAACpB,SAAS,CAACoB,QAAQ;IACxC,MAAMT,GAAG,GAAG,MAAM,IAAI,CAACiL,iBAAiB,CAACD,MAAM,CAAC;IAChD,MAAMzF,OAAO,GAAG,MAAM,IAAI,CAAC/F,QAAQ,CAACA,QAAQ,CAAC;MAAEQ,GAAG;MAAEkL,KAAK,EAAE;IAAK,CAAC,CAAC;IAClElL,GAAG,CAAC5B,OAAO,CAAE6D,EAAE,IAAKxB,QAAQ,CAACuD,KAAK,CAACC,OAAO,CAACG,kBAAkB,CAAC+G,eAAe,CAAClJ,EAAE,CAAC,CAAC;IAClF,MAAMxB,QAAQ,CAACuD,KAAK,CAACC,OAAO,CAACG,kBAAkB,CAACC,KAAK,CAAC,CAAC;IACvD,OAAO;MAAE+G,iBAAiB,EAAE7F,OAAO,CAACc;IAAW,CAAC;EAClD;EAEA,MAAc1F,YAAYA,CAACqK,MAAgB,EAAE/J,WAAmB,EAAEX,KAAc,EAAgC;IAC9G,MAAMN,GAAG,GAAG,MAAM,IAAI,CAACiL,iBAAiB,CAACD,MAAM,CAAC;IAChD;IACA,MAAM;MAAEpF;IAAkB,CAAC,GAAG,MAAM,IAAI,CAACrG,QAAQ,CAAC8L,IAAI,CAAC;MACrDC,YAAY,EAAE9G,8BAAe,CAACC,SAAS,CAACzE,GAAG,CAAC6B,GAAG,CAAEI,EAAE,IAAKA,EAAE,CAAC,CAAC;MAC5D3B,KAAK;MACLD,OAAO,EAAEY;IACX,CAAC,CAAC;IACF,OAAO;MAAEsK,kBAAkB,EAAE3F;IAAkB,CAAC;EAClD;EAEA,MAAcrE,sBAAsBA,CAClCV,MAAqB,EACrByH,MAAc,EACdkD,eAA4B,EAC5BvL,aAA4B,EACK;IACjC,MAAMD,GAAG,GAAG,MAAMyL,OAAO,CAACC,GAAG,CAC3B7K,MAAM,CAACgB,GAAG,CAAC,MAAO8J,KAAK,IAAK;MAC1B,MAAMC,eAAe,GAAGtD,MAAM,CAAClB,SAAS,CAAC,CAAC,GAAGuE,KAAK,CAAC3H,KAAK,GAAGsE,MAAM,CAACtE,KAAK;MACvE,MAAM6H,YAAY,GAAGxE,gBAAM,CAACC,IAAI,CAACgB,MAAM,CAACf,IAAI,EAAEqE,eAAyB,CAAC;MACxE,MAAMnE,UAAU,GAAG,MAAM,IAAI,CAACpI,SAAS,CAACoB,QAAQ,CAACuD,KAAK,CAACC,OAAO,CAAC6H,WAAW,CAACpE,MAAM,CAACmE,YAAY,EAAEF,KAAK,CAAC;MACtG,MAAMI,SAAS,GAAGF,YAAY,CAAC3J,QAAQ,CAAC,CAAC;MACzC,IAAI,CAACuF,UAAU,EAAE;QACf,MAAM,KAAIpF,oBAAQ,EAAE,oCAAmCsJ,KAAK,CAACK,sBAAsB,CAAC,CAAE,SAAQD,SAAU,GAAE,CAAC;MAC7G;MACA,OAAOJ,KAAK,CAACzI,aAAa,CAACuE,UAAU,CAACvF,QAAQ,CAAC,CAAC,CAAC;IACnD,CAAC,CACH,CAAC;IAED,OAAO,IAAI,CAACsE,cAAc,CAACxG,GAAG,EAAE;MAAEiM,YAAY,EAAE,KAAK;MAAEhM;IAAc,CAAC,EAAEuL,eAAe,EAAEA,eAAe,CAAC;EAC3G;EAEA,MAAc1F,sBAAsBA,CAClCrF,QAAkB,EAClBQ,WAAmB,EACnBX,KAAc,EACe;IAC7B,MAAM8D,kBAAkB,GAAG3D,QAAQ,CAACuD,KAAK,CAACC,OAAO,CAACG,kBAAkB,CAAC8H,aAAa,CAAC,CAAC;IACpF,IAAI,CAACzM,MAAM,CAAC0M,KAAK,CAAE,8CAA6C/H,kBAAkB,CAACjG,MAAM,CAAC+D,QAAQ,CAAC,CAAE,aAAY,CAAC;IAClH,IAAI,CAACkC,kBAAkB,CAACjG,MAAM,EAAE,OAAO,IAAI;IAC3C,MAAM6B,GAAG,GAAGwE,8BAAe,CAACC,SAAS,CAACL,kBAAkB,CAACvC,GAAG,CAAEpF,CAAC,IAAK2P,0BAAW,CAACC,UAAU,CAAC5P,CAAC,CAACwF,EAAE,CAAC,CAAC,CAAC;IAClG,OAAO,IAAI,CAAC1C,QAAQ,CAAC8L,IAAI,CAAC;MACxBC,YAAY,EAAEtL,GAAG;MACjBM,KAAK;MACLD,OAAO,EAAEY;IACX,CAAC,CAAC;EACJ;EAEA,MAAcuE,mBAAmBA,CAC/BF,QAAuB,EACvBgH,UAAkB,EAClBhM,KAAc,EACc;IAC5B,MAAMN,GAAG,GAAGsF,QAAQ,CAACzD,GAAG,CAAEI,EAAE,IAAK;MAC/B,OAAOA,EAAE,CAAC+J,sBAAsB,CAAC,CAAC;IACpC,CAAC,CAAC;IACF,IAAI,CAACvM,MAAM,CAAC0M,KAAK,CAAE,6CAA4C7G,QAAQ,CAACnH,MAAM,CAAC+D,QAAQ,CAAC,CAAE,aAAY,CAAC;IACvG,OAAO,IAAI,CAAC3C,QAAQ,CAACkD,GAAG,CAAC;MACvBzC,GAAG;MACHM,KAAK;MACLD,OAAO,EAAEiM,UAAU;MACnBC,UAAU,EAAE;IACd,CAAC,CAAC;EACJ;EAEA,MAActB,iBAAiBA,CAACuB,MAAiB,EAA0B;IACzE,IAAIA,MAAM,IAAIA,MAAM,CAACrO,MAAM,EAAE;MAC3B,MAAMsO,YAAY,GAAG,MAAM,IAAI,CAACpN,SAAS,CAACqN,2BAA2B,CAACF,MAAM,CAAC;MAC7EC,YAAY,CAACrO,OAAO,CAAE6D,EAAE,IAAK;QAC3B,MAAM0K,KAAK,GAAG,IAAI,CAACtN,SAAS,CAACoB,QAAQ,CAACuD,KAAK,CAACC,OAAO,CAACG,kBAAkB,CAACwI,QAAQ,CAAC3K,EAAE,CAAC;QACnF,IAAI,CAAC0K,KAAK,EAAE;UACV,MAAM,KAAIE,uBAAY,EAAE,2BAA0B5K,EAAE,CAACC,QAAQ,CAAC,CAAE,kCAAiC,CAAC;QACpG;MACF,CAAC,CAAC;MACF,OAAOuK,YAAY;IACrB;IACA,MAAMK,oBAAoB,GAAG,IAAI,CAACzN,SAAS,CAACoB,QAAQ,CAACuD,KAAK,CAACC,OAAO,CAACG,kBAAkB,CAAC8H,aAAa,CAAC,CAAC;IACrG,IAAI,CAACY,oBAAoB,CAAC3O,MAAM,EAAE,MAAM,KAAI0O,uBAAY,EAAE,oDAAmD,CAAC;IAC9G,OAAOC,oBAAoB,CAACjL,GAAG,CAAE1E,CAAC,IAAKiP,0BAAW,CAACC,UAAU,CAAClP,CAAC,CAAC8E,EAAE,CAAC,CAAC;EACtE;EAEA,MAAcnB,oBAAoBA,CAACL,QAAkB,EAAET,GAAa,EAA0B;IAC5F,MAAM+M,cAAc,GAAG,KAAIC,yBAAc,EAACvM,QAAQ,CAAC;IACnD,IAAI,CAACT,GAAG,CAAC7B,MAAM,EAAE;MACf,MAAM8O,YAAY,GAAG,MAAMF,cAAc,CAACG,0BAA0B,CAAC,CAAC;MACtE,OAAOD,YAAY,CAACpL,GAAG,CAAEJ,CAAC,IAAKA,CAAC,CAACQ,EAAE,CAAC;IACtC;IACA,IAAI,IAAAkL,sBAAW,EAACnN,GAAG,CAAC,EAAE;MACpB,OAAO+M,cAAc,CAACK,+BAA+B,CAACpN,GAAG,CAAC;IAC5D;IACA,OAAOA,GAAG,CAAC6B,GAAG,CAAEI,EAAE,IAAKxB,QAAQ,CAAC4M,WAAW,CAACpL,EAAE,CAAC,CAAC;EAClD;EAkBA,aAAaqL,QAAQA,CAAC,CACpBC,GAAG,EACHlO,SAAS,EACTE,QAAQ,EACRC,QAAQ,EACRF,OAAO,EACPkO,UAAU,EACVC,UAAU,EACV9N,QAAQ,EACRC,MAAM,EACNC,MAAM,EACN6N,YAAY,EACZ5N,YAAY,CAcb,EAAE;IACD,MAAML,MAAM,GAAG+N,UAAU,CAACG,YAAY,CAACC,wBAAa,CAAC3L,EAAE,CAAC;IACxD,MAAM4L,OAAO,GAAG,IAAI1O,WAAW,CAC7BE,SAAS,EACTC,OAAO,EACPC,QAAQ,EACRC,QAAQ,EACRC,MAAM,EACNgO,UAAU,EACV9N,QAAQ,EACRC,MAAM,EACNC,MAAM,EACNC,YACF,CAAC;IACDyN,GAAG,CAACO,QAAQ,CAAC,KAAIC,oBAAQ,EAACF,OAAO,EAAEH,YAAY,CAAC,CAAC;IACjD,OAAOG,OAAO;EAChB;AACF;AAACG,OAAA,CAAA7O,WAAA,GAAAA,WAAA;AAAAd,eAAA,CAlkBYc,WAAW,WAugBP,EAAE;AAAAd,eAAA,CAvgBNc,WAAW,kBAwgBA,CACpB8O,gBAAS,EACTC,oBAAe,EACfC,mBAAc,EACdC,0BAAc,EACdC,wBAAa,EACbC,sBAAY,EACZC,wCAAqB,EACrBC,mBAAc,EACdC,sBAAY,EACZC,iBAAY,EACZC,uBAAkB,EAClBC,kCAAkB,CACnB;AAAAvQ,eAAA,CArhBUc,WAAW,aAshBL0P,kBAAW;AA8C9BjB,wBAAa,CAACkB,UAAU,CAAC3P,WAAW,CAAC"}
1
+ {"version":3,"names":["_cli","data","require","_workspace","_interopRequireWildcard","_componentsList","_interopRequireDefault","_mergeVersion","_snapping","_hasWildcard","_pMapSeries","_componentId","_bitError","_laneId","_chalk","_config","_remove","_utils","_componentWriter","_importer","_logger","_globalConfig","_lodash","_checkout","_deleteComponentFiles","_configMerger","_install","_mergeCmd","_merging","_mergeStatusProvider","obj","__esModule","default","_getRequireWildcardCache","e","WeakMap","r","t","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","ownKeys","keys","getOwnPropertySymbols","o","filter","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","key","value","_toPropertyKey","configurable","writable","_toPrimitive","String","Symbol","toPrimitive","TypeError","Number","MergingMain","constructor","workspace","install","snapping","checkout","logger","componentWriter","importer","config","remove","configMerger","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","otherLaneId","currentLane","tag","componentWithConflict","find","component","hasConflicts","getMergeStrategyInteractive","componentStatus","shouldBeRemoved","componentIdsToRemove","changeVersion","undefined","succeededComponents","componentsResults","applyVersionMultiple","allConfigMerge","compact","configMergeResult","workspaceDepsUpdates","workspaceDepsConflicts","updateWorkspaceJsoncWithDepsIfNeeded","workspaceConfigConflictWriteError","writeWorkspaceJsoncWithConflictsGracefully","generateConfigMergeConflictFileForAll","scope","objects","add","persist","unmergedComponents","write","writeBitMap","compBitIdsToRemove","ComponentIdList","fromArray","deleteComponentsFiles","cleanFromBitMap","componentsHasConfigMergeConflicts","some","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","workspaceConfigUpdateResult","getMergeStatus","options","otherLane","mergeStatusProvider","MergeStatusProvider","getStatus","mapSeries","currentComponent","resolvedUnrelated","modelComponent","getModelComponent","updatedLaneId","isDefault","LaneId","from","name","applyVersion","remoteHead","getRef","version","compsToWrite","legacyCompToWrite","manyComponentsWriterOpts","writeConfig","reasonForBitmapChange","writeMany","filesStatus","unmergedComponent","fullName","head","laneId","addToCurrentLane","Error","isPartOfLane","isEqualWithoutVersion","addComponent","handleResolveUnrelated","headOnCurrentLane","unrelated","unrelatedHead","unrelatedLaneId","addEntry","markAllFilesAsUnchanged","files","file","pathNormalizeToLinux","relative","FileStatus","unchanged","MergeOptions","ours","strategy","remoteId","idToLoad","theirs","legacyComponent","loadComponentFromModelImportIfNeeded","updateFileStatus","modifiedStatus","modifiedFiles","applyModifiedVersion","removeFilesIfNeeded","successfullyMergedConfig","getSuccessfullyMergedConfig","mergedConfig","manual","unmergedPaths","f","conflict","filePath","setHead","markVersionAsLocal","values","getIdsForUnmerged","reset","removeComponent","abortedComponents","snap","legacyBitIds","resolvedComponents","localLaneObject","Promise","all","bitId","remoteScopeName","remoteLaneId","remoteLanes","laneIdStr","toStringWithoutVersion","shouldSquash","getComponents","debug","ComponentID","fromObject","tagMessage","unmodified","idsStr","componentIds","resolveMultipleComponentIds","entry","getEntry","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","ConfigMergerAspect","MainRuntime","addRuntime"],"sources":["merging.main.runtime.ts"],"sourcesContent":["import { CLIAspect, CLIMain, MainRuntime } from '@teambit/cli';\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 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 { 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 } from 'lodash';\nimport { MergeResultsThreeWay } from '@teambit/legacy/dist/consumer/versions-ops/merge-version/three-way-merge';\nimport {\n ApplyVersionWithComps,\n CheckoutAspect,\n CheckoutMain,\n ComponentStatusBase,\n applyModifiedVersion,\n removeFilesIfNeeded,\n updateFileStatus,\n} from '@teambit/checkout';\nimport deleteComponentsFiles from '@teambit/legacy/dist/consumer/component-ops/delete-component-files';\nimport {\n ConfigMergerAspect,\n ConfigMergerMain,\n ConfigMergeResult,\n WorkspaceConfigUpdateResult,\n} from '@teambit/config-merger';\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 { MergeStatusProvider, MergeStatusProviderOptions } from './merge-status-provider';\n\ntype ResolveUnrelatedData = {\n strategy: MergeStrategy;\n headOnCurrentLane: Ref;\n unrelatedHead: Ref;\n unrelatedLaneId: LaneId;\n};\n\nexport type ComponentMergeStatus = ComponentStatusBase & {\n mergeResults?: MergeResultsThreeWay | null;\n divergeData?: SnapsDistance;\n resolvedUnrelated?: ResolveUnrelatedData;\n configMergeResult?: ConfigMergeResult;\n};\n\nexport type ComponentMergeStatusBeforeMergeAttempt = ComponentStatusBase & {\n divergeData?: SnapsDistance;\n resolvedUnrelated?: ResolveUnrelatedData;\n mergeProps?: {\n otherLaneHead: Ref;\n currentId: ComponentID;\n modelComponent: ModelComponent;\n };\n};\n\nexport type FailedComponents = { id: ComponentID; unchangedMessage: string; unchangedLegitimately?: boolean };\n\n// fileName is PathLinux. TS doesn't let anything else in the keys other than string and number\nexport type FilesStatus = { [fileName: string]: keyof typeof FileStatus };\n\nexport type ApplyVersionResult = { id: ComponentID; filesStatus: FilesStatus };\n\nexport type ApplyVersionResults = {\n components?: ApplyVersionResult[];\n version?: string;\n failedComponents?: FailedComponents[];\n removedComponents?: ComponentID[];\n addedComponents?: ComponentID[]; // relevant when restoreMissingComponents is true (e.g. bit lane merge-abort)\n 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 workspaceConfigUpdateResult?: WorkspaceConfigUpdateResult;\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 private configMerger: ConfigMergerMain\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(\n bitIds,\n currentLaneId,\n currentLaneObject,\n mergeStrategy\n );\n const failedComponents = allComponentsStatus.filter((c) => c.unchangedMessage && !c.unchangedLegitimately);\n if (failedComponents.length) {\n const failureMsgs = failedComponents\n .map(\n (failedComponent) =>\n `${chalk.bold(failedComponent.id.toString())} - ${chalk.red(failedComponent.unchangedMessage as string)}`\n )\n .join('\\n');\n throw new BitError(`unable to merge due to the following failures:\\n${failureMsgs}`);\n }\n\n return this.mergeSnaps({\n mergeStrategy,\n allComponentsStatus,\n otherLaneId: currentLaneId,\n currentLane: currentLaneObject,\n 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 otherLaneId,\n currentLane,\n noSnap,\n tag,\n snapMessage,\n build,\n skipDependencyInstallation,\n }: {\n mergeStrategy: MergeStrategy;\n allComponentsStatus: ComponentMergeStatus[];\n otherLaneId: LaneId;\n currentLane: 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(\n succeededComponents,\n otherLaneId,\n mergeStrategy,\n currentLane\n );\n\n const allConfigMerge = compact(succeededComponents.map((c) => c.configMergeResult));\n\n const { workspaceDepsUpdates, workspaceDepsConflicts } =\n await this.configMerger.updateWorkspaceJsoncWithDepsIfNeeded(allConfigMerge);\n\n let workspaceConfigConflictWriteError: Error | undefined;\n if (workspaceDepsConflicts) {\n workspaceConfigConflictWriteError = await this.configMerger.writeWorkspaceJsoncWithConflictsGracefully(\n workspaceDepsConflicts\n );\n }\n await this.configMerger.generateConfigMergeConflictFileForAll(allConfigMerge);\n\n if (currentLane) consumer.scope.objects.add(currentLane);\n\n await consumer.scope.objects.persist(); // persist anyway, if currentLane is null it should save all main heads\n\n await consumer.scope.objects.unmergedComponents.write();\n\n await consumer.writeBitMap(`merge ${otherLaneId.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 workspaceConfigUpdateResult: {\n workspaceDepsUpdates,\n workspaceDepsConflicts,\n workspaceConfigConflictWriteError,\n },\n leftUnresolvedConflicts,\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 options: MergeStatusProviderOptions,\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 ): Promise<ComponentMergeStatus[]> {\n const mergeStatusProvider = new MergeStatusProvider(\n this.workspace,\n this.logger,\n this.importer,\n options,\n currentLane || undefined,\n otherLane || undefined\n );\n return mergeStatusProvider.getStatus(bitIds);\n }\n\n private async applyVersionMultiple(\n succeededComponents: ComponentMergeStatus[],\n otherLaneId: LaneId,\n mergeStrategy: MergeStrategy,\n currentLane: 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 = otherLaneId.isDefault() ? LaneId.from(otherLaneId.name, id.scope as string) : otherLaneId;\n return this.applyVersion({\n currentComponent,\n id,\n mergeResults,\n mergeStrategy,\n remoteHead: modelComponent.getRef(id.version as string) as Ref,\n otherLaneId: updatedLaneId,\n currentLane,\n resolvedUnrelated,\n configMergeResult,\n });\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 otherLaneId,\n currentLane,\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 otherLaneId: LaneId;\n currentLane: 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 id: { name: id.fullName, scope: id.scope },\n head: remoteHead,\n laneId: otherLaneId,\n };\n id = currentComponent ? currentComponent.id : id;\n\n const modelComponent = await consumer.scope.getModelComponent(id);\n\n const addToCurrentLane = (head: Ref) => {\n if (!currentLane) throw new Error('currentLane must be defined when adding to the lane');\n if (otherLaneId.isDefault()) {\n const isPartOfLane = currentLane.components.find((c) => c.id.isEqualWithoutVersion(id));\n if (!isPartOfLane) return;\n }\n currentLane.addComponent({ id, head });\n };\n\n const handleResolveUnrelated = (legacyCompToWrite?: ConsumerComponent) => {\n if (!currentComponent) throw new Error('currentComponent must be defined when resolvedUnrelated');\n // because when on a main, we don't allow merging lanes with unrelated. we asks users to switch to the lane\n // first and then merge with --resolve-unrelated\n if (!currentLane) throw new Error('currentLane must be defined when resolvedUnrelated');\n if (!resolvedUnrelated) throw new Error('resolvedUnrelated must be populated');\n addToCurrentLane(resolvedUnrelated.headOnCurrentLane);\n unmergedComponent.unrelated = {\n unrelatedHead: resolvedUnrelated.unrelatedHead,\n headOnCurrentLane: resolvedUnrelated.headOnCurrentLane,\n unrelatedLaneId: resolvedUnrelated.unrelatedLaneId,\n };\n 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, consumer, currentComponent || undefined);\n\n if (configMergeResult) {\n const successfullyMergedConfig = configMergeResult.getSuccessfullyMergedConfig();\n if (successfullyMergedConfig) {\n unmergedComponent.mergedConfig = successfullyMergedConfig;\n // no need to `unmergedComponents.addEntry` here. it'll be added in the next lines inside `if (mergeResults)`.\n // because if `configMergeResult` is set, `mergeResults` must be set as well. both happen on diverge.\n }\n }\n\n // if mergeResults, the head snap is going to be updated on a later phase when snapping with two parents\n // otherwise, update the head of the current lane or main\n if (mergeResults) {\n if (mergeResults.hasConflicts && mergeStrategy === MergeOptions.manual) {\n unmergedComponent.unmergedPaths = mergeResults.modifiedFiles.filter((f) => f.conflict).map((f) => f.filePath);\n }\n consumer.scope.objects.unmergedComponents.addEntry(unmergedComponent);\n } else if (currentLane) {\n if (resolvedUnrelated) {\n // must be \"theirs\"\n return handleResolveUnrelated(legacyComponent);\n }\n addToCurrentLane(remoteHead);\n } else {\n // this is main\n 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));\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 mergeStrategy: MergeStrategy\n ): Promise<ComponentMergeStatus[]> {\n const ids = await Promise.all(\n bitIds.map(async (bitId) => {\n const remoteScopeName = laneId.isDefault() ? bitId.scope : laneId.scope;\n const remoteLaneId = LaneId.from(laneId.name, remoteScopeName as string);\n const remoteHead = await this.workspace.consumer.scope.objects.remoteLanes.getRef(remoteLaneId, bitId);\n const laneIdStr = remoteLaneId.toString();\n if (!remoteHead) {\n throw new BitError(`unable to find a remote head of \"${bitId.toStringWithoutVersion()}\" in \"${laneIdStr}\"`);\n }\n return bitId.changeVersion(remoteHead.toString());\n })\n );\n\n return this.getMergeStatus(ids, { shouldSquash: false, mergeStrategy }, localLaneObject, localLaneObject);\n }\n\n private async snapResolvedComponents(\n 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);\n if (!entry) {\n throw new BitError(`unable to merge-resolve ${id.toString()}, it is not marked as unresolved`);\n }\n });\n return componentIds;\n }\n const unresolvedComponents = this.workspace.consumer.scope.objects.unmergedComponents.getComponents();\n if (!unresolvedComponents.length) throw new BitError(`all components are resolved already, nothing to do`);\n return unresolvedComponents.map((u) => ComponentID.fromObject(u.id));\n }\n\n private async getComponentsToMerge(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 ConfigMergerAspect,\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 configMerger,\n ]: [\n CLIMain,\n Workspace,\n SnappingMain,\n CheckoutMain,\n InstallMain,\n LoggerMain,\n ComponentWriterMain,\n ImporterMain,\n ConfigMain,\n RemoveMain,\n GlobalConfigMain,\n ConfigMergerMain\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 configMerger\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.150",
3
+ "version": "1.0.152",
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.150"
9
+ "version": "1.0.152"
10
10
  },
11
11
  "dependencies": {
12
12
  "chalk": "2.4.2",
@@ -16,18 +16,18 @@
16
16
  "@teambit/component-id": "1.2.0",
17
17
  "@teambit/lane-id": "0.0.311",
18
18
  "@teambit/harmony": "0.4.6",
19
- "@teambit/cli": "0.0.849",
20
- "@teambit/config-merger": "0.0.17",
21
- "@teambit/global-config": "0.0.852",
22
- "@teambit/importer": "1.0.150",
23
- "@teambit/logger": "0.0.942",
24
- "@teambit/workspace": "1.0.150",
25
- "@teambit/checkout": "1.0.150",
26
- "@teambit/component-writer": "1.0.150",
27
- "@teambit/config": "0.0.901",
28
- "@teambit/install": "1.0.150",
29
- "@teambit/remove": "1.0.150",
30
- "@teambit/snapping": "1.0.150"
19
+ "@teambit/cli": "0.0.850",
20
+ "@teambit/config-merger": "0.0.19",
21
+ "@teambit/global-config": "0.0.853",
22
+ "@teambit/importer": "1.0.152",
23
+ "@teambit/logger": "0.0.943",
24
+ "@teambit/workspace": "1.0.152",
25
+ "@teambit/checkout": "1.0.152",
26
+ "@teambit/component-writer": "1.0.152",
27
+ "@teambit/config": "0.0.903",
28
+ "@teambit/install": "1.0.152",
29
+ "@teambit/remove": "1.0.152",
30
+ "@teambit/snapping": "1.0.152"
31
31
  },
32
32
  "devDependencies": {
33
33
  "@types/lodash": "4.14.165",