@teambit/merging 0.0.167 → 0.0.169

package/dist/merging.main.runtime.d.ts

@@ -47,12 +47,13 @@ export declare class MergingMain {
     /**
      * merge multiple components according to the "allComponentsStatus".
      */
-    mergeSnaps({ mergeStrategy, allComponentsStatus, laneId, localLane, noSnap, snapMessage, build, skipDependencyInstallation, }: {
+    mergeSnaps({ mergeStrategy, allComponentsStatus, laneId, localLane, noSnap, tag, snapMessage, build, skipDependencyInstallation, }: {
         mergeStrategy: MergeStrategy;
         allComponentsStatus: ComponentMergeStatus[];
         laneId: LaneId;
         localLane: Lane | null;
         noSnap: boolean;
+        tag?: boolean;
         snapMessage: string;
         build: boolean;
         skipDependencyInstallation?: boolean;
@@ -80,6 +81,7 @@ export declare class MergingMain {
     private resolveMerge;
     private getAllComponentsStatus;
     private snapResolvedComponents;
+    private tagAllLaneComponent;
     private getIdsForUnmerged;
     private getComponentsToMerge;
     static slots: never[];

package/dist/merging.main.runtime.js

@@ -389,6 +389,7 @@ class MergingMain {
     laneId,
     localLane,
     noSnap,
+    tag,
     snapMessage,
     build,
     skipDependencyInstallation
@@ -440,10 +441,33 @@ class MergingMain {
     if (localLane) consumer.scope.objects.add(localLane);
     await consumer.scope.objects.persist(); // persist anyway, if localLane is null it should save all main heads
 
-    await consumer.scope.objects.unmergedComponents.write(); // if one of the component has conflict, don't snap-merge. otherwise, some of the components would be snap-merged
-    // and some not. besides the fact that it could by mistake tag dependent, it's a confusing state. better not snap.
+    await consumer.scope.objects.unmergedComponents.write();
+
+    const getSnapOrTagResults = async () => {
+      // if one of the component has conflict, don't snap-merge. otherwise, some of the components would be snap-merged
+      // and some not. besides the fact that it could by mistake tag dependent, it's a confusing state. better not snap.
+      if (noSnap || leftUnresolvedConflicts) {
+        return null;
+      }
+
+      if (tag) {
+        const idsToTag = allComponentsStatus.map(c => c.id);
+        const results = await this.tagAllLaneComponent(idsToTag, snapMessage, build);
+        if (!results) return null;
+        const {
+          taggedComponents,
+          autoTaggedResults
+        } = results;
+        return {
+          snappedComponents: taggedComponents,
+          autoSnappedResults: autoTaggedResults
+        };
+      }
+
+      return this.snapResolvedComponents(consumer, snapMessage, build);
+    };
 
-    const mergeSnapResults = noSnap || leftUnresolvedConflicts ? null : await this.snapResolvedComponents(consumer, snapMessage, build);
+    const mergeSnapResults = await getSnapOrTagResults();
     return {
       components: componentsResults,
       failedComponents,
@@ -859,6 +883,21 @@ class MergingMain {
     });
   }
 
+  async tagAllLaneComponent(idsToTag, tagMessage, build) {
+    const ids = idsToTag.map(id => {
+      return id.toStringWithoutVersion();
+    });
+
+    _logger().default.debug(`merge-snaps, tagResolvedComponents, total ${idsToTag.length.toString()} components`);
+
+    return this.snapping.tag({
+      ids,
+      build,
+      message: tagMessage,
+      unmodified: true
+    });
+  }
+
   async getIdsForUnmerged(idsStr) {
     if (idsStr && idsStr.length) {
       const componentIds = await this.workspace.resolveMultipleComponentIds(idsStr);

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

@@ -1 +1 @@
-{"version":3,"names":["MergingMain","constructor","workspace","install","snapping","checkout","consumer","merge","values","mergeStrategy","abort","resolve","noSnap","message","build","skipDependencyInstallation","ConsumerNotFound","mergeResults","firstValue","R","head","resolveMerge","abortMerge","BitId","isValidVersion","bitIds","getComponentsToMerge","mergeComponentsFromRemote","version","ids","tail","mergeVersion","onDestroy","snapMessage","currentLaneId","getCurrentLaneId","currentLaneObject","getCurrentLaneObject","allComponentsStatus","getAllComponentsStatus","failedComponents","filter","c","unmergedMessage","unmergedLegitimately","length","failureMsgs","map","failedComponent","chalk","bold","id","toString","red","join","BitError","mergeSnaps","laneId","localLane","componentWithConflict","find","component","hasConflicts","getMergeStrategyInteractive","componentStatus","failureMessage","unchangedLegitimately","succeededComponents","componentsResults","mapSeries","currentComponent","resolvedUnrelated","modelComponent","scope","getModelComponent","updatedLaneId","isDefault","LaneId","from","name","applyVersion","remoteHead","getRef","leftUnresolvedConflicts","undefined","dedupe","updateExisting","import","objects","add","persist","unmergedComponents","write","mergeSnapResults","snapResolvedComponents","components","getComponentMergeStatus","otherLaneName","options","returnUnmerged","msg","getModelComponentIfExist","unmerged","getEntry","toStringWithoutVersion","repo","otherLaneHead","existingBitMapId","bitMap","getBitIdIfExist","ignoreVersion","componentOnLane","loadVersion","isRemoved","getCurrentId","idOnLane","getComponent","changeVersion","getHeadAsTagIfExist","currentId","divergeData","getDivergeData","componentFromModel","getCurrentComponent","loadComponent","getConsumerComponent","isModified","componentModificationStatus","getComponentStatusById","modified","baseComponent","ignoreConfigChanges","isComponentSourceCodeModified","isComponentModified","laneHeadIsDifferentThanCheckedOut","laneHeadLocal","localHead","Ref","Error","err","mainHead","NoCommonSnap","resolveUnrelated","hasResolvedLocally","snapsOnLocalOnly","snap","isEqual","hasResolvedRemotely","snapsOnRemoteOnly","versionToSaveInLane","resolvedRef","strategy","isDiverged","isLocalAhead","isRemoteAhead","baseSnap","commonSnapBeforeDiverge","otherComponent","currentLaneName","toLaneId","threeWayMerge","otherLabel","currentLabel","filesStatus","unmergedComponent","remote","lane","handleResolveUnrelated","addComponent","unrelated","addEntry","markAllFilesAsUnchanged","files","forEach","file","pathNormalizeToLinux","relative","FileStatus","unchanged","MergeOptions","ours","remoteId","idToLoad","theirs","componentWithDependencies","loadComponentWithDependenciesFromModel","updated","modifiedStatus","modifiedFiles","applyModifiedVersion","manyComponentsWriter","ManyComponentsWriter","componentsWithDependencies","installNpmPackages","override","writeConfig","verbose","writeDists","writePackageJson","writeAll","manual","unmergedPaths","f","conflict","filePath","setHead","markVersionAsLocal","getIdsForUnmerged","results","reset","removeComponent","fullName","abortedComponents","snappedComponents","legacyBitIds","BitIds","fromArray","_legacy","resolvedComponents","localLaneObject","tmp","Tmp","componentsStatus","Promise","all","bitId","remoteScopeName","remoteLaneId","remoteLanes","laneIdStr","clear","getComponents","logger","debug","r","idsStr","componentIds","resolveMultipleComponentIds","entry","GeneralError","unresolvedComponents","u","ComponentID","fromLegacy","hasWildcard","componentsList","ComponentsList","listComponentsByIdsWithWildcard","getParsedId","provider","cli","merging","register","MergeCmd","CLIAspect","WorkspaceAspect","SnappingAspect","CheckoutAspect","InstallAspect","MainRuntime","MergingAspect","addRuntime"],"sources":["merging.main.runtime.ts"],"sourcesContent":["import { CLIAspect, CLIMain, MainRuntime } from '@teambit/cli';\nimport WorkspaceAspect, { Workspace } from '@teambit/workspace';\nimport R from 'ramda';\nimport { Consumer } from '@teambit/legacy/dist/consumer';\nimport ComponentsList from '@teambit/legacy/dist/consumer/component/components-list';\nimport {\n  ApplyVersionResults,\n  MergeStrategy,\n  mergeVersion,\n  ApplyVersionResult,\n  FailedComponents,\n  FileStatus,\n  getMergeStrategyInteractive,\n  MergeOptions,\n} from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport { ConsumerNotFound } from '@teambit/legacy/dist/consumer/exceptions';\nimport SnappingAspect, { SnappingMain } from '@teambit/snapping';\nimport hasWildcard from '@teambit/legacy/dist/utils/string/has-wildcard';\nimport mapSeries from 'p-map-series';\nimport { BitId, BitIds } from '@teambit/legacy/dist/bit-id';\nimport { BitError } from '@teambit/bit-error';\nimport GeneralError from '@teambit/legacy/dist/error/general-error';\nimport { LaneId } from '@teambit/lane-id';\nimport logger from '@teambit/legacy/dist/logger/logger';\nimport { AutoTagResult } from '@teambit/legacy/dist/scope/component-ops/auto-tag';\nimport { getDivergeData } from '@teambit/legacy/dist/scope/component-ops/get-diverge-data';\nimport { UnmergedComponent } from '@teambit/legacy/dist/scope/lanes/unmerged-components';\nimport { Lane, Version } from '@teambit/legacy/dist/scope/models';\nimport { Ref } from '@teambit/legacy/dist/scope/objects';\nimport chalk from 'chalk';\nimport { Tmp } from '@teambit/legacy/dist/scope/repositories';\nimport { pathNormalizeToLinux } from '@teambit/legacy/dist/utils';\nimport ManyComponentsWriter from '@teambit/legacy/dist/consumer/component-ops/many-components-writer';\nimport ConsumerComponent from '@teambit/legacy/dist/consumer/component/consumer-component';\nimport { applyModifiedVersion } from '@teambit/legacy/dist/consumer/versions-ops/checkout-version';\nimport threeWayMerge, {\n  MergeResultsThreeWay,\n} from '@teambit/legacy/dist/consumer/versions-ops/merge-version/three-way-merge';\nimport { NoCommonSnap } from '@teambit/legacy/dist/scope/exceptions/no-common-snap';\nimport { CheckoutAspect, CheckoutMain } from '@teambit/checkout';\nimport { ComponentID } from '@teambit/component-id';\nimport { DivergeData } from '@teambit/legacy/dist/scope/component-ops/diverge-data';\nimport { InstallMain, InstallAspect } from '@teambit/install';\nimport { MergeCmd } from './merge-cmd';\nimport { MergingAspect } from './merging.aspect';\n\ntype ResolveUnrelatedData = { strategy: MergeStrategy; head: Ref };\n\nexport type ComponentMergeStatus = {\n  currentComponent?: ConsumerComponent | null;\n  componentFromModel?: Version;\n  id: BitId;\n  unmergedMessage?: string;\n  unmergedLegitimately?: boolean; // failed to merge but for a legitimate reason, such as, up-to-date\n  mergeResults?: MergeResultsThreeWay | null;\n  divergeData?: DivergeData;\n  resolvedUnrelated?: ResolveUnrelatedData;\n};\n\nexport class MergingMain {\n  private consumer: Consumer;\n  constructor(\n    private workspace: Workspace,\n    private install: InstallMain,\n    private snapping: SnappingMain,\n    private checkout: CheckoutMain\n  ) {\n    this.consumer = this.workspace?.consumer;\n  }\n\n  /**\n   * merge components according to the \"values\" param.\n   * if the first param is a version, then merge the component ids to that version.\n   * otherwise, merge from the remote head to the local.\n   */\n  async merge(\n    values: string[],\n    mergeStrategy: MergeStrategy,\n    abort: boolean,\n    resolve: boolean,\n    noSnap: boolean,\n    message: string,\n    build: boolean,\n    skipDependencyInstallation: boolean\n  ): Promise<ApplyVersionResults> {\n    if (!this.workspace) throw new ConsumerNotFound();\n    const consumer: Consumer = this.workspace.consumer;\n    let mergeResults;\n    const firstValue = R.head(values);\n    if (resolve) {\n      mergeResults = await this.resolveMerge(values, message, build);\n    } else if (abort) {\n      mergeResults = await this.abortMerge(values);\n    } else if (!BitId.isValidVersion(firstValue)) {\n      const bitIds = this.getComponentsToMerge(consumer, values);\n      // @todo: version could be the lane only or remote/lane\n      mergeResults = await this.mergeComponentsFromRemote(\n        consumer,\n        bitIds,\n        mergeStrategy,\n        noSnap,\n        message,\n        build,\n        skipDependencyInstallation\n      );\n    } else {\n      const version = firstValue;\n      const ids = R.tail(values);\n      const bitIds = this.getComponentsToMerge(consumer, ids);\n      mergeResults = await mergeVersion(consumer, version, bitIds, mergeStrategy);\n    }\n    await consumer.onDestroy();\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: BitId[],\n    mergeStrategy: MergeStrategy,\n    noSnap: boolean,\n    snapMessage: string,\n    build: boolean,\n    skipDependencyInstallation: boolean\n  ): Promise<ApplyVersionResults> {\n    const currentLaneId = consumer.getCurrentLaneId();\n    const currentLaneObject = await consumer.getCurrentLaneObject();\n    const allComponentsStatus = await this.getAllComponentsStatus(bitIds, currentLaneId, currentLaneObject);\n    const failedComponents = allComponentsStatus.filter((c) => c.unmergedMessage && !c.unmergedLegitimately);\n    if (failedComponents.length) {\n      const failureMsgs = failedComponents\n        .map(\n          (failedComponent) =>\n            `${chalk.bold(failedComponent.id.toString())} - ${chalk.red(failedComponent.unmergedMessage as string)}`\n        )\n        .join('\\n');\n      throw new BitError(`unable to merge due to the following failures:\\n${failureMsgs}`);\n    }\n\n    return this.mergeSnaps({\n      mergeStrategy,\n      allComponentsStatus,\n      laneId: currentLaneId,\n      localLane: currentLaneObject,\n      noSnap,\n      snapMessage,\n      build,\n      skipDependencyInstallation,\n    });\n  }\n\n  /**\n   * merge multiple components according to the \"allComponentsStatus\".\n   */\n  async mergeSnaps({\n    mergeStrategy,\n    allComponentsStatus,\n    laneId,\n    localLane,\n    noSnap,\n    snapMessage,\n    build,\n    skipDependencyInstallation,\n  }: {\n    mergeStrategy: MergeStrategy;\n    allComponentsStatus: ComponentMergeStatus[];\n    laneId: LaneId;\n    localLane: Lane | null;\n    noSnap: boolean;\n    snapMessage: string;\n    build: boolean;\n    skipDependencyInstallation?: boolean;\n  }): Promise<ApplyVersionResults> {\n    const consumer = this.workspace.consumer;\n    const componentWithConflict = allComponentsStatus.find(\n      (component) => component.mergeResults && component.mergeResults.hasConflicts\n    );\n    if (componentWithConflict && !mergeStrategy) {\n      mergeStrategy = await getMergeStrategyInteractive();\n    }\n    const failedComponents: FailedComponents[] = allComponentsStatus\n      .filter((componentStatus) => componentStatus.unmergedMessage)\n      .map((componentStatus) => ({\n        id: componentStatus.id,\n        failureMessage: componentStatus.unmergedMessage as string,\n        unchangedLegitimately: componentStatus.unmergedLegitimately,\n      }));\n    const succeededComponents = allComponentsStatus.filter((componentStatus) => !componentStatus.unmergedMessage);\n    // do not use Promise.all for applyVersion. otherwise, it'll write all components in parallel,\n    // which can be an issue when some components are also dependencies of others\n    const componentsResults = await mapSeries(\n      succeededComponents,\n      async ({ currentComponent, id, mergeResults, resolvedUnrelated }) => {\n        const modelComponent = await consumer.scope.getModelComponent(id);\n        const updatedLaneId = laneId.isDefault() ? LaneId.from(laneId.name, id.scope as string) : laneId;\n        return this.applyVersion({\n          currentComponent,\n          id,\n          mergeResults,\n          mergeStrategy,\n          remoteHead: modelComponent.getRef(id.version as string) as Ref,\n          laneId: updatedLaneId,\n          localLane,\n          resolvedUnrelated,\n        });\n      }\n    );\n\n    const leftUnresolvedConflicts = componentWithConflict && mergeStrategy === 'manual';\n\n    if (!skipDependencyInstallation && !leftUnresolvedConflicts) {\n      await this.install.install(undefined, {\n        dedupe: true,\n        updateExisting: false,\n        import: false,\n      });\n    }\n\n    if (localLane) consumer.scope.objects.add(localLane);\n\n    await consumer.scope.objects.persist(); // persist anyway, if localLane is null it should save all main heads\n\n    await consumer.scope.objects.unmergedComponents.write();\n\n    // 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    const mergeSnapResults =\n      noSnap || leftUnresolvedConflicts ? null : await this.snapResolvedComponents(consumer, snapMessage, build);\n\n    return {\n      components: componentsResults,\n      failedComponents,\n      mergeSnapResults,\n      leftUnresolvedConflicts,\n    };\n  }\n\n  /**\n   * this function gets called from two different commands:\n   * 1. \"bit merge <ids...>\", when merging a component from a remote to the local.\n   * in this case, the remote and local are on the same lane or both on main.\n   * 2. \"bit lane merge\", when merging from one lane to another.\n   * @param id\n   * @param localLane\n   * @param otherLaneName\n   * @param existingOnWorkspaceOnly\n   * @returns\n   */\n  async getComponentMergeStatus(\n    id: BitId, // the id.version is the version we want to merge to the current component\n    localLane: Lane | null, // currently checked out lane. if on main, then it's null.\n    otherLaneName: string, // the lane name we want to merged to our lane. (can be also \"main\").\n    options?: { resolveUnrelated?: MergeStrategy; ignoreConfigChanges?: boolean }\n  ): Promise<ComponentMergeStatus> {\n    const consumer = this.workspace.consumer;\n    const componentStatus: ComponentMergeStatus = { id };\n    const returnUnmerged = (msg: string, unmergedLegitimately = false) => {\n      componentStatus.unmergedMessage = msg;\n      componentStatus.unmergedLegitimately = unmergedLegitimately;\n      return componentStatus;\n    };\n    const modelComponent = await consumer.scope.getModelComponentIfExist(id);\n    if (!modelComponent) {\n      return returnUnmerged(\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 = consumer.scope.objects.unmergedComponents.getEntry(id.name);\n    if (unmerged) {\n      return returnUnmerged(\n        `component ${id.toStringWithoutVersion()} is in during-merge state a previous merge, please snap/tag it first (or use bit merge --resolve/--abort)`\n      );\n    }\n    const repo = consumer.scope.objects;\n    const version = id.version as string;\n    const otherLaneHead = modelComponent.getRef(version);\n    const existingBitMapId = consumer.bitMap.getBitIdIfExist(id, { ignoreVersion: true });\n    const componentOnLane: Version = await modelComponent.loadVersion(version, consumer.scope.objects);\n    if (componentOnLane.isRemoved()) {\n      return returnUnmerged(`component has been removed`, true);\n    }\n    const getCurrentId = () => {\n      if (existingBitMapId) return existingBitMapId;\n      if (localLane) {\n        const idOnLane = localLane.getComponent(id);\n        if (!idOnLane) return null;\n        return idOnLane.id.changeVersion(idOnLane.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, otherLaneHead, null, false);\n      return { currentComponent: null, componentFromModel: componentOnLane, id, mergeResults: null, divergeData };\n    }\n    const getCurrentComponent = () => {\n      if (existingBitMapId) return consumer.loadComponent(existingBitMapId);\n      return consumer.scope.getConsumerComponent(currentId);\n    };\n    const currentComponent = await getCurrentComponent();\n    const isModified = async () => {\n      const componentModificationStatus = await consumer.getComponentStatusById(currentComponent.id);\n      if (!componentModificationStatus.modified) return false;\n      if (!existingBitMapId) return false;\n      const baseComponent = await modelComponent.loadVersion(\n        existingBitMapId.version as string,\n        consumer.scope.objects\n      );\n      return options?.ignoreConfigChanges\n        ? consumer.isComponentSourceCodeModified(baseComponent, currentComponent)\n        : true;\n    };\n\n    const isComponentModified = await isModified();\n\n    if (isComponentModified) {\n      return returnUnmerged(`component is modified, please snap/tag it first`);\n    }\n    const laneHeadIsDifferentThanCheckedOut =\n      localLane && existingBitMapId?.version && modelComponent.laneHeadLocal?.toString() !== existingBitMapId?.version;\n    const localHead = laneHeadIsDifferentThanCheckedOut ? Ref.from(existingBitMapId.version) : null;\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(repo, modelComponent, otherLaneHead, localHead, false);\n    if (divergeData.err) {\n      const mainHead = modelComponent.head;\n      if (divergeData.err instanceof NoCommonSnap && options?.resolveUnrelated && mainHead) {\n        const hasResolvedLocally = divergeData.snapsOnLocalOnly.find((snap) => mainHead.isEqual(snap));\n        const hasResolvedRemotely = divergeData.snapsOnRemoteOnly.find((snap) => mainHead.isEqual(snap));\n        if (!hasResolvedLocally && !hasResolvedRemotely) {\n          return returnUnmerged(\n            `unable to traverse ${currentComponent.id.toString()} history. the main-head ${mainHead.toString()} doesn't appear in both lanes, it was probably created in each lane separately`\n          );\n        }\n        const versionToSaveInLane = hasResolvedLocally ? currentComponent.id.version : id.version;\n        const resolvedRef = modelComponent.getRef(versionToSaveInLane as string);\n        if (!resolvedRef) throw new Error(`unable to get ref of \"${versionToSaveInLane}\" for \"${id.toString()}\"`);\n        if (options?.resolveUnrelated === 'theirs') {\n          // just override with the model data\n          return {\n            currentComponent,\n            componentFromModel: componentOnLane,\n            id,\n            mergeResults: null,\n            divergeData,\n            resolvedUnrelated: { strategy: 'theirs', head: resolvedRef },\n          };\n        }\n        if (options?.resolveUnrelated === 'ours') {\n          return {\n            currentComponent,\n            id,\n            mergeResults: null,\n            divergeData,\n            resolvedUnrelated: { strategy: 'ours', head: resolvedRef },\n          };\n        }\n        throw new Error(\n          `unsupported strategy \"${options?.resolveUnrelated}\" of resolve-unrelated. supported strategies are: [ours, theirs]`\n        );\n      }\n      return returnUnmerged(\n        `unable to traverse ${currentComponent.id.toString()} history. error: ${divergeData.err.message}`\n      );\n    }\n    if (!divergeData.isDiverged()) {\n      if (divergeData.isLocalAhead()) {\n        // do nothing!\n        return returnUnmerged(`component ${currentComponent.id.toString()} is ahead, nothing to merge`, true);\n      }\n      if (divergeData.isRemoteAhead()) {\n        // just override with the model data\n        return {\n          currentComponent,\n          componentFromModel: componentOnLane,\n          id,\n          mergeResults: null,\n          divergeData,\n        };\n      }\n      // we know that localHead and remoteHead are set, so if none of them is ahead they must be equal\n      return returnUnmerged(`component ${currentComponent.id.toString()} is already merged`, true);\n    }\n    const baseSnap = divergeData.commonSnapBeforeDiverge as Ref; // must be set when isTrueMerge\n    const baseComponent: Version = await modelComponent.loadVersion(baseSnap.toString(), repo);\n    const otherComponent: Version = await modelComponent.loadVersion(otherLaneHead.toString(), repo);\n    const currentLaneName = localLane?.toLaneId().toString() || 'main';\n    const mergeResults = await threeWayMerge({\n      consumer,\n      otherComponent,\n      otherLabel: `${otherLaneHead.toString()} (${otherLaneName})`,\n      currentComponent,\n      currentLabel: `${currentId.version} (${currentLaneName})`,\n      baseComponent,\n    });\n    return { currentComponent, id, mergeResults, divergeData };\n  }\n\n  private async applyVersion({\n    currentComponent,\n    id,\n    mergeResults,\n    mergeStrategy,\n    remoteHead,\n    laneId,\n    localLane,\n    resolvedUnrelated,\n  }: {\n    currentComponent: ConsumerComponent | null | undefined;\n    id: BitId;\n    mergeResults: MergeResultsThreeWay | null | undefined;\n    mergeStrategy: MergeStrategy;\n    remoteHead: Ref;\n    laneId: LaneId;\n    localLane: Lane | null;\n    resolvedUnrelated?: ResolveUnrelatedData;\n  }): Promise<ApplyVersionResult> {\n    const consumer = this.workspace.consumer;\n    let filesStatus = {};\n    const unmergedComponent: UnmergedComponent = {\n      // @ts-ignore\n      id: { name: id.name, scope: id.scope },\n      head: remoteHead,\n      remote: laneId.scope, // @todo: remove. it has been deprecated around 0.0.832\n      lane: laneId.name, // @todo: remove. it has been deprecated around 0.0.832\n      laneId,\n    };\n    id = currentComponent ? currentComponent.id : id;\n\n    const modelComponent = await consumer.scope.getModelComponent(id);\n    const handleResolveUnrelated = () => {\n      if (!currentComponent) throw new Error('currentComponent must be defined when resolvedUnrelated');\n      if (!localLane) throw new Error('localLane must be defined when resolvedUnrelated');\n      if (!resolvedUnrelated?.head) throw new Error('resolvedUnrelated must have head prop');\n      localLane.addComponent({ id, head: resolvedUnrelated.head });\n      const head = modelComponent.getRef(currentComponent.id.version as string);\n      if (!head) throw new Error(`unable to get the head for resolved-unrelated ${id.toString()}`);\n      unmergedComponent.laneId = localLane.toLaneId();\n      unmergedComponent.head = head;\n      unmergedComponent.unrelated = true;\n      consumer.scope.objects.unmergedComponents.addEntry(unmergedComponent);\n      return { id, filesStatus };\n    };\n\n    const markAllFilesAsUnchanged = () => {\n      if (!currentComponent) throw new Error(`applyVersion expect to get currentComponent for ${id.toString()}`);\n      currentComponent.files.forEach((file) => {\n        filesStatus[pathNormalizeToLinux(file.relative)] = FileStatus.unchanged;\n      });\n    };\n    if (mergeResults && mergeResults.hasConflicts && mergeStrategy === MergeOptions.ours) {\n      markAllFilesAsUnchanged();\n      consumer.scope.objects.unmergedComponents.addEntry(unmergedComponent);\n      return { id, filesStatus };\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 componentWithDependencies = await consumer.loadComponentWithDependenciesFromModel(idToLoad);\n    const files = componentWithDependencies.component.files;\n    files.forEach((file) => {\n      // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n      filesStatus[pathNormalizeToLinux(file.relative)] = FileStatus.updated;\n    });\n\n    if (mergeResults) {\n      // update files according to the merge results\n      const { filesStatus: modifiedStatus, modifiedFiles } = applyModifiedVersion(files, mergeResults, mergeStrategy);\n      componentWithDependencies.component.files = modifiedFiles;\n      filesStatus = { ...filesStatus, ...modifiedStatus };\n    }\n\n    const manyComponentsWriter = new ManyComponentsWriter({\n      consumer,\n      componentsWithDependencies: [componentWithDependencies],\n      installNpmPackages: false,\n      override: true,\n      writeConfig: false, // @todo: should write if config exists before, needs to figure out how to do it.\n      verbose: false, // @todo: do we need a flag here?\n      writeDists: true, // @todo: do we need a flag here?\n      writePackageJson: false,\n    });\n    await manyComponentsWriter.writeAll();\n\n    // if mergeResults, the head snap is going to be updated on a later phase when snapping with two parents\n    // otherwise, update the head of the current lane or main\n    if (mergeResults) {\n      if (mergeResults.hasConflicts && mergeStrategy === MergeOptions.manual) {\n        unmergedComponent.unmergedPaths = mergeResults.modifiedFiles.filter((f) => f.conflict).map((f) => f.filePath);\n      }\n      consumer.scope.objects.unmergedComponents.addEntry(unmergedComponent);\n    } else if (localLane) {\n      if (resolvedUnrelated) {\n        // must be \"theirs\"\n        return handleResolveUnrelated();\n      }\n      localLane.addComponent({ id, head: remoteHead });\n    } else {\n      // this is main\n      modelComponent.setHead(remoteHead);\n      // mark it as local, otherwise, when importing this component from a remote, it'll override it.\n      modelComponent.markVersionAsLocal(remoteHead.toString());\n      consumer.scope.objects.add(modelComponent);\n    }\n\n    return { id, filesStatus };\n  }\n\n  private async abortMerge(values: string[]): Promise<ApplyVersionResults> {\n    const consumer = this.workspace.consumer;\n    const ids = await this.getIdsForUnmerged(values);\n    const results = await this.checkout.checkout({ ids, reset: true });\n    ids.forEach((id) => consumer.scope.objects.unmergedComponents.removeComponent(id.fullName));\n    await consumer.scope.objects.unmergedComponents.write();\n    return { abortedComponents: results.components };\n  }\n\n  private async resolveMerge(values: string[], snapMessage: string, build: boolean): Promise<ApplyVersionResults> {\n    const ids = await this.getIdsForUnmerged(values);\n    // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n    const { snappedComponents } = await this.snapping.snap({\n      legacyBitIds: BitIds.fromArray(ids.map((id) => id._legacy)),\n      build,\n      message: snapMessage,\n    });\n    return { resolvedComponents: snappedComponents };\n  }\n\n  private async getAllComponentsStatus(\n    bitIds: BitId[],\n    laneId: LaneId,\n    localLaneObject: Lane | null\n  ): Promise<ComponentMergeStatus[]> {\n    const tmp = new Tmp(this.consumer.scope);\n    try {\n      const componentsStatus = 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.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          return this.getComponentMergeStatus(bitId.changeVersion(remoteHead.toString()), localLaneObject, laneIdStr);\n        })\n      );\n      await tmp.clear();\n      return componentsStatus;\n    } catch (err: any) {\n      await tmp.clear();\n      throw err;\n    }\n  }\n\n  private async snapResolvedComponents(\n    consumer: Consumer,\n    snapMessage: string,\n    build: boolean\n  ): Promise<null | { snappedComponents: ConsumerComponent[]; autoSnappedResults: AutoTagResult[] }> {\n    const unmergedComponents = consumer.scope.objects.unmergedComponents.getComponents();\n    logger.debug(`merge-snaps, snapResolvedComponents, total ${unmergedComponents.length.toString()} components`);\n    if (!unmergedComponents.length) return null;\n    const ids = BitIds.fromArray(unmergedComponents.map((r) => new BitId(r.id)));\n    return this.snapping.snap({\n      legacyBitIds: ids,\n      build,\n      message: snapMessage,\n    });\n  }\n\n  private async getIdsForUnmerged(idsStr?: string[]): Promise<ComponentID[]> {\n    if (idsStr && idsStr.length) {\n      const componentIds = await this.workspace.resolveMultipleComponentIds(idsStr);\n      componentIds.forEach((id) => {\n        const entry = this.workspace.consumer.scope.objects.unmergedComponents.getEntry(id.fullName);\n        if (!entry) {\n          throw new GeneralError(`unable to merge-resolve ${id.toString()}, it is not marked as unresolved`);\n        }\n      });\n      return componentIds;\n    }\n    const unresolvedComponents = this.workspace.consumer.scope.objects.unmergedComponents.getComponents();\n    if (!unresolvedComponents.length) throw new GeneralError(`all components are resolved already, nothing to do`);\n    return unresolvedComponents.map((u) => ComponentID.fromLegacy(new BitId(u.id)));\n  }\n\n  private getComponentsToMerge(consumer: Consumer, ids: string[]): BitId[] {\n    if (hasWildcard(ids)) {\n      const componentsList = new ComponentsList(consumer);\n      return componentsList.listComponentsByIdsWithWildcard(ids);\n    }\n    return ids.map((id) => consumer.getParsedId(id));\n  }\n\n  static slots = [];\n  static dependencies = [CLIAspect, WorkspaceAspect, SnappingAspect, CheckoutAspect, InstallAspect];\n  static runtime = MainRuntime;\n  static async provider([cli, workspace, snapping, checkout, install]: [\n    CLIMain,\n    Workspace,\n    SnappingMain,\n    CheckoutMain,\n    InstallMain\n  ]) {\n    const merging = new MergingMain(workspace, install, snapping, checkout);\n    cli.register(new MergeCmd(merging));\n    return merging;\n  }\n}\n\nMergingAspect.addRuntime(MergingMain);\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AAAA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AAEA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AAUA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AAEA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AAGA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AAEA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AAGA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AAEA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;;;;;AAeO,MAAMA,WAAN,CAAkB;EAEvBC,WAAW,CACDC,SADC,EAEDC,OAFC,EAGDC,QAHC,EAIDC,QAJC,EAKT;IAAA;;IAAA,KAJQH,SAIR,GAJQA,SAIR;IAAA,KAHQC,OAGR,GAHQA,OAGR;IAAA,KAFQC,QAER,GAFQA,QAER;IAAA,KADQC,QACR,GADQA,QACR;IAAA;IACA,KAAKC,QAAL,sBAAgB,KAAKJ,SAArB,oDAAgB,gBAAgBI,QAAhC;EACD;EAED;AACF;AACA;AACA;AACA;;;EACa,MAALC,KAAK,CACTC,MADS,EAETC,aAFS,EAGTC,KAHS,EAITC,OAJS,EAKTC,MALS,EAMTC,OANS,EAOTC,KAPS,EAQTC,0BARS,EASqB;IAC9B,IAAI,CAAC,KAAKb,SAAV,EAAqB,MAAM,KAAIc,8BAAJ,GAAN;IACrB,MAAMV,QAAkB,GAAG,KAAKJ,SAAL,CAAeI,QAA1C;IACA,IAAIW,YAAJ;;IACA,MAAMC,UAAU,GAAGC,gBAAA,CAAEC,IAAF,CAAOZ,MAAP,CAAnB;;IACA,IAAIG,OAAJ,EAAa;MACXM,YAAY,GAAG,MAAM,KAAKI,YAAL,CAAkBb,MAAlB,EAA0BK,OAA1B,EAAmCC,KAAnC,CAArB;IACD,CAFD,MAEO,IAAIJ,KAAJ,EAAW;MAChBO,YAAY,GAAG,MAAM,KAAKK,UAAL,CAAgBd,MAAhB,CAArB;IACD,CAFM,MAEA,IAAI,CAACe,cAAA,CAAMC,cAAN,CAAqBN,UAArB,CAAL,EAAuC;MAC5C,MAAMO,MAAM,GAAG,KAAKC,oBAAL,CAA0BpB,QAA1B,EAAoCE,MAApC,CAAf,CAD4C,CAE5C;;MACAS,YAAY,GAAG,MAAM,KAAKU,yBAAL,CACnBrB,QADmB,EAEnBmB,MAFmB,EAGnBhB,aAHmB,EAInBG,MAJmB,EAKnBC,OALmB,EAMnBC,KANmB,EAOnBC,0BAPmB,CAArB;IASD,CAZM,MAYA;MACL,MAAMa,OAAO,GAAGV,UAAhB;;MACA,MAAMW,GAAG,GAAGV,gBAAA,CAAEW,IAAF,CAAOtB,MAAP,CAAZ;;MACA,MAAMiB,MAAM,GAAG,KAAKC,oBAAL,CAA0BpB,QAA1B,EAAoCuB,GAApC,CAAf;MACAZ,YAAY,GAAG,MAAM,IAAAc,4BAAA,EAAazB,QAAb,EAAuBsB,OAAvB,EAAgCH,MAAhC,EAAwChB,aAAxC,CAArB;IACD;;IACD,MAAMH,QAAQ,CAAC0B,SAAT,EAAN;IACA,OAAOf,YAAP;EACD;EAED;AACF;AACA;AACA;;;EACiC,MAAzBU,yBAAyB,CAC7BrB,QAD6B,EAE7BmB,MAF6B,EAG7BhB,aAH6B,EAI7BG,MAJ6B,EAK7BqB,WAL6B,EAM7BnB,KAN6B,EAO7BC,0BAP6B,EAQC;IAC9B,MAAMmB,aAAa,GAAG5B,QAAQ,CAAC6B,gBAAT,EAAtB;IACA,MAAMC,iBAAiB,GAAG,MAAM9B,QAAQ,CAAC+B,oBAAT,EAAhC;IACA,MAAMC,mBAAmB,GAAG,MAAM,KAAKC,sBAAL,CAA4Bd,MAA5B,EAAoCS,aAApC,EAAmDE,iBAAnD,CAAlC;IACA,MAAMI,gBAAgB,GAAGF,mBAAmB,CAACG,MAApB,CAA4BC,CAAD,IAAOA,CAAC,CAACC,eAAF,IAAqB,CAACD,CAAC,CAACE,oBAA1D,CAAzB;;IACA,IAAIJ,gBAAgB,CAACK,MAArB,EAA6B;MAC3B,MAAMC,WAAW,GAAGN,gBAAgB,CACjCO,GADiB,CAEfC,eAAD,IACG,GAAEC,gBAAA,CAAMC,IAAN,CAAWF,eAAe,CAACG,EAAhB,CAAmBC,QAAnB,EAAX,CAA0C,MAAKH,gBAAA,CAAMI,GAAN,CAAUL,eAAe,CAACL,eAA1B,CAAqD,EAHzF,EAKjBW,IALiB,CAKZ,IALY,CAApB;MAMA,MAAM,KAAIC,oBAAJ,EAAc,mDAAkDT,WAAY,EAA5E,CAAN;IACD;;IAED,OAAO,KAAKU,UAAL,CAAgB;MACrB/C,aADqB;MAErB6B,mBAFqB;MAGrBmB,MAAM,EAAEvB,aAHa;MAIrBwB,SAAS,EAAEtB,iBAJU;MAKrBxB,MALqB;MAMrBqB,WANqB;MAOrBnB,KAPqB;MAQrBC;IARqB,CAAhB,CAAP;EAUD;EAED;AACF;AACA;;;EACkB,MAAVyC,UAAU,CAAC;IACf/C,aADe;IAEf6B,mBAFe;IAGfmB,MAHe;IAIfC,SAJe;IAKf9C,MALe;IAMfqB,WANe;IAOfnB,KAPe;IAQfC;EARe,CAAD,EAkBiB;IAC/B,MAAMT,QAAQ,GAAG,KAAKJ,SAAL,CAAeI,QAAhC;IACA,MAAMqD,qBAAqB,GAAGrB,mBAAmB,CAACsB,IAApB,CAC3BC,SAAD,IAAeA,SAAS,CAAC5C,YAAV,IAA0B4C,SAAS,CAAC5C,YAAV,CAAuB6C,YADpC,CAA9B;;IAGA,IAAIH,qBAAqB,IAAI,CAAClD,aAA9B,EAA6C;MAC3CA,aAAa,GAAG,MAAM,IAAAsD,2CAAA,GAAtB;IACD;;IACD,MAAMvB,gBAAoC,GAAGF,mBAAmB,CAC7DG,MAD0C,CAClCuB,eAAD,IAAqBA,eAAe,CAACrB,eADF,EAE1CI,GAF0C,CAErCiB,eAAD,KAAsB;MACzBb,EAAE,EAAEa,eAAe,CAACb,EADK;MAEzBc,cAAc,EAAED,eAAe,CAACrB,eAFP;MAGzBuB,qBAAqB,EAAEF,eAAe,CAACpB;IAHd,CAAtB,CAFsC,CAA7C;IAOA,MAAMuB,mBAAmB,GAAG7B,mBAAmB,CAACG,MAApB,CAA4BuB,eAAD,IAAqB,CAACA,eAAe,CAACrB,eAAjE,CAA5B,CAf+B,CAgB/B;IACA;;IACA,MAAMyB,iBAAiB,GAAG,MAAM,IAAAC,qBAAA,EAC9BF,mBAD8B,EAE9B,OAAO;MAAEG,gBAAF;MAAoBnB,EAApB;MAAwBlC,YAAxB;MAAsCsD;IAAtC,CAAP,KAAqE;MACnE,MAAMC,cAAc,GAAG,MAAMlE,QAAQ,CAACmE,KAAT,CAAeC,iBAAf,CAAiCvB,EAAjC,CAA7B;MACA,MAAMwB,aAAa,GAAGlB,MAAM,CAACmB,SAAP,KAAqBC,gBAAA,CAAOC,IAAP,CAAYrB,MAAM,CAACsB,IAAnB,EAAyB5B,EAAE,CAACsB,KAA5B,CAArB,GAAoEhB,MAA1F;MACA,OAAO,KAAKuB,YAAL,CAAkB;QACvBV,gBADuB;QAEvBnB,EAFuB;QAGvBlC,YAHuB;QAIvBR,aAJuB;QAKvBwE,UAAU,EAAET,cAAc,CAACU,MAAf,CAAsB/B,EAAE,CAACvB,OAAzB,CALW;QAMvB6B,MAAM,EAAEkB,aANe;QAOvBjB,SAPuB;QAQvBa;MARuB,CAAlB,CAAP;IAUD,CAf6B,CAAhC;IAkBA,MAAMY,uBAAuB,GAAGxB,qBAAqB,IAAIlD,aAAa,KAAK,QAA3E;;IAEA,IAAI,CAACM,0BAAD,IAA+B,CAACoE,uBAApC,EAA6D;MAC3D,MAAM,KAAKhF,OAAL,CAAaA,OAAb,CAAqBiF,SAArB,EAAgC;QACpCC,MAAM,EAAE,IAD4B;QAEpCC,cAAc,EAAE,KAFoB;QAGpCC,MAAM,EAAE;MAH4B,CAAhC,CAAN;IAKD;;IAED,IAAI7B,SAAJ,EAAepD,QAAQ,CAACmE,KAAT,CAAee,OAAf,CAAuBC,GAAvB,CAA2B/B,SAA3B;IAEf,MAAMpD,QAAQ,CAACmE,KAAT,CAAee,OAAf,CAAuBE,OAAvB,EAAN,CAhD+B,CAgDS;;IAExC,MAAMpF,QAAQ,CAACmE,KAAT,CAAee,OAAf,CAAuBG,kBAAvB,CAA0CC,KAA1C,EAAN,CAlD+B,CAoD/B;IACA;;IACA,MAAMC,gBAAgB,GACpBjF,MAAM,IAAIuE,uBAAV,GAAoC,IAApC,GAA2C,MAAM,KAAKW,sBAAL,CAA4BxF,QAA5B,EAAsC2B,WAAtC,EAAmDnB,KAAnD,CADnD;IAGA,OAAO;MACLiF,UAAU,EAAE3B,iBADP;MAEL5B,gBAFK;MAGLqD,gBAHK;MAILV;IAJK,CAAP;EAMD;EAED;AACF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;;EAC+B,MAAvBa,uBAAuB,CAC3B7C,EAD2B,EAChB;EACXO,SAF2B,EAEH;EACxBuC,aAH2B,EAGJ;EACvBC,OAJ2B,EAKI;IAAA;;IAC/B,MAAM5F,QAAQ,GAAG,KAAKJ,SAAL,CAAeI,QAAhC;IACA,MAAM0D,eAAqC,GAAG;MAAEb;IAAF,CAA9C;;IACA,MAAMgD,cAAc,GAAG,CAACC,GAAD,EAAcxD,oBAAoB,GAAG,KAArC,KAA+C;MACpEoB,eAAe,CAACrB,eAAhB,GAAkCyD,GAAlC;MACApC,eAAe,CAACpB,oBAAhB,GAAuCA,oBAAvC;MACA,OAAOoB,eAAP;IACD,CAJD;;IAKA,MAAMQ,cAAc,GAAG,MAAMlE,QAAQ,CAACmE,KAAT,CAAe4B,wBAAf,CAAwClD,EAAxC,CAA7B;;IACA,IAAI,CAACqB,cAAL,EAAqB;MACnB,OAAO2B,cAAc,CAClB,aAAYhD,EAAE,CAACC,QAAH,EAAc,gFADR,CAArB;IAGD;;IACD,MAAMkD,QAAQ,GAAGhG,QAAQ,CAACmE,KAAT,CAAee,OAAf,CAAuBG,kBAAvB,CAA0CY,QAA1C,CAAmDpD,EAAE,CAAC4B,IAAtD,CAAjB;;IACA,IAAIuB,QAAJ,EAAc;MACZ,OAAOH,cAAc,CAClB,aAAYhD,EAAE,CAACqD,sBAAH,EAA4B,2GADtB,CAArB;IAGD;;IACD,MAAMC,IAAI,GAAGnG,QAAQ,CAACmE,KAAT,CAAee,OAA5B;IACA,MAAM5D,OAAO,GAAGuB,EAAE,CAACvB,OAAnB;IACA,MAAM8E,aAAa,GAAGlC,cAAc,CAACU,MAAf,CAAsBtD,OAAtB,CAAtB;IACA,MAAM+E,gBAAgB,GAAGrG,QAAQ,CAACsG,MAAT,CAAgBC,eAAhB,CAAgC1D,EAAhC,EAAoC;MAAE2D,aAAa,EAAE;IAAjB,CAApC,CAAzB;IACA,MAAMC,eAAwB,GAAG,MAAMvC,cAAc,CAACwC,WAAf,CAA2BpF,OAA3B,EAAoCtB,QAAQ,CAACmE,KAAT,CAAee,OAAnD,CAAvC;;IACA,IAAIuB,eAAe,CAACE,SAAhB,EAAJ,EAAiC;MAC/B,OAAOd,cAAc,CAAE,4BAAF,EAA+B,IAA/B,CAArB;IACD;;IACD,MAAMe,YAAY,GAAG,MAAM;MACzB,IAAIP,gBAAJ,EAAsB,OAAOA,gBAAP;;MACtB,IAAIjD,SAAJ,EAAe;QACb,MAAMyD,QAAQ,GAAGzD,SAAS,CAAC0D,YAAV,CAAuBjE,EAAvB,CAAjB;QACA,IAAI,CAACgE,QAAL,EAAe,OAAO,IAAP;QACf,OAAOA,QAAQ,CAAChE,EAAT,CAAYkE,aAAZ,CAA0BF,QAAQ,CAAC/F,IAAT,CAAcgC,QAAd,EAA1B,CAAP;MACD,CANwB,CAOzB;;;MACA,MAAMhC,IAAI,GAAGoD,cAAc,CAAC8C,mBAAf,EAAb;;MACA,IAAIlG,IAAJ,EAAU;QACR,OAAO+B,EAAE,CAACkE,aAAH,CAAiBjG,IAAjB,CAAP;MACD;;MACD,OAAO,IAAP;IACD,CAbD;;IAcA,MAAMmG,SAAS,GAAGL,YAAY,EAA9B;;IACA,IAAI,CAACK,SAAL,EAAgB;MACd,MAAMC,WAAW,GAAG,MAAM,IAAAC,gCAAA,EAAehB,IAAf,EAAqBjC,cAArB,EAAqCkC,aAArC,EAAoD,IAApD,EAA0D,KAA1D,CAA1B;MACA,OAAO;QAAEpC,gBAAgB,EAAE,IAApB;QAA0BoD,kBAAkB,EAAEX,eAA9C;QAA+D5D,EAA/D;QAAmElC,YAAY,EAAE,IAAjF;QAAuFuG;MAAvF,CAAP;IACD;;IACD,MAAMG,mBAAmB,GAAG,MAAM;MAChC,IAAIhB,gBAAJ,EAAsB,OAAOrG,QAAQ,CAACsH,aAAT,CAAuBjB,gBAAvB,CAAP;MACtB,OAAOrG,QAAQ,CAACmE,KAAT,CAAeoD,oBAAf,CAAoCN,SAApC,CAAP;IACD,CAHD;;IAIA,MAAMjD,gBAAgB,GAAG,MAAMqD,mBAAmB,EAAlD;;IACA,MAAMG,UAAU,GAAG,YAAY;MAC7B,MAAMC,2BAA2B,GAAG,MAAMzH,QAAQ,CAAC0H,sBAAT,CAAgC1D,gBAAgB,CAACnB,EAAjD,CAA1C;MACA,IAAI,CAAC4E,2BAA2B,CAACE,QAAjC,EAA2C,OAAO,KAAP;MAC3C,IAAI,CAACtB,gBAAL,EAAuB,OAAO,KAAP;MACvB,MAAMuB,aAAa,GAAG,MAAM1D,cAAc,CAACwC,WAAf,CAC1BL,gBAAgB,CAAC/E,OADS,EAE1BtB,QAAQ,CAACmE,KAAT,CAAee,OAFW,CAA5B;MAIA,OAAOU,OAAO,SAAP,IAAAA,OAAO,WAAP,IAAAA,OAAO,CAAEiC,mBAAT,GACH7H,QAAQ,CAAC8H,6BAAT,CAAuCF,aAAvC,EAAsD5D,gBAAtD,CADG,GAEH,IAFJ;IAGD,CAXD;;IAaA,MAAM+D,mBAAmB,GAAG,MAAMP,UAAU,EAA5C;;IAEA,IAAIO,mBAAJ,EAAyB;MACvB,OAAOlC,cAAc,CAAE,iDAAF,CAArB;IACD;;IACD,MAAMmC,iCAAiC,GACrC5E,SAAS,KAAIiD,gBAAJ,aAAIA,gBAAJ,uBAAIA,gBAAgB,CAAE/E,OAAtB,CAAT,IAA0C,0BAAA4C,cAAc,CAAC+D,aAAf,gFAA8BnF,QAA9B,SAA6CuD,gBAA7C,aAA6CA,gBAA7C,uBAA6CA,gBAAgB,CAAE/E,OAA/D,CAD5C;IAEA,MAAM4G,SAAS,GAAGF,iCAAiC,GAAGG,cAAA,CAAI3D,IAAJ,CAAS6B,gBAAgB,CAAC/E,OAA1B,CAAH,GAAwC,IAA3F;;IAEA,IAAI,CAAC8E,aAAL,EAAoB;MAClB,MAAM,IAAIgC,KAAJ,CAAW,kDAAiD9G,OAAQ,OAAMuB,EAAE,CAACC,QAAH,EAAc,EAAxF,CAAN;IACD;;IACD,MAAMoE,WAAW,GAAG,MAAM,IAAAC,gCAAA,EAAehB,IAAf,EAAqBjC,cAArB,EAAqCkC,aAArC,EAAoD8B,SAApD,EAA+D,KAA/D,CAA1B;;IACA,IAAIhB,WAAW,CAACmB,GAAhB,EAAqB;MACnB,MAAMC,QAAQ,GAAGpE,cAAc,CAACpD,IAAhC;;MACA,IAAIoG,WAAW,CAACmB,GAAZ,YAA2BE,4BAA3B,IAA2C3C,OAA3C,aAA2CA,OAA3C,eAA2CA,OAAO,CAAE4C,gBAApD,IAAwEF,QAA5E,EAAsF;QACpF,MAAMG,kBAAkB,GAAGvB,WAAW,CAACwB,gBAAZ,CAA6BpF,IAA7B,CAAmCqF,IAAD,IAAUL,QAAQ,CAACM,OAAT,CAAiBD,IAAjB,CAA5C,CAA3B;QACA,MAAME,mBAAmB,GAAG3B,WAAW,CAAC4B,iBAAZ,CAA8BxF,IAA9B,CAAoCqF,IAAD,IAAUL,QAAQ,CAACM,OAAT,CAAiBD,IAAjB,CAA7C,CAA5B;;QACA,IAAI,CAACF,kBAAD,IAAuB,CAACI,mBAA5B,EAAiD;UAC/C,OAAOhD,cAAc,CAClB,sBAAqB7B,gBAAgB,CAACnB,EAAjB,CAAoBC,QAApB,EAA+B,2BAA0BwF,QAAQ,CAACxF,QAAT,EAAoB,gFADhF,CAArB;QAGD;;QACD,MAAMiG,mBAAmB,GAAGN,kBAAkB,GAAGzE,gBAAgB,CAACnB,EAAjB,CAAoBvB,OAAvB,GAAiCuB,EAAE,CAACvB,OAAlF;QACA,MAAM0H,WAAW,GAAG9E,cAAc,CAACU,MAAf,CAAsBmE,mBAAtB,CAApB;QACA,IAAI,CAACC,WAAL,EAAkB,MAAM,IAAIZ,KAAJ,CAAW,yBAAwBW,mBAAoB,UAASlG,EAAE,CAACC,QAAH,EAAc,GAA9E,CAAN;;QAClB,IAAI,CAAA8C,OAAO,SAAP,IAAAA,OAAO,WAAP,YAAAA,OAAO,CAAE4C,gBAAT,MAA8B,QAAlC,EAA4C;UAC1C;UACA,OAAO;YACLxE,gBADK;YAELoD,kBAAkB,EAAEX,eAFf;YAGL5D,EAHK;YAILlC,YAAY,EAAE,IAJT;YAKLuG,WALK;YAMLjD,iBAAiB,EAAE;cAAEgF,QAAQ,EAAE,QAAZ;cAAsBnI,IAAI,EAAEkI;YAA5B;UANd,CAAP;QAQD;;QACD,IAAI,CAAApD,OAAO,SAAP,IAAAA,OAAO,WAAP,YAAAA,OAAO,CAAE4C,gBAAT,MAA8B,MAAlC,EAA0C;UACxC,OAAO;YACLxE,gBADK;YAELnB,EAFK;YAGLlC,YAAY,EAAE,IAHT;YAILuG,WAJK;YAKLjD,iBAAiB,EAAE;cAAEgF,QAAQ,EAAE,MAAZ;cAAoBnI,IAAI,EAAEkI;YAA1B;UALd,CAAP;QAOD;;QACD,MAAM,IAAIZ,KAAJ,CACH,yBAAwBxC,OAAzB,aAAyBA,OAAzB,uBAAyBA,OAAO,CAAE4C,gBAAiB,kEAD/C,CAAN;MAGD;;MACD,OAAO3C,cAAc,CAClB,sBAAqB7B,gBAAgB,CAACnB,EAAjB,CAAoBC,QAApB,EAA+B,oBAAmBoE,WAAW,CAACmB,GAAZ,CAAgB9H,OAAQ,EAD7E,CAArB;IAGD;;IACD,IAAI,CAAC2G,WAAW,CAACgC,UAAZ,EAAL,EAA+B;MAC7B,IAAIhC,WAAW,CAACiC,YAAZ,EAAJ,EAAgC;QAC9B;QACA,OAAOtD,cAAc,CAAE,aAAY7B,gBAAgB,CAACnB,EAAjB,CAAoBC,QAApB,EAA+B,6BAA7C,EAA2E,IAA3E,CAArB;MACD;;MACD,IAAIoE,WAAW,CAACkC,aAAZ,EAAJ,EAAiC;QAC/B;QACA,OAAO;UACLpF,gBADK;UAELoD,kBAAkB,EAAEX,eAFf;UAGL5D,EAHK;UAILlC,YAAY,EAAE,IAJT;UAKLuG;QALK,CAAP;MAOD,CAd4B,CAe7B;;;MACA,OAAOrB,cAAc,CAAE,aAAY7B,gBAAgB,CAACnB,EAAjB,CAAoBC,QAApB,EAA+B,oBAA7C,EAAkE,IAAlE,CAArB;IACD;;IACD,MAAMuG,QAAQ,GAAGnC,WAAW,CAACoC,uBAA7B,CAzI+B,CAyI8B;;IAC7D,MAAM1B,aAAsB,GAAG,MAAM1D,cAAc,CAACwC,WAAf,CAA2B2C,QAAQ,CAACvG,QAAT,EAA3B,EAAgDqD,IAAhD,CAArC;IACA,MAAMoD,cAAuB,GAAG,MAAMrF,cAAc,CAACwC,WAAf,CAA2BN,aAAa,CAACtD,QAAd,EAA3B,EAAqDqD,IAArD,CAAtC;IACA,MAAMqD,eAAe,GAAG,CAAApG,SAAS,SAAT,IAAAA,SAAS,WAAT,YAAAA,SAAS,CAAEqG,QAAX,GAAsB3G,QAAtB,OAAoC,MAA5D;IACA,MAAMnC,YAAY,GAAG,MAAM,IAAA+I,wBAAA,EAAc;MACvC1J,QADuC;MAEvCuJ,cAFuC;MAGvCI,UAAU,EAAG,GAAEvD,aAAa,CAACtD,QAAd,EAAyB,KAAI6C,aAAc,GAHnB;MAIvC3B,gBAJuC;MAKvC4F,YAAY,EAAG,GAAE3C,SAAS,CAAC3F,OAAQ,KAAIkI,eAAgB,GALhB;MAMvC5B;IANuC,CAAd,CAA3B;IAQA,OAAO;MAAE5D,gBAAF;MAAoBnB,EAApB;MAAwBlC,YAAxB;MAAsCuG;IAAtC,CAAP;EACD;;EAEyB,MAAZxC,YAAY,CAAC;IACzBV,gBADyB;IAEzBnB,EAFyB;IAGzBlC,YAHyB;IAIzBR,aAJyB;IAKzBwE,UALyB;IAMzBxB,MANyB;IAOzBC,SAPyB;IAQzBa;EARyB,CAAD,EAkBM;IAC9B,MAAMjE,QAAQ,GAAG,KAAKJ,SAAL,CAAeI,QAAhC;IACA,IAAI6J,WAAW,GAAG,EAAlB;IACA,MAAMC,iBAAoC,GAAG;MAC3C;MACAjH,EAAE,EAAE;QAAE4B,IAAI,EAAE5B,EAAE,CAAC4B,IAAX;QAAiBN,KAAK,EAAEtB,EAAE,CAACsB;MAA3B,CAFuC;MAG3CrD,IAAI,EAAE6D,UAHqC;MAI3CoF,MAAM,EAAE5G,MAAM,CAACgB,KAJ4B;MAIrB;MACtB6F,IAAI,EAAE7G,MAAM,CAACsB,IAL8B;MAKxB;MACnBtB;IAN2C,CAA7C;IAQAN,EAAE,GAAGmB,gBAAgB,GAAGA,gBAAgB,CAACnB,EAApB,GAAyBA,EAA9C;IAEA,MAAMqB,cAAc,GAAG,MAAMlE,QAAQ,CAACmE,KAAT,CAAeC,iBAAf,CAAiCvB,EAAjC,CAA7B;;IACA,MAAMoH,sBAAsB,GAAG,MAAM;MACnC,IAAI,CAACjG,gBAAL,EAAuB,MAAM,IAAIoE,KAAJ,CAAU,yDAAV,CAAN;MACvB,IAAI,CAAChF,SAAL,EAAgB,MAAM,IAAIgF,KAAJ,CAAU,kDAAV,CAAN;MAChB,IAAI,EAACnE,iBAAD,aAACA,iBAAD,eAACA,iBAAiB,CAAEnD,IAApB,CAAJ,EAA8B,MAAM,IAAIsH,KAAJ,CAAU,uCAAV,CAAN;MAC9BhF,SAAS,CAAC8G,YAAV,CAAuB;QAAErH,EAAF;QAAM/B,IAAI,EAAEmD,iBAAiB,CAACnD;MAA9B,CAAvB;MACA,MAAMA,IAAI,GAAGoD,cAAc,CAACU,MAAf,CAAsBZ,gBAAgB,CAACnB,EAAjB,CAAoBvB,OAA1C,CAAb;MACA,IAAI,CAACR,IAAL,EAAW,MAAM,IAAIsH,KAAJ,CAAW,iDAAgDvF,EAAE,CAACC,QAAH,EAAc,EAAzE,CAAN;MACXgH,iBAAiB,CAAC3G,MAAlB,GAA2BC,SAAS,CAACqG,QAAV,EAA3B;MACAK,iBAAiB,CAAChJ,IAAlB,GAAyBA,IAAzB;MACAgJ,iBAAiB,CAACK,SAAlB,GAA8B,IAA9B;MACAnK,QAAQ,CAACmE,KAAT,CAAee,OAAf,CAAuBG,kBAAvB,CAA0C+E,QAA1C,CAAmDN,iBAAnD;MACA,OAAO;QAAEjH,EAAF;QAAMgH;MAAN,CAAP;IACD,CAZD;;IAcA,MAAMQ,uBAAuB,GAAG,MAAM;MACpC,IAAI,CAACrG,gBAAL,EAAuB,MAAM,IAAIoE,KAAJ,CAAW,mDAAkDvF,EAAE,CAACC,QAAH,EAAc,EAA3E,CAAN;MACvBkB,gBAAgB,CAACsG,KAAjB,CAAuBC,OAAvB,CAAgCC,IAAD,IAAU;QACvCX,WAAW,CAAC,IAAAY,6BAAA,EAAqBD,IAAI,CAACE,QAA1B,CAAD,CAAX,GAAmDC,0BAAA,CAAWC,SAA9D;MACD,CAFD;IAGD,CALD;;IAMA,IAAIjK,YAAY,IAAIA,YAAY,CAAC6C,YAA7B,IAA6CrD,aAAa,KAAK0K,4BAAA,CAAaC,IAAhF,EAAsF;MACpFT,uBAAuB;MACvBrK,QAAQ,CAACmE,KAAT,CAAee,OAAf,CAAuBG,kBAAvB,CAA0C+E,QAA1C,CAAmDN,iBAAnD;MACA,OAAO;QAAEjH,EAAF;QAAMgH;MAAN,CAAP;IACD;;IACD,IAAI,CAAA5F,iBAAiB,SAAjB,IAAAA,iBAAiB,WAAjB,YAAAA,iBAAiB,CAAEgF,QAAnB,MAAgC,MAApC,EAA4C;MAC1CoB,uBAAuB;MACvB,OAAOJ,sBAAsB,EAA7B;IACD;;IACD,MAAMc,QAAQ,GAAGlI,EAAE,CAACkE,aAAH,CAAiBpC,UAAU,CAAC7B,QAAX,EAAjB,CAAjB;IACA,MAAMkI,QAAQ,GAAG,CAACrK,YAAD,IAAiBR,aAAa,KAAK0K,4BAAA,CAAaI,MAAhD,GAAyDF,QAAzD,GAAoElI,EAArF;IACA,MAAMqI,yBAAyB,GAAG,MAAMlL,QAAQ,CAACmL,sCAAT,CAAgDH,QAAhD,CAAxC;IACA,MAAMV,KAAK,GAAGY,yBAAyB,CAAC3H,SAA1B,CAAoC+G,KAAlD;IACAA,KAAK,CAACC,OAAN,CAAeC,IAAD,IAAU;MACtB;MACAX,WAAW,CAAC,IAAAY,6BAAA,EAAqBD,IAAI,CAACE,QAA1B,CAAD,CAAX,GAAmDC,0BAAA,CAAWS,OAA9D;IACD,CAHD;;IAKA,IAAIzK,YAAJ,EAAkB;MAChB;MACA,MAAM;QAAEkJ,WAAW,EAAEwB,cAAf;QAA+BC;MAA/B,IAAiD,IAAAC,uCAAA,EAAqBjB,KAArB,EAA4B3J,YAA5B,EAA0CR,aAA1C,CAAvD;MACA+K,yBAAyB,CAAC3H,SAA1B,CAAoC+G,KAApC,GAA4CgB,aAA5C;MACAzB,WAAW,mCAAQA,WAAR,GAAwBwB,cAAxB,CAAX;IACD;;IAED,MAAMG,oBAAoB,GAAG,KAAIC,+BAAJ,EAAyB;MACpDzL,QADoD;MAEpD0L,0BAA0B,EAAE,CAACR,yBAAD,CAFwB;MAGpDS,kBAAkB,EAAE,KAHgC;MAIpDC,QAAQ,EAAE,IAJ0C;MAKpDC,WAAW,EAAE,KALuC;MAKhC;MACpBC,OAAO,EAAE,KAN2C;MAMpC;MAChBC,UAAU,EAAE,IAPwC;MAOlC;MAClBC,gBAAgB,EAAE;IARkC,CAAzB,CAA7B;IAUA,MAAMR,oBAAoB,CAACS,QAArB,EAAN,CArE8B,CAuE9B;IACA;;IACA,IAAItL,YAAJ,EAAkB;MAChB,IAAIA,YAAY,CAAC6C,YAAb,IAA6BrD,aAAa,KAAK0K,4BAAA,CAAaqB,MAAhE,EAAwE;QACtEpC,iBAAiB,CAACqC,aAAlB,GAAkCxL,YAAY,CAAC2K,aAAb,CAA2BnJ,MAA3B,CAAmCiK,CAAD,IAAOA,CAAC,CAACC,QAA3C,EAAqD5J,GAArD,CAA0D2J,CAAD,IAAOA,CAAC,CAACE,QAAlE,CAAlC;MACD;;MACDtM,QAAQ,CAACmE,KAAT,CAAee,OAAf,CAAuBG,kBAAvB,CAA0C+E,QAA1C,CAAmDN,iBAAnD;IACD,CALD,MAKO,IAAI1G,SAAJ,EAAe;MACpB,IAAIa,iBAAJ,EAAuB;QACrB;QACA,OAAOgG,sBAAsB,EAA7B;MACD;;MACD7G,SAAS,CAAC8G,YAAV,CAAuB;QAAErH,EAAF;QAAM/B,IAAI,EAAE6D;MAAZ,CAAvB;IACD,CANM,MAMA;MACL;MACAT,cAAc,CAACqI,OAAf,CAAuB5H,UAAvB,EAFK,CAGL;;MACAT,cAAc,CAACsI,kBAAf,CAAkC7H,UAAU,CAAC7B,QAAX,EAAlC;MACA9C,QAAQ,CAACmE,KAAT,CAAee,OAAf,CAAuBC,GAAvB,CAA2BjB,cAA3B;IACD;;IAED,OAAO;MAAErB,EAAF;MAAMgH;IAAN,CAAP;EACD;;EAEuB,MAAV7I,UAAU,CAACd,MAAD,EAAiD;IACvE,MAAMF,QAAQ,GAAG,KAAKJ,SAAL,CAAeI,QAAhC;IACA,MAAMuB,GAAG,GAAG,MAAM,KAAKkL,iBAAL,CAAuBvM,MAAvB,CAAlB;IACA,MAAMwM,OAAO,GAAG,MAAM,KAAK3M,QAAL,CAAcA,QAAd,CAAuB;MAAEwB,GAAF;MAAOoL,KAAK,EAAE;IAAd,CAAvB,CAAtB;IACApL,GAAG,CAACgJ,OAAJ,CAAa1H,EAAD,IAAQ7C,QAAQ,CAACmE,KAAT,CAAee,OAAf,CAAuBG,kBAAvB,CAA0CuH,eAA1C,CAA0D/J,EAAE,CAACgK,QAA7D,CAApB;IACA,MAAM7M,QAAQ,CAACmE,KAAT,CAAee,OAAf,CAAuBG,kBAAvB,CAA0CC,KAA1C,EAAN;IACA,OAAO;MAAEwH,iBAAiB,EAAEJ,OAAO,CAACjH;IAA7B,CAAP;EACD;;EAEyB,MAAZ1E,YAAY,CAACb,MAAD,EAAmByB,WAAnB,EAAwCnB,KAAxC,EAAsF;IAC9G,MAAMe,GAAG,GAAG,MAAM,KAAKkL,iBAAL,CAAuBvM,MAAvB,CAAlB,CAD8G,CAE9G;;IACA,MAAM;MAAE6M;IAAF,IAAwB,MAAM,KAAKjN,QAAL,CAAc6I,IAAd,CAAmB;MACrDqE,YAAY,EAAEC,eAAA,CAAOC,SAAP,CAAiB3L,GAAG,CAACkB,GAAJ,CAASI,EAAD,IAAQA,EAAE,CAACsK,OAAnB,CAAjB,CADuC;MAErD3M,KAFqD;MAGrDD,OAAO,EAAEoB;IAH4C,CAAnB,CAApC;IAKA,OAAO;MAAEyL,kBAAkB,EAAEL;IAAtB,CAAP;EACD;;EAEmC,MAAtB9K,sBAAsB,CAClCd,MADkC,EAElCgC,MAFkC,EAGlCkK,eAHkC,EAID;IACjC,MAAMC,GAAG,GAAG,KAAIC,mBAAJ,EAAQ,KAAKvN,QAAL,CAAcmE,KAAtB,CAAZ;;IACA,IAAI;MACF,MAAMqJ,gBAAgB,GAAG,MAAMC,OAAO,CAACC,GAAR,CAC7BvM,MAAM,CAACsB,GAAP,CAAW,MAAOkL,KAAP,IAAiB;QAC1B,MAAMC,eAAe,GAAGzK,MAAM,CAACmB,SAAP,KAAqBqJ,KAAK,CAACxJ,KAA3B,GAAmChB,MAAM,CAACgB,KAAlE;;QACA,MAAM0J,YAAY,GAAGtJ,gBAAA,CAAOC,IAAP,CAAYrB,MAAM,CAACsB,IAAnB,EAAyBmJ,eAAzB,CAArB;;QACA,MAAMjJ,UAAU,GAAG,MAAM,KAAK3E,QAAL,CAAcmE,KAAd,CAAoBe,OAApB,CAA4B4I,WAA5B,CAAwClJ,MAAxC,CAA+CiJ,YAA/C,EAA6DF,KAA7D,CAAzB;QACA,MAAMI,SAAS,GAAGF,YAAY,CAAC/K,QAAb,EAAlB;QACA,IAAI,CAAC6B,UAAL,EACE,MAAM,KAAI1B,oBAAJ,EAAc,oCAAmC0K,KAAK,CAACzH,sBAAN,EAA+B,SAAQ6H,SAAU,GAAlG,CAAN;QACF,OAAO,KAAKrI,uBAAL,CAA6BiI,KAAK,CAAC5G,aAAN,CAAoBpC,UAAU,CAAC7B,QAAX,EAApB,CAA7B,EAAyEuK,eAAzE,EAA0FU,SAA1F,CAAP;MACD,CARD,CAD6B,CAA/B;MAWA,MAAMT,GAAG,CAACU,KAAJ,EAAN;MACA,OAAOR,gBAAP;IACD,CAdD,CAcE,OAAOnF,GAAP,EAAiB;MACjB,MAAMiF,GAAG,CAACU,KAAJ,EAAN;MACA,MAAM3F,GAAN;IACD;EACF;;EAEmC,MAAtB7C,sBAAsB,CAClCxF,QADkC,EAElC2B,WAFkC,EAGlCnB,KAHkC,EAI+D;IACjG,MAAM6E,kBAAkB,GAAGrF,QAAQ,CAACmE,KAAT,CAAee,OAAf,CAAuBG,kBAAvB,CAA0C4I,aAA1C,EAA3B;;IACAC,iBAAA,CAAOC,KAAP,CAAc,8CAA6C9I,kBAAkB,CAAC9C,MAAnB,CAA0BO,QAA1B,EAAqC,aAAhG;;IACA,IAAI,CAACuC,kBAAkB,CAAC9C,MAAxB,EAAgC,OAAO,IAAP;;IAChC,MAAMhB,GAAG,GAAG0L,eAAA,CAAOC,SAAP,CAAiB7H,kBAAkB,CAAC5C,GAAnB,CAAwB2L,CAAD,IAAO,KAAInN,cAAJ,EAAUmN,CAAC,CAACvL,EAAZ,CAA9B,CAAjB,CAAZ;;IACA,OAAO,KAAK/C,QAAL,CAAc6I,IAAd,CAAmB;MACxBqE,YAAY,EAAEzL,GADU;MAExBf,KAFwB;MAGxBD,OAAO,EAAEoB;IAHe,CAAnB,CAAP;EAKD;;EAE8B,MAAjB8K,iBAAiB,CAAC4B,MAAD,EAA4C;IACzE,IAAIA,MAAM,IAAIA,MAAM,CAAC9L,MAArB,EAA6B;MAC3B,MAAM+L,YAAY,GAAG,MAAM,KAAK1O,SAAL,CAAe2O,2BAAf,CAA2CF,MAA3C,CAA3B;MACAC,YAAY,CAAC/D,OAAb,CAAsB1H,EAAD,IAAQ;QAC3B,MAAM2L,KAAK,GAAG,KAAK5O,SAAL,CAAeI,QAAf,CAAwBmE,KAAxB,CAA8Be,OAA9B,CAAsCG,kBAAtC,CAAyDY,QAAzD,CAAkEpD,EAAE,CAACgK,QAArE,CAAd;;QACA,IAAI,CAAC2B,KAAL,EAAY;UACV,MAAM,KAAIC,uBAAJ,EAAkB,2BAA0B5L,EAAE,CAACC,QAAH,EAAc,kCAA1D,CAAN;QACD;MACF,CALD;MAMA,OAAOwL,YAAP;IACD;;IACD,MAAMI,oBAAoB,GAAG,KAAK9O,SAAL,CAAeI,QAAf,CAAwBmE,KAAxB,CAA8Be,OAA9B,CAAsCG,kBAAtC,CAAyD4I,aAAzD,EAA7B;IACA,IAAI,CAACS,oBAAoB,CAACnM,MAA1B,EAAkC,MAAM,KAAIkM,uBAAJ,EAAkB,oDAAlB,CAAN;IAClC,OAAOC,oBAAoB,CAACjM,GAArB,CAA0BkM,CAAD,IAAOC,0BAAA,CAAYC,UAAZ,CAAuB,KAAI5N,cAAJ,EAAU0N,CAAC,CAAC9L,EAAZ,CAAvB,CAAhC,CAAP;EACD;;EAEOzB,oBAAoB,CAACpB,QAAD,EAAqBuB,GAArB,EAA6C;IACvE,IAAI,IAAAuN,sBAAA,EAAYvN,GAAZ,CAAJ,EAAsB;MACpB,MAAMwN,cAAc,GAAG,KAAIC,yBAAJ,EAAmBhP,QAAnB,CAAvB;MACA,OAAO+O,cAAc,CAACE,+BAAf,CAA+C1N,GAA/C,CAAP;IACD;;IACD,OAAOA,GAAG,CAACkB,GAAJ,CAASI,EAAD,IAAQ7C,QAAQ,CAACkP,WAAT,CAAqBrM,EAArB,CAAhB,CAAP;EACD;;EAKoB,aAARsM,QAAQ,CAAC,CAACC,GAAD,EAAMxP,SAAN,EAAiBE,QAAjB,EAA2BC,QAA3B,EAAqCF,OAArC,CAAD,EAMlB;IACD,MAAMwP,OAAO,GAAG,IAAI3P,WAAJ,CAAgBE,SAAhB,EAA2BC,OAA3B,EAAoCC,QAApC,EAA8CC,QAA9C,CAAhB;IACAqP,GAAG,CAACE,QAAJ,CAAa,KAAIC,oBAAJ,EAAaF,OAAb,CAAb;IACA,OAAOA,OAAP;EACD;;AAjjBsB;;;gCAAZ3P,W,WAoiBI,E;gCApiBJA,W,kBAqiBW,CAAC8P,gBAAD,EAAYC,oBAAZ,EAA6BC,mBAA7B,EAA6CC,0BAA7C,EAA6DC,wBAA7D,C;gCAriBXlQ,W,aAsiBMmQ,kB;;AAcnBC,wBAAA,CAAcC,UAAd,CAAyBrQ,WAAzB"}
+{"version":3,"names":["MergingMain","constructor","workspace","install","snapping","checkout","consumer","merge","values","mergeStrategy","abort","resolve","noSnap","message","build","skipDependencyInstallation","ConsumerNotFound","mergeResults","firstValue","R","head","resolveMerge","abortMerge","BitId","isValidVersion","bitIds","getComponentsToMerge","mergeComponentsFromRemote","version","ids","tail","mergeVersion","onDestroy","snapMessage","currentLaneId","getCurrentLaneId","currentLaneObject","getCurrentLaneObject","allComponentsStatus","getAllComponentsStatus","failedComponents","filter","c","unmergedMessage","unmergedLegitimately","length","failureMsgs","map","failedComponent","chalk","bold","id","toString","red","join","BitError","mergeSnaps","laneId","localLane","tag","componentWithConflict","find","component","hasConflicts","getMergeStrategyInteractive","componentStatus","failureMessage","unchangedLegitimately","succeededComponents","componentsResults","mapSeries","currentComponent","resolvedUnrelated","modelComponent","scope","getModelComponent","updatedLaneId","isDefault","LaneId","from","name","applyVersion","remoteHead","getRef","leftUnresolvedConflicts","undefined","dedupe","updateExisting","import","objects","add","persist","unmergedComponents","write","getSnapOrTagResults","idsToTag","results","tagAllLaneComponent","taggedComponents","autoTaggedResults","snappedComponents","autoSnappedResults","snapResolvedComponents","mergeSnapResults","components","getComponentMergeStatus","otherLaneName","options","returnUnmerged","msg","getModelComponentIfExist","unmerged","getEntry","toStringWithoutVersion","repo","otherLaneHead","existingBitMapId","bitMap","getBitIdIfExist","ignoreVersion","componentOnLane","loadVersion","isRemoved","getCurrentId","idOnLane","getComponent","changeVersion","getHeadAsTagIfExist","currentId","divergeData","getDivergeData","componentFromModel","getCurrentComponent","loadComponent","getConsumerComponent","isModified","componentModificationStatus","getComponentStatusById","modified","baseComponent","ignoreConfigChanges","isComponentSourceCodeModified","isComponentModified","laneHeadIsDifferentThanCheckedOut","laneHeadLocal","localHead","Ref","Error","err","mainHead","NoCommonSnap","resolveUnrelated","hasResolvedLocally","snapsOnLocalOnly","snap","isEqual","hasResolvedRemotely","snapsOnRemoteOnly","versionToSaveInLane","resolvedRef","strategy","isDiverged","isLocalAhead","isRemoteAhead","baseSnap","commonSnapBeforeDiverge","otherComponent","currentLaneName","toLaneId","threeWayMerge","otherLabel","currentLabel","filesStatus","unmergedComponent","remote","lane","handleResolveUnrelated","addComponent","unrelated","addEntry","markAllFilesAsUnchanged","files","forEach","file","pathNormalizeToLinux","relative","FileStatus","unchanged","MergeOptions","ours","remoteId","idToLoad","theirs","componentWithDependencies","loadComponentWithDependenciesFromModel","updated","modifiedStatus","modifiedFiles","applyModifiedVersion","manyComponentsWriter","ManyComponentsWriter","componentsWithDependencies","installNpmPackages","override","writeConfig","verbose","writeDists","writePackageJson","writeAll","manual","unmergedPaths","f","conflict","filePath","setHead","markVersionAsLocal","getIdsForUnmerged","reset","removeComponent","fullName","abortedComponents","legacyBitIds","BitIds","fromArray","_legacy","resolvedComponents","localLaneObject","tmp","Tmp","componentsStatus","Promise","all","bitId","remoteScopeName","remoteLaneId","remoteLanes","laneIdStr","clear","getComponents","logger","debug","r","tagMessage","unmodified","idsStr","componentIds","resolveMultipleComponentIds","entry","GeneralError","unresolvedComponents","u","ComponentID","fromLegacy","hasWildcard","componentsList","ComponentsList","listComponentsByIdsWithWildcard","getParsedId","provider","cli","merging","register","MergeCmd","CLIAspect","WorkspaceAspect","SnappingAspect","CheckoutAspect","InstallAspect","MainRuntime","MergingAspect","addRuntime"],"sources":["merging.main.runtime.ts"],"sourcesContent":["import { CLIAspect, CLIMain, MainRuntime } from '@teambit/cli';\nimport WorkspaceAspect, { Workspace } from '@teambit/workspace';\nimport R from 'ramda';\nimport { Consumer } from '@teambit/legacy/dist/consumer';\nimport ComponentsList from '@teambit/legacy/dist/consumer/component/components-list';\nimport {\n  ApplyVersionResults,\n  MergeStrategy,\n  mergeVersion,\n  ApplyVersionResult,\n  FailedComponents,\n  FileStatus,\n  getMergeStrategyInteractive,\n  MergeOptions,\n} from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport { ConsumerNotFound } from '@teambit/legacy/dist/consumer/exceptions';\nimport SnappingAspect, { SnappingMain } from '@teambit/snapping';\nimport hasWildcard from '@teambit/legacy/dist/utils/string/has-wildcard';\nimport mapSeries from 'p-map-series';\nimport { BitId, BitIds } from '@teambit/legacy/dist/bit-id';\nimport { BitError } from '@teambit/bit-error';\nimport GeneralError from '@teambit/legacy/dist/error/general-error';\nimport { LaneId } from '@teambit/lane-id';\nimport logger from '@teambit/legacy/dist/logger/logger';\nimport { AutoTagResult } from '@teambit/legacy/dist/scope/component-ops/auto-tag';\nimport { getDivergeData } from '@teambit/legacy/dist/scope/component-ops/get-diverge-data';\nimport { UnmergedComponent } from '@teambit/legacy/dist/scope/lanes/unmerged-components';\nimport { Lane, Version } from '@teambit/legacy/dist/scope/models';\nimport { Ref } from '@teambit/legacy/dist/scope/objects';\nimport chalk from 'chalk';\nimport { Tmp } from '@teambit/legacy/dist/scope/repositories';\nimport { pathNormalizeToLinux } from '@teambit/legacy/dist/utils';\nimport ManyComponentsWriter from '@teambit/legacy/dist/consumer/component-ops/many-components-writer';\nimport ConsumerComponent from '@teambit/legacy/dist/consumer/component/consumer-component';\nimport { applyModifiedVersion } from '@teambit/legacy/dist/consumer/versions-ops/checkout-version';\nimport threeWayMerge, {\n  MergeResultsThreeWay,\n} from '@teambit/legacy/dist/consumer/versions-ops/merge-version/three-way-merge';\nimport { NoCommonSnap } from '@teambit/legacy/dist/scope/exceptions/no-common-snap';\nimport { CheckoutAspect, CheckoutMain } from '@teambit/checkout';\nimport { ComponentID } from '@teambit/component-id';\nimport { DivergeData } from '@teambit/legacy/dist/scope/component-ops/diverge-data';\nimport { TagResults } from '@teambit/legacy/dist/api/consumer/lib/tag';\nimport { InstallMain, InstallAspect } from '@teambit/install';\nimport { MergeCmd } from './merge-cmd';\nimport { MergingAspect } from './merging.aspect';\n\ntype ResolveUnrelatedData = { strategy: MergeStrategy; head: Ref };\n\nexport type ComponentMergeStatus = {\n  currentComponent?: ConsumerComponent | null;\n  componentFromModel?: Version;\n  id: BitId;\n  unmergedMessage?: string;\n  unmergedLegitimately?: boolean; // failed to merge but for a legitimate reason, such as, up-to-date\n  mergeResults?: MergeResultsThreeWay | null;\n  divergeData?: DivergeData;\n  resolvedUnrelated?: ResolveUnrelatedData;\n};\n\nexport class MergingMain {\n  private consumer: Consumer;\n  constructor(\n    private workspace: Workspace,\n    private install: InstallMain,\n    private snapping: SnappingMain,\n    private checkout: CheckoutMain\n  ) {\n    this.consumer = this.workspace?.consumer;\n  }\n\n  /**\n   * merge components according to the \"values\" param.\n   * if the first param is a version, then merge the component ids to that version.\n   * otherwise, merge from the remote head to the local.\n   */\n  async merge(\n    values: string[],\n    mergeStrategy: MergeStrategy,\n    abort: boolean,\n    resolve: boolean,\n    noSnap: boolean,\n    message: string,\n    build: boolean,\n    skipDependencyInstallation: boolean\n  ): Promise<ApplyVersionResults> {\n    if (!this.workspace) throw new ConsumerNotFound();\n    const consumer: Consumer = this.workspace.consumer;\n    let mergeResults;\n    const firstValue = R.head(values);\n    if (resolve) {\n      mergeResults = await this.resolveMerge(values, message, build);\n    } else if (abort) {\n      mergeResults = await this.abortMerge(values);\n    } else if (!BitId.isValidVersion(firstValue)) {\n      const bitIds = this.getComponentsToMerge(consumer, values);\n      // @todo: version could be the lane only or remote/lane\n      mergeResults = await this.mergeComponentsFromRemote(\n        consumer,\n        bitIds,\n        mergeStrategy,\n        noSnap,\n        message,\n        build,\n        skipDependencyInstallation\n      );\n    } else {\n      const version = firstValue;\n      const ids = R.tail(values);\n      const bitIds = this.getComponentsToMerge(consumer, ids);\n      mergeResults = await mergeVersion(consumer, version, bitIds, mergeStrategy);\n    }\n    await consumer.onDestroy();\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: BitId[],\n    mergeStrategy: MergeStrategy,\n    noSnap: boolean,\n    snapMessage: string,\n    build: boolean,\n    skipDependencyInstallation: boolean\n  ): Promise<ApplyVersionResults> {\n    const currentLaneId = consumer.getCurrentLaneId();\n    const currentLaneObject = await consumer.getCurrentLaneObject();\n    const allComponentsStatus = await this.getAllComponentsStatus(bitIds, currentLaneId, currentLaneObject);\n    const failedComponents = allComponentsStatus.filter((c) => c.unmergedMessage && !c.unmergedLegitimately);\n    if (failedComponents.length) {\n      const failureMsgs = failedComponents\n        .map(\n          (failedComponent) =>\n            `${chalk.bold(failedComponent.id.toString())} - ${chalk.red(failedComponent.unmergedMessage as string)}`\n        )\n        .join('\\n');\n      throw new BitError(`unable to merge due to the following failures:\\n${failureMsgs}`);\n    }\n\n    return this.mergeSnaps({\n      mergeStrategy,\n      allComponentsStatus,\n      laneId: currentLaneId,\n      localLane: currentLaneObject,\n      noSnap,\n      snapMessage,\n      build,\n      skipDependencyInstallation,\n    });\n  }\n\n  /**\n   * merge multiple components according to the \"allComponentsStatus\".\n   */\n  async mergeSnaps({\n    mergeStrategy,\n    allComponentsStatus,\n    laneId,\n    localLane,\n    noSnap,\n    tag,\n    snapMessage,\n    build,\n    skipDependencyInstallation,\n  }: {\n    mergeStrategy: MergeStrategy;\n    allComponentsStatus: ComponentMergeStatus[];\n    laneId: LaneId;\n    localLane: Lane | null;\n    noSnap: boolean;\n    tag?: boolean;\n    snapMessage: string;\n    build: boolean;\n    skipDependencyInstallation?: boolean;\n  }): Promise<ApplyVersionResults> {\n    const consumer = this.workspace.consumer;\n    const componentWithConflict = allComponentsStatus.find(\n      (component) => component.mergeResults && component.mergeResults.hasConflicts\n    );\n    if (componentWithConflict && !mergeStrategy) {\n      mergeStrategy = await getMergeStrategyInteractive();\n    }\n    const failedComponents: FailedComponents[] = allComponentsStatus\n      .filter((componentStatus) => componentStatus.unmergedMessage)\n      .map((componentStatus) => ({\n        id: componentStatus.id,\n        failureMessage: componentStatus.unmergedMessage as string,\n        unchangedLegitimately: componentStatus.unmergedLegitimately,\n      }));\n    const succeededComponents = allComponentsStatus.filter((componentStatus) => !componentStatus.unmergedMessage);\n    // do not use Promise.all for applyVersion. otherwise, it'll write all components in parallel,\n    // which can be an issue when some components are also dependencies of others\n    const componentsResults = await mapSeries(\n      succeededComponents,\n      async ({ currentComponent, id, mergeResults, resolvedUnrelated }) => {\n        const modelComponent = await consumer.scope.getModelComponent(id);\n        const updatedLaneId = laneId.isDefault() ? LaneId.from(laneId.name, id.scope as string) : laneId;\n        return this.applyVersion({\n          currentComponent,\n          id,\n          mergeResults,\n          mergeStrategy,\n          remoteHead: modelComponent.getRef(id.version as string) as Ref,\n          laneId: updatedLaneId,\n          localLane,\n          resolvedUnrelated,\n        });\n      }\n    );\n\n    const leftUnresolvedConflicts = componentWithConflict && mergeStrategy === 'manual';\n\n    if (!skipDependencyInstallation && !leftUnresolvedConflicts) {\n      await this.install.install(undefined, {\n        dedupe: true,\n        updateExisting: false,\n        import: false,\n      });\n    }\n\n    if (localLane) consumer.scope.objects.add(localLane);\n\n    await consumer.scope.objects.persist(); // persist anyway, if localLane is null it should save all main heads\n\n    await consumer.scope.objects.unmergedComponents.write();\n\n    const getSnapOrTagResults = async () => {\n      // if one of the component has conflict, don't snap-merge. otherwise, some of the components would be snap-merged\n      // and some not. besides the fact that it could by mistake tag dependent, it's a confusing state. better not snap.\n      if (noSnap || leftUnresolvedConflicts) {\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 } = results;\n        return { snappedComponents: taggedComponents, autoSnappedResults: autoTaggedResults };\n      }\n      return this.snapResolvedComponents(consumer, snapMessage, build);\n    };\n    const mergeSnapResults = await getSnapOrTagResults();\n\n    return {\n      components: componentsResults,\n      failedComponents,\n      mergeSnapResults,\n      leftUnresolvedConflicts,\n    };\n  }\n\n  /**\n   * this function gets called from two different commands:\n   * 1. \"bit merge <ids...>\", when merging a component from a remote to the local.\n   * in this case, the remote and local are on the same lane or both on main.\n   * 2. \"bit lane merge\", when merging from one lane to another.\n   * @param id\n   * @param localLane\n   * @param otherLaneName\n   * @param existingOnWorkspaceOnly\n   * @returns\n   */\n  async getComponentMergeStatus(\n    id: BitId, // the id.version is the version we want to merge to the current component\n    localLane: Lane | null, // currently checked out lane. if on main, then it's null.\n    otherLaneName: string, // the lane name we want to merged to our lane. (can be also \"main\").\n    options?: { resolveUnrelated?: MergeStrategy; ignoreConfigChanges?: boolean }\n  ): Promise<ComponentMergeStatus> {\n    const consumer = this.workspace.consumer;\n    const componentStatus: ComponentMergeStatus = { id };\n    const returnUnmerged = (msg: string, unmergedLegitimately = false) => {\n      componentStatus.unmergedMessage = msg;\n      componentStatus.unmergedLegitimately = unmergedLegitimately;\n      return componentStatus;\n    };\n    const modelComponent = await consumer.scope.getModelComponentIfExist(id);\n    if (!modelComponent) {\n      return returnUnmerged(\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 = consumer.scope.objects.unmergedComponents.getEntry(id.name);\n    if (unmerged) {\n      return returnUnmerged(\n        `component ${id.toStringWithoutVersion()} is in during-merge state a previous merge, please snap/tag it first (or use bit merge --resolve/--abort)`\n      );\n    }\n    const repo = consumer.scope.objects;\n    const version = id.version as string;\n    const otherLaneHead = modelComponent.getRef(version);\n    const existingBitMapId = consumer.bitMap.getBitIdIfExist(id, { ignoreVersion: true });\n    const componentOnLane: Version = await modelComponent.loadVersion(version, consumer.scope.objects);\n    if (componentOnLane.isRemoved()) {\n      return returnUnmerged(`component has been removed`, true);\n    }\n    const getCurrentId = () => {\n      if (existingBitMapId) return existingBitMapId;\n      if (localLane) {\n        const idOnLane = localLane.getComponent(id);\n        if (!idOnLane) return null;\n        return idOnLane.id.changeVersion(idOnLane.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, otherLaneHead, null, false);\n      return { currentComponent: null, componentFromModel: componentOnLane, id, mergeResults: null, divergeData };\n    }\n    const getCurrentComponent = () => {\n      if (existingBitMapId) return consumer.loadComponent(existingBitMapId);\n      return consumer.scope.getConsumerComponent(currentId);\n    };\n    const currentComponent = await getCurrentComponent();\n    const isModified = async () => {\n      const componentModificationStatus = await consumer.getComponentStatusById(currentComponent.id);\n      if (!componentModificationStatus.modified) return false;\n      if (!existingBitMapId) return false;\n      const baseComponent = await modelComponent.loadVersion(\n        existingBitMapId.version as string,\n        consumer.scope.objects\n      );\n      return options?.ignoreConfigChanges\n        ? consumer.isComponentSourceCodeModified(baseComponent, currentComponent)\n        : true;\n    };\n\n    const isComponentModified = await isModified();\n\n    if (isComponentModified) {\n      return returnUnmerged(`component is modified, please snap/tag it first`);\n    }\n    const laneHeadIsDifferentThanCheckedOut =\n      localLane && existingBitMapId?.version && modelComponent.laneHeadLocal?.toString() !== existingBitMapId?.version;\n    const localHead = laneHeadIsDifferentThanCheckedOut ? Ref.from(existingBitMapId.version) : null;\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(repo, modelComponent, otherLaneHead, localHead, false);\n    if (divergeData.err) {\n      const mainHead = modelComponent.head;\n      if (divergeData.err instanceof NoCommonSnap && options?.resolveUnrelated && mainHead) {\n        const hasResolvedLocally = divergeData.snapsOnLocalOnly.find((snap) => mainHead.isEqual(snap));\n        const hasResolvedRemotely = divergeData.snapsOnRemoteOnly.find((snap) => mainHead.isEqual(snap));\n        if (!hasResolvedLocally && !hasResolvedRemotely) {\n          return returnUnmerged(\n            `unable to traverse ${currentComponent.id.toString()} history. the main-head ${mainHead.toString()} doesn't appear in both lanes, it was probably created in each lane separately`\n          );\n        }\n        const versionToSaveInLane = hasResolvedLocally ? currentComponent.id.version : id.version;\n        const resolvedRef = modelComponent.getRef(versionToSaveInLane as string);\n        if (!resolvedRef) throw new Error(`unable to get ref of \"${versionToSaveInLane}\" for \"${id.toString()}\"`);\n        if (options?.resolveUnrelated === 'theirs') {\n          // just override with the model data\n          return {\n            currentComponent,\n            componentFromModel: componentOnLane,\n            id,\n            mergeResults: null,\n            divergeData,\n            resolvedUnrelated: { strategy: 'theirs', head: resolvedRef },\n          };\n        }\n        if (options?.resolveUnrelated === 'ours') {\n          return {\n            currentComponent,\n            id,\n            mergeResults: null,\n            divergeData,\n            resolvedUnrelated: { strategy: 'ours', head: resolvedRef },\n          };\n        }\n        throw new Error(\n          `unsupported strategy \"${options?.resolveUnrelated}\" of resolve-unrelated. supported strategies are: [ours, theirs]`\n        );\n      }\n      return returnUnmerged(\n        `unable to traverse ${currentComponent.id.toString()} history. error: ${divergeData.err.message}`\n      );\n    }\n    if (!divergeData.isDiverged()) {\n      if (divergeData.isLocalAhead()) {\n        // do nothing!\n        return returnUnmerged(`component ${currentComponent.id.toString()} is ahead, nothing to merge`, true);\n      }\n      if (divergeData.isRemoteAhead()) {\n        // just override with the model data\n        return {\n          currentComponent,\n          componentFromModel: componentOnLane,\n          id,\n          mergeResults: null,\n          divergeData,\n        };\n      }\n      // we know that localHead and remoteHead are set, so if none of them is ahead they must be equal\n      return returnUnmerged(`component ${currentComponent.id.toString()} is already merged`, true);\n    }\n    const baseSnap = divergeData.commonSnapBeforeDiverge as Ref; // must be set when isTrueMerge\n    const baseComponent: Version = await modelComponent.loadVersion(baseSnap.toString(), repo);\n    const otherComponent: Version = await modelComponent.loadVersion(otherLaneHead.toString(), repo);\n    const currentLaneName = localLane?.toLaneId().toString() || 'main';\n    const mergeResults = await threeWayMerge({\n      consumer,\n      otherComponent,\n      otherLabel: `${otherLaneHead.toString()} (${otherLaneName})`,\n      currentComponent,\n      currentLabel: `${currentId.version} (${currentLaneName})`,\n      baseComponent,\n    });\n    return { currentComponent, id, mergeResults, divergeData };\n  }\n\n  private async applyVersion({\n    currentComponent,\n    id,\n    mergeResults,\n    mergeStrategy,\n    remoteHead,\n    laneId,\n    localLane,\n    resolvedUnrelated,\n  }: {\n    currentComponent: ConsumerComponent | null | undefined;\n    id: BitId;\n    mergeResults: MergeResultsThreeWay | null | undefined;\n    mergeStrategy: MergeStrategy;\n    remoteHead: Ref;\n    laneId: LaneId;\n    localLane: Lane | null;\n    resolvedUnrelated?: ResolveUnrelatedData;\n  }): Promise<ApplyVersionResult> {\n    const consumer = this.workspace.consumer;\n    let filesStatus = {};\n    const unmergedComponent: UnmergedComponent = {\n      // @ts-ignore\n      id: { name: id.name, scope: id.scope },\n      head: remoteHead,\n      remote: laneId.scope, // @todo: remove. it has been deprecated around 0.0.832\n      lane: laneId.name, // @todo: remove. it has been deprecated around 0.0.832\n      laneId,\n    };\n    id = currentComponent ? currentComponent.id : id;\n\n    const modelComponent = await consumer.scope.getModelComponent(id);\n    const handleResolveUnrelated = () => {\n      if (!currentComponent) throw new Error('currentComponent must be defined when resolvedUnrelated');\n      if (!localLane) throw new Error('localLane must be defined when resolvedUnrelated');\n      if (!resolvedUnrelated?.head) throw new Error('resolvedUnrelated must have head prop');\n      localLane.addComponent({ id, head: resolvedUnrelated.head });\n      const head = modelComponent.getRef(currentComponent.id.version as string);\n      if (!head) throw new Error(`unable to get the head for resolved-unrelated ${id.toString()}`);\n      unmergedComponent.laneId = localLane.toLaneId();\n      unmergedComponent.head = head;\n      unmergedComponent.unrelated = true;\n      consumer.scope.objects.unmergedComponents.addEntry(unmergedComponent);\n      return { id, filesStatus };\n    };\n\n    const markAllFilesAsUnchanged = () => {\n      if (!currentComponent) throw new Error(`applyVersion expect to get currentComponent for ${id.toString()}`);\n      currentComponent.files.forEach((file) => {\n        filesStatus[pathNormalizeToLinux(file.relative)] = FileStatus.unchanged;\n      });\n    };\n    if (mergeResults && mergeResults.hasConflicts && mergeStrategy === MergeOptions.ours) {\n      markAllFilesAsUnchanged();\n      consumer.scope.objects.unmergedComponents.addEntry(unmergedComponent);\n      return { id, filesStatus };\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 componentWithDependencies = await consumer.loadComponentWithDependenciesFromModel(idToLoad);\n    const files = componentWithDependencies.component.files;\n    files.forEach((file) => {\n      // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n      filesStatus[pathNormalizeToLinux(file.relative)] = FileStatus.updated;\n    });\n\n    if (mergeResults) {\n      // update files according to the merge results\n      const { filesStatus: modifiedStatus, modifiedFiles } = applyModifiedVersion(files, mergeResults, mergeStrategy);\n      componentWithDependencies.component.files = modifiedFiles;\n      filesStatus = { ...filesStatus, ...modifiedStatus };\n    }\n\n    const manyComponentsWriter = new ManyComponentsWriter({\n      consumer,\n      componentsWithDependencies: [componentWithDependencies],\n      installNpmPackages: false,\n      override: true,\n      writeConfig: false, // @todo: should write if config exists before, needs to figure out how to do it.\n      verbose: false, // @todo: do we need a flag here?\n      writeDists: true, // @todo: do we need a flag here?\n      writePackageJson: false,\n    });\n    await manyComponentsWriter.writeAll();\n\n    // if mergeResults, the head snap is going to be updated on a later phase when snapping with two parents\n    // otherwise, update the head of the current lane or main\n    if (mergeResults) {\n      if (mergeResults.hasConflicts && mergeStrategy === MergeOptions.manual) {\n        unmergedComponent.unmergedPaths = mergeResults.modifiedFiles.filter((f) => f.conflict).map((f) => f.filePath);\n      }\n      consumer.scope.objects.unmergedComponents.addEntry(unmergedComponent);\n    } else if (localLane) {\n      if (resolvedUnrelated) {\n        // must be \"theirs\"\n        return handleResolveUnrelated();\n      }\n      localLane.addComponent({ id, head: remoteHead });\n    } else {\n      // this is main\n      modelComponent.setHead(remoteHead);\n      // mark it as local, otherwise, when importing this component from a remote, it'll override it.\n      modelComponent.markVersionAsLocal(remoteHead.toString());\n      consumer.scope.objects.add(modelComponent);\n    }\n\n    return { id, filesStatus };\n  }\n\n  private async abortMerge(values: string[]): Promise<ApplyVersionResults> {\n    const consumer = this.workspace.consumer;\n    const ids = await this.getIdsForUnmerged(values);\n    const results = await this.checkout.checkout({ ids, reset: true });\n    ids.forEach((id) => consumer.scope.objects.unmergedComponents.removeComponent(id.fullName));\n    await consumer.scope.objects.unmergedComponents.write();\n    return { abortedComponents: results.components };\n  }\n\n  private async resolveMerge(values: string[], snapMessage: string, build: boolean): Promise<ApplyVersionResults> {\n    const ids = await this.getIdsForUnmerged(values);\n    // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n    const { snappedComponents } = await this.snapping.snap({\n      legacyBitIds: BitIds.fromArray(ids.map((id) => id._legacy)),\n      build,\n      message: snapMessage,\n    });\n    return { resolvedComponents: snappedComponents };\n  }\n\n  private async getAllComponentsStatus(\n    bitIds: BitId[],\n    laneId: LaneId,\n    localLaneObject: Lane | null\n  ): Promise<ComponentMergeStatus[]> {\n    const tmp = new Tmp(this.consumer.scope);\n    try {\n      const componentsStatus = 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.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          return this.getComponentMergeStatus(bitId.changeVersion(remoteHead.toString()), localLaneObject, laneIdStr);\n        })\n      );\n      await tmp.clear();\n      return componentsStatus;\n    } catch (err: any) {\n      await tmp.clear();\n      throw err;\n    }\n  }\n\n  private async snapResolvedComponents(\n    consumer: Consumer,\n    snapMessage: string,\n    build: boolean\n  ): Promise<null | { snappedComponents: ConsumerComponent[]; autoSnappedResults: AutoTagResult[] }> {\n    const unmergedComponents = consumer.scope.objects.unmergedComponents.getComponents();\n    logger.debug(`merge-snaps, snapResolvedComponents, total ${unmergedComponents.length.toString()} components`);\n    if (!unmergedComponents.length) return null;\n    const ids = BitIds.fromArray(unmergedComponents.map((r) => new BitId(r.id)));\n    return this.snapping.snap({\n      legacyBitIds: ids,\n      build,\n      message: snapMessage,\n    });\n  }\n\n  private async tagAllLaneComponent(idsToTag: BitId[], tagMessage: string, build: boolean): Promise<TagResults | null> {\n    const ids = idsToTag.map((id) => {\n      return id.toStringWithoutVersion();\n    });\n    logger.debug(`merge-snaps, tagResolvedComponents, total ${idsToTag.length.toString()} components`);\n    return this.snapping.tag({\n      ids,\n      build,\n      message: tagMessage,\n      unmodified: true,\n    });\n  }\n\n  private async getIdsForUnmerged(idsStr?: string[]): Promise<ComponentID[]> {\n    if (idsStr && idsStr.length) {\n      const componentIds = await this.workspace.resolveMultipleComponentIds(idsStr);\n      componentIds.forEach((id) => {\n        const entry = this.workspace.consumer.scope.objects.unmergedComponents.getEntry(id.fullName);\n        if (!entry) {\n          throw new GeneralError(`unable to merge-resolve ${id.toString()}, it is not marked as unresolved`);\n        }\n      });\n      return componentIds;\n    }\n    const unresolvedComponents = this.workspace.consumer.scope.objects.unmergedComponents.getComponents();\n    if (!unresolvedComponents.length) throw new GeneralError(`all components are resolved already, nothing to do`);\n    return unresolvedComponents.map((u) => ComponentID.fromLegacy(new BitId(u.id)));\n  }\n\n  private getComponentsToMerge(consumer: Consumer, ids: string[]): BitId[] {\n    if (hasWildcard(ids)) {\n      const componentsList = new ComponentsList(consumer);\n      return componentsList.listComponentsByIdsWithWildcard(ids);\n    }\n    return ids.map((id) => consumer.getParsedId(id));\n  }\n\n  static slots = [];\n  static dependencies = [CLIAspect, WorkspaceAspect, SnappingAspect, CheckoutAspect, InstallAspect];\n  static runtime = MainRuntime;\n  static async provider([cli, workspace, snapping, checkout, install]: [\n    CLIMain,\n    Workspace,\n    SnappingMain,\n    CheckoutMain,\n    InstallMain\n  ]) {\n    const merging = new MergingMain(workspace, install, snapping, checkout);\n    cli.register(new MergeCmd(merging));\n    return merging;\n  }\n}\n\nMergingAspect.addRuntime(MergingMain);\n"],"mappings":"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"}

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@teambit/merging",
-  "version": "0.0.167",
+  "version": "0.0.169",
   "homepage": "https://bit.dev/teambit/component/merging",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.component",
     "name": "merging",
-    "version": "0.0.167"
+    "version": "0.0.169"
   },
   "dependencies": {
     "chalk": "2.4.2",
@@ -16,14 +16,14 @@
     "@babel/runtime": "7.12.18",
     "core-js": "^3.0.0",
     "@teambit/bit-error": "0.0.400",
-    "@teambit/cli": "0.0.566",
+    "@teambit/cli": "0.0.567",
     "@teambit/harmony": "0.3.3",
-    "@teambit/checkout": "0.0.21",
+    "@teambit/checkout": "0.0.23",
     "@teambit/component-id": "0.0.417",
-    "@teambit/install": "0.0.3",
-    "@teambit/lane-id": "0.0.85",
-    "@teambit/snapping": "0.0.167",
-    "@teambit/workspace": "0.0.852"
+    "@teambit/install": "0.0.5",
+    "@teambit/lane-id": "0.0.86",
+    "@teambit/snapping": "0.0.169",
+    "@teambit/workspace": "0.0.854"
   },
   "devDependencies": {
     "@types/lodash": "4.14.165",
@@ -35,7 +35,7 @@
     "@types/node": "12.20.4"
   },
   "peerDependencies": {
-    "@teambit/legacy": "1.0.347",
+    "@teambit/legacy": "1.0.348",
     "react-dom": "^16.8.0 || ^17.0.0",
     "react": "^16.8.0 || ^17.0.0"
   },