npm - @teambit/merging - Versions diffs - 1.0.982 → 1.0.984 - Mend

@teambit/merging 1.0.982 → 1.0.984

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 (6) hide show

package/dist/merge-status-provider.js +5 -1
package/dist/merge-status-provider.js.map +1 -1
package/dist/merging.main.runtime.js +34 -11
package/dist/merging.main.runtime.js.map +1 -1
package/package.json +27 -27
/package/dist/{preview-1778583528331.js → preview-1778613913688.js} +0 -0

package/dist/merge-status-provider.js CHANGED Viewed

@@ -271,7 +271,11 @@ other:   ${otherLaneHead.toString()}`);
       ignoreVersion: true
     });
     const componentOnOther = await modelComponent.loadVersion(version, this.scope.legacyScope.objects);
-    const idOnCurrentLane = this.currentLane?.getComponent(id);
+    // include hidden lane.updateDependents — when merging main into a lane, a hidden cascade
+    // entry is the lane-side baseline for the 3-way merge. Without this the merge engine treats
+    // the comp as "not on the lane" and produces a snap with parents=[mainHead], losing the
+    // ancestral link to the lane's hidden head.
+    const idOnCurrentLane = this.currentLane?.getComponent(id) || this.currentLane?.getUpdateDependentAsLaneComponent(id);
     if (componentOnOther.isRemoved()) {
       // if exist in current lane, we want the current lane to get the soft-remove update.
       // or if it was removed with --update-main, we want to merge it so then main will get the update.

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

	@@ -1 +1 @@
1	- {"version":3,"names":["_pMapSeries","data","_interopRequireDefault","require","_componentId","_laneId","_component","_legacy","_lodash","_configMerger","_componentModules","_dependencyResolver","_builder","e","__esModule","default","ownKeys","r","t","Object","keys","getOwnPropertySymbols","o","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","defineProperty","_toPropertyKey","value","configurable","writable","i","_toPrimitive","Symbol","toPrimitive","call","TypeError","String","Number","compIsAlreadyMergedMsg","exports","compHasBeenRemovedMsg","MergeStatusProvider","constructor","scope","logger","importer","options","workspace","currentLane","otherLane","getStatus","bitIds","importObjectsFromMainIfExist","toBitIds","toVersionLatest","componentStatusBeforeMergeAttempt","mapSeries","id","getComponentStatusBeforeMergeAttempt","shouldImportHistoryOfOtherLane","shouldSquash","toImport","map","compStatus","divergeData","versionsToImport","commonSnapBeforeDiverge","snapsOnTargetOnly","compact","v","changeVersion","toString","flat","reason","legacyScope","scopeImporter","importWithoutDeps","ComponentIdList","fromArray","lane","cache","includeVersionHistory","compStatusNotNeedMerge","c","mergeProps","compStatusNeedMerge","getComponentsStatusNeedMerge","tmp","Tmp","componentsStatus","Promise","all","getComponentMergeStatus","clear","err","results","componentMergeStatusBeforeMergeAttempt","currentComponent","Error","otherLaneHead","currentId","modelComponent","repo","objects","baseSnap","debug","toStringWithoutVersion","version","baseComponent","loadVersion","otherComponent","currentLaneName","toLaneId","otherLaneName","DEFAULT_LANE","currentLabel","otherLabel","workspaceIds","listIds","toComponentIds","configMerger","ComponentConfigMerger","extensions","mergeStrategy","configMergeResult","merge","dataMergeResult","mergeExtensionsData","mergeResults","threeWayMerge","currentExtensions","baseExtensions","otherExtensions","shouldMergeAspectsData","conflictedAspects","aspectsToSkip","DependencyResolverAspect","BuilderAspect","currentExtension","includes","stringId","baseExtension","findExtension","idWithoutVersion","otherExtension","extensionId","isEqual","returnUnmerged","msg","unmergedLegitimately","componentStatus","unchangedMessage","unchangedLegitimately","consumer","getModelComponentIfExist","unmerged","unmergedComponents","getEntry","getRef","existingBitMapId","bitMap","getComponentIdIfExist","ignoreVersion","componentOnOther","idOnCurrentLane","getComponent","isRemoved","shouldMerge","shouldRemoveFromMain","head","shouldBeRemoved","getCurrentId","getHeadAsTagIfExist","getDivergeData","targetHead","throws","componentFromModel","componentMap","getComponentIfExist","isLocallyRemoved","getCurrentComponent","loadComponent","getConsumerComponent","isRemovedOnMain","findCoreExtension","config","removeOnMain","isTargetNotAhead","isTargetAhead","shouldIgnore","isModified","undefined","componentModificationStatus","getComponentStatusById","modified","isSourceCodeModified","isComponentSourceCodeModified","modifiedType","ignoreConfigChanges","sourceHead","NoCommonSnap","resolveUnrelated","message","handleNoCommonSnap","detachHead","commonSnapId","commonSnapComp","isDiverged","isSourceAhead","handleTargetAheadAsDiverged","mainHead","returnAccordingToOurs","headToSaveInLane","unrelatedHead","unrelatedLaneId","resolvedUnrelated","strategy","headOnCurrentLane","returnAccordingToTheirs","resolvedRef","unrelatedHeadRef","currentVersionRef","otherVersionRef","hasResolvedFromMain","hashToCompare","divergeDataFromMain","hasResolvedLocally","getHeadRegardlessOfLane","hasResolvedRemotely","refToSaveInLane"],"sources":["merge-status-provider.ts"],"sourcesContent":["import type { Workspace } from '@teambit/workspace';\nimport mapSeries from 'p-map-series';\nimport type { ComponentID } from '@teambit/component-id';\nimport { ComponentIdList } from '@teambit/component-id';\nimport type { LaneId } from '@teambit/lane-id';\nimport { DEFAULT_LANE } from '@teambit/lane-id';\nimport type { SnapsDistance } from '@teambit/component.snap-distance';\nimport { getDivergeData } from '@teambit/component.snap-distance';\nimport type { Lane, ModelComponent, Version, Ref } from '@teambit/objects';\nimport { NoCommonSnap, Tmp } from '@teambit/legacy.scope';\nimport type { ConsumerComponent } from '@teambit/legacy.consumer-component';\nimport type { ImporterMain } from '@teambit/importer';\nimport type { Logger } from '@teambit/logger';\nimport { compact, isEqual } from 'lodash';\nimport { ComponentConfigMerger } from '@teambit/config-merger';\nimport type { ScopeMain } from '@teambit/scope';\nimport type { MergeStrategy } from '@teambit/component.modules.merge-helper';\nimport { threeWayMerge } from '@teambit/component.modules.merge-helper';\nimport type { ComponentMergeStatus, ComponentMergeStatusBeforeMergeAttempt } from './merging.main.runtime';\nimport type { ExtensionDataList } from '@teambit/legacy.extension-data';\nimport { DependencyResolverAspect } from '@teambit/dependency-resolver';\nimport { BuilderAspect } from '@teambit/builder';\n\nexport type MergeStatusProviderOptions = {\n resolveUnrelated?: MergeStrategy;\n mergeStrategy: MergeStrategy;\n ignoreConfigChanges?: boolean;\n shouldSquash?: boolean;\n handleTargetAheadAsDiverged?: boolean;\n detachHead?: boolean;\n shouldMergeAspectsData?: boolean;\n};\n\ntype ConflictedDataAspects = { [extId: string]: string }; // extId => reason\n\nexport type DataMergeResult = {\n conflictedAspects?: ConflictedDataAspects;\n};\n\nexport const compIsAlreadyMergedMsg = 'component is already merged';\nexport const compHasBeenRemovedMsg = 'component has been removed';\nexport class MergeStatusProvider {\n constructor(\n private scope: ScopeMain,\n private logger: Logger,\n private importer: ImporterMain,\n private options: MergeStatusProviderOptions,\n private workspace?: Workspace,\n private currentLane?: Lane, // currently checked out lane. if on main, then it's undefined.\n private otherLane?: Lane // the lane we want to merged to our lane. (undefined if it's \"main\").\n ) {}\n\n async getStatus(\n bitIds: ComponentID[] // the id.version is the version we want to merge to the current component\n ): Promise<ComponentMergeStatus[]> {\n if (!this.currentLane && this.otherLane) {\n await this.importer.importObjectsFromMainIfExist(this.otherLane.toBitIds().toVersionLatest());\n }\n const componentStatusBeforeMergeAttempt = await mapSeries(bitIds, (id) =>\n this.getComponentStatusBeforeMergeAttempt(id)\n );\n // whether or not we need to import the gap between the common-snap and the other lane.\n // the common-snap itself we need anyway in order to get the files hash/content for checking conflicts.\n const shouldImportHistoryOfOtherLane =\n !this.options?.shouldSquash && // when squashing, no need for all history, only the head is going to be pushed\n (!this.currentLane \|\| // on main. we need all history in order to push each component to its remote\n this.currentLane.scope !== this.otherLane?.scope); // on lane, but the other lane is from a different scope. we need all history in order to push to the current lane's scope\n const toImport = componentStatusBeforeMergeAttempt\n .map((compStatus) => {\n if (!compStatus.divergeData) return [];\n const versionsToImport = [compStatus.divergeData.commonSnapBeforeDiverge];\n if (shouldImportHistoryOfOtherLane) {\n versionsToImport.push(...compStatus.divergeData.snapsOnTargetOnly);\n }\n return compact(versionsToImport).map((v) => compStatus.id.changeVersion(v.toString()));\n })\n .flat();\n const reason = shouldImportHistoryOfOtherLane\n ? `for filling the gap between the common-snap and the head of ${this.otherLane?.id() \|\| 'main'}`\n : `for getting the common-snap between ${this.currentLane?.id() \|\| 'main'} and ${this.otherLane?.id() \|\| 'main'}`;\n await this.scope.legacyScope.scopeImporter.importWithoutDeps(ComponentIdList.fromArray(toImport), {\n lane: this.otherLane,\n cache: true,\n includeVersionHistory: false,\n reason,\n });\n\n const compStatusNotNeedMerge = componentStatusBeforeMergeAttempt.filter(\n (c) => !c.mergeProps\n ) as ComponentMergeStatus[];\n const compStatusNeedMerge = componentStatusBeforeMergeAttempt.filter((c) => c.mergeProps);\n\n const getComponentsStatusNeedMerge = async (): Promise<ComponentMergeStatus[]> => {\n const tmp = new Tmp(this.scope.legacyScope);\n try {\n const componentsStatus = await Promise.all(\n compStatusNeedMerge.map((compStatus) => this.getComponentMergeStatus(compStatus))\n );\n await tmp.clear();\n return componentsStatus;\n } catch (err: any) {\n await tmp.clear();\n throw err;\n }\n };\n const results = await getComponentsStatusNeedMerge();\n\n results.push(...compStatusNotNeedMerge);\n return results;\n }\n\n private async getComponentMergeStatus(\n componentMergeStatusBeforeMergeAttempt: ComponentMergeStatusBeforeMergeAttempt\n ) {\n const { id, divergeData, currentComponent, mergeProps } = componentMergeStatusBeforeMergeAttempt;\n if (!mergeProps) throw new Error(`getDivergedMergeStatus, mergeProps is missing for ${id.toString()}`);\n const { otherLaneHead, currentId, modelComponent } = mergeProps;\n const repo = this.scope.legacyScope.objects;\n if (!divergeData) throw new Error(`getDivergedMergeStatus, divergeData is missing for ${id.toString()}`);\n if (!currentComponent) throw new Error(`getDivergedMergeStatus, currentComponent is missing for ${id.toString()}`);\n\n const baseSnap = divergeData.commonSnapBeforeDiverge as unknown as Ref; // must be set when isTrueMerge\n this.logger.debug(`merging snaps details:\nid: ${id.toStringWithoutVersion()}\nbase: ${baseSnap.toString()}\ncurrent: ${currentId.version}\nother: ${otherLaneHead.toString()}`);\n const baseComponent: Version = await modelComponent.loadVersion(baseSnap.toString(), repo);\n const otherComponent: Version = await modelComponent.loadVersion(otherLaneHead.toString(), repo);\n\n const currentLaneName = this.currentLane?.toLaneId().toString() \|\| 'main';\n const otherLaneName = this.otherLane ? this.otherLane.toLaneId().toString() : DEFAULT_LANE;\n const currentLabel = `${currentId.version} (${currentLaneName === otherLaneName ? 'current' : currentLaneName})`;\n const otherLabel = `${otherLaneHead.toString()} (${\n otherLaneName === currentLaneName ? 'incoming' : otherLaneName\n })`;\n const workspaceIds = this.workspace?.listIds() \|\| this.currentLane?.toComponentIds() \|\| [];\n const configMerger = new ComponentConfigMerger(\n id.toStringWithoutVersion(),\n workspaceIds,\n this.otherLane,\n currentComponent.extensions,\n baseComponent.extensions,\n otherComponent.extensions,\n currentLabel,\n otherLabel,\n this.logger,\n this.options.mergeStrategy\n );\n const configMergeResult = configMerger.merge();\n\n const dataMergeResult = this.mergeExtensionsData(\n currentComponent.extensions,\n baseComponent.extensions,\n otherComponent.extensions\n );\n\n const mergeResults = await threeWayMerge({\n scope: this.scope.legacyScope,\n otherComponent,\n otherLabel,\n currentComponent,\n currentLabel,\n baseComponent,\n });\n return {\n currentComponent,\n id,\n mergeResults,\n divergeData,\n configMergeResult,\n dataMergeResult,\n };\n }\n\n private mergeExtensionsData(\n currentExtensions: ExtensionDataList,\n baseExtensions: ExtensionDataList,\n otherExtensions: ExtensionDataList\n ): DataMergeResult {\n if (!this.options.shouldMergeAspectsData) {\n return {};\n }\n const conflictedAspects: { [extId: string]: string } = {}; // extId => reason\n // these aspects handled separately\n const aspectsToSkip = [DependencyResolverAspect.id, BuilderAspect.id];\n currentExtensions.forEach((currentExtension) => {\n if (aspectsToSkip.includes(currentExtension.stringId)) {\n return;\n }\n const baseExtension = baseExtensions.findExtension(currentExtension.idWithoutVersion, true);\n const otherExtension = otherExtensions.findExtension(currentExtension.idWithoutVersion, true);\n if (!otherExtension) {\n conflictedAspects[currentExtension.stringId] = 'missing in other';\n return;\n }\n // check whether the version is different.\n if (currentExtension.extensionId?.version !== otherExtension.extensionId?.version) {\n if (baseExtension?.extensionId?.version === otherExtension.extensionId?.version) {\n // ext version has changed in current. we're good.\n return;\n }\n conflictedAspects[currentExtension.stringId] =\n `version changed. base: ${baseExtension?.extensionId?.version}, other: ${otherExtension.extensionId?.version}`;\n return;\n }\n if (isEqual(currentExtension.data, otherExtension.data)) return;\n if (!baseExtension) {\n conflictedAspects[currentExtension.stringId] = 'no base-version. conflicted in data';\n return;\n }\n if (isEqual(baseExtension.data, otherExtension.data)) {\n return; // changed in current. leave it.\n }\n if (isEqual(baseExtension.data, currentExtension.data)) {\n // changed in other. copy it.\n currentExtension.data = otherExtension.data;\n return;\n }\n // changed in both. conflict.\n conflictedAspects[currentExtension.stringId] = 'conflicted in data since base-version';\n });\n otherExtensions.forEach((otherExtension) => {\n if (!currentExtensions.findExtension(otherExtension.idWithoutVersion, true)) {\n conflictedAspects[otherExtension.stringId] = 'missing in current';\n }\n });\n\n return { conflictedAspects };\n }\n\n private returnUnmerged(\n id: ComponentID,\n msg: string,\n unmergedLegitimately = false\n ): ComponentMergeStatusBeforeMergeAttempt {\n const componentStatus: ComponentMergeStatusBeforeMergeAttempt = { id };\n componentStatus.unchangedMessage = msg;\n componentStatus.unchangedLegitimately = unmergedLegitimately;\n return componentStatus;\n }\n\n // eslint-disable-next-line complexity\n private async getComponentStatusBeforeMergeAttempt(\n id: ComponentID // the id.version is the version we want to merge to the current component\n ): Promise<ComponentMergeStatusBeforeMergeAttempt> {\n const consumer = this.workspace?.consumer;\n const componentStatus: ComponentMergeStatusBeforeMergeAttempt = { id };\n const modelComponent = await this.scope.legacyScope.getModelComponentIfExist(id);\n if (!modelComponent) {\n return this.returnUnmerged(\n id,\n `component ${id.toString()} is on the lane/main but its objects were not found, please re-import the lane`\n );\n }\n const unmerged = this.scope.legacyScope.objects.unmergedComponents.getEntry(id);\n if (unmerged) {\n return this.returnUnmerged(\n id,\n `component ${id.toStringWithoutVersion()} is in during-merge state a previous merge, please snap/tag it first (or use bit merge --resolve/--abort/ bit lane merge-abort)`\n );\n }\n const repo = this.scope.legacyScope.objects;\n const version = id.version as string;\n const otherLaneHead = modelComponent.getRef(version);\n const existingBitMapId = consumer?.bitMap.getComponentIdIfExist(id, { ignoreVersion: true });\n const componentOnOther: Version = await modelComponent.loadVersion(version, this.scope.legacyScope.objects);\n const idOnCurrentLane = this.currentLane?.getComponent(id);\n\n if (componentOnOther.isRemoved()) {\n // if exist in current lane, we want the current lane to get the soft-remove update.\n // or if it was removed with --update-main, we want to merge it so then main will get the update.\n // (unless this component does not exist on main, in which case, we don't want to merge it).\n const shouldMerge = idOnCurrentLane \|\| (componentOnOther.shouldRemoveFromMain() && modelComponent.head);\n if (shouldMerge) {\n // remove the component from the workspace if exist.\n componentStatus.shouldBeRemoved = true;\n } else {\n // on main, don't merge soft-removed components unless it's marked with removeOnMain.\n // on lane, if it's not part of the current lane, don't merge it.\n return this.returnUnmerged(id, compHasBeenRemovedMsg, true);\n }\n }\n const getCurrentId = () => {\n if (existingBitMapId) return existingBitMapId;\n if (this.currentLane) {\n if (!idOnCurrentLane) return null;\n return idOnCurrentLane.id.changeVersion(idOnCurrentLane.head.toString());\n }\n // it's on main\n const head = modelComponent.getHeadAsTagIfExist();\n if (head) {\n return id.changeVersion(head);\n }\n return null;\n };\n const currentId = getCurrentId();\n if (!currentId) {\n const divergeData = await getDivergeData({ repo, modelComponent, targetHead: otherLaneHead, throws: false });\n return { ...componentStatus, componentFromModel: componentOnOther, divergeData };\n }\n const componentMap = consumer?.bitMap.getComponentIfExist(currentId, { ignoreVersion: true });\n const isLocallyRemoved = componentMap?.isRemoved();\n if (isLocallyRemoved) {\n return this.returnUnmerged(\n id,\n `component is locally deleted, please snap and export first or undo by bit recover`\n );\n }\n const getCurrentComponent = () => {\n // eslint-disable-next-line @typescript-eslint/no-non-null-assertion\n if (existingBitMapId) return consumer!.loadComponent(existingBitMapId);\n return this.scope.legacyScope.getConsumerComponent(currentId);\n };\n const currentComponent = await getCurrentComponent();\n if (currentComponent.isRemoved()) {\n // we have a few options:\n // 1. \"other\" is main.\n // 1.a. it was deleted on the lane with --update-main. in this case, we need to merge because eventually we need this component\n // to be merged to main with the \"removed: true\".\n // 1.b. it was deleted on the lane without --update-main. in this case, we don't care what happens on main,\n // we want the component to stay deleted on this lane. (even when main is ahead, we don't want to merge it).\n // 2. other is ahead. in this case, other recovered the component. so we can continue with the merge.\n // it is possible that it is diverged, in which case, still continue with the merge, and later on, the\n // merge-config will show a config conflict of the remove aspect.\n // 3. other is not ahead. in this case, just ignore this component, no point to merge it, we want it removed.\n const isRemovedOnMain =\n currentComponent.extensions.findCoreExtension('teambit.component/remove')?.config?.removeOnMain;\n const divergeData = await getDivergeData({ repo, modelComponent, targetHead: otherLaneHead, throws: false });\n const isTargetNotAhead = !divergeData.err && !divergeData.isTargetAhead();\n const shouldIgnore = this.otherLane\n ? isTargetNotAhead // option #2 and #3 above\n : !isRemovedOnMain; // it's main. option #1 above.\n if (shouldIgnore) {\n return this.returnUnmerged(id, compHasBeenRemovedMsg, true);\n }\n }\n\n const isModified = async (): Promise<undefined \| 'code' \| 'config'> => {\n if (!consumer \|\| !this.workspace) return undefined;\n const componentModificationStatus = await this.workspace.getComponentStatusById(currentComponent.id);\n if (!componentModificationStatus.modified) return undefined;\n if (!existingBitMapId) return undefined;\n const baseComponent = await modelComponent.loadVersion(\n existingBitMapId.version as string,\n consumer.scope.objects\n );\n const isSourceCodeModified = await consumer.isComponentSourceCodeModified(baseComponent, currentComponent);\n if (isSourceCodeModified) return 'code';\n return 'config';\n };\n\n const modifiedType = await isModified();\n if (modifiedType === 'config' && !this.options?.ignoreConfigChanges) {\n return this.returnUnmerged(\n id,\n `component has config changes, please snap/tag it first. alternatively, use --ignore-config-changes flag to bypass`\n );\n }\n if (modifiedType === 'code') {\n return this.returnUnmerged(id, `component is modified, please snap/tag it first`);\n }\n\n if (!otherLaneHead) {\n throw new Error(`merging: unable finding a hash for the version ${version} of ${id.toString()}`);\n }\n const divergeData = await getDivergeData({\n repo,\n modelComponent,\n sourceHead: this.workspace ? undefined : modelComponent.getRef(currentId.version as string), // not sure if needs to check for this.workspace\n targetHead: otherLaneHead,\n throws: false,\n });\n if (divergeData.err) {\n if (!(divergeData.err instanceof NoCommonSnap) \|\| !this.options?.resolveUnrelated) {\n return this.returnUnmerged(id, `unable to traverse history. error: ${divergeData.err.message}`);\n }\n return this.handleNoCommonSnap(\n modelComponent,\n id,\n otherLaneHead,\n currentComponent,\n componentOnOther,\n divergeData\n );\n }\n if (this.options.detachHead && divergeData.commonSnapBeforeDiverge) {\n // just override with the model data\n const commonSnapId = id.changeVersion(divergeData.commonSnapBeforeDiverge.toString());\n const commonSnapComp = await this.scope.legacyScope.getConsumerComponent(commonSnapId);\n return {\n ...componentStatus,\n currentComponent: commonSnapComp,\n componentFromModel: componentOnOther,\n divergeData,\n };\n }\n if (!divergeData.isDiverged()) {\n if (divergeData.isSourceAhead()) {\n // component is ahead nothing to merge.\n return this.returnUnmerged(id, compIsAlreadyMergedMsg, true);\n }\n if (!divergeData.isTargetAhead()) {\n // we know that localHead and remoteHead are set, so if none of them is ahead they must be equal\n return this.returnUnmerged(id, compIsAlreadyMergedMsg, true);\n }\n // target is ahead.\n if (!this.options.handleTargetAheadAsDiverged \|\| !divergeData.commonSnapBeforeDiverge) {\n // just override with the model data\n return {\n ...componentStatus,\n currentComponent,\n componentFromModel: componentOnOther,\n divergeData,\n };\n }\n // target is ahead and we want to treat it as diverged, continue.\n }\n\n // it's diverged and needs merge operation\n const mergeProps = {\n otherLaneHead,\n currentId,\n modelComponent,\n };\n\n return { ...componentStatus, currentComponent, mergeProps, divergeData };\n }\n\n private async handleNoCommonSnap(\n modelComponent: ModelComponent,\n id: ComponentID,\n otherLaneHead: Ref,\n currentComponent: ConsumerComponent,\n componentOnOther?: Version,\n divergeData?: SnapsDistance\n ): Promise<ComponentMergeStatusBeforeMergeAttempt> {\n let { resolveUnrelated } = this.options \|\| {};\n if (currentComponent.isRemoved()) {\n resolveUnrelated = 'theirs';\n }\n if (!resolveUnrelated) throw new Error(`handleNoCommonSnap expects resolveUnrelated to be set`);\n const repo = this.scope.legacyScope.objects;\n const mainHead = modelComponent.head;\n\n const returnAccordingToOurs = (\n headToSaveInLane: Ref,\n unrelatedHead: Ref,\n unrelatedLaneId: LaneId\n ): ComponentMergeStatusBeforeMergeAttempt => {\n return {\n currentComponent,\n id,\n divergeData,\n resolvedUnrelated: {\n strategy: 'ours',\n headOnCurrentLane: headToSaveInLane,\n unrelatedHead,\n unrelatedLaneId,\n },\n };\n };\n const returnAccordingToTheirs = (\n resolvedRef: Ref,\n unrelatedHeadRef: Ref,\n unrelatedLaneId: LaneId\n ): ComponentMergeStatusBeforeMergeAttempt => {\n // just override with the model data\n return {\n currentComponent,\n componentFromModel: componentOnOther,\n id,\n divergeData,\n resolvedUnrelated: {\n strategy: 'theirs',\n headOnCurrentLane: resolvedRef,\n unrelatedHead: unrelatedHeadRef,\n unrelatedLaneId,\n },\n };\n };\n\n const currentVersionRef = modelComponent.getRef(currentComponent.id.version as string);\n if (!currentVersionRef)\n throw new Error(\n `handleNoCommonSnap, unable to get ref of current version \"${\n currentComponent.id.version\n }\" for \"${id.toString()}\"`\n );\n const otherVersionRef = modelComponent.getRef(id.version as string);\n if (!otherVersionRef)\n throw new Error(`handleNoCommonSnap, unable to get ref of other version \"${id.version}\" for \"${id.toString()}\"`);\n\n if (mainHead) {\n const hasResolvedFromMain = async (hashToCompare: Ref \| null) => {\n const divergeDataFromMain = await getDivergeData({\n repo,\n modelComponent,\n sourceHead: hashToCompare,\n targetHead: mainHead,\n throws: false,\n });\n if (!divergeDataFromMain.err) return true;\n return !(divergeDataFromMain.err instanceof NoCommonSnap);\n };\n const hasResolvedLocally = await hasResolvedFromMain(modelComponent.getHeadRegardlessOfLane() as Ref);\n const hasResolvedRemotely = await hasResolvedFromMain(otherLaneHead);\n if (!hasResolvedLocally && !hasResolvedRemotely) {\n return this.returnUnmerged(\n id,\n `unable to traverse ${currentComponent.id.toString()} history. the main-head ${mainHead.toString()} doesn't appear in both lanes.\nit was probably created in each lane separately and it also exists on main. please merge main first to one of these lanes`\n );\n }\n const refToSaveInLane = hasResolvedLocally ? currentVersionRef : otherVersionRef;\n const unrelatedHeadRef = hasResolvedLocally ? otherVersionRef : currentVersionRef;\n if (resolveUnrelated === 'ours') {\n return returnAccordingToOurs(refToSaveInLane, unrelatedHeadRef, this.currentLane?.toLaneId() as LaneId);\n }\n if (resolveUnrelated === 'theirs') {\n return returnAccordingToTheirs(refToSaveInLane, unrelatedHeadRef, this.currentLane?.toLaneId() as LaneId);\n }\n throw new Error(\n `unsupported strategy \"${resolveUnrelated}\" of resolve-unrelated. supported strategies are: [ours, theirs]`\n );\n }\n\n const refToSaveInLane = resolveUnrelated === 'ours' ? currentVersionRef : otherVersionRef;\n const unrelatedHeadRef = resolveUnrelated === 'ours' ? otherVersionRef : currentVersionRef;\n if (resolveUnrelated === 'ours') {\n return returnAccordingToOurs(refToSaveInLane, unrelatedHeadRef, this.otherLane?.toLaneId() as LaneId);\n }\n if (resolveUnrelated === 'theirs') {\n return returnAccordingToTheirs(refToSaveInLane, unrelatedHeadRef, this.currentLane?.toLaneId() as LaneId);\n }\n throw new Error(\n `unsupported strategy \"${resolveUnrelated}\" of resolve-unrelated. supported strategies are: [ours, theirs]`\n );\n }\n}\n"],"mappings":";;;;;;AACA,SAAAA,YAAA;EAAA,MAAAC,IAAA,GAAAC,sBAAA,CAAAC,OAAA;EAAAH,WAAA,YAAAA,CAAA;IAAA,OAAAC,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAEA,SAAAG,aAAA;EAAA,MAAAH,IAAA,GAAAE,OAAA;EAAAC,YAAA,YAAAA,CAAA;IAAA,OAAAH,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAEA,SAAAI,QAAA;EAAA,MAAAJ,IAAA,GAAAE,OAAA;EAAAE,OAAA,YAAAA,CAAA;IAAA,OAAAJ,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAEA,SAAAK,WAAA;EAAA,MAAAL,IAAA,GAAAE,OAAA;EAAAG,UAAA,YAAAA,CAAA;IAAA,OAAAL,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAEA,SAAAM,QAAA;EAAA,MAAAN,IAAA,GAAAE,OAAA;EAAAI,OAAA,YAAAA,CAAA;IAAA,OAAAN,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAIA,SAAAO,QAAA;EAAA,MAAAP,IAAA,GAAAE,OAAA;EAAAK,OAAA,YAAAA,CAAA;IAAA,OAAAP,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAQ,cAAA;EAAA,MAAAR,IAAA,GAAAE,OAAA;EAAAM,aAAA,YAAAA,CAAA;IAAA,OAAAR,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAGA,SAAAS,kBAAA;EAAA,MAAAT,IAAA,GAAAE,OAAA;EAAAO,iBAAA,YAAAA,CAAA;IAAA,OAAAT,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAGA,SAAAU,oBAAA;EAAA,MAAAV,IAAA,GAAAE,OAAA;EAAAQ,mBAAA,YAAAA,CAAA;IAAA,OAAAV,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAW,SAAA;EAAA,MAAAX,IAAA,GAAAE,OAAA;EAAAS,QAAA,YAAAA,CAAA;IAAA,OAAAX,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAAiD,SAAAC,uBAAAW,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAAA,SAAAG,QAAAH,CAAA,EAAAI,CAAA,QAAAC,CAAA,GAAAC,MAAA,CAAAC,IAAA,CAAAP,CAAA,OAAAM,MAAA,CAAAE,qBAAA,QAAAC,CAAA,GAAAH,MAAA,CAAAE,qBAAA,CAAAR,CAAA,GAAAI,CAAA,KAAAK,CAAA,GAAAA,CAAA,CAAAC,MAAA,WAAAN,CAAA,WAAAE,MAAA,CAAAK,wBAAA,CAAAX,CAAA,EAAAI,CAAA,EAAAQ,UAAA,OAAAP,CAAA,CAAAQ,IAAA,CAAAC,KAAA,CAAAT,CAAA,EAAAI,CAAA,YAAAJ,CAAA;AAAA,SAAAU,cAAAf,CAAA,aAAAI,CAAA,MAAAA,CAAA,GAAAY,SAAA,CAAAC,MAAA,EAAAb,CAAA,UAAAC,CAAA,WAAAW,SAAA,CAAAZ,CAAA,IAAAY,SAAA,CAAAZ,CAAA,QAAAA,CAAA,OAAAD,OAAA,CAAAG,MAAA,CAAAD,CAAA,OAAAa,OAAA,WAAAd,CAAA,IAAAe,eAAA,CAAAnB,CAAA,EAAAI,CAAA,EAAAC,CAAA,CAAAD,CAAA,SAAAE,MAAA,CAAAc,yBAAA,GAAAd,MAAA,CAAAe,gBAAA,CAAArB,CAAA,EAAAM,MAAA,CAAAc,yBAAA,CAAAf,CAAA,KAAAF,OAAA,CAAAG,MAAA,CAAAD,CAAA,GAAAa,OAAA,WAAAd,CAAA,IAAAE,MAAA,CAAAgB,cAAA,CAAAtB,CAAA,EAAAI,CAAA,EAAAE,MAAA,CAAAK,wBAAA,CAAAN,CAAA,EAAAD,CAAA,iBAAAJ,CAAA;AAAA,SAAAmB,gBAAAnB,CAAA,EAAAI,CAAA,EAAAC,CAAA,YAAAD,CAAA,GAAAmB,cAAA,CAAAnB,CAAA,MAAAJ,CAAA,GAAAM,MAAA,CAAAgB,cAAA,CAAAtB,CAAA,EAAAI,CAAA,IAAAoB,KAAA,EAAAnB,CAAA,EAAAO,UAAA,MAAAa,YAAA,MAAAC,QAAA,UAAA1B,CAAA,CAAAI,CAAA,IAAAC,CAAA,EAAAL,CAAA;AAAA,SAAAuB,eAAAlB,CAAA,QAAAsB,CAAA,GAAAC,YAAA,CAAAvB,CAAA,uCAAAsB,CAAA,GAAAA,CAAA,GAAAA,CAAA;AAAA,SAAAC,aAAAvB,CAAA,EAAAD,CAAA,2BAAAC,CAAA,KAAAA,CAAA,SAAAA,CAAA,MAAAL,CAAA,GAAAK,CAAA,CAAAwB,MAAA,CAAAC,WAAA,kBAAA9B,CAAA,QAAA2B,CAAA,GAAA3B,CAAA,CAAA+B,IAAA,CAAA1B,CAAA,EAAAD,CAAA,uCAAAuB,CAAA,SAAAA,CAAA,YAAAK,SAAA,yEAAA5B,CAAA,GAAA6B,MAAA,GAAAC,MAAA,EAAA7B,CAAA;AAYS;;AAMnD,MAAM8B,sBAAsB,GAAAC,OAAA,CAAAD,sBAAA,GAAG,6BAA6B;AAC5D,MAAME,qBAAqB,GAAAD,OAAA,CAAAC,qBAAA,GAAG,4BAA4B;AAC1D,MAAMC,mBAAmB,CAAC;EAC/BC,WAAWA,CACDC,KAAgB,EAChBC,MAAc,EACdC,QAAsB,EACtBC,OAAmC,EACnCC,SAAqB,EACrBC,WAAkB;EAAE;EACpBC,SAAgB,CAAC;EAAA,EACzB;IAAA,KAPQN,KAAgB,GAAhBA,KAAgB;IAAA,KAChBC,MAAc,GAAdA,MAAc;IAAA,KACdC,QAAsB,GAAtBA,QAAsB;IAAA,KACtBC,OAAmC,GAAnCA,OAAmC;IAAA,KACnCC,SAAqB,GAArBA,SAAqB;IAAA,KACrBC,WAAkB,GAAlBA,WAAkB;IAAA,KAClBC,SAAgB,GAAhBA,SAAgB;EACvB;EAEH,MAAMC,SAASA,CACbC,MAAqB,EACY;IACjC,IAAI,CAAC,IAAI,CAACH,WAAW,IAAI,IAAI,CAACC,SAAS,EAAE;MACvC,MAAM,IAAI,CAACJ,QAAQ,CAACO,4BAA4B,CAAC,IAAI,CAACH,SAAS,CAACI,QAAQ,CAAC,CAAC,CAACC,eAAe,CAAC,CAAC,CAAC;IAC/F;IACA,MAAMC,iCAAiC,GAAG,MAAM,IAAAC,qBAAS,EAACL,MAAM,EAAGM,EAAE,IACnE,IAAI,CAACC,oCAAoC,CAACD,EAAE,CAC9C,CAAC;IACD;IACA;IACA,MAAME,8BAA8B,GAClC,CAAC,IAAI,CAACb,OAAO,EAAEc,YAAY;IAAI;IAC9B,CAAC,IAAI,CAACZ,WAAW;IAAI;IACpB,IAAI,CAACA,WAAW,CAACL,KAAK,KAAK,IAAI,CAACM,SAAS,EAAEN,KAAK,CAAC,CAAC,CAAC;IACvD,MAAMkB,QAAQ,GAAGN,iCAAiC,CAC/CO,GAAG,CAAEC,UAAU,IAAK;MACnB,IAAI,CAACA,UAAU,CAACC,WAAW,EAAE,OAAO,EAAE;MACtC,MAAMC,gBAAgB,GAAG,CAACF,UAAU,CAACC,WAAW,CAACE,uBAAuB,CAAC;MACzE,IAAIP,8BAA8B,EAAE;QAClCM,gBAAgB,CAACjD,IAAI,CAAC,GAAG+C,UAAU,CAACC,WAAW,CAACG,iBAAiB,CAAC;MACpE;MACA,OAAO,IAAAC,iBAAO,EAACH,gBAAgB,CAAC,CAACH,GAAG,CAAEO,CAAC,IAAKN,UAAU,CAACN,EAAE,CAACa,aAAa,CAACD,CAAC,CAACE,QAAQ,CAAC,CAAC,CAAC,CAAC;IACxF,CAAC,CAAC,CACDC,IAAI,CAAC,CAAC;IACT,MAAMC,MAAM,GAAGd,8BAA8B,GACzC,+DAA+D,IAAI,CAACV,SAAS,EAAEQ,EAAE,CAAC,CAAC,IAAI,MAAM,EAAE,GAC/F,uCAAuC,IAAI,CAACT,WAAW,EAAES,EAAE,CAAC,CAAC,IAAI,MAAM,QAAQ,IAAI,CAACR,SAAS,EAAEQ,EAAE,CAAC,CAAC,IAAI,MAAM,EAAE;IACnH,MAAM,IAAI,CAACd,KAAK,CAAC+B,WAAW,CAACC,aAAa,CAACC,iBAAiB,CAACC,8BAAe,CAACC,SAAS,CAACjB,QAAQ,CAAC,EAAE;MAChGkB,IAAI,EAAE,IAAI,CAAC9B,SAAS;MACpB+B,KAAK,EAAE,IAAI;MACXC,qBAAqB,EAAE,KAAK;MAC5BR;IACF,CAAC,CAAC;IAEF,MAAMS,sBAAsB,GAAG3B,iCAAiC,CAAC1C,MAAM,CACpEsE,CAAC,IAAK,CAACA,CAAC,CAACC,UACZ,CAA2B;IAC3B,MAAMC,mBAAmB,GAAG9B,iCAAiC,CAAC1C,MAAM,CAAEsE,CAAC,IAAKA,CAAC,CAACC,UAAU,CAAC;IAEzF,MAAME,4BAA4B,GAAG,MAAAA,CAAA,KAA6C;MAChF,MAAMC,GAAG,GAAG,KAAIC,aAAG,EAAC,IAAI,CAAC7C,KAAK,CAAC+B,WAAW,CAAC;MAC3C,IAAI;QACF,MAAMe,gBAAgB,GAAG,MAAMC,OAAO,CAACC,GAAG,CACxCN,mBAAmB,CAACvB,GAAG,CAAEC,UAAU,IAAK,IAAI,CAAC6B,uBAAuB,CAAC7B,UAAU,CAAC,CAClF,CAAC;QACD,MAAMwB,GAAG,CAACM,KAAK,CAAC,CAAC;QACjB,OAAOJ,gBAAgB;MACzB,CAAC,CAAC,OAAOK,GAAQ,EAAE;QACjB,MAAMP,GAAG,CAACM,KAAK,CAAC,CAAC;QACjB,MAAMC,GAAG;MACX;IACF,CAAC;IACD,MAAMC,OAAO,GAAG,MAAMT,4BAA4B,CAAC,CAAC;IAEpDS,OAAO,CAAC/E,IAAI,CAAC,GAAGkE,sBAAsB,CAAC;IACvC,OAAOa,OAAO;EAChB;EAEA,MAAcH,uBAAuBA,CACnCI,sCAA8E,EAC9E;IACA,MAAM;MAAEvC,EAAE;MAAEO,WAAW;MAAEiC,gBAAgB;MAAEb;IAAW,CAAC,GAAGY,sCAAsC;IAChG,IAAI,CAACZ,UAAU,EAAE,MAAM,IAAIc,KAAK,CAAC,qDAAqDzC,EAAE,CAACc,QAAQ,CAAC,CAAC,EAAE,CAAC;IACtG,MAAM;MAAE4B,aAAa;MAAEC,SAAS;MAAEC;IAAe,CAAC,GAAGjB,UAAU;IAC/D,MAAMkB,IAAI,GAAG,IAAI,CAAC3D,KAAK,CAAC+B,WAAW,CAAC6B,OAAO;IAC3C,IAAI,CAACvC,WAAW,EAAE,MAAM,IAAIkC,KAAK,CAAC,sDAAsDzC,EAAE,CAACc,QAAQ,CAAC,CAAC,EAAE,CAAC;IACxG,IAAI,CAAC0B,gBAAgB,EAAE,MAAM,IAAIC,KAAK,CAAC,2DAA2DzC,EAAE,CAACc,QAAQ,CAAC,CAAC,EAAE,CAAC;IAElH,MAAMiC,QAAQ,GAAGxC,WAAW,CAACE,uBAAyC,CAAC,CAAC;IACxE,IAAI,CAACtB,MAAM,CAAC6D,KAAK,CAAC;AACtB,WAAWhD,EAAE,CAACiD,sBAAsB,CAAC,CAAC;AACtC,WAAWF,QAAQ,CAACjC,QAAQ,CAAC,CAAC;AAC9B,WAAW6B,SAAS,CAACO,OAAO;AAC5B,WAAWR,aAAa,CAAC5B,QAAQ,CAAC,CAAC,EAAE,CAAC;IAClC,MAAMqC,aAAsB,GAAG,MAAMP,cAAc,CAACQ,WAAW,CAACL,QAAQ,CAACjC,QAAQ,CAAC,CAAC,EAAE+B,IAAI,CAAC;IAC1F,MAAMQ,cAAuB,GAAG,MAAMT,cAAc,CAACQ,WAAW,CAACV,aAAa,CAAC5B,QAAQ,CAAC,CAAC,EAAE+B,IAAI,CAAC;IAEhG,MAAMS,eAAe,GAAG,IAAI,CAAC/D,WAAW,EAAEgE,QAAQ,CAAC,CAAC,CAACzC,QAAQ,CAAC,CAAC,IAAI,MAAM;IACzE,MAAM0C,aAAa,GAAG,IAAI,CAAChE,SAAS,GAAG,IAAI,CAACA,SAAS,CAAC+D,QAAQ,CAAC,CAAC,CAACzC,QAAQ,CAAC,CAAC,GAAG2C,sBAAY;IAC1F,MAAMC,YAAY,GAAG,GAAGf,SAAS,CAACO,OAAO,KAAKI,eAAe,KAAKE,aAAa,GAAG,SAAS,GAAGF,eAAe,GAAG;IAChH,MAAMK,UAAU,GAAG,GAAGjB,aAAa,CAAC5B,QAAQ,CAAC,CAAC,KAC5C0C,aAAa,KAAKF,eAAe,GAAG,UAAU,GAAGE,aAAa,GAC7D;IACH,MAAMI,YAAY,GAAG,IAAI,CAACtE,SAAS,EAAEuE,OAAO,CAAC,CAAC,IAAI,IAAI,CAACtE,WAAW,EAAEuE,cAAc,CAAC,CAAC,IAAI,EAAE;IAC1F,MAAMC,YAAY,GAAG,KAAIC,qCAAqB,EAC5ChE,EAAE,CAACiD,sBAAsB,CAAC,CAAC,EAC3BW,YAAY,EACZ,IAAI,CAACpE,SAAS,EACdgD,gBAAgB,CAACyB,UAAU,EAC3Bd,aAAa,CAACc,UAAU,EACxBZ,cAAc,CAACY,UAAU,EACzBP,YAAY,EACZC,UAAU,EACV,IAAI,CAACxE,MAAM,EACX,IAAI,CAACE,OAAO,CAAC6E,aACf,CAAC;IACD,MAAMC,iBAAiB,GAAGJ,YAAY,CAACK,KAAK,CAAC,CAAC;IAE9C,MAAMC,eAAe,GAAG,IAAI,CAACC,mBAAmB,CAC9C9B,gBAAgB,CAACyB,UAAU,EAC3Bd,aAAa,CAACc,UAAU,EACxBZ,cAAc,CAACY,UACjB,CAAC;IAED,MAAMM,YAAY,GAAG,MAAM,IAAAC,iCAAa,EAAC;MACvCtF,KAAK,EAAE,IAAI,CAACA,KAAK,CAAC+B,WAAW;MAC7BoC,cAAc;MACdM,UAAU;MACVnB,gBAAgB;MAChBkB,YAAY;MACZP;IACF,CAAC,CAAC;IACF,OAAO;MACLX,gBAAgB;MAChBxC,EAAE;MACFuE,YAAY;MACZhE,WAAW;MACX4D,iBAAiB;MACjBE;IACF,CAAC;EACH;EAEQC,mBAAmBA,CACzBG,iBAAoC,EACpCC,cAAiC,EACjCC,eAAkC,EACjB;IACjB,IAAI,CAAC,IAAI,CAACtF,OAAO,CAACuF,sBAAsB,EAAE;MACxC,OAAO,CAAC,CAAC;IACX;IACA,MAAMC,iBAA8C,GAAG,CAAC,CAAC,CAAC,CAAC;IAC3D;IACA,MAAMC,aAAa,GAAG,CAACC,8CAAwB,CAAC/E,EAAE,EAAEgF,wBAAa,CAAChF,EAAE,CAAC;IACrEyE,iBAAiB,CAAC7G,OAAO,CAAEqH,gBAAgB,IAAK;MAC9C,IAAIH,aAAa,CAACI,QAAQ,CAACD,gBAAgB,CAACE,QAAQ,CAAC,EAAE;QACrD;MACF;MACA,MAAMC,aAAa,GAAGV,cAAc,CAACW,aAAa,CAACJ,gBAAgB,CAACK,gBAAgB,EAAE,IAAI,CAAC;MAC3F,MAAMC,cAAc,GAAGZ,eAAe,CAACU,aAAa,CAACJ,gBAAgB,CAACK,gBAAgB,EAAE,IAAI,CAAC;MAC7F,IAAI,CAACC,cAAc,EAAE;QACnBV,iBAAiB,CAACI,gBAAgB,CAACE,QAAQ,CAAC,GAAG,kBAAkB;QACjE;MACF;MACA;MACA,IAAIF,gBAAgB,CAACO,WAAW,EAAEtC,OAAO,KAAKqC,cAAc,CAACC,WAAW,EAAEtC,OAAO,EAAE;QACjF,IAAIkC,aAAa,EAAEI,WAAW,EAAEtC,OAAO,KAAKqC,cAAc,CAACC,WAAW,EAAEtC,OAAO,EAAE;UAC/E;UACA;QACF;QACA2B,iBAAiB,CAACI,gBAAgB,CAACE,QAAQ,CAAC,GAC1C,0BAA0BC,aAAa,EAAEI,WAAW,EAAEtC,OAAO,YAAYqC,cAAc,CAACC,WAAW,EAAEtC,OAAO,EAAE;QAChH;MACF;MACA,IAAI,IAAAuC,iBAAO,EAACR,gBAAgB,CAACnJ,IAAI,EAAEyJ,cAAc,CAACzJ,IAAI,CAAC,EAAE;MACzD,IAAI,CAACsJ,aAAa,EAAE;QAClBP,iBAAiB,CAACI,gBAAgB,CAACE,QAAQ,CAAC,GAAG,qCAAqC;QACpF;MACF;MACA,IAAI,IAAAM,iBAAO,EAACL,aAAa,CAACtJ,IAAI,EAAEyJ,cAAc,CAACzJ,IAAI,CAAC,EAAE;QACpD,OAAO,CAAC;MACV;MACA,IAAI,IAAA2J,iBAAO,EAACL,aAAa,CAACtJ,IAAI,EAAEmJ,gBAAgB,CAACnJ,IAAI,CAAC,EAAE;QACtD;QACAmJ,gBAAgB,CAACnJ,IAAI,GAAGyJ,cAAc,CAACzJ,IAAI;QAC3C;MACF;MACA;MACA+I,iBAAiB,CAACI,gBAAgB,CAACE,QAAQ,CAAC,GAAG,uCAAuC;IACxF,CAAC,CAAC;IACFR,eAAe,CAAC/G,OAAO,CAAE2H,cAAc,IAAK;MAC1C,IAAI,CAACd,iBAAiB,CAACY,aAAa,CAACE,cAAc,CAACD,gBAAgB,EAAE,IAAI,CAAC,EAAE;QAC3ET,iBAAiB,CAACU,cAAc,CAACJ,QAAQ,CAAC,GAAG,oBAAoB;MACnE;IACF,CAAC,CAAC;IAEF,OAAO;MAAEN;IAAkB,CAAC;EAC9B;EAEQa,cAAcA,CACpB1F,EAAe,EACf2F,GAAW,EACXC,oBAAoB,GAAG,KAAK,EACY;IACxC,MAAMC,eAAuD,GAAG;MAAE7F;IAAG,CAAC;IACtE6F,eAAe,CAACC,gBAAgB,GAAGH,GAAG;IACtCE,eAAe,CAACE,qBAAqB,GAAGH,oBAAoB;IAC5D,OAAOC,eAAe;EACxB;;EAEA;EACA,MAAc5F,oCAAoCA,CAChDD,EAAe,EACkC;IACjD,MAAMgG,QAAQ,GAAG,IAAI,CAAC1G,SAAS,EAAE0G,QAAQ;IACzC,MAAMH,eAAuD,GAAG;MAAE7F;IAAG,CAAC;IACtE,MAAM4C,cAAc,GAAG,MAAM,IAAI,CAAC1D,KAAK,CAAC+B,WAAW,CAACgF,wBAAwB,CAACjG,EAAE,CAAC;IAChF,IAAI,CAAC4C,cAAc,EAAE;MACnB,OAAO,IAAI,CAAC8C,cAAc,CACxB1F,EAAE,EACF,aAAaA,EAAE,CAACc,QAAQ,CAAC,CAAC,gFAC5B,CAAC;IACH;IACA,MAAMoF,QAAQ,GAAG,IAAI,CAAChH,KAAK,CAAC+B,WAAW,CAAC6B,OAAO,CAACqD,kBAAkB,CAACC,QAAQ,CAACpG,EAAE,CAAC;IAC/E,IAAIkG,QAAQ,EAAE;MACZ,OAAO,IAAI,CAACR,cAAc,CACxB1F,EAAE,EACF,aAAaA,EAAE,CAACiD,sBAAsB,CAAC,CAAC,iIAC1C,CAAC;IACH;IACA,MAAMJ,IAAI,GAAG,IAAI,CAAC3D,KAAK,CAAC+B,WAAW,CAAC6B,OAAO;IAC3C,MAAMI,OAAO,GAAGlD,EAAE,CAACkD,OAAiB;IACpC,MAAMR,aAAa,GAAGE,cAAc,CAACyD,MAAM,CAACnD,OAAO,CAAC;IACpD,MAAMoD,gBAAgB,GAAGN,QAAQ,EAAEO,MAAM,CAACC,qBAAqB,CAACxG,EAAE,EAAE;MAAEyG,aAAa,EAAE;IAAK,CAAC,CAAC;IAC5F,MAAMC,gBAAyB,GAAG,MAAM9D,cAAc,CAACQ,WAAW,CAACF,OAAO,EAAE,IAAI,CAAChE,KAAK,CAAC+B,WAAW,CAAC6B,OAAO,CAAC;IAC3G,MAAM6D,eAAe,GAAG,IAAI,CAACpH,WAAW,EAAEqH,YAAY,CAAC5G,EAAE,CAAC;IAE1D,IAAI0G,gBAAgB,CAACG,SAAS,CAAC,CAAC,EAAE;MAChC;MACA;MACA;MACA,MAAMC,WAAW,GAAGH,eAAe,IAAKD,gBAAgB,CAACK,oBAAoB,CAAC,CAAC,IAAInE,cAAc,CAACoE,IAAK;MACvG,IAAIF,WAAW,EAAE;QACf;QACAjB,eAAe,CAACoB,eAAe,GAAG,IAAI;MACxC,CAAC,MAAM;QACL;QACA;QACA,OAAO,IAAI,CAACvB,cAAc,CAAC1F,EAAE,EAAEjB,qBAAqB,EAAE,IAAI,CAAC;MAC7D;IACF;IACA,MAAMmI,YAAY,GAAGA,CAAA,KAAM;MACzB,IAAIZ,gBAAgB,EAAE,OAAOA,gBAAgB;MAC7C,IAAI,IAAI,CAAC/G,WAAW,EAAE;QACpB,IAAI,CAACoH,eAAe,EAAE,OAAO,IAAI;QACjC,OAAOA,eAAe,CAAC3G,EAAE,CAACa,aAAa,CAAC8F,eAAe,CAACK,IAAI,CAAClG,QAAQ,CAAC,CAAC,CAAC;MAC1E;MACA;MACA,MAAMkG,IAAI,GAAGpE,cAAc,CAACuE,mBAAmB,CAAC,CAAC;MACjD,IAAIH,IAAI,EAAE;QACR,OAAOhH,EAAE,CAACa,aAAa,CAACmG,IAAI,CAAC;MAC/B;MACA,OAAO,IAAI;IACb,CAAC;IACD,MAAMrE,SAAS,GAAGuE,YAAY,CAAC,CAAC;IAChC,IAAI,CAACvE,SAAS,EAAE;MACd,MAAMpC,WAAW,GAAG,MAAM,IAAA6G,2BAAc,EAAC;QAAEvE,IAAI;QAAED,cAAc;QAAEyE,UAAU,EAAE3E,aAAa;QAAE4E,MAAM,EAAE;MAAM,CAAC,CAAC;MAC5G,OAAA7J,aAAA,CAAAA,aAAA,KAAYoI,eAAe;QAAE0B,kBAAkB,EAAEb,gBAAgB;QAAEnG;MAAW;IAChF;IACA,MAAMiH,YAAY,GAAGxB,QAAQ,EAAEO,MAAM,CAACkB,mBAAmB,CAAC9E,SAAS,EAAE;MAAE8D,aAAa,EAAE;IAAK,CAAC,CAAC;IAC7F,MAAMiB,gBAAgB,GAAGF,YAAY,EAAEX,SAAS,CAAC,CAAC;IAClD,IAAIa,gBAAgB,EAAE;MACpB,OAAO,IAAI,CAAChC,cAAc,CACxB1F,EAAE,EACF,mFACF,CAAC;IACH;IACA,MAAM2H,mBAAmB,GAAGA,CAAA,KAAM;MAChC;MACA,IAAIrB,gBAAgB,EAAE,OAAON,QAAQ,CAAE4B,aAAa,CAACtB,gBAAgB,CAAC;MACtE,OAAO,IAAI,CAACpH,KAAK,CAAC+B,WAAW,CAAC4G,oBAAoB,CAAClF,SAAS,CAAC;IAC/D,CAAC;IACD,MAAMH,gBAAgB,GAAG,MAAMmF,mBAAmB,CAAC,CAAC;IACpD,IAAInF,gBAAgB,CAACqE,SAAS,CAAC,CAAC,EAAE;MAChC;MACA;MACA;MACA;MACA;MACA;MACA;MACA;MACA;MACA;MACA,MAAMiB,eAAe,GACnBtF,gBAAgB,CAACyB,UAAU,CAAC8D,iBAAiB,CAAC,0BAA0B,CAAC,EAAEC,MAAM,EAAEC,YAAY;MACjG,MAAM1H,WAAW,GAAG,MAAM,IAAA6G,2BAAc,EAAC;QAAEvE,IAAI;QAAED,cAAc;QAAEyE,UAAU,EAAE3E,aAAa;QAAE4E,MAAM,EAAE;MAAM,CAAC,CAAC;MAC5G,MAAMY,gBAAgB,GAAG,CAAC3H,WAAW,CAAC8B,GAAG,IAAI,CAAC9B,WAAW,CAAC4H,aAAa,CAAC,CAAC;MACzE,MAAMC,YAAY,GAAG,IAAI,CAAC5I,SAAS,GAC/B0I,gBAAgB,CAAC;MAAA,EACjB,CAACJ,eAAe,CAAC,CAAC;MACtB,IAAIM,YAAY,EAAE;QAChB,OAAO,IAAI,CAAC1C,cAAc,CAAC1F,EAAE,EAAEjB,qBAAqB,EAAE,IAAI,CAAC;MAC7D;IACF;IAEA,MAAMsJ,UAAU,GAAG,MAAAA,CAAA,KAAoD;MACrE,IAAI,CAACrC,QAAQ,IAAI,CAAC,IAAI,CAAC1G,SAAS,EAAE,OAAOgJ,SAAS;MAClD,MAAMC,2BAA2B,GAAG,MAAM,IAAI,CAACjJ,SAAS,CAACkJ,sBAAsB,CAAChG,gBAAgB,CAACxC,EAAE,CAAC;MACpG,IAAI,CAACuI,2BAA2B,CAACE,QAAQ,EAAE,OAAOH,SAAS;MAC3D,IAAI,CAAChC,gBAAgB,EAAE,OAAOgC,SAAS;MACvC,MAAMnF,aAAa,GAAG,MAAMP,cAAc,CAACQ,WAAW,CACpDkD,gBAAgB,CAACpD,OAAO,EACxB8C,QAAQ,CAAC9G,KAAK,CAAC4D,OACjB,CAAC;MACD,MAAM4F,oBAAoB,GAAG,MAAM1C,QAAQ,CAAC2C,6BAA6B,CAACxF,aAAa,EAAEX,gBAAgB,CAAC;MAC1G,IAAIkG,oBAAoB,EAAE,OAAO,MAAM;MACvC,OAAO,QAAQ;IACjB,CAAC;IAED,MAAME,YAAY,GAAG,MAAMP,UAAU,CAAC,CAAC;IACvC,IAAIO,YAAY,KAAK,QAAQ,IAAI,CAAC,IAAI,CAACvJ,OAAO,EAAEwJ,mBAAmB,EAAE;MACnE,OAAO,IAAI,CAACnD,cAAc,CACxB1F,EAAE,EACF,mHACF,CAAC;IACH;IACA,IAAI4I,YAAY,KAAK,MAAM,EAAE;MAC3B,OAAO,IAAI,CAAClD,cAAc,CAAC1F,EAAE,EAAE,iDAAiD,CAAC;IACnF;IAEA,IAAI,CAAC0C,aAAa,EAAE;MAClB,MAAM,IAAID,KAAK,CAAC,kDAAkDS,OAAO,OAAOlD,EAAE,CAACc,QAAQ,CAAC,CAAC,EAAE,CAAC;IAClG;IACA,MAAMP,WAAW,GAAG,MAAM,IAAA6G,2BAAc,EAAC;MACvCvE,IAAI;MACJD,cAAc;MACdkG,UAAU,EAAE,IAAI,CAACxJ,SAAS,GAAGgJ,SAAS,GAAG1F,cAAc,CAACyD,MAAM,CAAC1D,SAAS,CAACO,OAAiB,CAAC;MAAE;MAC7FmE,UAAU,EAAE3E,aAAa;MACzB4E,MAAM,EAAE;IACV,CAAC,CAAC;IACF,IAAI/G,WAAW,CAAC8B,GAAG,EAAE;MACnB,IAAI,EAAE9B,WAAW,CAAC8B,GAAG,YAAY0G,sBAAY,CAAC,IAAI,CAAC,IAAI,CAAC1J,OAAO,EAAE2J,gBAAgB,EAAE;QACjF,OAAO,IAAI,CAACtD,cAAc,CAAC1F,EAAE,EAAE,sCAAsCO,WAAW,CAAC8B,GAAG,CAAC4G,OAAO,EAAE,CAAC;MACjG;MACA,OAAO,IAAI,CAACC,kBAAkB,CAC5BtG,cAAc,EACd5C,EAAE,EACF0C,aAAa,EACbF,gBAAgB,EAChBkE,gBAAgB,EAChBnG,WACF,CAAC;IACH;IACA,IAAI,IAAI,CAAClB,OAAO,CAAC8J,UAAU,IAAI5I,WAAW,CAACE,uBAAuB,EAAE;MAClE;MACA,MAAM2I,YAAY,GAAGpJ,EAAE,CAACa,aAAa,CAACN,WAAW,CAACE,uBAAuB,CAACK,QAAQ,CAAC,CAAC,CAAC;MACrF,MAAMuI,cAAc,GAAG,MAAM,IAAI,CAACnK,KAAK,CAAC+B,WAAW,CAAC4G,oBAAoB,CAACuB,YAAY,CAAC;MACtF,OAAA3L,aAAA,CAAAA,aAAA,KACKoI,eAAe;QAClBrD,gBAAgB,EAAE6G,cAAc;QAChC9B,kBAAkB,EAAEb,gBAAgB;QACpCnG;MAAW;IAEf;IACA,IAAI,CAACA,WAAW,CAAC+I,UAAU,CAAC,CAAC,EAAE;MAC7B,IAAI/I,WAAW,CAACgJ,aAAa,CAAC,CAAC,EAAE;QAC/B;QACA,OAAO,IAAI,CAAC7D,cAAc,CAAC1F,EAAE,EAAEnB,sBAAsB,EAAE,IAAI,CAAC;MAC9D;MACA,IAAI,CAAC0B,WAAW,CAAC4H,aAAa,CAAC,CAAC,EAAE;QAChC;QACA,OAAO,IAAI,CAACzC,cAAc,CAAC1F,EAAE,EAAEnB,sBAAsB,EAAE,IAAI,CAAC;MAC9D;MACA;MACA,IAAI,CAAC,IAAI,CAACQ,OAAO,CAACmK,2BAA2B,IAAI,CAACjJ,WAAW,CAACE,uBAAuB,EAAE;QACrF;QACA,OAAAhD,aAAA,CAAAA,aAAA,KACKoI,eAAe;UAClBrD,gBAAgB;UAChB+E,kBAAkB,EAAEb,gBAAgB;UACpCnG;QAAW;MAEf;MACA;IACF;;IAEA;IACA,MAAMoB,UAAU,GAAG;MACjBe,aAAa;MACbC,SAAS;MACTC;IACF,CAAC;IAED,OAAAnF,aAAA,CAAAA,aAAA,KAAYoI,eAAe;MAAErD,gBAAgB;MAAEb,UAAU;MAAEpB;IAAW;EACxE;EAEA,MAAc2I,kBAAkBA,CAC9BtG,cAA8B,EAC9B5C,EAAe,EACf0C,aAAkB,EAClBF,gBAAmC,EACnCkE,gBAA0B,EAC1BnG,WAA2B,EACsB;IACjD,IAAI;MAAEyI;IAAiB,CAAC,GAAG,IAAI,CAAC3J,OAAO,IAAI,CAAC,CAAC;IAC7C,IAAImD,gBAAgB,CAACqE,SAAS,CAAC,CAAC,EAAE;MAChCmC,gBAAgB,GAAG,QAAQ;IAC7B;IACA,IAAI,CAACA,gBAAgB,EAAE,MAAM,IAAIvG,KAAK,CAAC,uDAAuD,CAAC;IAC/F,MAAMI,IAAI,GAAG,IAAI,CAAC3D,KAAK,CAAC+B,WAAW,CAAC6B,OAAO;IAC3C,MAAM2G,QAAQ,GAAG7G,cAAc,CAACoE,IAAI;IAEpC,MAAM0C,qBAAqB,GAAGA,CAC5BC,gBAAqB,EACrBC,aAAkB,EAClBC,eAAuB,KACoB;MAC3C,OAAO;QACLrH,gBAAgB;QAChBxC,EAAE;QACFO,WAAW;QACXuJ,iBAAiB,EAAE;UACjBC,QAAQ,EAAE,MAAM;UAChBC,iBAAiB,EAAEL,gBAAgB;UACnCC,aAAa;UACbC;QACF;MACF,CAAC;IACH,CAAC;IACD,MAAMI,uBAAuB,GAAGA,CAC9BC,WAAgB,EAChBC,gBAAqB,EACrBN,eAAuB,KACoB;MAC3C;MACA,OAAO;QACLrH,gBAAgB;QAChB+E,kBAAkB,EAAEb,gBAAgB;QACpC1G,EAAE;QACFO,WAAW;QACXuJ,iBAAiB,EAAE;UACjBC,QAAQ,EAAE,QAAQ;UAClBC,iBAAiB,EAAEE,WAAW;UAC9BN,aAAa,EAAEO,gBAAgB;UAC/BN;QACF;MACF,CAAC;IACH,CAAC;IAED,MAAMO,iBAAiB,GAAGxH,cAAc,CAACyD,MAAM,CAAC7D,gBAAgB,CAACxC,EAAE,CAACkD,OAAiB,CAAC;IACtF,IAAI,CAACkH,iBAAiB,EACpB,MAAM,IAAI3H,KAAK,CACb,6DACED,gBAAgB,CAACxC,EAAE,CAACkD,OAAO,UACnBlD,EAAE,CAACc,QAAQ,CAAC,CAAC,GACzB,CAAC;IACH,MAAMuJ,eAAe,GAAGzH,cAAc,CAACyD,MAAM,CAACrG,EAAE,CAACkD,OAAiB,CAAC;IACnE,IAAI,CAACmH,eAAe,EAClB,MAAM,IAAI5H,KAAK,CAAC,2DAA2DzC,EAAE,CAACkD,OAAO,UAAUlD,EAAE,CAACc,QAAQ,CAAC,CAAC,GAAG,CAAC;IAElH,IAAI2I,QAAQ,EAAE;MACZ,MAAMa,mBAAmB,GAAG,MAAOC,aAAyB,IAAK;QAC/D,MAAMC,mBAAmB,GAAG,MAAM,IAAApD,2BAAc,EAAC;UAC/CvE,IAAI;UACJD,cAAc;UACdkG,UAAU,EAAEyB,aAAa;UACzBlD,UAAU,EAAEoC,QAAQ;UACpBnC,MAAM,EAAE;QACV,CAAC,CAAC;QACF,IAAI,CAACkD,mBAAmB,CAACnI,GAAG,EAAE,OAAO,IAAI;QACzC,OAAO,EAAEmI,mBAAmB,CAACnI,GAAG,YAAY0G,sBAAY,CAAC;MAC3D,CAAC;MACD,MAAM0B,kBAAkB,GAAG,MAAMH,mBAAmB,CAAC1H,cAAc,CAAC8H,uBAAuB,CAAC,CAAQ,CAAC;MACrG,MAAMC,mBAAmB,GAAG,MAAML,mBAAmB,CAAC5H,aAAa,CAAC;MACpE,IAAI,CAAC+H,kBAAkB,IAAI,CAACE,mBAAmB,EAAE;QAC/C,OAAO,IAAI,CAACjF,cAAc,CACxB1F,EAAE,EACF,sBAAsBwC,gBAAgB,CAACxC,EAAE,CAACc,QAAQ,CAAC,CAAC,2BAA2B2I,QAAQ,CAAC3I,QAAQ,CAAC,CAAC;AAC5G,0HACQ,CAAC;MACH;MACA,MAAM8J,eAAe,GAAGH,kBAAkB,GAAGL,iBAAiB,GAAGC,eAAe;MAChF,MAAMF,gBAAgB,GAAGM,kBAAkB,GAAGJ,eAAe,GAAGD,iBAAiB;MACjF,IAAIpB,gBAAgB,KAAK,MAAM,EAAE;QAC/B,OAAOU,qBAAqB,CAACkB,eAAe,EAAET,gBAAgB,EAAE,IAAI,CAAC5K,WAAW,EAAEgE,QAAQ,CAAC,CAAW,CAAC;MACzG;MACA,IAAIyF,gBAAgB,KAAK,QAAQ,EAAE;QACjC,OAAOiB,uBAAuB,CAACW,eAAe,EAAET,gBAAgB,EAAE,IAAI,CAAC5K,WAAW,EAAEgE,QAAQ,CAAC,CAAW,CAAC;MAC3G;MACA,MAAM,IAAId,KAAK,CACb,yBAAyBuG,gBAAgB,kEAC3C,CAAC;IACH;IAEA,MAAM4B,eAAe,GAAG5B,gBAAgB,KAAK,MAAM,GAAGoB,iBAAiB,GAAGC,eAAe;IACzF,MAAMF,gBAAgB,GAAGnB,gBAAgB,KAAK,MAAM,GAAGqB,eAAe,GAAGD,iBAAiB;IAC1F,IAAIpB,gBAAgB,KAAK,MAAM,EAAE;MAC/B,OAAOU,qBAAqB,CAACkB,eAAe,EAAET,gBAAgB,EAAE,IAAI,CAAC3K,SAAS,EAAE+D,QAAQ,CAAC,CAAW,CAAC;IACvG;IACA,IAAIyF,gBAAgB,KAAK,QAAQ,EAAE;MACjC,OAAOiB,uBAAuB,CAACW,eAAe,EAAET,gBAAgB,EAAE,IAAI,CAAC5K,WAAW,EAAEgE,QAAQ,CAAC,CAAW,CAAC;IAC3G;IACA,MAAM,IAAId,KAAK,CACb,yBAAyBuG,gBAAgB,kEAC3C,CAAC;EACH;AACF;AAAClK,OAAA,CAAAE,mBAAA,GAAAA,mBAAA","ignoreList":[]}
1	+ {"version":3,"names":["_pMapSeries","data","_interopRequireDefault","require","_componentId","_laneId","_component","_legacy","_lodash","_configMerger","_componentModules","_dependencyResolver","_builder","e","__esModule","default","ownKeys","r","t","Object","keys","getOwnPropertySymbols","o","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","defineProperty","_toPropertyKey","value","configurable","writable","i","_toPrimitive","Symbol","toPrimitive","call","TypeError","String","Number","compIsAlreadyMergedMsg","exports","compHasBeenRemovedMsg","MergeStatusProvider","constructor","scope","logger","importer","options","workspace","currentLane","otherLane","getStatus","bitIds","importObjectsFromMainIfExist","toBitIds","toVersionLatest","componentStatusBeforeMergeAttempt","mapSeries","id","getComponentStatusBeforeMergeAttempt","shouldImportHistoryOfOtherLane","shouldSquash","toImport","map","compStatus","divergeData","versionsToImport","commonSnapBeforeDiverge","snapsOnTargetOnly","compact","v","changeVersion","toString","flat","reason","legacyScope","scopeImporter","importWithoutDeps","ComponentIdList","fromArray","lane","cache","includeVersionHistory","compStatusNotNeedMerge","c","mergeProps","compStatusNeedMerge","getComponentsStatusNeedMerge","tmp","Tmp","componentsStatus","Promise","all","getComponentMergeStatus","clear","err","results","componentMergeStatusBeforeMergeAttempt","currentComponent","Error","otherLaneHead","currentId","modelComponent","repo","objects","baseSnap","debug","toStringWithoutVersion","version","baseComponent","loadVersion","otherComponent","currentLaneName","toLaneId","otherLaneName","DEFAULT_LANE","currentLabel","otherLabel","workspaceIds","listIds","toComponentIds","configMerger","ComponentConfigMerger","extensions","mergeStrategy","configMergeResult","merge","dataMergeResult","mergeExtensionsData","mergeResults","threeWayMerge","currentExtensions","baseExtensions","otherExtensions","shouldMergeAspectsData","conflictedAspects","aspectsToSkip","DependencyResolverAspect","BuilderAspect","currentExtension","includes","stringId","baseExtension","findExtension","idWithoutVersion","otherExtension","extensionId","isEqual","returnUnmerged","msg","unmergedLegitimately","componentStatus","unchangedMessage","unchangedLegitimately","consumer","getModelComponentIfExist","unmerged","unmergedComponents","getEntry","getRef","existingBitMapId","bitMap","getComponentIdIfExist","ignoreVersion","componentOnOther","idOnCurrentLane","getComponent","getUpdateDependentAsLaneComponent","isRemoved","shouldMerge","shouldRemoveFromMain","head","shouldBeRemoved","getCurrentId","getHeadAsTagIfExist","getDivergeData","targetHead","throws","componentFromModel","componentMap","getComponentIfExist","isLocallyRemoved","getCurrentComponent","loadComponent","getConsumerComponent","isRemovedOnMain","findCoreExtension","config","removeOnMain","isTargetNotAhead","isTargetAhead","shouldIgnore","isModified","undefined","componentModificationStatus","getComponentStatusById","modified","isSourceCodeModified","isComponentSourceCodeModified","modifiedType","ignoreConfigChanges","sourceHead","NoCommonSnap","resolveUnrelated","message","handleNoCommonSnap","detachHead","commonSnapId","commonSnapComp","isDiverged","isSourceAhead","handleTargetAheadAsDiverged","mainHead","returnAccordingToOurs","headToSaveInLane","unrelatedHead","unrelatedLaneId","resolvedUnrelated","strategy","headOnCurrentLane","returnAccordingToTheirs","resolvedRef","unrelatedHeadRef","currentVersionRef","otherVersionRef","hasResolvedFromMain","hashToCompare","divergeDataFromMain","hasResolvedLocally","getHeadRegardlessOfLane","hasResolvedRemotely","refToSaveInLane"],"sources":["merge-status-provider.ts"],"sourcesContent":["import type { Workspace } from '@teambit/workspace';\nimport mapSeries from 'p-map-series';\nimport type { ComponentID } from '@teambit/component-id';\nimport { ComponentIdList } from '@teambit/component-id';\nimport type { LaneId } from '@teambit/lane-id';\nimport { DEFAULT_LANE } from '@teambit/lane-id';\nimport type { SnapsDistance } from '@teambit/component.snap-distance';\nimport { getDivergeData } from '@teambit/component.snap-distance';\nimport type { Lane, ModelComponent, Ref, Version } from '@teambit/objects';\nimport { NoCommonSnap, Tmp } from '@teambit/legacy.scope';\nimport type { ConsumerComponent } from '@teambit/legacy.consumer-component';\nimport type { ImporterMain } from '@teambit/importer';\nimport type { Logger } from '@teambit/logger';\nimport { compact, isEqual } from 'lodash';\nimport { ComponentConfigMerger } from '@teambit/config-merger';\nimport type { ScopeMain } from '@teambit/scope';\nimport type { MergeStrategy } from '@teambit/component.modules.merge-helper';\nimport { threeWayMerge } from '@teambit/component.modules.merge-helper';\nimport type { ComponentMergeStatus, ComponentMergeStatusBeforeMergeAttempt } from './merging.main.runtime';\nimport type { ExtensionDataList } from '@teambit/legacy.extension-data';\nimport { DependencyResolverAspect } from '@teambit/dependency-resolver';\nimport { BuilderAspect } from '@teambit/builder';\n\nexport type MergeStatusProviderOptions = {\n resolveUnrelated?: MergeStrategy;\n mergeStrategy: MergeStrategy;\n ignoreConfigChanges?: boolean;\n shouldSquash?: boolean;\n handleTargetAheadAsDiverged?: boolean;\n detachHead?: boolean;\n shouldMergeAspectsData?: boolean;\n};\n\ntype ConflictedDataAspects = { [extId: string]: string }; // extId => reason\n\nexport type DataMergeResult = {\n conflictedAspects?: ConflictedDataAspects;\n};\n\nexport const compIsAlreadyMergedMsg = 'component is already merged';\nexport const compHasBeenRemovedMsg = 'component has been removed';\nexport class MergeStatusProvider {\n constructor(\n private scope: ScopeMain,\n private logger: Logger,\n private importer: ImporterMain,\n private options: MergeStatusProviderOptions,\n private workspace?: Workspace,\n private currentLane?: Lane, // currently checked out lane. if on main, then it's undefined.\n private otherLane?: Lane // the lane we want to merged to our lane. (undefined if it's \"main\").\n ) {}\n\n async getStatus(\n bitIds: ComponentID[] // the id.version is the version we want to merge to the current component\n ): Promise<ComponentMergeStatus[]> {\n if (!this.currentLane && this.otherLane) {\n await this.importer.importObjectsFromMainIfExist(this.otherLane.toBitIds().toVersionLatest());\n }\n const componentStatusBeforeMergeAttempt = await mapSeries(bitIds, (id) =>\n this.getComponentStatusBeforeMergeAttempt(id)\n );\n // whether or not we need to import the gap between the common-snap and the other lane.\n // the common-snap itself we need anyway in order to get the files hash/content for checking conflicts.\n const shouldImportHistoryOfOtherLane =\n !this.options?.shouldSquash && // when squashing, no need for all history, only the head is going to be pushed\n (!this.currentLane \|\| // on main. we need all history in order to push each component to its remote\n this.currentLane.scope !== this.otherLane?.scope); // on lane, but the other lane is from a different scope. we need all history in order to push to the current lane's scope\n const toImport = componentStatusBeforeMergeAttempt\n .map((compStatus) => {\n if (!compStatus.divergeData) return [];\n const versionsToImport = [compStatus.divergeData.commonSnapBeforeDiverge];\n if (shouldImportHistoryOfOtherLane) {\n versionsToImport.push(...compStatus.divergeData.snapsOnTargetOnly);\n }\n return compact(versionsToImport).map((v) => compStatus.id.changeVersion(v.toString()));\n })\n .flat();\n const reason = shouldImportHistoryOfOtherLane\n ? `for filling the gap between the common-snap and the head of ${this.otherLane?.id() \|\| 'main'}`\n : `for getting the common-snap between ${this.currentLane?.id() \|\| 'main'} and ${this.otherLane?.id() \|\| 'main'}`;\n await this.scope.legacyScope.scopeImporter.importWithoutDeps(ComponentIdList.fromArray(toImport), {\n lane: this.otherLane,\n cache: true,\n includeVersionHistory: false,\n reason,\n });\n\n const compStatusNotNeedMerge = componentStatusBeforeMergeAttempt.filter(\n (c) => !c.mergeProps\n ) as ComponentMergeStatus[];\n const compStatusNeedMerge = componentStatusBeforeMergeAttempt.filter((c) => c.mergeProps);\n\n const getComponentsStatusNeedMerge = async (): Promise<ComponentMergeStatus[]> => {\n const tmp = new Tmp(this.scope.legacyScope);\n try {\n const componentsStatus = await Promise.all(\n compStatusNeedMerge.map((compStatus) => this.getComponentMergeStatus(compStatus))\n );\n await tmp.clear();\n return componentsStatus;\n } catch (err: any) {\n await tmp.clear();\n throw err;\n }\n };\n const results = await getComponentsStatusNeedMerge();\n\n results.push(...compStatusNotNeedMerge);\n return results;\n }\n\n private async getComponentMergeStatus(\n componentMergeStatusBeforeMergeAttempt: ComponentMergeStatusBeforeMergeAttempt\n ) {\n const { id, divergeData, currentComponent, mergeProps } = componentMergeStatusBeforeMergeAttempt;\n if (!mergeProps) throw new Error(`getDivergedMergeStatus, mergeProps is missing for ${id.toString()}`);\n const { otherLaneHead, currentId, modelComponent } = mergeProps;\n const repo = this.scope.legacyScope.objects;\n if (!divergeData) throw new Error(`getDivergedMergeStatus, divergeData is missing for ${id.toString()}`);\n if (!currentComponent) throw new Error(`getDivergedMergeStatus, currentComponent is missing for ${id.toString()}`);\n\n const baseSnap = divergeData.commonSnapBeforeDiverge as unknown as Ref; // must be set when isTrueMerge\n this.logger.debug(`merging snaps details:\nid: ${id.toStringWithoutVersion()}\nbase: ${baseSnap.toString()}\ncurrent: ${currentId.version}\nother: ${otherLaneHead.toString()}`);\n const baseComponent: Version = await modelComponent.loadVersion(baseSnap.toString(), repo);\n const otherComponent: Version = await modelComponent.loadVersion(otherLaneHead.toString(), repo);\n\n const currentLaneName = this.currentLane?.toLaneId().toString() \|\| 'main';\n const otherLaneName = this.otherLane ? this.otherLane.toLaneId().toString() : DEFAULT_LANE;\n const currentLabel = `${currentId.version} (${currentLaneName === otherLaneName ? 'current' : currentLaneName})`;\n const otherLabel = `${otherLaneHead.toString()} (${\n otherLaneName === currentLaneName ? 'incoming' : otherLaneName\n })`;\n const workspaceIds = this.workspace?.listIds() \|\| this.currentLane?.toComponentIds() \|\| [];\n const configMerger = new ComponentConfigMerger(\n id.toStringWithoutVersion(),\n workspaceIds,\n this.otherLane,\n currentComponent.extensions,\n baseComponent.extensions,\n otherComponent.extensions,\n currentLabel,\n otherLabel,\n this.logger,\n this.options.mergeStrategy\n );\n const configMergeResult = configMerger.merge();\n\n const dataMergeResult = this.mergeExtensionsData(\n currentComponent.extensions,\n baseComponent.extensions,\n otherComponent.extensions\n );\n\n const mergeResults = await threeWayMerge({\n scope: this.scope.legacyScope,\n otherComponent,\n otherLabel,\n currentComponent,\n currentLabel,\n baseComponent,\n });\n return {\n currentComponent,\n id,\n mergeResults,\n divergeData,\n configMergeResult,\n dataMergeResult,\n };\n }\n\n private mergeExtensionsData(\n currentExtensions: ExtensionDataList,\n baseExtensions: ExtensionDataList,\n otherExtensions: ExtensionDataList\n ): DataMergeResult {\n if (!this.options.shouldMergeAspectsData) {\n return {};\n }\n const conflictedAspects: { [extId: string]: string } = {}; // extId => reason\n // these aspects handled separately\n const aspectsToSkip = [DependencyResolverAspect.id, BuilderAspect.id];\n currentExtensions.forEach((currentExtension) => {\n if (aspectsToSkip.includes(currentExtension.stringId)) {\n return;\n }\n const baseExtension = baseExtensions.findExtension(currentExtension.idWithoutVersion, true);\n const otherExtension = otherExtensions.findExtension(currentExtension.idWithoutVersion, true);\n if (!otherExtension) {\n conflictedAspects[currentExtension.stringId] = 'missing in other';\n return;\n }\n // check whether the version is different.\n if (currentExtension.extensionId?.version !== otherExtension.extensionId?.version) {\n if (baseExtension?.extensionId?.version === otherExtension.extensionId?.version) {\n // ext version has changed in current. we're good.\n return;\n }\n conflictedAspects[currentExtension.stringId] =\n `version changed. base: ${baseExtension?.extensionId?.version}, other: ${otherExtension.extensionId?.version}`;\n return;\n }\n if (isEqual(currentExtension.data, otherExtension.data)) return;\n if (!baseExtension) {\n conflictedAspects[currentExtension.stringId] = 'no base-version. conflicted in data';\n return;\n }\n if (isEqual(baseExtension.data, otherExtension.data)) {\n return; // changed in current. leave it.\n }\n if (isEqual(baseExtension.data, currentExtension.data)) {\n // changed in other. copy it.\n currentExtension.data = otherExtension.data;\n return;\n }\n // changed in both. conflict.\n conflictedAspects[currentExtension.stringId] = 'conflicted in data since base-version';\n });\n otherExtensions.forEach((otherExtension) => {\n if (!currentExtensions.findExtension(otherExtension.idWithoutVersion, true)) {\n conflictedAspects[otherExtension.stringId] = 'missing in current';\n }\n });\n\n return { conflictedAspects };\n }\n\n private returnUnmerged(\n id: ComponentID,\n msg: string,\n unmergedLegitimately = false\n ): ComponentMergeStatusBeforeMergeAttempt {\n const componentStatus: ComponentMergeStatusBeforeMergeAttempt = { id };\n componentStatus.unchangedMessage = msg;\n componentStatus.unchangedLegitimately = unmergedLegitimately;\n return componentStatus;\n }\n\n // eslint-disable-next-line complexity\n private async getComponentStatusBeforeMergeAttempt(\n id: ComponentID // the id.version is the version we want to merge to the current component\n ): Promise<ComponentMergeStatusBeforeMergeAttempt> {\n const consumer = this.workspace?.consumer;\n const componentStatus: ComponentMergeStatusBeforeMergeAttempt = { id };\n const modelComponent = await this.scope.legacyScope.getModelComponentIfExist(id);\n if (!modelComponent) {\n return this.returnUnmerged(\n id,\n `component ${id.toString()} is on the lane/main but its objects were not found, please re-import the lane`\n );\n }\n const unmerged = this.scope.legacyScope.objects.unmergedComponents.getEntry(id);\n if (unmerged) {\n return this.returnUnmerged(\n id,\n `component ${id.toStringWithoutVersion()} is in during-merge state a previous merge, please snap/tag it first (or use bit merge --resolve/--abort/ bit lane merge-abort)`\n );\n }\n const repo = this.scope.legacyScope.objects;\n const version = id.version as string;\n const otherLaneHead = modelComponent.getRef(version);\n const existingBitMapId = consumer?.bitMap.getComponentIdIfExist(id, { ignoreVersion: true });\n const componentOnOther: Version = await modelComponent.loadVersion(version, this.scope.legacyScope.objects);\n // include hidden lane.updateDependents — when merging main into a lane, a hidden cascade\n // entry is the lane-side baseline for the 3-way merge. Without this the merge engine treats\n // the comp as \"not on the lane\" and produces a snap with parents=[mainHead], losing the\n // ancestral link to the lane's hidden head.\n const idOnCurrentLane =\n this.currentLane?.getComponent(id) \|\| this.currentLane?.getUpdateDependentAsLaneComponent(id);\n\n if (componentOnOther.isRemoved()) {\n // if exist in current lane, we want the current lane to get the soft-remove update.\n // or if it was removed with --update-main, we want to merge it so then main will get the update.\n // (unless this component does not exist on main, in which case, we don't want to merge it).\n const shouldMerge = idOnCurrentLane \|\| (componentOnOther.shouldRemoveFromMain() && modelComponent.head);\n if (shouldMerge) {\n // remove the component from the workspace if exist.\n componentStatus.shouldBeRemoved = true;\n } else {\n // on main, don't merge soft-removed components unless it's marked with removeOnMain.\n // on lane, if it's not part of the current lane, don't merge it.\n return this.returnUnmerged(id, compHasBeenRemovedMsg, true);\n }\n }\n const getCurrentId = () => {\n if (existingBitMapId) return existingBitMapId;\n if (this.currentLane) {\n if (!idOnCurrentLane) return null;\n return idOnCurrentLane.id.changeVersion(idOnCurrentLane.head.toString());\n }\n // it's on main\n const head = modelComponent.getHeadAsTagIfExist();\n if (head) {\n return id.changeVersion(head);\n }\n return null;\n };\n const currentId = getCurrentId();\n if (!currentId) {\n const divergeData = await getDivergeData({ repo, modelComponent, targetHead: otherLaneHead, throws: false });\n return { ...componentStatus, componentFromModel: componentOnOther, divergeData };\n }\n const componentMap = consumer?.bitMap.getComponentIfExist(currentId, { ignoreVersion: true });\n const isLocallyRemoved = componentMap?.isRemoved();\n if (isLocallyRemoved) {\n return this.returnUnmerged(\n id,\n `component is locally deleted, please snap and export first or undo by bit recover`\n );\n }\n const getCurrentComponent = () => {\n // eslint-disable-next-line @typescript-eslint/no-non-null-assertion\n if (existingBitMapId) return consumer!.loadComponent(existingBitMapId);\n return this.scope.legacyScope.getConsumerComponent(currentId);\n };\n const currentComponent = await getCurrentComponent();\n if (currentComponent.isRemoved()) {\n // we have a few options:\n // 1. \"other\" is main.\n // 1.a. it was deleted on the lane with --update-main. in this case, we need to merge because eventually we need this component\n // to be merged to main with the \"removed: true\".\n // 1.b. it was deleted on the lane without --update-main. in this case, we don't care what happens on main,\n // we want the component to stay deleted on this lane. (even when main is ahead, we don't want to merge it).\n // 2. other is ahead. in this case, other recovered the component. so we can continue with the merge.\n // it is possible that it is diverged, in which case, still continue with the merge, and later on, the\n // merge-config will show a config conflict of the remove aspect.\n // 3. other is not ahead. in this case, just ignore this component, no point to merge it, we want it removed.\n const isRemovedOnMain =\n currentComponent.extensions.findCoreExtension('teambit.component/remove')?.config?.removeOnMain;\n const divergeData = await getDivergeData({ repo, modelComponent, targetHead: otherLaneHead, throws: false });\n const isTargetNotAhead = !divergeData.err && !divergeData.isTargetAhead();\n const shouldIgnore = this.otherLane\n ? isTargetNotAhead // option #2 and #3 above\n : !isRemovedOnMain; // it's main. option #1 above.\n if (shouldIgnore) {\n return this.returnUnmerged(id, compHasBeenRemovedMsg, true);\n }\n }\n\n const isModified = async (): Promise<undefined \| 'code' \| 'config'> => {\n if (!consumer \|\| !this.workspace) return undefined;\n const componentModificationStatus = await this.workspace.getComponentStatusById(currentComponent.id);\n if (!componentModificationStatus.modified) return undefined;\n if (!existingBitMapId) return undefined;\n const baseComponent = await modelComponent.loadVersion(\n existingBitMapId.version as string,\n consumer.scope.objects\n );\n const isSourceCodeModified = await consumer.isComponentSourceCodeModified(baseComponent, currentComponent);\n if (isSourceCodeModified) return 'code';\n return 'config';\n };\n\n const modifiedType = await isModified();\n if (modifiedType === 'config' && !this.options?.ignoreConfigChanges) {\n return this.returnUnmerged(\n id,\n `component has config changes, please snap/tag it first. alternatively, use --ignore-config-changes flag to bypass`\n );\n }\n if (modifiedType === 'code') {\n return this.returnUnmerged(id, `component is modified, please snap/tag it first`);\n }\n\n if (!otherLaneHead) {\n throw new Error(`merging: unable finding a hash for the version ${version} of ${id.toString()}`);\n }\n const divergeData = await getDivergeData({\n repo,\n modelComponent,\n sourceHead: this.workspace ? undefined : modelComponent.getRef(currentId.version as string), // not sure if needs to check for this.workspace\n targetHead: otherLaneHead,\n throws: false,\n });\n if (divergeData.err) {\n if (!(divergeData.err instanceof NoCommonSnap) \|\| !this.options?.resolveUnrelated) {\n return this.returnUnmerged(id, `unable to traverse history. error: ${divergeData.err.message}`);\n }\n return this.handleNoCommonSnap(\n modelComponent,\n id,\n otherLaneHead,\n currentComponent,\n componentOnOther,\n divergeData\n );\n }\n if (this.options.detachHead && divergeData.commonSnapBeforeDiverge) {\n // just override with the model data\n const commonSnapId = id.changeVersion(divergeData.commonSnapBeforeDiverge.toString());\n const commonSnapComp = await this.scope.legacyScope.getConsumerComponent(commonSnapId);\n return {\n ...componentStatus,\n currentComponent: commonSnapComp,\n componentFromModel: componentOnOther,\n divergeData,\n };\n }\n if (!divergeData.isDiverged()) {\n if (divergeData.isSourceAhead()) {\n // component is ahead nothing to merge.\n return this.returnUnmerged(id, compIsAlreadyMergedMsg, true);\n }\n if (!divergeData.isTargetAhead()) {\n // we know that localHead and remoteHead are set, so if none of them is ahead they must be equal\n return this.returnUnmerged(id, compIsAlreadyMergedMsg, true);\n }\n // target is ahead.\n if (!this.options.handleTargetAheadAsDiverged \|\| !divergeData.commonSnapBeforeDiverge) {\n // just override with the model data\n return {\n ...componentStatus,\n currentComponent,\n componentFromModel: componentOnOther,\n divergeData,\n };\n }\n // target is ahead and we want to treat it as diverged, continue.\n }\n\n // it's diverged and needs merge operation\n const mergeProps = {\n otherLaneHead,\n currentId,\n modelComponent,\n };\n\n return { ...componentStatus, currentComponent, mergeProps, divergeData };\n }\n\n private async handleNoCommonSnap(\n modelComponent: ModelComponent,\n id: ComponentID,\n otherLaneHead: Ref,\n currentComponent: ConsumerComponent,\n componentOnOther?: Version,\n divergeData?: SnapsDistance\n ): Promise<ComponentMergeStatusBeforeMergeAttempt> {\n let { resolveUnrelated } = this.options \|\| {};\n if (currentComponent.isRemoved()) {\n resolveUnrelated = 'theirs';\n }\n if (!resolveUnrelated) throw new Error(`handleNoCommonSnap expects resolveUnrelated to be set`);\n const repo = this.scope.legacyScope.objects;\n const mainHead = modelComponent.head;\n\n const returnAccordingToOurs = (\n headToSaveInLane: Ref,\n unrelatedHead: Ref,\n unrelatedLaneId: LaneId\n ): ComponentMergeStatusBeforeMergeAttempt => {\n return {\n currentComponent,\n id,\n divergeData,\n resolvedUnrelated: {\n strategy: 'ours',\n headOnCurrentLane: headToSaveInLane,\n unrelatedHead,\n unrelatedLaneId,\n },\n };\n };\n const returnAccordingToTheirs = (\n resolvedRef: Ref,\n unrelatedHeadRef: Ref,\n unrelatedLaneId: LaneId\n ): ComponentMergeStatusBeforeMergeAttempt => {\n // just override with the model data\n return {\n currentComponent,\n componentFromModel: componentOnOther,\n id,\n divergeData,\n resolvedUnrelated: {\n strategy: 'theirs',\n headOnCurrentLane: resolvedRef,\n unrelatedHead: unrelatedHeadRef,\n unrelatedLaneId,\n },\n };\n };\n\n const currentVersionRef = modelComponent.getRef(currentComponent.id.version as string);\n if (!currentVersionRef)\n throw new Error(\n `handleNoCommonSnap, unable to get ref of current version \"${\n currentComponent.id.version\n }\" for \"${id.toString()}\"`\n );\n const otherVersionRef = modelComponent.getRef(id.version as string);\n if (!otherVersionRef)\n throw new Error(`handleNoCommonSnap, unable to get ref of other version \"${id.version}\" for \"${id.toString()}\"`);\n\n if (mainHead) {\n const hasResolvedFromMain = async (hashToCompare: Ref \| null) => {\n const divergeDataFromMain = await getDivergeData({\n repo,\n modelComponent,\n sourceHead: hashToCompare,\n targetHead: mainHead,\n throws: false,\n });\n if (!divergeDataFromMain.err) return true;\n return !(divergeDataFromMain.err instanceof NoCommonSnap);\n };\n const hasResolvedLocally = await hasResolvedFromMain(modelComponent.getHeadRegardlessOfLane() as Ref);\n const hasResolvedRemotely = await hasResolvedFromMain(otherLaneHead);\n if (!hasResolvedLocally && !hasResolvedRemotely) {\n return this.returnUnmerged(\n id,\n `unable to traverse ${currentComponent.id.toString()} history. the main-head ${mainHead.toString()} doesn't appear in both lanes.\nit was probably created in each lane separately and it also exists on main. please merge main first to one of these lanes`\n );\n }\n const refToSaveInLane = hasResolvedLocally ? currentVersionRef : otherVersionRef;\n const unrelatedHeadRef = hasResolvedLocally ? otherVersionRef : currentVersionRef;\n if (resolveUnrelated === 'ours') {\n return returnAccordingToOurs(refToSaveInLane, unrelatedHeadRef, this.currentLane?.toLaneId() as LaneId);\n }\n if (resolveUnrelated === 'theirs') {\n return returnAccordingToTheirs(refToSaveInLane, unrelatedHeadRef, this.currentLane?.toLaneId() as LaneId);\n }\n throw new Error(\n `unsupported strategy \"${resolveUnrelated}\" of resolve-unrelated. supported strategies are: [ours, theirs]`\n );\n }\n\n const refToSaveInLane = resolveUnrelated === 'ours' ? currentVersionRef : otherVersionRef;\n const unrelatedHeadRef = resolveUnrelated === 'ours' ? otherVersionRef : currentVersionRef;\n if (resolveUnrelated === 'ours') {\n return returnAccordingToOurs(refToSaveInLane, unrelatedHeadRef, this.otherLane?.toLaneId() as LaneId);\n }\n if (resolveUnrelated === 'theirs') {\n return returnAccordingToTheirs(refToSaveInLane, unrelatedHeadRef, this.currentLane?.toLaneId() as LaneId);\n }\n throw new Error(\n `unsupported strategy \"${resolveUnrelated}\" of resolve-unrelated. supported strategies are: [ours, theirs]`\n );\n }\n}\n"],"mappings":"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","ignoreList":[]}

