@teambit/merging 1.0.1238 → 1.0.1240

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

@@ -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","Boolean","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","currentWorkspaceComp","get","state","_consumer","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    // the gap is needed only when the other side is a lane from a different scope than ours: its snaps\n    // exist only on that lane's scope, and once merged they become part of our history, so our export\n    // must push them onward (to each component's home scope when merging into main, or to the current\n    // lane's scope). when the other side is main, its history is already on every component's home scope\n    // and is never pushed by us (lane scopes are lean) — the VersionHistory (imported during the\n    // pre-fetch) covers the divergence traversal.\n    const shouldImportHistoryOfOtherLane =\n      !this.options?.shouldSquash && // when squashing, no need for all history, only the head is going to be pushed\n      Boolean(this.otherLane) &&\n      this.otherLane?.scope !== this.currentLane?.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 = async () => {\n      if (existingBitMapId && this.workspace) {\n        const currentWorkspaceComp = await this.workspace.get(existingBitMapId);\n        return currentWorkspaceComp.state._consumer;\n      }\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;IACA;IACA;IACA;IACA;IACA;IACA,MAAME,8BAA8B,GAClC,CAAC,IAAI,CAACb,OAAO,EAAEc,YAAY;IAAI;IAC/BC,OAAO,CAAC,IAAI,CAACZ,SAAS,CAAC,IACvB,IAAI,CAACA,SAAS,EAAEN,KAAK,KAAK,IAAI,CAACK,WAAW,EAAEL,KAAK;IACnD,MAAMmB,QAAQ,GAAGP,iCAAiC,CAC/CQ,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,IAAIR,8BAA8B,EAAE;QAClCO,gBAAgB,CAAClD,IAAI,CAAC,GAAGgD,UAAU,CAACC,WAAW,CAACG,iBAAiB,CAAC;MACpE;MACA,OAAO,IAAAC,iBAAO,EAACH,gBAAgB,CAAC,CAACH,GAAG,CAAEO,CAAC,IAAKN,UAAU,CAACP,EAAE,CAACc,aAAa,CAACD,CAAC,CAACE,QAAQ,CAAC,CAAC,CAAC,CAAC;IACxF,CAAC,CAAC,CACDC,IAAI,CAAC,CAAC;IACT,MAAMC,MAAM,GAAGf,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,CAACgC,WAAW,CAACC,aAAa,CAACC,iBAAiB,CAACC,8BAAe,CAACC,SAAS,CAACjB,QAAQ,CAAC,EAAE;MAChGkB,IAAI,EAAE,IAAI,CAAC/B,SAAS;MACpBgC,KAAK,EAAE,IAAI;MACXC,qBAAqB,EAAE,KAAK;MAC5BR;IACF,CAAC,CAAC;IAEF,MAAMS,sBAAsB,GAAG5B,iCAAiC,CAAC1C,MAAM,CACpEuE,CAAC,IAAK,CAACA,CAAC,CAACC,UACZ,CAA2B;IAC3B,MAAMC,mBAAmB,GAAG/B,iCAAiC,CAAC1C,MAAM,CAAEuE,CAAC,IAAKA,CAAC,CAACC,UAAU,CAAC;IAEzF,MAAME,4BAA4B,GAAG,MAAAA,CAAA,KAA6C;MAChF,MAAMC,GAAG,GAAG,KAAIC,aAAG,EAAC,IAAI,CAAC9C,KAAK,CAACgC,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,CAAChF,IAAI,CAAC,GAAGmE,sBAAsB,CAAC;IACvC,OAAOa,OAAO;EAChB;EAEA,MAAcH,uBAAuBA,CACnCI,sCAA8E,EAC9E;IACA,MAAM;MAAExC,EAAE;MAAEQ,WAAW;MAAEiC,gBAAgB;MAAEb;IAAW,CAAC,GAAGY,sCAAsC;IAChG,IAAI,CAACZ,UAAU,EAAE,MAAM,IAAIc,KAAK,CAAC,qDAAqD1C,EAAE,CAACe,QAAQ,CAAC,CAAC,EAAE,CAAC;IACtG,MAAM;MAAE4B,aAAa;MAAEC,SAAS;MAAEC;IAAe,CAAC,GAAGjB,UAAU;IAC/D,MAAMkB,IAAI,GAAG,IAAI,CAAC5D,KAAK,CAACgC,WAAW,CAAC6B,OAAO;IAC3C,IAAI,CAACvC,WAAW,EAAE,MAAM,IAAIkC,KAAK,CAAC,sDAAsD1C,EAAE,CAACe,QAAQ,CAAC,CAAC,EAAE,CAAC;IACxG,IAAI,CAAC0B,gBAAgB,EAAE,MAAM,IAAIC,KAAK,CAAC,2DAA2D1C,EAAE,CAACe,QAAQ,CAAC,CAAC,EAAE,CAAC;IAElH,MAAMiC,QAAQ,GAAGxC,WAAW,CAACE,uBAAyC,CAAC,CAAC;IACxE,IAAI,CAACvB,MAAM,CAAC8D,KAAK,CAAC;AACtB,WAAWjD,EAAE,CAACkD,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,CAAChE,WAAW,EAAEiE,QAAQ,CAAC,CAAC,CAACzC,QAAQ,CAAC,CAAC,IAAI,MAAM;IACzE,MAAM0C,aAAa,GAAG,IAAI,CAACjE,SAAS,GAAG,IAAI,CAACA,SAAS,CAACgE,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,CAACvE,SAAS,EAAEwE,OAAO,CAAC,CAAC,IAAI,IAAI,CAACvE,WAAW,EAAEwE,cAAc,CAAC,CAAC,IAAI,EAAE;IAC1F,MAAMC,YAAY,GAAG,KAAIC,qCAAqB,EAC5CjE,EAAE,CAACkD,sBAAsB,CAAC,CAAC,EAC3BW,YAAY,EACZ,IAAI,CAACrE,SAAS,EACdiD,gBAAgB,CAACyB,UAAU,EAC3Bd,aAAa,CAACc,UAAU,EACxBZ,cAAc,CAACY,UAAU,EACzBP,YAAY,EACZC,UAAU,EACV,IAAI,CAACzE,MAAM,EACX,IAAI,CAACE,OAAO,CAAC8E,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;MACvCvF,KAAK,EAAE,IAAI,CAACA,KAAK,CAACgC,WAAW;MAC7BoC,cAAc;MACdM,UAAU;MACVnB,gBAAgB;MAChBkB,YAAY;MACZP;IACF,CAAC,CAAC;IACF,OAAO;MACLX,gBAAgB;MAChBzC,EAAE;MACFwE,YAAY;MACZhE,WAAW;MACX4D,iBAAiB;MACjBE;IACF,CAAC;EACH;EAEQC,mBAAmBA,CACzBG,iBAAoC,EACpCC,cAAiC,EACjCC,eAAkC,EACjB;IACjB,IAAI,CAAC,IAAI,CAACvF,OAAO,CAACwF,sBAAsB,EAAE;MACxC,OAAO,CAAC,CAAC;IACX;IACA,MAAMC,iBAA8C,GAAG,CAAC,CAAC,CAAC,CAAC;IAC3D;IACA,MAAMC,aAAa,GAAG,CAACC,8CAAwB,CAAChF,EAAE,EAAEiF,wBAAa,CAACjF,EAAE,CAAC;IACrE0E,iBAAiB,CAAC9G,OAAO,CAAEsH,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,CAACpJ,IAAI,EAAE0J,cAAc,CAAC1J,IAAI,CAAC,EAAE;MACzD,IAAI,CAACuJ,aAAa,EAAE;QAClBP,iBAAiB,CAACI,gBAAgB,CAACE,QAAQ,CAAC,GAAG,qCAAqC;QACpF;MACF;MACA,IAAI,IAAAM,iBAAO,EAACL,aAAa,CAACvJ,IAAI,EAAE0J,cAAc,CAAC1J,IAAI,CAAC,EAAE;QACpD,OAAO,CAAC;MACV;MACA,IAAI,IAAA4J,iBAAO,EAACL,aAAa,CAACvJ,IAAI,EAAEoJ,gBAAgB,CAACpJ,IAAI,CAAC,EAAE;QACtD;QACAoJ,gBAAgB,CAACpJ,IAAI,GAAG0J,cAAc,CAAC1J,IAAI;QAC3C;MACF;MACA;MACAgJ,iBAAiB,CAACI,gBAAgB,CAACE,QAAQ,CAAC,GAAG,uCAAuC;IACxF,CAAC,CAAC;IACFR,eAAe,CAAChH,OAAO,CAAE4H,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,CACpB3F,EAAe,EACf4F,GAAW,EACXC,oBAAoB,GAAG,KAAK,EACY;IACxC,MAAMC,eAAuD,GAAG;MAAE9F;IAAG,CAAC;IACtE8F,eAAe,CAACC,gBAAgB,GAAGH,GAAG;IACtCE,eAAe,CAACE,qBAAqB,GAAGH,oBAAoB;IAC5D,OAAOC,eAAe;EACxB;;EAEA;EACA,MAAc7F,oCAAoCA,CAChDD,EAAe,EACkC;IACjD,MAAMiG,QAAQ,GAAG,IAAI,CAAC3G,SAAS,EAAE2G,QAAQ;IACzC,MAAMH,eAAuD,GAAG;MAAE9F;IAAG,CAAC;IACtE,MAAM6C,cAAc,GAAG,MAAM,IAAI,CAAC3D,KAAK,CAACgC,WAAW,CAACgF,wBAAwB,CAAClG,EAAE,CAAC;IAChF,IAAI,CAAC6C,cAAc,EAAE;MACnB,OAAO,IAAI,CAAC8C,cAAc,CACxB3F,EAAE,EACF,aAAaA,EAAE,CAACe,QAAQ,CAAC,CAAC,gFAC5B,CAAC;IACH;IACA,MAAMoF,QAAQ,GAAG,IAAI,CAACjH,KAAK,CAACgC,WAAW,CAAC6B,OAAO,CAACqD,kBAAkB,CAACC,QAAQ,CAACrG,EAAE,CAAC;IAC/E,IAAImG,QAAQ,EAAE;MACZ,OAAO,IAAI,CAACR,cAAc,CACxB3F,EAAE,EACF,aAAaA,EAAE,CAACkD,sBAAsB,CAAC,CAAC,iIAC1C,CAAC;IACH;IACA,MAAMJ,IAAI,GAAG,IAAI,CAAC5D,KAAK,CAACgC,WAAW,CAAC6B,OAAO;IAC3C,MAAMI,OAAO,GAAGnD,EAAE,CAACmD,OAAiB;IACpC,MAAMR,aAAa,GAAGE,cAAc,CAACyD,MAAM,CAACnD,OAAO,CAAC;IACpD,MAAMoD,gBAAgB,GAAGN,QAAQ,EAAEO,MAAM,CAACC,qBAAqB,CAACzG,EAAE,EAAE;MAAE0G,aAAa,EAAE;IAAK,CAAC,CAAC;IAC5F,MAAMC,gBAAyB,GAAG,MAAM9D,cAAc,CAACQ,WAAW,CAACF,OAAO,EAAE,IAAI,CAACjE,KAAK,CAACgC,WAAW,CAAC6B,OAAO,CAAC;IAC3G;IACA;IACA;IACA;IACA,MAAM6D,eAAe,GACnB,IAAI,CAACrH,WAAW,EAAEsH,YAAY,CAAC7G,EAAE,CAAC,IAAI,IAAI,CAACT,WAAW,EAAEuH,iCAAiC,CAAC9G,EAAE,CAAC;IAE/F,IAAI2G,gBAAgB,CAACI,SAAS,CAAC,CAAC,EAAE;MAChC;MACA;MACA;MACA,MAAMC,WAAW,GAAGJ,eAAe,IAAKD,gBAAgB,CAACM,oBAAoB,CAAC,CAAC,IAAIpE,cAAc,CAACqE,IAAK;MACvG,IAAIF,WAAW,EAAE;QACf;QACAlB,eAAe,CAACqB,eAAe,GAAG,IAAI;MACxC,CAAC,MAAM;QACL;QACA;QACA,OAAO,IAAI,CAACxB,cAAc,CAAC3F,EAAE,EAAEjB,qBAAqB,EAAE,IAAI,CAAC;MAC7D;IACF;IACA,MAAMqI,YAAY,GAAGA,CAAA,KAAM;MACzB,IAAIb,gBAAgB,EAAE,OAAOA,gBAAgB;MAC7C,IAAI,IAAI,CAAChH,WAAW,EAAE;QACpB,IAAI,CAACqH,eAAe,EAAE,OAAO,IAAI;QACjC,OAAOA,eAAe,CAAC5G,EAAE,CAACc,aAAa,CAAC8F,eAAe,CAACM,IAAI,CAACnG,QAAQ,CAAC,CAAC,CAAC;MAC1E;MACA;MACA,MAAMmG,IAAI,GAAGrE,cAAc,CAACwE,mBAAmB,CAAC,CAAC;MACjD,IAAIH,IAAI,EAAE;QACR,OAAOlH,EAAE,CAACc,aAAa,CAACoG,IAAI,CAAC;MAC/B;MACA,OAAO,IAAI;IACb,CAAC;IACD,MAAMtE,SAAS,GAAGwE,YAAY,CAAC,CAAC;IAChC,IAAI,CAACxE,SAAS,EAAE;MACd,MAAMpC,WAAW,GAAG,MAAM,IAAA8G,2BAAc,EAAC;QAAExE,IAAI;QAAED,cAAc;QAAE0E,UAAU,EAAE5E,aAAa;QAAE6E,MAAM,EAAE;MAAM,CAAC,CAAC;MAC5G,OAAA/J,aAAA,CAAAA,aAAA,KAAYqI,eAAe;QAAE2B,kBAAkB,EAAEd,gBAAgB;QAAEnG;MAAW;IAChF;IACA,MAAMkH,YAAY,GAAGzB,QAAQ,EAAEO,MAAM,CAACmB,mBAAmB,CAAC/E,SAAS,EAAE;MAAE8D,aAAa,EAAE;IAAK,CAAC,CAAC;IAC7F,MAAMkB,gBAAgB,GAAGF,YAAY,EAAEX,SAAS,CAAC,CAAC;IAClD,IAAIa,gBAAgB,EAAE;MACpB,OAAO,IAAI,CAACjC,cAAc,CACxB3F,EAAE,EACF,mFACF,CAAC;IACH;IACA,MAAM6H,mBAAmB,GAAG,MAAAA,CAAA,KAAY;MACtC,IAAItB,gBAAgB,IAAI,IAAI,CAACjH,SAAS,EAAE;QACtC,MAAMwI,oBAAoB,GAAG,MAAM,IAAI,CAACxI,SAAS,CAACyI,GAAG,CAACxB,gBAAgB,CAAC;QACvE,OAAOuB,oBAAoB,CAACE,KAAK,CAACC,SAAS;MAC7C;MACA,OAAO,IAAI,CAAC/I,KAAK,CAACgC,WAAW,CAACgH,oBAAoB,CAACtF,SAAS,CAAC;IAC/D,CAAC;IACD,MAAMH,gBAAgB,GAAG,MAAMoF,mBAAmB,CAAC,CAAC;IACpD,IAAIpF,gBAAgB,CAACsE,SAAS,CAAC,CAAC,EAAE;MAChC;MACA;MACA;MACA;MACA;MACA;MACA;MACA;MACA;MACA;MACA,MAAMoB,eAAe,GACnB1F,gBAAgB,CAACyB,UAAU,CAACkE,iBAAiB,CAAC,0BAA0B,CAAC,EAAEC,MAAM,EAAEC,YAAY;MACjG,MAAM9H,WAAW,GAAG,MAAM,IAAA8G,2BAAc,EAAC;QAAExE,IAAI;QAAED,cAAc;QAAE0E,UAAU,EAAE5E,aAAa;QAAE6E,MAAM,EAAE;MAAM,CAAC,CAAC;MAC5G,MAAMe,gBAAgB,GAAG,CAAC/H,WAAW,CAAC8B,GAAG,IAAI,CAAC9B,WAAW,CAACgI,aAAa,CAAC,CAAC;MACzE,MAAMC,YAAY,GAAG,IAAI,CAACjJ,SAAS,GAC/B+I,gBAAgB,CAAC;MAAA,EACjB,CAACJ,eAAe,CAAC,CAAC;MACtB,IAAIM,YAAY,EAAE;QAChB,OAAO,IAAI,CAAC9C,cAAc,CAAC3F,EAAE,EAAEjB,qBAAqB,EAAE,IAAI,CAAC;MAC7D;IACF;IAEA,MAAM2J,UAAU,GAAG,MAAAA,CAAA,KAAoD;MACrE,IAAI,CAACzC,QAAQ,IAAI,CAAC,IAAI,CAAC3G,SAAS,EAAE,OAAOqJ,SAAS;MAClD,MAAMC,2BAA2B,GAAG,MAAM,IAAI,CAACtJ,SAAS,CAACuJ,sBAAsB,CAACpG,gBAAgB,CAACzC,EAAE,CAAC;MACpG,IAAI,CAAC4I,2BAA2B,CAACE,QAAQ,EAAE,OAAOH,SAAS;MAC3D,IAAI,CAACpC,gBAAgB,EAAE,OAAOoC,SAAS;MACvC,MAAMvF,aAAa,GAAG,MAAMP,cAAc,CAACQ,WAAW,CACpDkD,gBAAgB,CAACpD,OAAO,EACxB8C,QAAQ,CAAC/G,KAAK,CAAC6D,OACjB,CAAC;MACD,MAAMgG,oBAAoB,GAAG,MAAM9C,QAAQ,CAAC+C,6BAA6B,CAAC5F,aAAa,EAAEX,gBAAgB,CAAC;MAC1G,IAAIsG,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,CAAC5J,OAAO,EAAE6J,mBAAmB,EAAE;MACnE,OAAO,IAAI,CAACvD,cAAc,CACxB3F,EAAE,EACF,mHACF,CAAC;IACH;IACA,IAAIiJ,YAAY,KAAK,MAAM,EAAE;MAC3B,OAAO,IAAI,CAACtD,cAAc,CAAC3F,EAAE,EAAE,iDAAiD,CAAC;IACnF;IAEA,IAAI,CAAC2C,aAAa,EAAE;MAClB,MAAM,IAAID,KAAK,CAAC,kDAAkDS,OAAO,OAAOnD,EAAE,CAACe,QAAQ,CAAC,CAAC,EAAE,CAAC;IAClG;IACA,MAAMP,WAAW,GAAG,MAAM,IAAA8G,2BAAc,EAAC;MACvCxE,IAAI;MACJD,cAAc;MACdsG,UAAU,EAAE,IAAI,CAAC7J,SAAS,GAAGqJ,SAAS,GAAG9F,cAAc,CAACyD,MAAM,CAAC1D,SAAS,CAACO,OAAiB,CAAC;MAAE;MAC7FoE,UAAU,EAAE5E,aAAa;MACzB6E,MAAM,EAAE;IACV,CAAC,CAAC;IACF,IAAIhH,WAAW,CAAC8B,GAAG,EAAE;MACnB,IAAI,EAAE9B,WAAW,CAAC8B,GAAG,YAAY8G,sBAAY,CAAC,IAAI,CAAC,IAAI,CAAC/J,OAAO,EAAEgK,gBAAgB,EAAE;QACjF,OAAO,IAAI,CAAC1D,cAAc,CAAC3F,EAAE,EAAE,sCAAsCQ,WAAW,CAAC8B,GAAG,CAACgH,OAAO,EAAE,CAAC;MACjG;MACA,OAAO,IAAI,CAACC,kBAAkB,CAC5B1G,cAAc,EACd7C,EAAE,EACF2C,aAAa,EACbF,gBAAgB,EAChBkE,gBAAgB,EAChBnG,WACF,CAAC;IACH;IACA,IAAI,IAAI,CAACnB,OAAO,CAACmK,UAAU,IAAIhJ,WAAW,CAACE,uBAAuB,EAAE;MAClE;MACA,MAAM+I,YAAY,GAAGzJ,EAAE,CAACc,aAAa,CAACN,WAAW,CAACE,uBAAuB,CAACK,QAAQ,CAAC,CAAC,CAAC;MACrF,MAAM2I,cAAc,GAAG,MAAM,IAAI,CAACxK,KAAK,CAACgC,WAAW,CAACgH,oBAAoB,CAACuB,YAAY,CAAC;MACtF,OAAAhM,aAAA,CAAAA,aAAA,KACKqI,eAAe;QAClBrD,gBAAgB,EAAEiH,cAAc;QAChCjC,kBAAkB,EAAEd,gBAAgB;QACpCnG;MAAW;IAEf;IACA,IAAI,CAACA,WAAW,CAACmJ,UAAU,CAAC,CAAC,EAAE;MAC7B,IAAInJ,WAAW,CAACoJ,aAAa,CAAC,CAAC,EAAE;QAC/B;QACA,OAAO,IAAI,CAACjE,cAAc,CAAC3F,EAAE,EAAEnB,sBAAsB,EAAE,IAAI,CAAC;MAC9D;MACA,IAAI,CAAC2B,WAAW,CAACgI,aAAa,CAAC,CAAC,EAAE;QAChC;QACA,OAAO,IAAI,CAAC7C,cAAc,CAAC3F,EAAE,EAAEnB,sBAAsB,EAAE,IAAI,CAAC;MAC9D;MACA;MACA,IAAI,CAAC,IAAI,CAACQ,OAAO,CAACwK,2BAA2B,IAAI,CAACrJ,WAAW,CAACE,uBAAuB,EAAE;QACrF;QACA,OAAAjD,aAAA,CAAAA,aAAA,KACKqI,eAAe;UAClBrD,gBAAgB;UAChBgF,kBAAkB,EAAEd,gBAAgB;UACpCnG;QAAW;MAEf;MACA;IACF;;IAEA;IACA,MAAMoB,UAAU,GAAG;MACjBe,aAAa;MACbC,SAAS;MACTC;IACF,CAAC;IAED,OAAApF,aAAA,CAAAA,aAAA,KAAYqI,eAAe;MAAErD,gBAAgB;MAAEb,UAAU;MAAEpB;IAAW;EACxE;EAEA,MAAc+I,kBAAkBA,CAC9B1G,cAA8B,EAC9B7C,EAAe,EACf2C,aAAkB,EAClBF,gBAAmC,EACnCkE,gBAA0B,EAC1BnG,WAA2B,EACsB;IACjD,IAAI;MAAE6I;IAAiB,CAAC,GAAG,IAAI,CAAChK,OAAO,IAAI,CAAC,CAAC;IAC7C,IAAIoD,gBAAgB,CAACsE,SAAS,CAAC,CAAC,EAAE;MAChCsC,gBAAgB,GAAG,QAAQ;IAC7B;IACA,IAAI,CAACA,gBAAgB,EAAE,MAAM,IAAI3G,KAAK,CAAC,uDAAuD,CAAC;IAC/F,MAAMI,IAAI,GAAG,IAAI,CAAC5D,KAAK,CAACgC,WAAW,CAAC6B,OAAO;IAC3C,MAAM+G,QAAQ,GAAGjH,cAAc,CAACqE,IAAI;IAEpC,MAAM6C,qBAAqB,GAAGA,CAC5BC,gBAAqB,EACrBC,aAAkB,EAClBC,eAAuB,KACoB;MAC3C,OAAO;QACLzH,gBAAgB;QAChBzC,EAAE;QACFQ,WAAW;QACX2J,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;QACLzH,gBAAgB;QAChBgF,kBAAkB,EAAEd,gBAAgB;QACpC3G,EAAE;QACFQ,WAAW;QACX2J,iBAAiB,EAAE;UACjBC,QAAQ,EAAE,QAAQ;UAClBC,iBAAiB,EAAEE,WAAW;UAC9BN,aAAa,EAAEO,gBAAgB;UAC/BN;QACF;MACF,CAAC;IACH,CAAC;IAED,MAAMO,iBAAiB,GAAG5H,cAAc,CAACyD,MAAM,CAAC7D,gBAAgB,CAACzC,EAAE,CAACmD,OAAiB,CAAC;IACtF,IAAI,CAACsH,iBAAiB,EACpB,MAAM,IAAI/H,KAAK,CACb,6DACED,gBAAgB,CAACzC,EAAE,CAACmD,OAAO,UACnBnD,EAAE,CAACe,QAAQ,CAAC,CAAC,GACzB,CAAC;IACH,MAAM2J,eAAe,GAAG7H,cAAc,CAACyD,MAAM,CAACtG,EAAE,CAACmD,OAAiB,CAAC;IACnE,IAAI,CAACuH,eAAe,EAClB,MAAM,IAAIhI,KAAK,CAAC,2DAA2D1C,EAAE,CAACmD,OAAO,UAAUnD,EAAE,CAACe,QAAQ,CAAC,CAAC,GAAG,CAAC;IAElH,IAAI+I,QAAQ,EAAE;MACZ,MAAMa,mBAAmB,GAAG,MAAOC,aAAyB,IAAK;QAC/D,MAAMC,mBAAmB,GAAG,MAAM,IAAAvD,2BAAc,EAAC;UAC/CxE,IAAI;UACJD,cAAc;UACdsG,UAAU,EAAEyB,aAAa;UACzBrD,UAAU,EAAEuC,QAAQ;UACpBtC,MAAM,EAAE;QACV,CAAC,CAAC;QACF,IAAI,CAACqD,mBAAmB,CAACvI,GAAG,EAAE,OAAO,IAAI;QACzC,OAAO,EAAEuI,mBAAmB,CAACvI,GAAG,YAAY8G,sBAAY,CAAC;MAC3D,CAAC;MACD,MAAM0B,kBAAkB,GAAG,MAAMH,mBAAmB,CAAC9H,cAAc,CAACkI,uBAAuB,CAAC,CAAQ,CAAC;MACrG,MAAMC,mBAAmB,GAAG,MAAML,mBAAmB,CAAChI,aAAa,CAAC;MACpE,IAAI,CAACmI,kBAAkB,IAAI,CAACE,mBAAmB,EAAE;QAC/C,OAAO,IAAI,CAACrF,cAAc,CACxB3F,EAAE,EACF,sBAAsByC,gBAAgB,CAACzC,EAAE,CAACe,QAAQ,CAAC,CAAC,2BAA2B+I,QAAQ,CAAC/I,QAAQ,CAAC,CAAC;AAC5G,0HACQ,CAAC;MACH;MACA,MAAMkK,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,CAACjL,WAAW,EAAEiE,QAAQ,CAAC,CAAW,CAAC;MACzG;MACA,IAAI6F,gBAAgB,KAAK,QAAQ,EAAE;QACjC,OAAOiB,uBAAuB,CAACW,eAAe,EAAET,gBAAgB,EAAE,IAAI,CAACjL,WAAW,EAAEiE,QAAQ,CAAC,CAAW,CAAC;MAC3G;MACA,MAAM,IAAId,KAAK,CACb,yBAAyB2G,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,CAAChL,SAAS,EAAEgE,QAAQ,CAAC,CAAW,CAAC;IACvG;IACA,IAAI6F,gBAAgB,KAAK,QAAQ,EAAE;MACjC,OAAOiB,uBAAuB,CAACW,eAAe,EAAET,gBAAgB,EAAE,IAAI,CAACjL,WAAW,EAAEiE,QAAQ,CAAC,CAAW,CAAC;IAC3G;IACA,MAAM,IAAId,KAAK,CACb,yBAAyB2G,gBAAgB,kEAC3C,CAAC;EACH;AACF;AAACvK,OAAA,CAAAE,mBAAA,GAAAA,mBAAA","ignoreList":[]}
+{"version":3,"names":["_pMapSeries","data","_interopRequireDefault","require","_componentId","_laneId","_component","_legacy","_lodash","_configMerger","_componentModules","_dependencyResolver","_builder","_mergeDependencies","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","Boolean","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","getDependenciesMergeResult","undefined","hasConflicts","MergeOptions","theirs","getDependenciesOfVersion","mergeDependencies","toComponentIdsIncludeUpdateDependents","dependenciesMergeResult","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","currentWorkspaceComp","get","state","_consumer","getConsumerComponent","isRemovedOnMain","findCoreExtension","config","removeOnMain","isTargetNotAhead","isTargetAhead","shouldIgnore","isModified","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 { MergeOptions, 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';\nimport { getDependenciesOfVersion, mergeDependencies } from './merge-dependencies';\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    // the gap is needed only when the other side is a lane from a different scope than ours: its snaps\n    // exist only on that lane's scope, and once merged they become part of our history, so our export\n    // must push them onward (to each component's home scope when merging into main, or to the current\n    // lane's scope). when the other side is main, its history is already on every component's home scope\n    // and is never pushed by us (lane scopes are lean) — the VersionHistory (imported during the\n    // pre-fetch) covers the divergence traversal.\n    const shouldImportHistoryOfOtherLane =\n      !this.options?.shouldSquash && // when squashing, no need for all history, only the head is going to be pushed\n      Boolean(this.otherLane) &&\n      this.otherLane?.scope !== this.currentLane?.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    // a workspace re-detects the dependencies from the merged files. a bare scope can't, it merges the resolved ones.\n    const getDependenciesMergeResult = () => {\n      if (this.workspace) return undefined;\n      // \"theirs\" with a file conflict takes all the files of other (see applyModifiedVersion), so the dependencies too\n      if (mergeResults.hasConflicts && this.options.mergeStrategy === MergeOptions.theirs) {\n        return getDependenciesOfVersion(otherComponent);\n      }\n      return mergeDependencies(\n        getDependenciesOfVersion(baseComponent),\n        currentComponent,\n        getDependenciesOfVersion(otherComponent),\n        this.options.mergeStrategy,\n        this.currentLane?.toComponentIdsIncludeUpdateDependents()\n      );\n    };\n    const dependenciesMergeResult = getDependenciesMergeResult();\n    return {\n      currentComponent,\n      id,\n      mergeResults,\n      divergeData,\n      configMergeResult,\n      dataMergeResult,\n      dependenciesMergeResult,\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 = async () => {\n      if (existingBitMapId && this.workspace) {\n        const currentWorkspaceComp = await this.workspace.get(existingBitMapId);\n        return currentWorkspaceComp.state._consumer;\n      }\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.d.ts

@@ -18,6 +18,7 @@ import type { DependencyResolverMain } from '@teambit/dependency-resolver';
 import type { InstallMain } from '@teambit/install';
 import type { ScopeMain } from '@teambit/scope';
 import type { DataMergeResult, MergeStatusProviderOptions } from './merge-status-provider';
+import type { DependenciesSnapshot } from './merge-dependencies';
 import type { MergeStrategy, MergeResultsThreeWay, ApplyVersionResults } from '@teambit/component.modules.merge-helper';
 import type { ConfigStoreMain } from '@teambit/config-store';
 import type { ApplicationMain } from '@teambit/application';
@@ -37,6 +38,7 @@ export type ComponentMergeStatus = ComponentStatusBase & {
     resolvedUnrelated?: ResolveUnrelatedData;
     configMergeResult?: ConfigMergeResult;
     dataMergeResult?: DataMergeResult;
+    dependenciesMergeResult?: DependenciesSnapshot;
 };
 export type ComponentMergeStatusBeforeMergeAttempt = ComponentStatusBase & {
     divergeData?: SnapsDistance;
@@ -98,6 +100,19 @@ export declare class MergingMain {
     otherLane?: Lane): Promise<ComponentMergeStatus[]>;
     private applyVersionMultiple;
     private applyVersion;
+    /**
+     * a workspace makes the merge snap from the merged files it re-loads, which re-calculates the component.
+     * a bare scope makes it from the in-memory component, so bring it to the same state: the merged aspects-data and the
+     * merged dependencies. (the dependencies policy and overrides are re-calculated later, during the snap. see
+     * snapFromScope's "recalcDependencies").
+     */
+    private prepareScopeComponentForMergeSnap;
+    /**
+     * a dependency on a component of the current lane gets the lane's version, same as a workspace gets it from .bitmap
+     * (or from the lane's hidden updateDependents, see updateDependenciesVersions).
+     * call it once all the components were applied, so the lane has the new heads of the ones the merge updated.
+     */
+    private setLaneVersionsOfDeps;
     private abortMerge;
     private resolveMerge;
     private getAllComponentsStatus;

package/dist/merging.main.runtime.js

@@ -450,7 +450,8 @@ class MergingMain {
       id,
       mergeResults,
       resolvedUnrelated,
-      configMergeResult
+      configMergeResult,
+      dependenciesMergeResult
     }) => {
       const modelComponent = await this.scope.legacyScope.getModelComponent(id);
       const updatedLaneId = otherLaneId.isDefault() ? _laneId().LaneId.from(otherLaneId.name, id.scope) : otherLaneId;
@@ -464,10 +465,14 @@ class MergingMain {
         currentLane,
         resolvedUnrelated,
         configMergeResult,
+        dependenciesMergeResult,
         detachHead,
         shouldSquash
       });
     });
+    if (!this.workspace && currentLane) {
+      await Promise.all((0, _lodash().compact)(succeededComponents.map(c => c.dependenciesMergeResult)).map(dependenciesMergeResult => this.setLaneVersionsOfDeps(dependenciesMergeResult, currentLane)));
+    }
     if (this.workspace) {
       // 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
@@ -498,6 +503,7 @@ class MergingMain {
     currentLane,
     resolvedUnrelated,
     configMergeResult,
+    dependenciesMergeResult,
     detachHead,
     shouldSquash
   }) {
@@ -589,6 +595,12 @@ class MergingMain {
       // in this case, we don't want to update .bitmap with the version of the remote. we want to keep the same version
       legacyComponent.version = id.version;
     }
+    if (!this.workspace && mergeResults) {
+      await this.prepareScopeComponentForMergeSnap(legacyComponent, {
+        currentComponent: idToLoad === id ? currentComponent : undefined,
+        dependenciesMergeResult
+      });
+    }
     const files = legacyComponent.files;
     (0, _checkout().updateFileStatus)(files, filesStatus, currentComponent || undefined);
     if (mergeResults) {
@@ -648,6 +660,46 @@ class MergingMain {
       legacyCompToWrite: legacyComponent
     };
   }
+
+  /**
+   * a workspace makes the merge snap from the merged files it re-loads, which re-calculates the component.
+   * a bare scope makes it from the in-memory component, so bring it to the same state: the merged aspects-data and the
+   * merged dependencies. (the dependencies policy and overrides are re-calculated later, during the snap. see
+   * snapFromScope's "recalcDependencies").
+   */
+  async prepareScopeComponentForMergeSnap(legacyComponent, {
+    currentComponent,
+    dependenciesMergeResult
+  }) {
+    if (currentComponent) {
+      // MergeStatusProvider.mergeExtensionsData() merged the aspects-data into currentComponent, which is a different
+      // instance than legacyComponent (each load from the scope clones the extensions). without this, data that changed
+      // on the other side only (e.g. a new test file in dev-files) is lost, and as it's not a conflict, it's not
+      // re-calculated either.
+      legacyComponent.extensions = currentComponent.extensions.clone();
+    }
+    if (dependenciesMergeResult) Object.assign(legacyComponent, dependenciesMergeResult);
+  }
+
+  /**
+   * a dependency on a component of the current lane gets the lane's version, same as a workspace gets it from .bitmap
+   * (or from the lane's hidden updateDependents, see updateDependenciesVersions).
+   * call it once all the components were applied, so the lane has the new heads of the ones the merge updated.
+   */
+  async setLaneVersionsOfDeps(dependenciesMergeResult, currentLane) {
+    const {
+      dependencies,
+      devDependencies,
+      peerDependencies
+    } = dependenciesMergeResult;
+    const compDeps = [...dependencies.get(), ...devDependencies.get(), ...peerDependencies.get()];
+    await Promise.all(compDeps.map(async dep => {
+      const onLane = currentLane.getComponent(dep.id) || currentLane.getUpdateDependentAsLaneComponent(dep.id);
+      if (!onLane) return;
+      const modelComponent = await this.scope.legacyScope.getModelComponentIfExist(dep.id.changeVersion(undefined));
+      dep.id = dep.id.changeVersion(modelComponent?.getTagOfRefIfExists(onLane.head) || onLane.head.toString());
+    }));
+  }
   async abortMerge(pattern) {
     const consumer = this.workspace.consumer;
     const ids = await this.getIdsForUnmerged(pattern);
@@ -724,6 +776,8 @@ class MergingMain {
         lane: laneId?.toString(),
         updatedLegacyComponents: updatedComponents,
         loadAspectOnlyForIds: getLoadAspectOnlyForIds(),
+        // the config was merged, it may differ from the stored one (e.g. an env or a policy changed on the other side)
+        recalcDependencies: true,
         loose
       });
       return results;