package/dist/merging.main.runtime.js CHANGED Viewed

@@ -448,7 +448,13 @@ class MergingMain {
       });
     });
     if (this.workspace) {
-      const compsToWrite = (0, _lodash().compact)(componentsResults.map(c => c.legacyCompToWrite));
+      // Hidden lane updateDependents live only on the lane and in the scope. Writing them to
+      // the workspace would (a) leak internal lane plumbing into bitmap/files, and (b) confuse
+      // downstream classifiers that key off bitmap-presence (the cascade-on-snap detector in
+      // version-maker treats "in bitmap" as "workspace tracked"). Filter them out here.
+      const hiddenIds = currentLane?.updateDependents || [];
+      const visibleResults = componentsResults.filter(c => !hiddenIds.find(id => id.isEqualWithoutVersion(c.applyVersionResult.id)));
+      const compsToWrite = (0, _lodash().compact)(visibleResults.map(c => c.legacyCompToWrite));
       const manyComponentsWriterOpts = {
         consumer: this.workspace.consumer,
         components: compsToWrite,
@@ -487,14 +493,19 @@ class MergingMain {
     const modelComponent = await legacyScope.getModelComponent(id);
     const addToCurrentLane = head => {
       if (!currentLane) throw new Error('currentLane must be defined when adding to the lane');
-      if (otherLaneId.isDefault()) {
-        const isPartOfLane = currentLane.components.find(c => c.id.isEqualWithoutVersion(id));
-        if (!isPartOfLane) return;
+      const existingOnLane = currentLane.getComponent(id);
+      const existingInUpdateDependents = currentLane.findUpdateDependent(id);
+      if (otherLaneId.isDefault() && !existingOnLane && !existingInUpdateDependents) return;
+      // preserve the existing entry's bucket so a merge refreshing a hidden updateDependent
+      // doesn't accidentally promote it into the workspace-tracked bucket (and vice versa).
+      if (existingInUpdateDependents && !existingOnLane) {
+        currentLane.addComponentToUpdateDependents(id.changeVersion(head.toString()));
+      } else {
+        currentLane.addComponent({
+          id,
+          head
+        });
       }
-      currentLane.addComponent({
-        id,
-        head
-      });
     };
     const convertHashToTagIfPossible = componentId => {
       if (!componentId.version) return componentId;
@@ -692,10 +703,22 @@ class MergingMain {
       });
       return results;
     }
-    return this.snapping.snap({
-      legacyBitIds: ids,
-      build,
+    // Hidden lane updateDependents ride the same `makeVersion` batch as visible workspace
+    // components. version-maker's `isHiddenLaneEntry` detection (workspace flow: not-in-bitmap)
+    // routes each entry correctly. workspace.getMany picks up disk-merged files for visible; the
+    // in-memory merged ConsumerComponents from `applyVersion` are passed through for hidden
+    // (which have no disk state). Single pipeline → consistent log/buildStatus/
+    // flattenedDependencies/lane-history/stagedSnaps for all merge-cascade snaps.
+    const lane = await this.scope.legacyScope.getCurrentLaneObject();
+    const updateDependentsIds = lane?.updateDependents || [];
+    const hiddenIds = _componentId().ComponentIdList.fromArray(ids.filter(id => updateDependentsIds.find(u => u.isEqualWithoutVersion(id))));
+    const visibleIds = _componentId().ComponentIdList.fromArray(ids.filter(id => !hiddenIds.find(h => h.isEqualWithoutVersion(id))));
+    const hiddenLegacyComponents = updatedComponents.filter(c => hiddenIds.find(h => h.isEqualWithoutVersion(c.componentId)));
+    return this.snapping.snapForMerge({
+      visibleIds,
+      hiddenLegacyComponents,
       message: snapMessage,
+      build,
       loose
     });
   }

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

	@@ -1 +1 @@
1	- {"version":3,"names":["_cli","data","require","_workspace","_legacy","_snapping","_pMapSeries","_interopRequireDefault","_componentId","_bitError","_laneId","_chalk","_config","_remove","_toolboxPath","_pkgModules","_componentWriter","_importer","_logger","_lodash","_checkout","_configMerger","_dependencyResolver","_install","_scope","_mergeCmd","_merging","_mergeStatusProvider","_componentModules","_configStore","_application","e","__esModule","default","ownKeys","r","t","Object","keys","getOwnPropertySymbols","o","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","defineProperty","_toPropertyKey","value","configurable","writable","i","_toPrimitive","Symbol","toPrimitive","call","TypeError","String","Number","MergingMain","constructor","workspace","scope","install","snapping","checkout","logger","componentWriter","importer","config","remove","configMerger","depResolver","application","merge","pattern","mergeStrategy","abort","resolve","noAutoSnap","message","build","skipDependencyInstallation","OutsideWorkspaceError","consumer","mergeResults","resolveMerge","abortMerge","bitIds","getComponentsToMerge","mergeComponentsFromRemote","onDestroy","snapMessage","currentLaneId","getCurrentLaneId","currentLaneObject","getCurrentLaneObject","allComponentsStatus","getAllComponentsStatus","failedComponents","c","unchangedMessage","unchangedLegitimately","failureMsgs","map","failedComponent","chalk","bold","id","toString","red","join","BitError","mergeSnaps","otherLaneId","currentLane","noSnap","tag","detachHead","loose","legacyScope","componentWithConflict","find","component","hasConflicts","getMergeStrategyInteractive","componentStatus","shouldBeRemoved","componentIdsToRemove","changeVersion","undefined","succeededComponents","currentLaneIdsBeforeMerge","toComponentIds","componentsResults","applyVersionMultiple","allConfigMerge","compact","configMergeResult","workspaceDepsUpdates","workspaceDepsConflicts","workspaceDepsUnchanged","updateWorkspaceJsoncWithDepsIfNeeded","workspaceConfigConflictWriteError","writeWorkspaceJsoncWithConflictsGracefully","generateConfigMergeConflictFileForAll","laneHistoryMsg","laneHistory","lanes","updateLaneHistory","objects","add","persist","unmergedComponents","write","writeBitMap","removeFromWsJsonPolicyIfExists","compBitIdsToRemove","ComponentIdList","fromArray","deleteComponentsFiles","cleanFromBitMap","componentsHasConfigMergeConflicts","some","leftUnresolvedConflicts","loadAllAppsAsAspects","dedupe","updateExisting","import","err","error","consoleFailure","updatedComponents","legacyCompToWrite","getSnapOrTagResults","idsToTag","results","tagAllLaneComponent","taggedComponents","autoTaggedResults","removedComponents","snappedComponents","autoSnappedResults","snapResolvedComponents","laneId","toLaneId","mergeSnapResults","mergeSnapError","bitMapSnapshot","bitMap","takeSnapshot","restoreFromSnapshot","components","applyVersionResult","workspaceConfigUpdateResult","newlyIntroducedIds","hasWithoutVersion","newlyIntroducedComponentIds","packages","componentIdToPackageName","isRemoved","removeFromRootPolicy","persistConfig","getMergeStatus","options","otherLane","mergeStatusProvider","MergeStatusProvider","getStatus","mapSeries","currentComponent","resolvedUnrelated","modelComponent","getModelComponent","updatedLaneId","isDefault","LaneId","from","name","applyVersion","remoteHead","getRef","version","compsToWrite","manyComponentsWriterOpts","writeConfig","reasonForBitmapChange","writeMany","filesStatus","unmergedComponent","fullName","head","addToCurrentLane","Error","isPartOfLane","isEqualWithoutVersion","addComponent","convertHashToTagIfPossible","componentId","getTag","handleResolveUnrelated","headOnCurrentLane","unrelated","unrelatedHead","unrelatedLaneId","addEntry","idForOutput","markAllFilesAsUnchanged","files","file","pathNormalizeToLinux","relative","FileStatus","unchanged","MergeOptions","ours","strategy","remoteId","idToLoad","theirs","legacyComponent","loadComponentFromModelImportIfNeeded","getConsumerComponent","updateFileStatus","modifiedStatus","modifiedFiles","applyModifiedVersion","removeFilesIfNeeded","successfullyMergedConfig","getSuccessfullyMergedConfig","mergeScopeSpecificDepsPolicy","extensions","filterDeletedDependenciesFromConfig","mergedConfig","manual","unmergedPaths","f","conflict","filePath","detachedHeads","setHead","markVersionAsLocal","ids","getIdsForUnmerged","reset","removeComponent","abortedComponents","snap","legacyBitIds","resolvedComponents","localLaneObject","Promise","all","bitId","remoteScopeName","remoteLaneId","remoteLanes","laneIdStr","toStringWithoutVersion","shouldSquash","getComponents","debug","ComponentID","fromObject","getLoadAspectOnlyForIds","dataMergeResult","dataConflictedIds","conflictedAspects","aspectIds","aspectId","snapFromScope","aspects","getEntry","lane","updatedLegacyComponents","loadAspectOnlyForIds","tagMessage","unmodified","componentIds","idsByPattern","entry","unresolvedComponents","u","mergePending","listMergePendingComponents","componentsList","ComponentsList","allIds","getAllIdsAvailableOnLaneIncludeRemoved","componentsFromModel","getModelComponents","duringMergeComps","listDuringMergeStateComponents","mergePendingComponents","toComponentId","divergedData","getDivergeDataForMergePending","isDiverged","diverge","scopeExtensions","mergeConfig","mergeConfigPolicy","DependencyResolverAspect","policy","depsResolver","findCoreExtension","scopePolicy","depType","scopeDepsForType","depId","force","addScopePolicyToMergedArray","policyArray","existingDep","dep","depValue","filtered","provider","cli","loggerMain","compWriter","configStore","createLogger","MergingAspect","merging","register","MergeCmd","exports","CLIAspect","WorkspaceAspect","ScopeAspect","SnappingAspect","CheckoutAspect","InstallAspect","LoggerAspect","ComponentWriterAspect","ImporterAspect","ConfigAspect","RemoveAspect","ConfigStoreAspect","ConfigMergerAspect","ApplicationAspect","MainRuntime","addRuntime"],"sources":["merging.main.runtime.ts"],"sourcesContent":["import type { CLIMain } from '@teambit/cli';\nimport { CLIAspect, MainRuntime } from '@teambit/cli';\nimport type { Workspace } from '@teambit/workspace';\nimport { WorkspaceAspect, OutsideWorkspaceError } from '@teambit/workspace';\nimport type { Consumer } from '@teambit/legacy.consumer';\nimport { ComponentsList } from '@teambit/legacy.component-list';\nimport type { SnappingMain, TagResults } from '@teambit/snapping';\nimport { SnappingAspect } from '@teambit/snapping';\nimport mapSeries from 'p-map-series';\nimport { ComponentID, ComponentIdList } from '@teambit/component-id';\nimport { BitError } from '@teambit/bit-error';\nimport { LaneId } from '@teambit/lane-id';\nimport type { UnmergedComponent } from '@teambit/legacy.scope';\nimport type { Ref, Lane, ModelComponent } from '@teambit/objects';\nimport chalk from 'chalk';\nimport type { ConfigMain } from '@teambit/config';\nimport { ConfigAspect } from '@teambit/config';\nimport type { RemoveMain } from '@teambit/remove';\nimport { RemoveAspect, deleteComponentsFiles } from '@teambit/remove';\nimport { pathNormalizeToLinux } from '@teambit/toolbox.path.path';\nimport { componentIdToPackageName } from '@teambit/pkg.modules.component-package-name';\nimport type { ComponentWriterMain } from '@teambit/component-writer';\nimport { ComponentWriterAspect } from '@teambit/component-writer';\nimport type { ConsumerComponent } from '@teambit/legacy.consumer-component';\nimport type { ImporterMain } from '@teambit/importer';\nimport { ImporterAspect } from '@teambit/importer';\nimport type { Logger, LoggerMain } from '@teambit/logger';\nimport { LoggerAspect } from '@teambit/logger';\nimport { compact } from 'lodash';\nimport type { ApplyVersionWithComps, CheckoutMain, ComponentStatusBase } from '@teambit/checkout';\nimport { CheckoutAspect, removeFilesIfNeeded, updateFileStatus } from '@teambit/checkout';\nimport type { ConfigMergerMain, ConfigMergeResult, PolicyDependency } from '@teambit/config-merger';\nimport { ConfigMergerAspect } from '@teambit/config-merger';\nimport type { SnapsDistance } from '@teambit/component.snap-distance';\nimport type { DependencyResolverMain } from '@teambit/dependency-resolver';\nimport { DependencyResolverAspect } from '@teambit/dependency-resolver';\nimport type { InstallMain } from '@teambit/install';\nimport { InstallAspect } from '@teambit/install';\nimport type { ScopeMain } from '@teambit/scope';\nimport { ScopeAspect } from '@teambit/scope';\nimport type { ExtensionDataList } from '@teambit/legacy.extension-data';\nimport { MergeCmd } from './merge-cmd';\nimport { MergingAspect } from './merging.aspect';\nimport type { DataMergeResult, MergeStatusProviderOptions } from './merge-status-provider';\nimport { MergeStatusProvider } from './merge-status-provider';\nimport type {\n MergeStrategy,\n MergeResultsThreeWay,\n ApplyVersionResults,\n FailedComponents,\n MergeSnapResults,\n} from '@teambit/component.modules.merge-helper';\nimport {\n applyModifiedVersion,\n FileStatus,\n getMergeStrategyInteractive,\n MergeOptions,\n} from '@teambit/component.modules.merge-helper';\nimport type { ConfigStoreMain } from '@teambit/config-store';\nimport { ConfigStoreAspect } from '@teambit/config-store';\nimport type { ApplicationMain } from '@teambit/application';\nimport { ApplicationAspect } from '@teambit/application';\n\ntype ResolveUnrelatedData = {\n strategy: MergeStrategy;\n headOnCurrentLane: Ref;\n unrelatedHead: Ref;\n unrelatedLaneId: LaneId;\n};\n\nexport type DivergedComponent = { id: ComponentID; diverge: SnapsDistance };\n\nexport type ComponentMergeStatus = ComponentStatusBase & {\n mergeResults?: MergeResultsThreeWay \| null;\n divergeData?: SnapsDistance;\n resolvedUnrelated?: ResolveUnrelatedData;\n configMergeResult?: ConfigMergeResult;\n dataMergeResult?: DataMergeResult;\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 class MergingMain {\n constructor(\n private workspace: Workspace,\n private scope: ScopeMain,\n private install: InstallMain,\n private snapping: SnappingMain,\n private checkout: CheckoutMain,\n private logger: Logger,\n private componentWriter: ComponentWriterMain,\n private importer: ImporterMain,\n private config: ConfigMain,\n private remove: RemoveMain,\n private configMerger: ConfigMergerMain,\n private depResolver: DependencyResolverMain,\n private application: ApplicationMain\n ) {}\n\n async merge(\n pattern: string,\n mergeStrategy: MergeStrategy,\n abort: boolean,\n resolve: boolean,\n noAutoSnap: boolean,\n message: string,\n build: boolean,\n skipDependencyInstallation: boolean\n ): Promise<ApplyVersionResults> {\n if (!this.workspace) throw new OutsideWorkspaceError();\n const consumer: Consumer = this.workspace.consumer;\n let mergeResults;\n if (resolve) {\n mergeResults = await this.resolveMerge(pattern, message, build);\n } else if (abort) {\n mergeResults = await this.abortMerge(pattern);\n } else {\n const bitIds = await this.getComponentsToMerge(pattern);\n mergeResults = await this.mergeComponentsFromRemote(\n consumer,\n bitIds,\n mergeStrategy,\n noAutoSnap,\n message,\n build,\n skipDependencyInstallation\n );\n }\n await consumer.onDestroy('merge');\n return mergeResults;\n }\n\n /*\n when user is on main, it merges the remote main components into local.\n * when user is on a lane, it merges the remote lane components into the local lane.\n /\n async mergeComponentsFromRemote(\n consumer: Consumer,\n bitIds: ComponentID[],\n mergeStrategy: MergeStrategy,\n noAutoSnap: boolean,\n snapMessage: string,\n build: boolean,\n skipDependencyInstallation: boolean\n ): Promise<ApplyVersionResults> {\n const currentLaneId = consumer.getCurrentLaneId();\n const currentLaneObject = await consumer.getCurrentLaneObject();\n const allComponentsStatus = await this.getAllComponentsStatus(\n bitIds,\n currentLaneId,\n currentLaneObject,\n mergeStrategy\n );\n const failedComponents = allComponentsStatus.filter((c) => c.unchangedMessage && !c.unchangedLegitimately);\n if (failedComponents.length) {\n const failureMsgs = failedComponents\n .map(\n (failedComponent) =>\n `${chalk.bold(failedComponent.id.toString())} - ${chalk.red(failedComponent.unchangedMessage as string)}`\n )\n .join('\\n');\n throw new BitError(`unable to merge due to the following failures:\\n${failureMsgs}`);\n }\n\n return this.mergeSnaps({\n mergeStrategy,\n allComponentsStatus,\n otherLaneId: currentLaneId,\n currentLane: currentLaneObject,\n noAutoSnap: noAutoSnap,\n snapMessage,\n build,\n skipDependencyInstallation,\n });\n }\n\n /\n merge multiple components according to the \"allComponentsStatus\".\n /\n async mergeSnaps({\n mergeStrategy,\n allComponentsStatus,\n otherLaneId,\n currentLane,\n noAutoSnap,\n noSnap,\n tag,\n snapMessage,\n build,\n skipDependencyInstallation,\n detachHead,\n loose,\n }: {\n mergeStrategy: MergeStrategy;\n allComponentsStatus: ComponentMergeStatus[];\n otherLaneId: LaneId;\n currentLane?: Lane;\n noAutoSnap?: boolean;\n noSnap?: boolean;\n tag?: boolean;\n snapMessage?: string;\n build?: boolean;\n skipDependencyInstallation?: boolean;\n detachHead?: boolean;\n loose?: boolean;\n }): Promise<ApplyVersionResults> {\n const consumer = this.workspace?.consumer;\n const legacyScope = this.scope.legacyScope;\n const componentWithConflict = allComponentsStatus.find(\n (component) => component.mergeResults && component.mergeResults.hasConflicts\n );\n if (componentWithConflict && !mergeStrategy) {\n mergeStrategy = await getMergeStrategyInteractive();\n }\n const failedComponents: FailedComponents[] = allComponentsStatus\n .filter((componentStatus) => componentStatus.unchangedMessage)\n .filter((componentStatus) => !componentStatus.shouldBeRemoved)\n .map((componentStatus) => ({\n id: componentStatus.id,\n unchangedMessage: componentStatus.unchangedMessage as string,\n unchangedLegitimately: componentStatus.unchangedLegitimately,\n }));\n\n const componentIdsToRemove = allComponentsStatus\n .filter((componentStatus) => componentStatus.shouldBeRemoved)\n .map((c) => c.id.changeVersion(undefined));\n\n const succeededComponents = allComponentsStatus.filter((componentStatus) => !componentStatus.unchangedMessage);\n\n const currentLaneIdsBeforeMerge = currentLane?.toComponentIds();\n\n const componentsResults = await this.applyVersionMultiple(\n succeededComponents,\n otherLaneId,\n mergeStrategy,\n currentLane,\n detachHead\n );\n\n const allConfigMerge = compact(succeededComponents.map((c) => c.configMergeResult));\n\n const { workspaceDepsUpdates, workspaceDepsConflicts, workspaceDepsUnchanged } = this.workspace\n ? await this.configMerger.updateWorkspaceJsoncWithDepsIfNeeded(allConfigMerge)\n : { workspaceDepsUpdates: undefined, workspaceDepsConflicts: undefined, workspaceDepsUnchanged: undefined };\n\n let workspaceConfigConflictWriteError: Error \| undefined;\n if (workspaceDepsConflicts) {\n workspaceConfigConflictWriteError =\n await this.configMerger.writeWorkspaceJsoncWithConflictsGracefully(workspaceDepsConflicts);\n }\n if (this.workspace) await this.configMerger.generateConfigMergeConflictFileForAll(allConfigMerge);\n\n if (currentLane) {\n const laneHistoryMsg = `merge from \"${otherLaneId.toString()}\"`;\n const laneHistory = await legacyScope.lanes.updateLaneHistory(currentLane, laneHistoryMsg);\n legacyScope.objects.add(laneHistory);\n legacyScope.objects.add(currentLane);\n }\n\n await legacyScope.objects.persist(); // persist anyway, if currentLane is null it should save all main heads\n\n await legacyScope.objects.unmergedComponents.write();\n\n if (this.workspace) {\n await consumer.writeBitMap(`merge ${otherLaneId.toString()}`);\n await this.removeFromWsJsonPolicyIfExists(componentsResults, currentLane, currentLaneIdsBeforeMerge);\n }\n\n if (componentIdsToRemove.length && this.workspace) {\n const compBitIdsToRemove = ComponentIdList.fromArray(componentIdsToRemove);\n await deleteComponentsFiles(consumer, compBitIdsToRemove);\n await consumer.cleanFromBitMap(compBitIdsToRemove);\n }\n\n const componentsHasConfigMergeConflicts = allComponentsStatus.some((c) => c.configMergeResult?.hasConflicts());\n const leftUnresolvedConflicts = componentWithConflict && mergeStrategy === 'manual';\n\n if (!skipDependencyInstallation && !leftUnresolvedConflicts && !componentsHasConfigMergeConflicts) {\n // this is a workaround.\n // keep this here. although it gets called before snapping.\n // the reason is that when the installation is running, for some reason, some apps are unable to load in the same process.\n // they throw an error \"Cannot find module\" during the aspect loading.\n await this.application.loadAllAppsAsAspects();\n\n try {\n await this.install.install(undefined, {\n dedupe: true,\n updateExisting: false,\n import: false,\n });\n } catch (err: any) {\n this.logger.error(`failed installing packages`, err);\n this.logger.consoleFailure(\n `failed installing packages, see the log for full stacktrace. error: ${err.message}`\n );\n }\n }\n\n const updatedComponents = compact(componentsResults.map((c) => c.legacyCompToWrite));\n\n const getSnapOrTagResults = async (): Promise<MergeSnapResults> => {\n // if one of the component has conflict, don't snap-merge. otherwise, some of the components would be snap-merged\n // and some not. besides the fact that it could by mistake tag dependent, it's a confusing state. better not snap.\n if (noAutoSnap \|\| noSnap \|\| leftUnresolvedConflicts \|\| componentsHasConfigMergeConflicts) {\n return null;\n }\n if (tag) {\n const idsToTag = allComponentsStatus.map((c) => c.id);\n const results = await this.tagAllLaneComponent(idsToTag, snapMessage, build);\n if (!results) return null;\n const { taggedComponents, autoTaggedResults, removedComponents } = results;\n return { snappedComponents: taggedComponents, autoSnappedResults: autoTaggedResults, removedComponents };\n }\n return this.snapResolvedComponents(allComponentsStatus, updatedComponents, {\n snapMessage,\n build,\n laneId: currentLane?.toLaneId(),\n loose,\n });\n };\n let mergeSnapResults: MergeSnapResults = null;\n let mergeSnapError: Error \| undefined;\n const bitMapSnapshot = this.workspace ? this.workspace.bitMap.takeSnapshot() : null;\n try {\n mergeSnapResults = await getSnapOrTagResults();\n } catch (err: any) {\n this.logger.error('failed running snap. mergeSnapError:', err);\n mergeSnapError = err;\n if (bitMapSnapshot) this.workspace.bitMap.restoreFromSnapshot(bitMapSnapshot);\n }\n\n return {\n components: componentsResults.map((c) => c.applyVersionResult),\n failedComponents,\n removedComponents: [...componentIdsToRemove, ...(mergeSnapResults?.removedComponents \|\| [])],\n mergeSnapResults,\n mergeSnapError,\n workspaceConfigUpdateResult: {\n workspaceDepsUpdates,\n workspaceDepsConflicts,\n workspaceDepsUnchanged,\n workspaceConfigConflictWriteError,\n },\n leftUnresolvedConflicts,\n };\n }\n\n async removeFromWsJsonPolicyIfExists(\n componentsResults: ApplyVersionWithComps[],\n currentLane?: Lane,\n currentLaneIdsBeforeMerge?: ComponentIdList\n ) {\n const newlyIntroducedIds = currentLane\n ?.toComponentIds()\n .filter((id) => !currentLaneIdsBeforeMerge?.hasWithoutVersion(id));\n const newlyIntroducedComponentIds = ComponentIdList.fromArray(newlyIntroducedIds \|\| []);\n const components = compact(\n componentsResults\n .map((c) => c.legacyCompToWrite)\n .filter((c) => c && newlyIntroducedComponentIds.hasWithoutVersion(c.id))\n );\n const packages = components.map((c) => componentIdToPackageName(c));\n const isRemoved = this.depResolver.removeFromRootPolicy(packages);\n if (isRemoved) await this.depResolver.persistConfig('merge (remove packages)');\n }\n\n /\n this function gets called from two different commands:\n * 1. \"bit merge <ids...>\", when merging a component from a remote to the local.\n * in this case, the remote and local are on the same lane or both on main.\n * 2. \"bit lane merge\", when merging from one lane to another.\n /\n async getMergeStatus(\n bitIds: ComponentID[], // the id.version is the version we want to merge to the current component\n options: MergeStatusProviderOptions,\n currentLane?: Lane, // currently checked out lane. if on main, then it's null.\n otherLane?: Lane // the lane we want to merged to our lane. (null if it's \"main\").\n ): Promise<ComponentMergeStatus[]> {\n const mergeStatusProvider = new MergeStatusProvider(\n this.scope,\n this.logger,\n this.importer,\n options,\n this.workspace,\n currentLane,\n otherLane\n );\n return mergeStatusProvider.getStatus(bitIds);\n }\n\n private async applyVersionMultiple(\n succeededComponents: ComponentMergeStatus[],\n otherLaneId: LaneId,\n mergeStrategy: MergeStrategy,\n currentLane?: Lane,\n detachHead?: boolean\n ): Promise<ApplyVersionWithComps[]> {\n const componentsResults = await mapSeries(\n succeededComponents,\n async ({ currentComponent, id, mergeResults, resolvedUnrelated, configMergeResult }) => {\n const modelComponent = await this.scope.legacyScope.getModelComponent(id);\n const updatedLaneId = otherLaneId.isDefault() ? LaneId.from(otherLaneId.name, id.scope as string) : otherLaneId;\n return this.applyVersion({\n currentComponent,\n id,\n mergeResults,\n mergeStrategy,\n remoteHead: modelComponent.getRef(id.version as string) as Ref,\n otherLaneId: updatedLaneId,\n currentLane,\n resolvedUnrelated,\n configMergeResult,\n detachHead,\n });\n }\n );\n\n if (this.workspace) {\n const compsToWrite = compact(componentsResults.map((c) => c.legacyCompToWrite));\n const manyComponentsWriterOpts = {\n consumer: this.workspace.consumer,\n components: compsToWrite,\n skipDependencyInstallation: true,\n writeConfig: false, // @todo: should write if config exists before, needs to figure out how to do it.\n reasonForBitmapChange: 'merge',\n };\n await this.componentWriter.writeMany(manyComponentsWriterOpts);\n }\n\n return componentsResults;\n }\n\n private async applyVersion({\n currentComponent,\n id,\n mergeResults,\n mergeStrategy,\n remoteHead,\n otherLaneId,\n currentLane,\n resolvedUnrelated,\n configMergeResult,\n detachHead,\n }: {\n currentComponent: ConsumerComponent \| null \| undefined;\n id: ComponentID;\n mergeResults: MergeResultsThreeWay \| null \| undefined;\n mergeStrategy: MergeStrategy;\n remoteHead: Ref;\n otherLaneId: LaneId;\n currentLane?: Lane;\n resolvedUnrelated?: ResolveUnrelatedData;\n configMergeResult?: ConfigMergeResult;\n detachHead?: boolean;\n }): Promise<ApplyVersionWithComps> {\n const legacyScope = this.scope.legacyScope;\n let filesStatus = {};\n const unmergedComponent: UnmergedComponent = {\n id: { name: id.fullName, scope: id.scope },\n head: remoteHead,\n laneId: otherLaneId,\n };\n id = currentComponent ? currentComponent.id : id;\n const modelComponent = await legacyScope.getModelComponent(id);\n\n const addToCurrentLane = (head: Ref) => {\n if (!currentLane) throw new Error('currentLane must be defined when adding to the lane');\n if (otherLaneId.isDefault()) {\n const isPartOfLane = currentLane.components.find((c) => c.id.isEqualWithoutVersion(id));\n if (!isPartOfLane) return;\n }\n currentLane.addComponent({ id, head });\n };\n\n const convertHashToTagIfPossible = (componentId: ComponentID): ComponentID => {\n if (!componentId.version) return componentId;\n const tag = modelComponent.getTag(componentId.version);\n return tag ? componentId.changeVersion(tag) : componentId;\n };\n\n const handleResolveUnrelated = (legacyCompToWrite?: ConsumerComponent) => {\n if (!currentComponent) throw new Error('currentComponent must be defined when resolvedUnrelated');\n // because when on a main, we don't allow merging lanes with unrelated. we asks users to switch to the lane\n // first and then merge with --resolve-unrelated\n if (!currentLane) throw new Error('currentLane must be defined when resolvedUnrelated');\n if (!resolvedUnrelated) throw new Error('resolvedUnrelated must be populated');\n addToCurrentLane(resolvedUnrelated.headOnCurrentLane);\n unmergedComponent.unrelated = {\n unrelatedHead: resolvedUnrelated.unrelatedHead,\n headOnCurrentLane: resolvedUnrelated.headOnCurrentLane,\n unrelatedLaneId: resolvedUnrelated.unrelatedLaneId,\n };\n legacyScope.objects.unmergedComponents.addEntry(unmergedComponent);\n const idForOutput = convertHashToTagIfPossible(id);\n return { applyVersionResult: { id: idForOutput, filesStatus }, component: currentComponent, legacyCompToWrite };\n };\n\n const markAllFilesAsUnchanged = () => {\n if (!currentComponent) throw new Error(`applyVersion expect to get currentComponent for ${id.toString()}`);\n currentComponent.files.forEach((file) => {\n filesStatus[pathNormalizeToLinux(file.relative)] = FileStatus.unchanged;\n });\n };\n if (mergeResults && mergeResults.hasConflicts && mergeStrategy === MergeOptions.ours) {\n markAllFilesAsUnchanged();\n legacyScope.objects.unmergedComponents.addEntry(unmergedComponent);\n const idForOutput = convertHashToTagIfPossible(id);\n return { applyVersionResult: { id: idForOutput, filesStatus }, component: currentComponent \|\| undefined };\n }\n if (resolvedUnrelated?.strategy === 'ours') {\n markAllFilesAsUnchanged();\n return handleResolveUnrelated();\n }\n const remoteId = id.changeVersion(remoteHead.toString());\n const idToLoad = !mergeResults \|\| mergeStrategy === MergeOptions.theirs ? remoteId : id;\n const legacyComponent = this.workspace\n ? await this.workspace.consumer.loadComponentFromModelImportIfNeeded(idToLoad)\n : await legacyScope.getConsumerComponent(idToLoad); // when loading from the scope, we import all needed components first, so it should be fine. otherwise, change the code to import it here\n if (mergeResults && mergeStrategy === MergeOptions.theirs) {\n // in this case, we don't want to update .bitmap with the version of the remote. we want to keep the same version\n legacyComponent.version = id.version;\n }\n const files = legacyComponent.files;\n updateFileStatus(files, filesStatus, currentComponent \|\| undefined);\n\n if (mergeResults) {\n // update files according to the merge results\n const { filesStatus: modifiedStatus, modifiedFiles } = applyModifiedVersion(files, mergeResults, mergeStrategy);\n legacyComponent.files = modifiedFiles;\n filesStatus = { ...filesStatus, ...modifiedStatus };\n }\n\n if (this.workspace) await removeFilesIfNeeded(filesStatus, this.workspace.consumer, currentComponent \|\| undefined);\n\n if (configMergeResult) {\n const successfullyMergedConfig = configMergeResult.getSuccessfullyMergedConfig();\n if (successfullyMergedConfig) {\n // Process mergedConfig to merge scope-specific policy and filter deletion markers\n // This happens ONCE here, so both workspace and bare-scope merges use the same processed config\n this.mergeScopeSpecificDepsPolicy(legacyComponent.extensions, successfullyMergedConfig);\n this.filterDeletedDependenciesFromConfig(successfullyMergedConfig);\n\n unmergedComponent.mergedConfig = successfullyMergedConfig;\n // no need to `unmergedComponents.addEntry` here. it'll be added in the next lines inside `if (mergeResults)`.\n // because if `configMergeResult` is set, `mergeResults` must be set as well. both happen on diverge.\n }\n }\n\n // if mergeResults, the head snap is going to be updated on a later phase when snapping with two parents\n // otherwise, update the head of the current lane or main\n if (mergeResults) {\n if (mergeResults.hasConflicts && mergeStrategy === MergeOptions.manual) {\n unmergedComponent.unmergedPaths = mergeResults.modifiedFiles.filter((f) => f.conflict).map((f) => f.filePath);\n }\n legacyScope.objects.unmergedComponents.addEntry(unmergedComponent);\n } else if (currentLane) {\n if (resolvedUnrelated) {\n // must be \"theirs\"\n return handleResolveUnrelated(legacyComponent);\n }\n addToCurrentLane(remoteHead);\n } else {\n // this is main\n if (detachHead) {\n modelComponent.detachedHeads.setHead(remoteHead);\n } else {\n modelComponent.setHead(remoteHead);\n // mark it as local, otherwise, when importing this component from a remote, it'll override it.\n modelComponent.markVersionAsLocal(remoteHead.toString());\n }\n legacyScope.objects.add(modelComponent);\n }\n\n const idForOutput = convertHashToTagIfPossible(idToLoad);\n return {\n applyVersionResult: { id: idForOutput, filesStatus },\n component: currentComponent \|\| undefined,\n legacyCompToWrite: legacyComponent,\n };\n }\n\n private async abortMerge(pattern: string): Promise<ApplyVersionResults> {\n const consumer = this.workspace.consumer;\n const ids = await this.getIdsForUnmerged(pattern);\n const results = await this.checkout.checkout({ ids, reset: true });\n ids.forEach((id) => consumer.scope.objects.unmergedComponents.removeComponent(id));\n await consumer.scope.objects.unmergedComponents.write();\n return { abortedComponents: results.components };\n }\n\n private async resolveMerge(pattern: string, snapMessage: string, build: boolean): Promise<ApplyVersionResults> {\n const ids = await this.getIdsForUnmerged(pattern);\n // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n const { snappedComponents } = await this.snapping.snap({\n legacyBitIds: ComponentIdList.fromArray(ids.map((id) => id)),\n build,\n message: snapMessage,\n });\n return { resolvedComponents: snappedComponents };\n }\n\n private async getAllComponentsStatus(\n bitIds: ComponentID[],\n laneId: LaneId,\n localLaneObject: Lane \| undefined,\n mergeStrategy: MergeStrategy\n ): Promise<ComponentMergeStatus[]> {\n const ids = await Promise.all(\n bitIds.map(async (bitId) => {\n const remoteScopeName = laneId.isDefault() ? bitId.scope : laneId.scope;\n const remoteLaneId = LaneId.from(laneId.name, remoteScopeName as string);\n const remoteHead = await this.workspace.consumer.scope.objects.remoteLanes.getRef(remoteLaneId, bitId);\n const laneIdStr = remoteLaneId.toString();\n if (!remoteHead) {\n throw new BitError(`unable to find a remote head of \"${bitId.toStringWithoutVersion()}\" in \"${laneIdStr}\"`);\n }\n return bitId.changeVersion(remoteHead.toString());\n })\n );\n\n return this.getMergeStatus(ids, { shouldSquash: false, mergeStrategy }, localLaneObject, localLaneObject);\n }\n\n private async snapResolvedComponents(\n allComponentsStatus: ComponentMergeStatus[],\n updatedComponents: ConsumerComponent[],\n {\n snapMessage,\n build,\n laneId,\n loose,\n }: {\n snapMessage?: string;\n build?: boolean;\n laneId?: LaneId;\n loose?: boolean;\n }\n ): Promise<MergeSnapResults> {\n const unmergedComponents = this.scope.legacyScope.objects.unmergedComponents.getComponents();\n this.logger.debug(`merge-snaps, snapResolvedComponents, total ${unmergedComponents.length.toString()} components`);\n if (!unmergedComponents.length) return null;\n const ids = ComponentIdList.fromArray(unmergedComponents.map((r) => ComponentID.fromObject(r.id)));\n if (!this.workspace) {\n const getLoadAspectOnlyForIds = (): ComponentIdList \| undefined => {\n if (!allComponentsStatus.length \|\| !allComponentsStatus[0].dataMergeResult) return undefined;\n const dataConflictedIds = allComponentsStatus\n .filter((c) => {\n const conflictedAspects = c.dataMergeResult?.conflictedAspects \|\| {};\n const aspectIds = Object.keys(conflictedAspects);\n aspectIds.forEach((aspectId) =>\n this.logger.debug(\n `conflicted-data for \"${c.id.toString()}\". aspectId: ${aspectId}. reason: ${conflictedAspects[aspectId]}`\n )\n );\n return aspectIds.length;\n })\n .map((c) => c.id);\n return ComponentIdList.fromArray(dataConflictedIds);\n };\n\n // mergedConfig has already been processed in applyVersion() with scope-specific policy merged\n // and deletion markers filtered, so we can use it directly\n const results = await this.snapping.snapFromScope(\n ids.map((id) => ({\n componentId: id.toString(),\n aspects: this.scope.legacyScope.objects.unmergedComponents.getEntry(id)?.mergedConfig,\n })),\n {\n message: snapMessage,\n build,\n lane: laneId?.toString(),\n updatedLegacyComponents: updatedComponents,\n loadAspectOnlyForIds: getLoadAspectOnlyForIds(),\n loose,\n }\n );\n return results;\n }\n return this.snapping.snap({\n legacyBitIds: ids,\n build,\n message: snapMessage,\n loose,\n });\n }\n\n private async tagAllLaneComponent(\n idsToTag: ComponentID[],\n tagMessage?: string,\n build?: boolean\n ): Promise<TagResults \| null> {\n const ids = idsToTag.map((id) => {\n return id.toStringWithoutVersion();\n });\n this.logger.debug(`merge-snaps, tagResolvedComponents, total ${idsToTag.length.toString()} components`);\n return this.snapping.tag({\n ids,\n build,\n message: tagMessage,\n unmodified: true,\n });\n }\n\n private async getIdsForUnmerged(pattern?: string): Promise<ComponentID[]> {\n if (pattern) {\n const componentIds = await this.workspace.idsByPattern(pattern);\n componentIds.forEach((id) => {\n const entry = this.workspace.consumer.scope.objects.unmergedComponents.getEntry(id);\n if (!entry) {\n throw new BitError(`unable to merge-resolve ${id.toString()}, it is not marked as unresolved`);\n }\n });\n return componentIds;\n }\n const unresolvedComponents = this.workspace.consumer.scope.objects.unmergedComponents.getComponents();\n if (!unresolvedComponents.length) throw new BitError(`all components are resolved already, nothing to do`);\n return unresolvedComponents.map((u) => ComponentID.fromObject(u.id));\n }\n\n private async getComponentsToMerge(pattern?: string): Promise<ComponentID[]> {\n if (pattern) {\n return this.workspace.idsByPattern(pattern);\n }\n const mergePending = await this.listMergePendingComponents();\n return mergePending.map((c) => c.id);\n }\n\n async listMergePendingComponents(componentsList?: ComponentsList): Promise<DivergedComponent[]> {\n const consumer = this.workspace.consumer;\n componentsList = componentsList \|\| new ComponentsList(this.workspace);\n const allIds = consumer.bitMap.getAllIdsAvailableOnLaneIncludeRemoved();\n const componentsFromModel = await componentsList.getModelComponents();\n const duringMergeComps = componentsList.listDuringMergeStateComponents();\n const mergePendingComponents = await Promise.all(\n allIds.map(async (componentId: ComponentID) => {\n const modelComponent = componentsFromModel.find((c) => c.toComponentId().isEqualWithoutVersion(componentId));\n if (!modelComponent \|\| duringMergeComps.hasWithoutVersion(componentId)) return null;\n const divergedData = await modelComponent.getDivergeDataForMergePending(consumer.scope.objects);\n if (!divergedData.isDiverged()) return null;\n return { id: modelComponent.toComponentId(), diverge: divergedData };\n })\n );\n return compact(mergePendingComponents);\n }\n\n /\n Merges scope dependency policy into the merged config.\n * This handles dependencies with force:true from the scope, regardless of whether they're\n * set via \"bit dependencies set\" (__specific: true) or workspace variants.\n \n This is needed because if the mergeConfig has a policy, it will be used, and any other policy along the line will be ignored.\n * In case the model has some dependencies that were set explicitly they're gonna be ignored.\n * This makes sure to add them to the policy of the mergeConfig.\n * In a way, this is similar to what we do when a user is running `bit deps set` and the component had previous dependencies set,\n * we copy those dependencies along with the current one to the .bitmap file, so they won't get lost.\n */\n private mergeScopeSpecificDepsPolicy(scopeExtensions: ExtensionDataList, mergeConfig?: Record<string, any>): void {\n const mergeConfigPolicy: Record<string, PolicyDependency[]> \| undefined =\n mergeConfig?.[DependencyResolverAspect.id]?.policy;\n if (!mergeConfigPolicy) return;\n\n const depsResolver = scopeExtensions.findCoreExtension(DependencyResolverAspect.id);\n const scopePolicy = depsResolver?.config.policy;\n if (!scopePolicy) return;\n\n Object.keys(scopePolicy).forEach((depType) => {\n const scopeDepsForType = scopePolicy[depType];\n if (!mergeConfigPolicy[depType]) {\n // mergeConfigPolicy doesn't have this depType yet.\n // Convert scope policy (object format) to array format before adding\n mergeConfigPolicy[depType] = Object.keys(scopeDepsForType).map((depId) => ({\n name: depId,\n version: scopeDepsForType[depId],\n force: true,\n }));\n return;\n }\n\n // mergeConfigPolicy is always in array format (from config merger)\n this.addScopePolicyToMergedArray(mergeConfigPolicy[depType], scopeDepsForType);\n });\n }\n\n private addScopePolicyToMergedArray(policyArray: PolicyDependency[], scopeDepsForType: Record<string, string>): void {\n Object.keys(scopeDepsForType).forEach((depId) => {\n const version = scopeDepsForType[depId];\n const existingDep = policyArray.find((dep) => dep.name === depId);\n\n if (existingDep) {\n // If merge config has version: '-', it means the dependency was explicitly deleted.\n // Keep the '-' marker and don't override with scope policy.\n if (existingDep.version === '-') {\n return;\n }\n // Otherwise, dependency exists in merge config - keep merge config version (it's stronger)\n } else {\n // Dependency only exists in scope policy - add it to merge config\n policyArray.push({ name: depId, version, force: true });\n }\n });\n }\n\n private filterDeletedDependenciesFromConfig(mergeConfig?: Record<string, any>): void {\n const policy: Record<string, PolicyDependency[]> \| undefined = mergeConfig?.[DependencyResolverAspect.id]?.policy;\n if (!policy) return;\n\n Object.keys(policy).forEach((depType) => {\n const depValue = policy[depType];\n // Filter out entries with version: '-' (deletion markers)\n const filtered = depValue.filter((dep) => dep.version !== '-');\n // If array is now empty, delete the key to avoid issues with downstream code\n if (filtered.length === 0) {\n delete policy[depType];\n } else {\n policy[depType] = filtered;\n }\n });\n }\n\n static slots = [];\n static dependencies = [\n CLIAspect,\n WorkspaceAspect,\n ScopeAspect,\n SnappingAspect,\n CheckoutAspect,\n InstallAspect,\n LoggerAspect,\n ComponentWriterAspect,\n ImporterAspect,\n ConfigAspect,\n RemoveAspect,\n ConfigStoreAspect,\n ConfigMergerAspect,\n DependencyResolverAspect,\n ApplicationAspect,\n ];\n static runtime = MainRuntime;\n static async provider([\n cli,\n workspace,\n scope,\n snapping,\n checkout,\n install,\n loggerMain,\n compWriter,\n importer,\n config,\n remove,\n configStore,\n configMerger,\n depResolver,\n application,\n ]: [\n CLIMain,\n Workspace,\n ScopeMain,\n SnappingMain,\n CheckoutMain,\n InstallMain,\n LoggerMain,\n ComponentWriterMain,\n ImporterMain,\n ConfigMain,\n RemoveMain,\n ConfigStoreMain,\n ConfigMergerMain,\n DependencyResolverMain,\n ApplicationMain,\n ]) {\n const logger = loggerMain.createLogger(MergingAspect.id);\n const merging = new MergingMain(\n workspace,\n scope,\n install,\n snapping,\n checkout,\n logger,\n compWriter,\n importer,\n config,\n remove,\n configMerger,\n depResolver,\n application\n );\n cli.register(new MergeCmd(merging, configStore));\n return merging;\n }\n}\n\nMergingAspect.addRuntime(MergingMain);\n"],"mappings":"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","ignoreList":[]}
1	+ {"version":3,"names":["_cli","data","require","_workspace","_legacy","_snapping","_pMapSeries","_interopRequireDefault","_componentId","_bitError","_laneId","_chalk","_config","_remove","_toolboxPath","_pkgModules","_componentWriter","_importer","_logger","_lodash","_checkout","_configMerger","_dependencyResolver","_install","_scope","_mergeCmd","_merging","_mergeStatusProvider","_componentModules","_configStore","_application","e","__esModule","default","ownKeys","r","t","Object","keys","getOwnPropertySymbols","o","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","defineProperty","_toPropertyKey","value","configurable","writable","i","_toPrimitive","Symbol","toPrimitive","call","TypeError","String","Number","MergingMain","constructor","workspace","scope","install","snapping","checkout","logger","componentWriter","importer","config","remove","configMerger","depResolver","application","merge","pattern","mergeStrategy","abort","resolve","noAutoSnap","message","build","skipDependencyInstallation","OutsideWorkspaceError","consumer","mergeResults","resolveMerge","abortMerge","bitIds","getComponentsToMerge","mergeComponentsFromRemote","onDestroy","snapMessage","currentLaneId","getCurrentLaneId","currentLaneObject","getCurrentLaneObject","allComponentsStatus","getAllComponentsStatus","failedComponents","c","unchangedMessage","unchangedLegitimately","failureMsgs","map","failedComponent","chalk","bold","id","toString","red","join","BitError","mergeSnaps","otherLaneId","currentLane","noSnap","tag","detachHead","loose","legacyScope","componentWithConflict","find","component","hasConflicts","getMergeStrategyInteractive","componentStatus","shouldBeRemoved","componentIdsToRemove","changeVersion","undefined","succeededComponents","currentLaneIdsBeforeMerge","toComponentIds","componentsResults","applyVersionMultiple","allConfigMerge","compact","configMergeResult","workspaceDepsUpdates","workspaceDepsConflicts","workspaceDepsUnchanged","updateWorkspaceJsoncWithDepsIfNeeded","workspaceConfigConflictWriteError","writeWorkspaceJsoncWithConflictsGracefully","generateConfigMergeConflictFileForAll","laneHistoryMsg","laneHistory","lanes","updateLaneHistory","objects","add","persist","unmergedComponents","write","writeBitMap","removeFromWsJsonPolicyIfExists","compBitIdsToRemove","ComponentIdList","fromArray","deleteComponentsFiles","cleanFromBitMap","componentsHasConfigMergeConflicts","some","leftUnresolvedConflicts","loadAllAppsAsAspects","dedupe","updateExisting","import","err","error","consoleFailure","updatedComponents","legacyCompToWrite","getSnapOrTagResults","idsToTag","results","tagAllLaneComponent","taggedComponents","autoTaggedResults","removedComponents","snappedComponents","autoSnappedResults","snapResolvedComponents","laneId","toLaneId","mergeSnapResults","mergeSnapError","bitMapSnapshot","bitMap","takeSnapshot","restoreFromSnapshot","components","applyVersionResult","workspaceConfigUpdateResult","newlyIntroducedIds","hasWithoutVersion","newlyIntroducedComponentIds","packages","componentIdToPackageName","isRemoved","removeFromRootPolicy","persistConfig","getMergeStatus","options","otherLane","mergeStatusProvider","MergeStatusProvider","getStatus","mapSeries","currentComponent","resolvedUnrelated","modelComponent","getModelComponent","updatedLaneId","isDefault","LaneId","from","name","applyVersion","remoteHead","getRef","version","hiddenIds","updateDependents","visibleResults","isEqualWithoutVersion","compsToWrite","manyComponentsWriterOpts","writeConfig","reasonForBitmapChange","writeMany","filesStatus","unmergedComponent","fullName","head","addToCurrentLane","Error","existingOnLane","getComponent","existingInUpdateDependents","findUpdateDependent","addComponentToUpdateDependents","addComponent","convertHashToTagIfPossible","componentId","getTag","handleResolveUnrelated","headOnCurrentLane","unrelated","unrelatedHead","unrelatedLaneId","addEntry","idForOutput","markAllFilesAsUnchanged","files","file","pathNormalizeToLinux","relative","FileStatus","unchanged","MergeOptions","ours","strategy","remoteId","idToLoad","theirs","legacyComponent","loadComponentFromModelImportIfNeeded","getConsumerComponent","updateFileStatus","modifiedStatus","modifiedFiles","applyModifiedVersion","removeFilesIfNeeded","successfullyMergedConfig","getSuccessfullyMergedConfig","mergeScopeSpecificDepsPolicy","extensions","filterDeletedDependenciesFromConfig","mergedConfig","manual","unmergedPaths","f","conflict","filePath","detachedHeads","setHead","markVersionAsLocal","ids","getIdsForUnmerged","reset","removeComponent","abortedComponents","snap","legacyBitIds","resolvedComponents","localLaneObject","Promise","all","bitId","remoteScopeName","remoteLaneId","remoteLanes","laneIdStr","toStringWithoutVersion","shouldSquash","getComponents","debug","ComponentID","fromObject","getLoadAspectOnlyForIds","dataMergeResult","dataConflictedIds","conflictedAspects","aspectIds","aspectId","snapFromScope","aspects","getEntry","lane","updatedLegacyComponents","loadAspectOnlyForIds","updateDependentsIds","u","visibleIds","h","hiddenLegacyComponents","snapForMerge","tagMessage","unmodified","componentIds","idsByPattern","entry","unresolvedComponents","mergePending","listMergePendingComponents","componentsList","ComponentsList","allIds","getAllIdsAvailableOnLaneIncludeRemoved","componentsFromModel","getModelComponents","duringMergeComps","listDuringMergeStateComponents","mergePendingComponents","toComponentId","divergedData","getDivergeDataForMergePending","isDiverged","diverge","scopeExtensions","mergeConfig","mergeConfigPolicy","DependencyResolverAspect","policy","depsResolver","findCoreExtension","scopePolicy","depType","scopeDepsForType","depId","force","addScopePolicyToMergedArray","policyArray","existingDep","dep","depValue","filtered","provider","cli","loggerMain","compWriter","configStore","createLogger","MergingAspect","merging","register","MergeCmd","exports","CLIAspect","WorkspaceAspect","ScopeAspect","SnappingAspect","CheckoutAspect","InstallAspect","LoggerAspect","ComponentWriterAspect","ImporterAspect","ConfigAspect","RemoveAspect","ConfigStoreAspect","ConfigMergerAspect","ApplicationAspect","MainRuntime","addRuntime"],"sources":["merging.main.runtime.ts"],"sourcesContent":["import type { CLIMain } from '@teambit/cli';\nimport { CLIAspect, MainRuntime } from '@teambit/cli';\nimport type { Workspace } from '@teambit/workspace';\nimport { WorkspaceAspect, OutsideWorkspaceError } from '@teambit/workspace';\nimport type { Consumer } from '@teambit/legacy.consumer';\nimport { ComponentsList } from '@teambit/legacy.component-list';\nimport type { SnappingMain, TagResults } from '@teambit/snapping';\nimport { SnappingAspect } from '@teambit/snapping';\nimport mapSeries from 'p-map-series';\nimport { ComponentID, ComponentIdList } from '@teambit/component-id';\nimport { BitError } from '@teambit/bit-error';\nimport { LaneId } from '@teambit/lane-id';\nimport type { UnmergedComponent } from '@teambit/legacy.scope';\nimport type { Ref, Lane, ModelComponent } from '@teambit/objects';\nimport chalk from 'chalk';\nimport type { ConfigMain } from '@teambit/config';\nimport { ConfigAspect } from '@teambit/config';\nimport type { RemoveMain } from '@teambit/remove';\nimport { RemoveAspect, deleteComponentsFiles } from '@teambit/remove';\nimport { pathNormalizeToLinux } from '@teambit/toolbox.path.path';\nimport { componentIdToPackageName } from '@teambit/pkg.modules.component-package-name';\nimport type { ComponentWriterMain } from '@teambit/component-writer';\nimport { ComponentWriterAspect } from '@teambit/component-writer';\nimport type { ConsumerComponent } from '@teambit/legacy.consumer-component';\nimport type { ImporterMain } from '@teambit/importer';\nimport { ImporterAspect } from '@teambit/importer';\nimport type { Logger, LoggerMain } from '@teambit/logger';\nimport { LoggerAspect } from '@teambit/logger';\nimport { compact } from 'lodash';\nimport type { ApplyVersionWithComps, CheckoutMain, ComponentStatusBase } from '@teambit/checkout';\nimport { CheckoutAspect, removeFilesIfNeeded, updateFileStatus } from '@teambit/checkout';\nimport type { ConfigMergerMain, ConfigMergeResult, PolicyDependency } from '@teambit/config-merger';\nimport { ConfigMergerAspect } from '@teambit/config-merger';\nimport type { SnapsDistance } from '@teambit/component.snap-distance';\nimport type { DependencyResolverMain } from '@teambit/dependency-resolver';\nimport { DependencyResolverAspect } from '@teambit/dependency-resolver';\nimport type { InstallMain } from '@teambit/install';\nimport { InstallAspect } from '@teambit/install';\nimport type { ScopeMain } from '@teambit/scope';\nimport { ScopeAspect } from '@teambit/scope';\nimport type { ExtensionDataList } from '@teambit/legacy.extension-data';\nimport { MergeCmd } from './merge-cmd';\nimport { MergingAspect } from './merging.aspect';\nimport type { DataMergeResult, MergeStatusProviderOptions } from './merge-status-provider';\nimport { MergeStatusProvider } from './merge-status-provider';\nimport type {\n MergeStrategy,\n MergeResultsThreeWay,\n ApplyVersionResults,\n FailedComponents,\n MergeSnapResults,\n} from '@teambit/component.modules.merge-helper';\nimport {\n applyModifiedVersion,\n FileStatus,\n getMergeStrategyInteractive,\n MergeOptions,\n} from '@teambit/component.modules.merge-helper';\nimport type { ConfigStoreMain } from '@teambit/config-store';\nimport { ConfigStoreAspect } from '@teambit/config-store';\nimport type { ApplicationMain } from '@teambit/application';\nimport { ApplicationAspect } from '@teambit/application';\n\ntype ResolveUnrelatedData = {\n strategy: MergeStrategy;\n headOnCurrentLane: Ref;\n unrelatedHead: Ref;\n unrelatedLaneId: LaneId;\n};\n\nexport type DivergedComponent = { id: ComponentID; diverge: SnapsDistance };\n\nexport type ComponentMergeStatus = ComponentStatusBase & {\n mergeResults?: MergeResultsThreeWay \| null;\n divergeData?: SnapsDistance;\n resolvedUnrelated?: ResolveUnrelatedData;\n configMergeResult?: ConfigMergeResult;\n dataMergeResult?: DataMergeResult;\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 class MergingMain {\n constructor(\n private workspace: Workspace,\n private scope: ScopeMain,\n private install: InstallMain,\n private snapping: SnappingMain,\n private checkout: CheckoutMain,\n private logger: Logger,\n private componentWriter: ComponentWriterMain,\n private importer: ImporterMain,\n private config: ConfigMain,\n private remove: RemoveMain,\n private configMerger: ConfigMergerMain,\n private depResolver: DependencyResolverMain,\n private application: ApplicationMain\n ) {}\n\n async merge(\n pattern: string,\n mergeStrategy: MergeStrategy,\n abort: boolean,\n resolve: boolean,\n noAutoSnap: boolean,\n message: string,\n build: boolean,\n skipDependencyInstallation: boolean\n ): Promise<ApplyVersionResults> {\n if (!this.workspace) throw new OutsideWorkspaceError();\n const consumer: Consumer = this.workspace.consumer;\n let mergeResults;\n if (resolve) {\n mergeResults = await this.resolveMerge(pattern, message, build);\n } else if (abort) {\n mergeResults = await this.abortMerge(pattern);\n } else {\n const bitIds = await this.getComponentsToMerge(pattern);\n mergeResults = await this.mergeComponentsFromRemote(\n consumer,\n bitIds,\n mergeStrategy,\n noAutoSnap,\n message,\n build,\n skipDependencyInstallation\n );\n }\n await consumer.onDestroy('merge');\n return mergeResults;\n }\n\n /*\n when user is on main, it merges the remote main components into local.\n * when user is on a lane, it merges the remote lane components into the local lane.\n /\n async mergeComponentsFromRemote(\n consumer: Consumer,\n bitIds: ComponentID[],\n mergeStrategy: MergeStrategy,\n noAutoSnap: boolean,\n snapMessage: string,\n build: boolean,\n skipDependencyInstallation: boolean\n ): Promise<ApplyVersionResults> {\n const currentLaneId = consumer.getCurrentLaneId();\n const currentLaneObject = await consumer.getCurrentLaneObject();\n const allComponentsStatus = await this.getAllComponentsStatus(\n bitIds,\n currentLaneId,\n currentLaneObject,\n mergeStrategy\n );\n const failedComponents = allComponentsStatus.filter((c) => c.unchangedMessage && !c.unchangedLegitimately);\n if (failedComponents.length) {\n const failureMsgs = failedComponents\n .map(\n (failedComponent) =>\n `${chalk.bold(failedComponent.id.toString())} - ${chalk.red(failedComponent.unchangedMessage as string)}`\n )\n .join('\\n');\n throw new BitError(`unable to merge due to the following failures:\\n${failureMsgs}`);\n }\n\n return this.mergeSnaps({\n mergeStrategy,\n allComponentsStatus,\n otherLaneId: currentLaneId,\n currentLane: currentLaneObject,\n noAutoSnap: noAutoSnap,\n snapMessage,\n build,\n skipDependencyInstallation,\n });\n }\n\n /\n merge multiple components according to the \"allComponentsStatus\".\n /\n async mergeSnaps({\n mergeStrategy,\n allComponentsStatus,\n otherLaneId,\n currentLane,\n noAutoSnap,\n noSnap,\n tag,\n snapMessage,\n build,\n skipDependencyInstallation,\n detachHead,\n loose,\n }: {\n mergeStrategy: MergeStrategy;\n allComponentsStatus: ComponentMergeStatus[];\n otherLaneId: LaneId;\n currentLane?: Lane;\n noAutoSnap?: boolean;\n noSnap?: boolean;\n tag?: boolean;\n snapMessage?: string;\n build?: boolean;\n skipDependencyInstallation?: boolean;\n detachHead?: boolean;\n loose?: boolean;\n }): Promise<ApplyVersionResults> {\n const consumer = this.workspace?.consumer;\n const legacyScope = this.scope.legacyScope;\n const componentWithConflict = allComponentsStatus.find(\n (component) => component.mergeResults && component.mergeResults.hasConflicts\n );\n if (componentWithConflict && !mergeStrategy) {\n mergeStrategy = await getMergeStrategyInteractive();\n }\n const failedComponents: FailedComponents[] = allComponentsStatus\n .filter((componentStatus) => componentStatus.unchangedMessage)\n .filter((componentStatus) => !componentStatus.shouldBeRemoved)\n .map((componentStatus) => ({\n id: componentStatus.id,\n unchangedMessage: componentStatus.unchangedMessage as string,\n unchangedLegitimately: componentStatus.unchangedLegitimately,\n }));\n\n const componentIdsToRemove = allComponentsStatus\n .filter((componentStatus) => componentStatus.shouldBeRemoved)\n .map((c) => c.id.changeVersion(undefined));\n\n const succeededComponents = allComponentsStatus.filter((componentStatus) => !componentStatus.unchangedMessage);\n\n const currentLaneIdsBeforeMerge = currentLane?.toComponentIds();\n\n const componentsResults = await this.applyVersionMultiple(\n succeededComponents,\n otherLaneId,\n mergeStrategy,\n currentLane,\n detachHead\n );\n\n const allConfigMerge = compact(succeededComponents.map((c) => c.configMergeResult));\n\n const { workspaceDepsUpdates, workspaceDepsConflicts, workspaceDepsUnchanged } = this.workspace\n ? await this.configMerger.updateWorkspaceJsoncWithDepsIfNeeded(allConfigMerge)\n : { workspaceDepsUpdates: undefined, workspaceDepsConflicts: undefined, workspaceDepsUnchanged: undefined };\n\n let workspaceConfigConflictWriteError: Error \| undefined;\n if (workspaceDepsConflicts) {\n workspaceConfigConflictWriteError =\n await this.configMerger.writeWorkspaceJsoncWithConflictsGracefully(workspaceDepsConflicts);\n }\n if (this.workspace) await this.configMerger.generateConfigMergeConflictFileForAll(allConfigMerge);\n\n if (currentLane) {\n const laneHistoryMsg = `merge from \"${otherLaneId.toString()}\"`;\n const laneHistory = await legacyScope.lanes.updateLaneHistory(currentLane, laneHistoryMsg);\n legacyScope.objects.add(laneHistory);\n legacyScope.objects.add(currentLane);\n }\n\n await legacyScope.objects.persist(); // persist anyway, if currentLane is null it should save all main heads\n\n await legacyScope.objects.unmergedComponents.write();\n\n if (this.workspace) {\n await consumer.writeBitMap(`merge ${otherLaneId.toString()}`);\n await this.removeFromWsJsonPolicyIfExists(componentsResults, currentLane, currentLaneIdsBeforeMerge);\n }\n\n if (componentIdsToRemove.length && this.workspace) {\n const compBitIdsToRemove = ComponentIdList.fromArray(componentIdsToRemove);\n await deleteComponentsFiles(consumer, compBitIdsToRemove);\n await consumer.cleanFromBitMap(compBitIdsToRemove);\n }\n\n const componentsHasConfigMergeConflicts = allComponentsStatus.some((c) => c.configMergeResult?.hasConflicts());\n const leftUnresolvedConflicts = componentWithConflict && mergeStrategy === 'manual';\n\n if (!skipDependencyInstallation && !leftUnresolvedConflicts && !componentsHasConfigMergeConflicts) {\n // this is a workaround.\n // keep this here. although it gets called before snapping.\n // the reason is that when the installation is running, for some reason, some apps are unable to load in the same process.\n // they throw an error \"Cannot find module\" during the aspect loading.\n await this.application.loadAllAppsAsAspects();\n\n try {\n await this.install.install(undefined, {\n dedupe: true,\n updateExisting: false,\n import: false,\n });\n } catch (err: any) {\n this.logger.error(`failed installing packages`, err);\n this.logger.consoleFailure(\n `failed installing packages, see the log for full stacktrace. error: ${err.message}`\n );\n }\n }\n\n const updatedComponents = compact(componentsResults.map((c) => c.legacyCompToWrite));\n\n const getSnapOrTagResults = async (): Promise<MergeSnapResults> => {\n // if one of the component has conflict, don't snap-merge. otherwise, some of the components would be snap-merged\n // and some not. besides the fact that it could by mistake tag dependent, it's a confusing state. better not snap.\n if (noAutoSnap \|\| noSnap \|\| leftUnresolvedConflicts \|\| componentsHasConfigMergeConflicts) {\n return null;\n }\n if (tag) {\n const idsToTag = allComponentsStatus.map((c) => c.id);\n const results = await this.tagAllLaneComponent(idsToTag, snapMessage, build);\n if (!results) return null;\n const { taggedComponents, autoTaggedResults, removedComponents } = results;\n return { snappedComponents: taggedComponents, autoSnappedResults: autoTaggedResults, removedComponents };\n }\n return this.snapResolvedComponents(allComponentsStatus, updatedComponents, {\n snapMessage,\n build,\n laneId: currentLane?.toLaneId(),\n loose,\n });\n };\n let mergeSnapResults: MergeSnapResults = null;\n let mergeSnapError: Error \| undefined;\n const bitMapSnapshot = this.workspace ? this.workspace.bitMap.takeSnapshot() : null;\n try {\n mergeSnapResults = await getSnapOrTagResults();\n } catch (err: any) {\n this.logger.error('failed running snap. mergeSnapError:', err);\n mergeSnapError = err;\n if (bitMapSnapshot) this.workspace.bitMap.restoreFromSnapshot(bitMapSnapshot);\n }\n\n return {\n components: componentsResults.map((c) => c.applyVersionResult),\n failedComponents,\n removedComponents: [...componentIdsToRemove, ...(mergeSnapResults?.removedComponents \|\| [])],\n mergeSnapResults,\n mergeSnapError,\n workspaceConfigUpdateResult: {\n workspaceDepsUpdates,\n workspaceDepsConflicts,\n workspaceDepsUnchanged,\n workspaceConfigConflictWriteError,\n },\n leftUnresolvedConflicts,\n };\n }\n\n async removeFromWsJsonPolicyIfExists(\n componentsResults: ApplyVersionWithComps[],\n currentLane?: Lane,\n currentLaneIdsBeforeMerge?: ComponentIdList\n ) {\n const newlyIntroducedIds = currentLane\n ?.toComponentIds()\n .filter((id) => !currentLaneIdsBeforeMerge?.hasWithoutVersion(id));\n const newlyIntroducedComponentIds = ComponentIdList.fromArray(newlyIntroducedIds \|\| []);\n const components = compact(\n componentsResults\n .map((c) => c.legacyCompToWrite)\n .filter((c) => c && newlyIntroducedComponentIds.hasWithoutVersion(c.id))\n );\n const packages = components.map((c) => componentIdToPackageName(c));\n const isRemoved = this.depResolver.removeFromRootPolicy(packages);\n if (isRemoved) await this.depResolver.persistConfig('merge (remove packages)');\n }\n\n /\n this function gets called from two different commands:\n * 1. \"bit merge <ids...>\", when merging a component from a remote to the local.\n * in this case, the remote and local are on the same lane or both on main.\n * 2. \"bit lane merge\", when merging from one lane to another.\n /\n async getMergeStatus(\n bitIds: ComponentID[], // the id.version is the version we want to merge to the current component\n options: MergeStatusProviderOptions,\n currentLane?: Lane, // currently checked out lane. if on main, then it's null.\n otherLane?: Lane // the lane we want to merged to our lane. (null if it's \"main\").\n ): Promise<ComponentMergeStatus[]> {\n const mergeStatusProvider = new MergeStatusProvider(\n this.scope,\n this.logger,\n this.importer,\n options,\n this.workspace,\n currentLane,\n otherLane\n );\n return mergeStatusProvider.getStatus(bitIds);\n }\n\n private async applyVersionMultiple(\n succeededComponents: ComponentMergeStatus[],\n otherLaneId: LaneId,\n mergeStrategy: MergeStrategy,\n currentLane?: Lane,\n detachHead?: boolean\n ): Promise<ApplyVersionWithComps[]> {\n const componentsResults = await mapSeries(\n succeededComponents,\n async ({ currentComponent, id, mergeResults, resolvedUnrelated, configMergeResult }) => {\n const modelComponent = await this.scope.legacyScope.getModelComponent(id);\n const updatedLaneId = otherLaneId.isDefault() ? LaneId.from(otherLaneId.name, id.scope as string) : otherLaneId;\n return this.applyVersion({\n currentComponent,\n id,\n mergeResults,\n mergeStrategy,\n remoteHead: modelComponent.getRef(id.version as string) as Ref,\n otherLaneId: updatedLaneId,\n currentLane,\n resolvedUnrelated,\n configMergeResult,\n detachHead,\n });\n }\n );\n\n if (this.workspace) {\n // Hidden lane updateDependents live only on the lane and in the scope. Writing them to\n // the workspace would (a) leak internal lane plumbing into bitmap/files, and (b) confuse\n // downstream classifiers that key off bitmap-presence (the cascade-on-snap detector in\n // version-maker treats \"in bitmap\" as \"workspace tracked\"). Filter them out here.\n const hiddenIds = currentLane?.updateDependents \|\| [];\n const visibleResults = componentsResults.filter(\n (c) => !hiddenIds.find((id) => id.isEqualWithoutVersion(c.applyVersionResult.id))\n );\n const compsToWrite = compact(visibleResults.map((c) => c.legacyCompToWrite));\n const manyComponentsWriterOpts = {\n consumer: this.workspace.consumer,\n components: compsToWrite,\n skipDependencyInstallation: true,\n writeConfig: false, // @todo: should write if config exists before, needs to figure out how to do it.\n reasonForBitmapChange: 'merge',\n };\n await this.componentWriter.writeMany(manyComponentsWriterOpts);\n }\n\n return componentsResults;\n }\n\n private async applyVersion({\n currentComponent,\n id,\n mergeResults,\n mergeStrategy,\n remoteHead,\n otherLaneId,\n currentLane,\n resolvedUnrelated,\n configMergeResult,\n detachHead,\n }: {\n currentComponent: ConsumerComponent \| null \| undefined;\n id: ComponentID;\n mergeResults: MergeResultsThreeWay \| null \| undefined;\n mergeStrategy: MergeStrategy;\n remoteHead: Ref;\n otherLaneId: LaneId;\n currentLane?: Lane;\n resolvedUnrelated?: ResolveUnrelatedData;\n configMergeResult?: ConfigMergeResult;\n detachHead?: boolean;\n }): Promise<ApplyVersionWithComps> {\n const legacyScope = this.scope.legacyScope;\n let filesStatus = {};\n const unmergedComponent: UnmergedComponent = {\n id: { name: id.fullName, scope: id.scope },\n head: remoteHead,\n laneId: otherLaneId,\n };\n id = currentComponent ? currentComponent.id : id;\n const modelComponent = await legacyScope.getModelComponent(id);\n\n const addToCurrentLane = (head: Ref) => {\n if (!currentLane) throw new Error('currentLane must be defined when adding to the lane');\n const existingOnLane = currentLane.getComponent(id);\n const existingInUpdateDependents = currentLane.findUpdateDependent(id);\n if (otherLaneId.isDefault() && !existingOnLane && !existingInUpdateDependents) return;\n // preserve the existing entry's bucket so a merge refreshing a hidden updateDependent\n // doesn't accidentally promote it into the workspace-tracked bucket (and vice versa).\n if (existingInUpdateDependents && !existingOnLane) {\n currentLane.addComponentToUpdateDependents(id.changeVersion(head.toString()));\n } else {\n currentLane.addComponent({ id, head });\n }\n };\n\n const convertHashToTagIfPossible = (componentId: ComponentID): ComponentID => {\n if (!componentId.version) return componentId;\n const tag = modelComponent.getTag(componentId.version);\n return tag ? componentId.changeVersion(tag) : componentId;\n };\n\n const handleResolveUnrelated = (legacyCompToWrite?: ConsumerComponent) => {\n if (!currentComponent) throw new Error('currentComponent must be defined when resolvedUnrelated');\n // because when on a main, we don't allow merging lanes with unrelated. we asks users to switch to the lane\n // first and then merge with --resolve-unrelated\n if (!currentLane) throw new Error('currentLane must be defined when resolvedUnrelated');\n if (!resolvedUnrelated) throw new Error('resolvedUnrelated must be populated');\n addToCurrentLane(resolvedUnrelated.headOnCurrentLane);\n unmergedComponent.unrelated = {\n unrelatedHead: resolvedUnrelated.unrelatedHead,\n headOnCurrentLane: resolvedUnrelated.headOnCurrentLane,\n unrelatedLaneId: resolvedUnrelated.unrelatedLaneId,\n };\n legacyScope.objects.unmergedComponents.addEntry(unmergedComponent);\n const idForOutput = convertHashToTagIfPossible(id);\n return { applyVersionResult: { id: idForOutput, filesStatus }, component: currentComponent, legacyCompToWrite };\n };\n\n const markAllFilesAsUnchanged = () => {\n if (!currentComponent) throw new Error(`applyVersion expect to get currentComponent for ${id.toString()}`);\n currentComponent.files.forEach((file) => {\n filesStatus[pathNormalizeToLinux(file.relative)] = FileStatus.unchanged;\n });\n };\n if (mergeResults && mergeResults.hasConflicts && mergeStrategy === MergeOptions.ours) {\n markAllFilesAsUnchanged();\n legacyScope.objects.unmergedComponents.addEntry(unmergedComponent);\n const idForOutput = convertHashToTagIfPossible(id);\n return { applyVersionResult: { id: idForOutput, filesStatus }, component: currentComponent \|\| undefined };\n }\n if (resolvedUnrelated?.strategy === 'ours') {\n markAllFilesAsUnchanged();\n return handleResolveUnrelated();\n }\n const remoteId = id.changeVersion(remoteHead.toString());\n const idToLoad = !mergeResults \|\| mergeStrategy === MergeOptions.theirs ? remoteId : id;\n const legacyComponent = this.workspace\n ? await this.workspace.consumer.loadComponentFromModelImportIfNeeded(idToLoad)\n : await legacyScope.getConsumerComponent(idToLoad); // when loading from the scope, we import all needed components first, so it should be fine. otherwise, change the code to import it here\n if (mergeResults && mergeStrategy === MergeOptions.theirs) {\n // in this case, we don't want to update .bitmap with the version of the remote. we want to keep the same version\n legacyComponent.version = id.version;\n }\n const files = legacyComponent.files;\n updateFileStatus(files, filesStatus, currentComponent \|\| undefined);\n\n if (mergeResults) {\n // update files according to the merge results\n const { filesStatus: modifiedStatus, modifiedFiles } = applyModifiedVersion(files, mergeResults, mergeStrategy);\n legacyComponent.files = modifiedFiles;\n filesStatus = { ...filesStatus, ...modifiedStatus };\n }\n\n if (this.workspace) await removeFilesIfNeeded(filesStatus, this.workspace.consumer, currentComponent \|\| undefined);\n\n if (configMergeResult) {\n const successfullyMergedConfig = configMergeResult.getSuccessfullyMergedConfig();\n if (successfullyMergedConfig) {\n // Process mergedConfig to merge scope-specific policy and filter deletion markers\n // This happens ONCE here, so both workspace and bare-scope merges use the same processed config\n this.mergeScopeSpecificDepsPolicy(legacyComponent.extensions, successfullyMergedConfig);\n this.filterDeletedDependenciesFromConfig(successfullyMergedConfig);\n\n unmergedComponent.mergedConfig = successfullyMergedConfig;\n // no need to `unmergedComponents.addEntry` here. it'll be added in the next lines inside `if (mergeResults)`.\n // because if `configMergeResult` is set, `mergeResults` must be set as well. both happen on diverge.\n }\n }\n\n // if mergeResults, the head snap is going to be updated on a later phase when snapping with two parents\n // otherwise, update the head of the current lane or main\n if (mergeResults) {\n if (mergeResults.hasConflicts && mergeStrategy === MergeOptions.manual) {\n unmergedComponent.unmergedPaths = mergeResults.modifiedFiles.filter((f) => f.conflict).map((f) => f.filePath);\n }\n legacyScope.objects.unmergedComponents.addEntry(unmergedComponent);\n } else if (currentLane) {\n if (resolvedUnrelated) {\n // must be \"theirs\"\n return handleResolveUnrelated(legacyComponent);\n }\n addToCurrentLane(remoteHead);\n } else {\n // this is main\n if (detachHead) {\n modelComponent.detachedHeads.setHead(remoteHead);\n } else {\n modelComponent.setHead(remoteHead);\n // mark it as local, otherwise, when importing this component from a remote, it'll override it.\n modelComponent.markVersionAsLocal(remoteHead.toString());\n }\n legacyScope.objects.add(modelComponent);\n }\n\n const idForOutput = convertHashToTagIfPossible(idToLoad);\n return {\n applyVersionResult: { id: idForOutput, filesStatus },\n component: currentComponent \|\| undefined,\n legacyCompToWrite: legacyComponent,\n };\n }\n\n private async abortMerge(pattern: string): Promise<ApplyVersionResults> {\n const consumer = this.workspace.consumer;\n const ids = await this.getIdsForUnmerged(pattern);\n const results = await this.checkout.checkout({ ids, reset: true });\n ids.forEach((id) => consumer.scope.objects.unmergedComponents.removeComponent(id));\n await consumer.scope.objects.unmergedComponents.write();\n return { abortedComponents: results.components };\n }\n\n private async resolveMerge(pattern: string, snapMessage: string, build: boolean): Promise<ApplyVersionResults> {\n const ids = await this.getIdsForUnmerged(pattern);\n // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n const { snappedComponents } = await this.snapping.snap({\n legacyBitIds: ComponentIdList.fromArray(ids.map((id) => id)),\n build,\n message: snapMessage,\n });\n return { resolvedComponents: snappedComponents };\n }\n\n private async getAllComponentsStatus(\n bitIds: ComponentID[],\n laneId: LaneId,\n localLaneObject: Lane \| undefined,\n mergeStrategy: MergeStrategy\n ): Promise<ComponentMergeStatus[]> {\n const ids = await Promise.all(\n bitIds.map(async (bitId) => {\n const remoteScopeName = laneId.isDefault() ? bitId.scope : laneId.scope;\n const remoteLaneId = LaneId.from(laneId.name, remoteScopeName as string);\n const remoteHead = await this.workspace.consumer.scope.objects.remoteLanes.getRef(remoteLaneId, bitId);\n const laneIdStr = remoteLaneId.toString();\n if (!remoteHead) {\n throw new BitError(`unable to find a remote head of \"${bitId.toStringWithoutVersion()}\" in \"${laneIdStr}\"`);\n }\n return bitId.changeVersion(remoteHead.toString());\n })\n );\n\n return this.getMergeStatus(ids, { shouldSquash: false, mergeStrategy }, localLaneObject, localLaneObject);\n }\n\n private async snapResolvedComponents(\n allComponentsStatus: ComponentMergeStatus[],\n updatedComponents: ConsumerComponent[],\n {\n snapMessage,\n build,\n laneId,\n loose,\n }: {\n snapMessage?: string;\n build?: boolean;\n laneId?: LaneId;\n loose?: boolean;\n }\n ): Promise<MergeSnapResults> {\n const unmergedComponents = this.scope.legacyScope.objects.unmergedComponents.getComponents();\n this.logger.debug(`merge-snaps, snapResolvedComponents, total ${unmergedComponents.length.toString()} components`);\n if (!unmergedComponents.length) return null;\n const ids = ComponentIdList.fromArray(unmergedComponents.map((r) => ComponentID.fromObject(r.id)));\n if (!this.workspace) {\n const getLoadAspectOnlyForIds = (): ComponentIdList \| undefined => {\n if (!allComponentsStatus.length \|\| !allComponentsStatus[0].dataMergeResult) return undefined;\n const dataConflictedIds = allComponentsStatus\n .filter((c) => {\n const conflictedAspects = c.dataMergeResult?.conflictedAspects \|\| {};\n const aspectIds = Object.keys(conflictedAspects);\n aspectIds.forEach((aspectId) =>\n this.logger.debug(\n `conflicted-data for \"${c.id.toString()}\". aspectId: ${aspectId}. reason: ${conflictedAspects[aspectId]}`\n )\n );\n return aspectIds.length;\n })\n .map((c) => c.id);\n return ComponentIdList.fromArray(dataConflictedIds);\n };\n\n // mergedConfig has already been processed in applyVersion() with scope-specific policy merged\n // and deletion markers filtered, so we can use it directly\n const results = await this.snapping.snapFromScope(\n ids.map((id) => ({\n componentId: id.toString(),\n aspects: this.scope.legacyScope.objects.unmergedComponents.getEntry(id)?.mergedConfig,\n })),\n {\n message: snapMessage,\n build,\n lane: laneId?.toString(),\n updatedLegacyComponents: updatedComponents,\n loadAspectOnlyForIds: getLoadAspectOnlyForIds(),\n loose,\n }\n );\n return results;\n }\n // Hidden lane updateDependents ride the same `makeVersion` batch as visible workspace\n // components. version-maker's `isHiddenLaneEntry` detection (workspace flow: not-in-bitmap)\n // routes each entry correctly. workspace.getMany picks up disk-merged files for visible; the\n // in-memory merged ConsumerComponents from `applyVersion` are passed through for hidden\n // (which have no disk state). Single pipeline → consistent log/buildStatus/\n // flattenedDependencies/lane-history/stagedSnaps for all merge-cascade snaps.\n const lane = await this.scope.legacyScope.getCurrentLaneObject();\n const updateDependentsIds = lane?.updateDependents \|\| [];\n const hiddenIds = ComponentIdList.fromArray(\n ids.filter((id) => updateDependentsIds.find((u) => u.isEqualWithoutVersion(id)))\n );\n const visibleIds = ComponentIdList.fromArray(\n ids.filter((id) => !hiddenIds.find((h) => h.isEqualWithoutVersion(id)))\n );\n const hiddenLegacyComponents = updatedComponents.filter((c) =>\n hiddenIds.find((h) => h.isEqualWithoutVersion(c.componentId))\n );\n return this.snapping.snapForMerge({\n visibleIds,\n hiddenLegacyComponents,\n message: snapMessage,\n build,\n loose,\n });\n }\n\n private async tagAllLaneComponent(\n idsToTag: ComponentID[],\n tagMessage?: string,\n build?: boolean\n ): Promise<TagResults \| null> {\n const ids = idsToTag.map((id) => {\n return id.toStringWithoutVersion();\n });\n this.logger.debug(`merge-snaps, tagResolvedComponents, total ${idsToTag.length.toString()} components`);\n return this.snapping.tag({\n ids,\n build,\n message: tagMessage,\n unmodified: true,\n });\n }\n\n private async getIdsForUnmerged(pattern?: string): Promise<ComponentID[]> {\n if (pattern) {\n const componentIds = await this.workspace.idsByPattern(pattern);\n componentIds.forEach((id) => {\n const entry = this.workspace.consumer.scope.objects.unmergedComponents.getEntry(id);\n if (!entry) {\n throw new BitError(`unable to merge-resolve ${id.toString()}, it is not marked as unresolved`);\n }\n });\n return componentIds;\n }\n const unresolvedComponents = this.workspace.consumer.scope.objects.unmergedComponents.getComponents();\n if (!unresolvedComponents.length) throw new BitError(`all components are resolved already, nothing to do`);\n return unresolvedComponents.map((u) => ComponentID.fromObject(u.id));\n }\n\n private async getComponentsToMerge(pattern?: string): Promise<ComponentID[]> {\n if (pattern) {\n return this.workspace.idsByPattern(pattern);\n }\n const mergePending = await this.listMergePendingComponents();\n return mergePending.map((c) => c.id);\n }\n\n async listMergePendingComponents(componentsList?: ComponentsList): Promise<DivergedComponent[]> {\n const consumer = this.workspace.consumer;\n componentsList = componentsList \|\| new ComponentsList(this.workspace);\n const allIds = consumer.bitMap.getAllIdsAvailableOnLaneIncludeRemoved();\n const componentsFromModel = await componentsList.getModelComponents();\n const duringMergeComps = componentsList.listDuringMergeStateComponents();\n const mergePendingComponents = await Promise.all(\n allIds.map(async (componentId: ComponentID) => {\n const modelComponent = componentsFromModel.find((c) => c.toComponentId().isEqualWithoutVersion(componentId));\n if (!modelComponent \|\| duringMergeComps.hasWithoutVersion(componentId)) return null;\n const divergedData = await modelComponent.getDivergeDataForMergePending(consumer.scope.objects);\n if (!divergedData.isDiverged()) return null;\n return { id: modelComponent.toComponentId(), diverge: divergedData };\n })\n );\n return compact(mergePendingComponents);\n }\n\n /\n Merges scope dependency policy into the merged config.\n * This handles dependencies with force:true from the scope, regardless of whether they're\n * set via \"bit dependencies set\" (__specific: true) or workspace variants.\n \n This is needed because if the mergeConfig has a policy, it will be used, and any other policy along the line will be ignored.\n * In case the model has some dependencies that were set explicitly they're gonna be ignored.\n * This makes sure to add them to the policy of the mergeConfig.\n * In a way, this is similar to what we do when a user is running `bit deps set` and the component had previous dependencies set,\n * we copy those dependencies along with the current one to the .bitmap file, so they won't get lost.\n */\n private mergeScopeSpecificDepsPolicy(scopeExtensions: ExtensionDataList, mergeConfig?: Record<string, any>): void {\n const mergeConfigPolicy: Record<string, PolicyDependency[]> \| undefined =\n mergeConfig?.[DependencyResolverAspect.id]?.policy;\n if (!mergeConfigPolicy) return;\n\n const depsResolver = scopeExtensions.findCoreExtension(DependencyResolverAspect.id);\n const scopePolicy = depsResolver?.config.policy;\n if (!scopePolicy) return;\n\n Object.keys(scopePolicy).forEach((depType) => {\n const scopeDepsForType = scopePolicy[depType];\n if (!mergeConfigPolicy[depType]) {\n // mergeConfigPolicy doesn't have this depType yet.\n // Convert scope policy (object format) to array format before adding\n mergeConfigPolicy[depType] = Object.keys(scopeDepsForType).map((depId) => ({\n name: depId,\n version: scopeDepsForType[depId],\n force: true,\n }));\n return;\n }\n\n // mergeConfigPolicy is always in array format (from config merger)\n this.addScopePolicyToMergedArray(mergeConfigPolicy[depType], scopeDepsForType);\n });\n }\n\n private addScopePolicyToMergedArray(policyArray: PolicyDependency[], scopeDepsForType: Record<string, string>): void {\n Object.keys(scopeDepsForType).forEach((depId) => {\n const version = scopeDepsForType[depId];\n const existingDep = policyArray.find((dep) => dep.name === depId);\n\n if (existingDep) {\n // If merge config has version: '-', it means the dependency was explicitly deleted.\n // Keep the '-' marker and don't override with scope policy.\n if (existingDep.version === '-') {\n return;\n }\n // Otherwise, dependency exists in merge config - keep merge config version (it's stronger)\n } else {\n // Dependency only exists in scope policy - add it to merge config\n policyArray.push({ name: depId, version, force: true });\n }\n });\n }\n\n private filterDeletedDependenciesFromConfig(mergeConfig?: Record<string, any>): void {\n const policy: Record<string, PolicyDependency[]> \| undefined = mergeConfig?.[DependencyResolverAspect.id]?.policy;\n if (!policy) return;\n\n Object.keys(policy).forEach((depType) => {\n const depValue = policy[depType];\n // Filter out entries with version: '-' (deletion markers)\n const filtered = depValue.filter((dep) => dep.version !== '-');\n // If array is now empty, delete the key to avoid issues with downstream code\n if (filtered.length === 0) {\n delete policy[depType];\n } else {\n policy[depType] = filtered;\n }\n });\n }\n\n static slots = [];\n static dependencies = [\n CLIAspect,\n WorkspaceAspect,\n ScopeAspect,\n SnappingAspect,\n CheckoutAspect,\n InstallAspect,\n LoggerAspect,\n ComponentWriterAspect,\n ImporterAspect,\n ConfigAspect,\n RemoveAspect,\n ConfigStoreAspect,\n ConfigMergerAspect,\n DependencyResolverAspect,\n ApplicationAspect,\n ];\n static runtime = MainRuntime;\n static async provider([\n cli,\n workspace,\n scope,\n snapping,\n checkout,\n install,\n loggerMain,\n compWriter,\n importer,\n config,\n remove,\n configStore,\n configMerger,\n depResolver,\n application,\n ]: [\n CLIMain,\n Workspace,\n ScopeMain,\n SnappingMain,\n CheckoutMain,\n InstallMain,\n LoggerMain,\n ComponentWriterMain,\n ImporterMain,\n ConfigMain,\n RemoveMain,\n ConfigStoreMain,\n ConfigMergerMain,\n DependencyResolverMain,\n ApplicationMain,\n ]) {\n const logger = loggerMain.createLogger(MergingAspect.id);\n const merging = new MergingMain(\n workspace,\n scope,\n install,\n snapping,\n checkout,\n logger,\n compWriter,\n importer,\n config,\n remove,\n configMerger,\n depResolver,\n application\n );\n cli.register(new MergeCmd(merging, configStore));\n return merging;\n }\n}\n\nMergingAspect.addRuntime(MergingMain);\n"],"mappings":"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","ignoreList":[]}

package/package.json CHANGED Viewed

@@ -1,48 +1,48 @@
 {
   "name": "@teambit/merging",
-  "version": "1.0.982",
+  "version": "1.0.984",
   "homepage": "https://bit.cloud/teambit/component/merging",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.component",
     "name": "merging",
-    "version": "1.0.982"
+    "version": "1.0.984"
   },
   "dependencies": {
     "chalk": "4.1.2",
     "lodash": "4.17.21",
     "p-map-series": "2.1.0",
-    "@teambit/component.modules.merge-helper": "0.0.55",
     "@teambit/bit-error": "0.0.404",
-    "@teambit/cli": "0.0.1321",
-    "@teambit/config-store": "0.0.202",
     "@teambit/legacy.constants": "0.0.26",
     "@teambit/component-id": "1.2.4",
-    "@teambit/component.snap-distance": "0.0.113",
     "@teambit/lane-id": "0.0.312",
-    "@teambit/legacy.consumer-component": "0.0.113",
-    "@teambit/legacy.extension-data": "0.0.114",
-    "@teambit/legacy.scope": "0.0.112",
-    "@teambit/logger": "0.0.1414",
     "@teambit/harmony": "0.4.7",
-    "@teambit/config": "0.0.1496",
-    "@teambit/legacy.component-list": "0.0.166",
-    "@teambit/legacy.consumer": "0.0.112",
-    "@teambit/pkg.modules.component-package-name": "0.0.119",
     "@teambit/toolbox.path.path": "0.0.16",
-    "@teambit/config-merger": "0.0.847",
-    "@teambit/builder": "1.0.980",
-    "@teambit/dependency-resolver": "1.0.980",
-    "@teambit/importer": "1.0.980",
-    "@teambit/objects": "0.0.487",
-    "@teambit/scope": "1.0.980",
-    "@teambit/workspace": "1.0.980",
-    "@teambit/application": "1.0.980",
-    "@teambit/checkout": "1.0.981",
-    "@teambit/component-writer": "1.0.980",
-    "@teambit/install": "1.0.980",
-    "@teambit/remove": "1.0.980",
-    "@teambit/snapping": "1.0.980"
+    "@teambit/component.modules.merge-helper": "0.0.57",
+    "@teambit/cli": "0.0.1323",
+    "@teambit/config-merger": "0.0.849",
+    "@teambit/config-store": "0.0.204",
+    "@teambit/builder": "1.0.982",
+    "@teambit/component.snap-distance": "0.0.115",
+    "@teambit/dependency-resolver": "1.0.982",
+    "@teambit/importer": "1.0.982",
+    "@teambit/legacy.consumer-component": "0.0.115",
+    "@teambit/legacy.extension-data": "0.0.116",
+    "@teambit/legacy.scope": "0.0.114",
+    "@teambit/logger": "0.0.1416",
+    "@teambit/objects": "0.0.489",
+    "@teambit/scope": "1.0.982",
+    "@teambit/workspace": "1.0.982",
+    "@teambit/application": "1.0.982",
+    "@teambit/checkout": "1.0.983",
+    "@teambit/component-writer": "1.0.982",
+    "@teambit/config": "0.0.1498",
+    "@teambit/install": "1.0.982",
+    "@teambit/legacy.component-list": "0.0.168",
+    "@teambit/legacy.consumer": "0.0.114",
+    "@teambit/pkg.modules.component-package-name": "0.0.121",
+    "@teambit/remove": "1.0.982",
+    "@teambit/snapping": "1.0.982"
   },
   "devDependencies": {
     "@types/lodash": "4.14.165",

/package/dist/{preview-1778583528331.js → preview-1778613913688.js} RENAMED Viewed

File without changes