@teambit/merge-lanes 0.0.176 → 0.0.178

package/dist/merge-lanes.main.runtime.js

@@ -93,6 +93,13 @@ function _laneId() {
   };
   return data;
 }
+function _artifactFiles() {
+  const data = require("@teambit/legacy/dist/consumer/component/sources/artifact-files");
+  _artifactFiles = function () {
+    return data;
+  };
+  return data;
+}
 function _logger() {
   const data = require("@teambit/logger");
   _logger = function () {
@@ -201,7 +208,20 @@ class MergeLanesMain {
       const shouldFetch = !lane || !skipFetch && !lane.isNew;
       if (shouldFetch) {
         // don't assign `lane` to the result of this command. otherwise, if you have local snaps, it'll ignore them and use the remote-lane.
-        await this.lanes.fetchLaneWithItsComponents(otherLaneId);
+        const otherLane = await this.lanes.fetchLaneWithItsComponents(otherLaneId);
+
+        // get all artifacts
+        const allIds = otherLane.toBitIds();
+        const laneComps = await consumer.scope.getManyConsumerComponents(allIds);
+        const allRefs = laneComps.map(comp => (0, _artifactFiles().getRefsFromExtensions)(comp.extensions)).flat();
+        const allRefsUniq = (0, _lodash().uniq)(allRefs.map(r => r.toString()));
+        try {
+          await consumer.scope.scopeImporter.importManyObjects({
+            [otherLaneId.scope]: allRefsUniq
+          });
+        } catch (err) {
+          this.logger.error(`failed fetching artifacts for lane ${otherLaneId.toString()}`, err);
+        }
         lane = await consumer.scope.loadLane(otherLaneId);
       }
       return lane;

package/dist/merge-lanes.main.runtime.js.map

@@ -1 +1 @@
-{"version":3,"names":["MergeLanesMain","constructor","workspace","merging","lanes","logger","remove","scope","exporter","mergeLane","laneName","options","BitError","consumer","mergeStrategy","noSnap","tag","snapMessage","existingOnWorkspaceOnly","build","keepReadme","noSquash","pattern","includeDeps","skipDependencyInstallation","resolveUnrelated","ignoreConfigChanges","skipFetch","currentLaneId","getCurrentLaneId","isDefault","toString","otherLaneId","getParsedLaneId","isEqual","currentLane","loadLane","isDefaultLane","getOtherLane","importer","importObjectsFromMainIfExist","toBitIds","toVersionLatest","undefined","lane","shouldFetch","isNew","fetchLaneWithItsComponents","otherLane","getBitIds","Error","DEFAULT_LANE","getMainIdsToMerge","bitIds","debug","allComponentsStatus","getMergeStatus","shouldSquash","componentIds","resolveMultipleComponentIds","compIdsFromPattern","filterIdsFromPoolIdsByPattern","filterComponentsStatus","forEach","bitId","find","c","id","isEqualWithoutVersion","push","unmergedLegitimately","unmergedMessage","workspaceIds","listIds","filter","_legacy","throwForFailures","squashSnaps","mergeResults","mergeSnaps","laneId","localLane","mergedSuccessfully","failedComponents","length","every","failedComponent","unchangedLegitimately","deleteResults","readmeComponent","readmeComponentId","changeVersion","head","hash","componentsPattern","force","remote","track","deleteFiles","fromLane","readmeResult","name","configMergeResults","map","configMergeResult","onDestroy","compact","failureMsgs","chalk","bold","red","join","laneIds","mainNotOnLane","ids","hasScope","modelComponents","Promise","all","legacyScope","getModelComponent","toBitId","mergeFromScope","toLane","fromLaneId","LaneId","parse","fromLaneObj","importLaneObject","toLaneId","getDefaultLaneId","toLaneObj","fromLaneBitIds","getIdsToMerge","laneCompIds","BitIds","fromArray","idsToMerge","scopeComponentsImporter","ScopeComponentsImporter","getInstance","importManyDeltaWithoutDeps","fromHead","ignoreMissingHead","throwIfNotUpToDate","repo","objects","mergedPreviously","mergedNow","bitObjectsPerComp","pMapSeries","modelComponent","fromVersionObj","loadVersion","version","isRemoved","fromLaneHead","getRef","toLaneHead","getComponent","divergeData","getDivergeData","sourceHead","targetHead","modifiedVersion","squashOneComp","addComponent","setHead","bitObjects","b","bitObjectsFlat","flat","writeObjectsToTheFS","exportedIds","exported","exportMany","idsWithFutureScope","laneObject","allVersions","exportHeadsOnly","status","diffStatus","skipChanges","compsNotUpToDate","componentsStatus","s","upToDate","componentId","provider","cli","loggerMain","createLogger","MergeLanesAspect","lanesCommand","getCommand","mergeLanesMain","commands","MergeLaneCmd","register","MergeLaneFromScopeCmd","LanesAspect","CLIAspect","WorkspaceAspect","MergingAspect","LoggerAspect","RemoveAspect","ScopeAspect","ExportAspect","MainRuntime","compIdsToKeep","allBitIds","bitIdsFromPattern","bitIdsNotFromPattern","hasWithoutVersion","filteredComponentStatus","depsToAdd","compId","fromStatus","targetVersions","snapsOnTargetOnly","headOnTarget","remoteVersion","versionObj","flattenedDeps","getAllFlattenedDependencies","depsNotIncludeInPattern","depsOnLane","dep","isOnLane","isIdOnLane","d","depsUniq","uniqFromArray","currentLaneName","succeededComponents","componentFromModel","modifiedComp","add","versionHistory","updateRebasedVersionHistory","isDiverged","isSourceAhead","isTargetAhead","remoteSnaps","currentParents","parents","commonSnapBeforeDiverge","addAsOnlyParent","ref","removeParent","setSquashed","previousParents","addRuntime"],"sources":["merge-lanes.main.runtime.ts"],"sourcesContent":["import { BitError } from '@teambit/bit-error';\nimport { CLIAspect, CLIMain, MainRuntime } from '@teambit/cli';\nimport { LanesAspect, LanesMain } from '@teambit/lanes';\nimport MergingAspect, {\n  MergingMain,\n  ComponentMergeStatus,\n  ConfigMergeResult,\n  ApplyVersionResults,\n} from '@teambit/merging';\nimport WorkspaceAspect, { Workspace } from '@teambit/workspace';\nimport chalk from 'chalk';\nimport { BitId } from '@teambit/legacy-bit-id';\nimport pMapSeries from 'p-map-series';\nimport { Consumer } from '@teambit/legacy/dist/consumer';\nimport { MergeStrategy } from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport { BitIds } from '@teambit/legacy/dist/bit-id';\nimport { ScopeAspect, ScopeMain } from '@teambit/scope';\nimport ScopeComponentsImporter from '@teambit/legacy/dist/scope/component-ops/scope-components-importer';\nimport { ComponentID } from '@teambit/component-id';\nimport { DEFAULT_LANE, LaneId } from '@teambit/lane-id';\nimport { Lane, Version } from '@teambit/legacy/dist/scope/models';\nimport { Logger, LoggerAspect, LoggerMain } from '@teambit/logger';\nimport { SnapsDistance } from '@teambit/legacy/dist/scope/component-ops/snaps-distance';\nimport { RemoveAspect, RemoveMain } from '@teambit/remove';\nimport { compact } from 'lodash';\nimport { ExportAspect, ExportMain } from '@teambit/export';\nimport { BitObject } from '@teambit/legacy/dist/scope/objects';\nimport { getDivergeData } from '@teambit/legacy/dist/scope/component-ops/get-diverge-data';\nimport { MergeLanesAspect } from './merge-lanes.aspect';\nimport { MergeLaneCmd } from './merge-lane.cmd';\nimport { MergeLaneFromScopeCmd } from './merge-lane-from-scope.cmd';\n\nexport type MergeLaneOptions = {\n  mergeStrategy: MergeStrategy;\n  noSnap: boolean;\n  snapMessage: string;\n  existingOnWorkspaceOnly: boolean;\n  build: boolean;\n  keepReadme: boolean;\n  noSquash: boolean;\n  tag?: boolean;\n  pattern?: string;\n  includeDeps?: boolean;\n  skipDependencyInstallation?: boolean;\n  resolveUnrelated?: MergeStrategy;\n  ignoreConfigChanges?: boolean;\n  skipFetch?: boolean;\n};\n\nexport class MergeLanesMain {\n  constructor(\n    private workspace: Workspace | undefined,\n    private merging: MergingMain,\n    private lanes: LanesMain,\n    private logger: Logger,\n    private remove: RemoveMain,\n    private scope: ScopeMain,\n    private exporter: ExportMain\n  ) {}\n\n  async mergeLane(\n    laneName: string,\n    options: MergeLaneOptions\n  ): Promise<{ mergeResults: ApplyVersionResults; deleteResults: any; configMergeResults: ConfigMergeResult[] }> {\n    if (!this.workspace) {\n      throw new BitError(`unable to merge a lane outside of Bit workspace`);\n    }\n    const consumer = this.workspace.consumer;\n\n    const {\n      mergeStrategy,\n      noSnap,\n      tag,\n      snapMessage,\n      existingOnWorkspaceOnly,\n      build,\n      keepReadme,\n      noSquash,\n      pattern,\n      includeDeps,\n      skipDependencyInstallation,\n      resolveUnrelated,\n      ignoreConfigChanges,\n      skipFetch,\n    } = options;\n\n    const currentLaneId = consumer.getCurrentLaneId();\n    if (tag && !currentLaneId.isDefault()) {\n      throw new BitError(`--tag only possible when on main. currently checked out to ${currentLaneId.toString()}`);\n    }\n    const otherLaneId = await consumer.getParsedLaneId(laneName);\n    if (otherLaneId.isEqual(currentLaneId)) {\n      throw new BitError(\n        `unable to merge lane \"${otherLaneId.toString()}\", you're already at this lane. to get updates, simply run \"bit checkout head\"`\n      );\n    }\n    const currentLane = currentLaneId.isDefault() ? null : await consumer.scope.loadLane(currentLaneId);\n    const isDefaultLane = otherLaneId.isDefault();\n    const getOtherLane = async () => {\n      if (isDefaultLane) {\n        if (!skipFetch) {\n          await this.lanes.importer.importObjectsFromMainIfExist(currentLane?.toBitIds().toVersionLatest() || []);\n        }\n        return undefined;\n      }\n      let lane = await consumer.scope.loadLane(otherLaneId);\n      const shouldFetch = !lane || (!skipFetch && !lane.isNew);\n      if (shouldFetch) {\n        // don't assign `lane` to the result of this command. otherwise, if you have local snaps, it'll ignore them and use the remote-lane.\n        await this.lanes.fetchLaneWithItsComponents(otherLaneId);\n        lane = await consumer.scope.loadLane(otherLaneId);\n      }\n      return lane;\n    };\n    const otherLane = await getOtherLane();\n    const getBitIds = async () => {\n      if (isDefaultLane) {\n        if (!currentLane) throw new Error(`unable to merge ${DEFAULT_LANE}, the current lane was not found`);\n        return this.getMainIdsToMerge(currentLane);\n      }\n      if (!otherLane) throw new Error(`lane must be defined for non-default`);\n      return otherLane.toBitIds();\n    };\n    const bitIds = await getBitIds();\n    this.logger.debug(`merging the following bitIds: ${bitIds.toString()}`);\n\n    let allComponentsStatus = await this.merging.getMergeStatus(bitIds, currentLane, otherLane, {\n      resolveUnrelated,\n      ignoreConfigChanges,\n    });\n    const shouldSquash = currentLaneId.isDefault() && !noSquash;\n\n    if (pattern) {\n      const componentIds = await this.workspace.resolveMultipleComponentIds(bitIds);\n      const compIdsFromPattern = this.workspace.scope.filterIdsFromPoolIdsByPattern(pattern, componentIds);\n      allComponentsStatus = await filterComponentsStatus(\n        allComponentsStatus,\n        compIdsFromPattern,\n        bitIds,\n        this.workspace,\n        includeDeps,\n        otherLane || undefined,\n        shouldSquash\n      );\n      bitIds.forEach((bitId) => {\n        if (!allComponentsStatus.find((c) => c.id.isEqualWithoutVersion(bitId))) {\n          allComponentsStatus.push({ id: bitId, unmergedLegitimately: true, unmergedMessage: `excluded by pattern` });\n        }\n      });\n    }\n    if (existingOnWorkspaceOnly) {\n      const workspaceIds = await this.workspace.listIds();\n      const compIdsFromPattern = workspaceIds.filter((id) =>\n        allComponentsStatus.find((c) => c.id.isEqualWithoutVersion(id._legacy))\n      );\n      allComponentsStatus = await filterComponentsStatus(\n        allComponentsStatus,\n        compIdsFromPattern,\n        bitIds,\n        this.workspace,\n        includeDeps,\n        otherLane || undefined,\n        shouldSquash\n      );\n      bitIds.forEach((bitId) => {\n        if (!allComponentsStatus.find((c) => c.id.isEqualWithoutVersion(bitId))) {\n          allComponentsStatus.push({ id: bitId, unmergedLegitimately: true, unmergedMessage: `not in the workspace` });\n        }\n      });\n    }\n\n    throwForFailures();\n\n    if (shouldSquash) {\n      await squashSnaps(allComponentsStatus, otherLaneId, consumer);\n    }\n\n    const mergeResults = await this.merging.mergeSnaps({\n      mergeStrategy,\n      allComponentsStatus,\n      laneId: otherLaneId,\n      localLane: currentLane,\n      noSnap,\n      tag,\n      snapMessage,\n      build,\n      skipDependencyInstallation,\n    });\n\n    const mergedSuccessfully =\n      !mergeResults.failedComponents ||\n      mergeResults.failedComponents.length === 0 ||\n      mergeResults.failedComponents.every((failedComponent) => failedComponent.unchangedLegitimately);\n\n    let deleteResults = {};\n\n    if (!keepReadme && otherLane && otherLane.readmeComponent && mergedSuccessfully) {\n      const readmeComponentId = otherLane.readmeComponent.id\n        .changeVersion(otherLane.readmeComponent?.head?.hash)\n        .toString();\n\n      deleteResults = await this.remove.remove({\n        componentsPattern: readmeComponentId,\n        force: false,\n        remote: false,\n        track: false,\n        deleteFiles: true,\n        fromLane: false,\n      });\n    } else if (otherLane && !otherLane.readmeComponent) {\n      deleteResults = { readmeResult: `\\nlane ${otherLane.name} doesn't have a readme component` };\n    }\n    const configMergeResults = allComponentsStatus.map((c) => c.configMergeResult);\n\n    await this.workspace.consumer.onDestroy();\n\n    return { mergeResults, deleteResults, configMergeResults: compact(configMergeResults) };\n\n    function throwForFailures() {\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  }\n\n  private async getMainIdsToMerge(lane: Lane) {\n    const laneIds = lane.toBitIds();\n    if (!this.workspace) {\n      throw new BitError(`getMainIdsToMerge needs workspace`);\n    }\n    const workspaceIds = (await this.workspace.listIds()).map((id) => id._legacy);\n    const mainNotOnLane = workspaceIds.filter((id) => !laneIds.find((laneId) => laneId.isEqualWithoutVersion(id)));\n    const ids = [...laneIds, ...mainNotOnLane].filter((id) => id.hasScope());\n    const modelComponents = await Promise.all(ids.map((id) => this.scope.legacyScope.getModelComponent(id)));\n    return compact(\n      modelComponents.map((c) => {\n        if (!c.head) return null; // probably the component was never merged to main\n        return c.toBitId().changeVersion(c.head.toString());\n      })\n    );\n  }\n\n  async mergeFromScope(\n    fromLane: string,\n    toLane: string,\n    options: Partial<MergeLaneOptions> & { push?: boolean }\n  ): Promise<{\n    mergedPreviously: string[];\n    mergedNow: string[];\n    exportedIds: string[];\n  }> {\n    if (this.workspace) {\n      throw new BitError(\n        `unable to run this command from a workspace, please create a new bare-scope and run it from there`\n      );\n    }\n    const fromLaneId = LaneId.parse(fromLane);\n    const fromLaneObj = await this.lanes.importLaneObject(fromLaneId);\n    const toLaneId = toLane === DEFAULT_LANE ? this.lanes.getDefaultLaneId() : LaneId.parse(toLane);\n    const toLaneObj = toLaneId.isDefault() ? undefined : await this.lanes.importLaneObject(toLaneId);\n    const fromLaneBitIds = fromLaneObj.toBitIds();\n    const getIdsToMerge = async (): Promise<BitIds> => {\n      if (!options.pattern) return fromLaneBitIds;\n      const laneCompIds = await this.scope.resolveMultipleComponentIds(fromLaneBitIds);\n      const ids = this.scope.filterIdsFromPoolIdsByPattern(options.pattern, laneCompIds);\n      return BitIds.fromArray(ids.map((id) => id._legacy));\n    };\n    const idsToMerge = await getIdsToMerge();\n    const scopeComponentsImporter = ScopeComponentsImporter.getInstance(this.scope.legacyScope);\n    await scopeComponentsImporter.importManyDeltaWithoutDeps({\n      ids: idsToMerge,\n      fromHead: true,\n      lane: fromLaneObj,\n      ignoreMissingHead: true,\n    });\n    // get their main/to-lane as well\n    await scopeComponentsImporter.importManyDeltaWithoutDeps({\n      ids: idsToMerge.toVersionLatest(),\n      fromHead: true,\n      ignoreMissingHead: true,\n      lane: toLaneObj,\n    });\n    await this.throwIfNotUpToDate(fromLaneId, toLaneId);\n    const repo = this.scope.legacyScope.objects;\n    // loop through all components, make sure they're all ahead of main (it might not be on main yet).\n    // then, change the version object to include an extra parent to point to the main.\n    // then, change the component object head to point to this changed version\n    const mergedPreviously: BitId[] = [];\n    const mergedNow: BitId[] = [];\n    const shouldSquash = !toLaneObj && !options.noSquash; // only when merging to main we squash.\n    const bitObjectsPerComp = await pMapSeries(idsToMerge, async (id) => {\n      const modelComponent = await this.scope.legacyScope.getModelComponent(id);\n      const fromVersionObj = await modelComponent.loadVersion(id.version as string, repo);\n      if (fromVersionObj.isRemoved()) return undefined;\n      const fromLaneHead = modelComponent.getRef(id.version as string);\n      if (!fromLaneHead) throw new Error(`lane head must be defined for ${id.toString()}`);\n      const toLaneHead = toLaneObj ? toLaneObj.getComponent(id)?.head : modelComponent.head || null;\n      if (toLaneHead?.isEqual(fromLaneHead)) {\n        mergedPreviously.push(id);\n        return undefined;\n      }\n      // this might be confusing, we pass the toLaneHead as the sourceHead and the fromLaneHead as the targetHead.\n      // this is because normally, in the workspace, we merge another lane (target) into the current lane (source).\n      // so effectively, in the workspace, we merge fromLane=target into toLane=source.\n      const divergeData = await getDivergeData({\n        repo,\n        modelComponent,\n        sourceHead: toLaneHead,\n        targetHead: fromLaneHead,\n      });\n      const modifiedVersion = shouldSquash\n        ? squashOneComp(DEFAULT_LANE, fromLaneId, id, divergeData, fromVersionObj)\n        : undefined;\n      const objects: BitObject[] = [];\n      if (modifiedVersion) objects.push(modifiedVersion);\n      if (toLaneObj) {\n        toLaneObj.addComponent({ id: id.changeVersion(undefined), head: fromLaneHead });\n      } else {\n        modelComponent.setHead(fromLaneHead);\n        objects.push(modelComponent);\n      }\n      mergedNow.push(id);\n      return { id, objects };\n    });\n    const bitObjects = compact(bitObjectsPerComp).map((b) => b.objects);\n    const bitObjectsFlat = bitObjects.flat();\n    if (toLaneObj) bitObjectsFlat.push(toLaneObj);\n    await repo.writeObjectsToTheFS(bitObjectsFlat);\n    let exportedIds: string[] = [];\n    if (options.push) {\n      const ids = compact(bitObjectsPerComp).map((b) => b.id);\n      const bitIds = BitIds.fromArray(ids);\n      const { exported } = await this.exporter.exportMany({\n        scope: this.scope.legacyScope,\n        ids: shouldSquash ? bitIds : new BitIds(),\n        idsWithFutureScope: shouldSquash ? bitIds : new BitIds(),\n        laneObject: toLaneObj,\n        allVersions: false,\n        // no need to export anything else other than the head. the normal calculation of what to export won't apply here\n        // as it is done from the scope.\n        exportHeadsOnly: shouldSquash,\n      });\n      exportedIds = exported.map((id) => id.toString());\n    }\n\n    return {\n      mergedPreviously: mergedPreviously.map((id) => id.toString()),\n      mergedNow: mergedNow.map((id) => id.toString()),\n      exportedIds,\n    };\n  }\n  private async throwIfNotUpToDate(fromLaneId: LaneId, toLaneId: LaneId) {\n    const status = await this.lanes.diffStatus(fromLaneId, toLaneId, { skipChanges: true });\n    const compsNotUpToDate = status.componentsStatus.filter((s) => !s.upToDate);\n    if (compsNotUpToDate.length) {\n      throw new Error(`unable to merge, the following components are not up-to-date:\n${compsNotUpToDate.map((s) => s.componentId.toString()).join('\\n')}`);\n    }\n  }\n\n  static slots = [];\n  static dependencies = [\n    LanesAspect,\n    CLIAspect,\n    WorkspaceAspect,\n    MergingAspect,\n    LoggerAspect,\n    RemoveAspect,\n    ScopeAspect,\n    ExportAspect,\n  ];\n  static runtime = MainRuntime;\n\n  static async provider([lanes, cli, workspace, merging, loggerMain, remove, scope, exporter]: [\n    LanesMain,\n    CLIMain,\n    Workspace,\n    MergingMain,\n    LoggerMain,\n    RemoveMain,\n    ScopeMain,\n    ExportMain\n  ]) {\n    const logger = loggerMain.createLogger(MergeLanesAspect.id);\n    const lanesCommand = cli.getCommand('lane');\n    const mergeLanesMain = new MergeLanesMain(workspace, merging, lanes, logger, remove, scope, exporter);\n    lanesCommand?.commands?.push(new MergeLaneCmd(mergeLanesMain));\n    cli.register(new MergeLaneFromScopeCmd(mergeLanesMain));\n    return mergeLanesMain;\n  }\n}\n\nasync function filterComponentsStatus(\n  allComponentsStatus: ComponentMergeStatus[],\n  compIdsToKeep: ComponentID[],\n  allBitIds: BitId[],\n  workspace: Workspace,\n  includeDeps = false,\n  otherLane?: Lane, // lane that gets merged into the current lane. if not provided, it's main that gets merged into the current lane\n  shouldSquash?: boolean\n): Promise<ComponentMergeStatus[]> {\n  const bitIdsFromPattern = BitIds.fromArray(compIdsToKeep.map((c) => c._legacy));\n  const bitIdsNotFromPattern = allBitIds.filter((bitId) => !bitIdsFromPattern.hasWithoutVersion(bitId));\n  const filteredComponentStatus: ComponentMergeStatus[] = [];\n  const depsToAdd: BitId[] = [];\n  await pMapSeries(compIdsToKeep, async (compId) => {\n    const fromStatus = allComponentsStatus.find((c) => c.id.isEqualWithoutVersion(compId._legacy));\n    if (!fromStatus) {\n      throw new Error(`filterComponentsStatus: unable to find ${compId.toString()} in component-status`);\n    }\n    filteredComponentStatus.push(fromStatus);\n    if (fromStatus.unmergedMessage) {\n      return;\n    }\n    if (!otherLane) {\n      // if merging main, no need to check whether the deps are included in the pattern.\n      return;\n    }\n    const { divergeData } = fromStatus;\n    if (!divergeData) {\n      throw new Error(`filterComponentsStatus: unable to find divergeData for ${compId.toString()}`);\n    }\n    let targetVersions = divergeData.snapsOnTargetOnly;\n    if (!targetVersions.length) {\n      return;\n    }\n    const modelComponent = await workspace.consumer.scope.getModelComponent(compId._legacy);\n    if (shouldSquash) {\n      // no need to check all versions, we merge only the head\n      const headOnTarget = otherLane ? otherLane.getComponent(compId._legacy)?.head : modelComponent.head;\n      if (!headOnTarget) {\n        throw new Error(`filterComponentsStatus: unable to find head for ${compId.toString()}`);\n      }\n      targetVersions = [headOnTarget];\n    }\n\n    await pMapSeries(targetVersions, async (remoteVersion) => {\n      const versionObj = await modelComponent.loadVersion(remoteVersion.toString(), workspace.consumer.scope.objects);\n      const flattenedDeps = versionObj.getAllFlattenedDependencies();\n      const depsNotIncludeInPattern = flattenedDeps.filter((id) =>\n        bitIdsNotFromPattern.find((bitId) => bitId.isEqualWithoutVersion(id))\n      );\n      if (!depsNotIncludeInPattern.length) {\n        return;\n      }\n      const depsOnLane: BitId[] = [];\n      await Promise.all(\n        depsNotIncludeInPattern.map(async (dep) => {\n          const isOnLane = await workspace.consumer.scope.isIdOnLane(dep, otherLane);\n          if (isOnLane) {\n            depsOnLane.push(dep);\n          }\n        })\n      );\n      if (!depsOnLane.length) {\n        return;\n      }\n      if (!includeDeps) {\n        throw new BitError(`unable to merge ${compId.toString()}.\nit has (in version ${remoteVersion.toString()}) the following dependencies which were not included in the pattern. consider adding \"--include-deps\" flag\n${depsOnLane.map((d) => d.toString()).join('\\n')}`);\n      }\n      depsToAdd.push(...depsOnLane);\n    });\n  });\n  if (depsToAdd.length) {\n    const depsUniq = BitIds.uniqFromArray(depsToAdd);\n    depsUniq.forEach((id) => {\n      const fromStatus = allComponentsStatus.find((c) => c.id.isEqualWithoutVersion(id));\n      if (!fromStatus) {\n        throw new Error(`filterComponentsStatus: unable to find ${id.toString()} in component-status`);\n      }\n      filteredComponentStatus.push(fromStatus);\n    });\n  }\n  return filteredComponentStatus;\n}\n\nasync function squashSnaps(allComponentsStatus: ComponentMergeStatus[], otherLaneId: LaneId, consumer: Consumer) {\n  const currentLaneName = consumer.getCurrentLaneId().name;\n  const succeededComponents = allComponentsStatus.filter((c) => !c.unmergedMessage);\n  await Promise.all(\n    succeededComponents.map(async ({ id, divergeData, componentFromModel }) => {\n      if (!divergeData) {\n        throw new Error(`unable to squash. divergeData is missing from ${id.toString()}`);\n      }\n      const modifiedComp = squashOneComp(currentLaneName, otherLaneId, id, divergeData, componentFromModel);\n      if (modifiedComp) {\n        consumer.scope.objects.add(modifiedComp);\n        const modelComponent = await consumer.scope.getModelComponent(id);\n        const versionHistory = await modelComponent.updateRebasedVersionHistory(consumer.scope.objects, [modifiedComp]);\n        if (versionHistory) consumer.scope.objects.add(versionHistory);\n      }\n    })\n  );\n}\n\n/**\n * returns Version object if it was modified. otherwise, returns undefined\n */\nfunction squashOneComp(\n  currentLaneName: string,\n  otherLaneId: LaneId,\n  id: BitId,\n  divergeData: SnapsDistance,\n  componentFromModel?: Version\n): Version | undefined {\n  if (divergeData.isDiverged()) {\n    throw new BitError(`unable to squash because ${id.toString()} is diverged in history.\nconsider switching to \"${\n      otherLaneId.name\n    }\" first, merging \"${currentLaneName}\", then switching back to \"${currentLaneName}\" and merging \"${\n      otherLaneId.name\n    }\"\nalternatively, use \"--no-squash\" flag to keep the entire history of \"${otherLaneId.name}\"`);\n  }\n  if (divergeData.isSourceAhead()) {\n    // nothing to do. current is ahead, nothing to merge. (it was probably filtered out already as a \"failedComponent\")\n    return undefined;\n  }\n  if (!divergeData.isTargetAhead()) {\n    // nothing to do. current and remote are the same, nothing to merge. (it was probably filtered out already as a \"failedComponent\")\n    return undefined;\n  }\n  // remote is ahead and was not diverge.\n  const remoteSnaps = divergeData.snapsOnTargetOnly;\n  if (remoteSnaps.length === 0) {\n    throw new Error(`remote is ahead but it has no snaps. it's impossible`);\n  }\n  // no need to check this case. even if it has only one snap ahead, we want to do the \"squash\", and run \"addAsOnlyParent\"\n  // to make sure it doesn't not have two parents.\n  // if (remoteSnaps.length === 1) {\n  //   // nothing to squash. it has only one commit.\n  //   return;\n  // }\n  if (!componentFromModel) {\n    throw new Error('unable to squash, the componentFromModel is missing');\n  }\n\n  const currentParents = componentFromModel.parents;\n\n  // do the squash.\n  if (divergeData.commonSnapBeforeDiverge) {\n    componentFromModel.addAsOnlyParent(divergeData.commonSnapBeforeDiverge);\n  } else {\n    // there is no commonSnapBeforeDiverge. the local has no snaps, all are remote, no need for parents. keep only head.\n    componentFromModel.parents.forEach((ref) => componentFromModel.removeParent(ref));\n  }\n  componentFromModel.setSquashed({ previousParents: currentParents, laneId: otherLaneId });\n  return componentFromModel;\n}\n\nMergeLanesAspect.addRuntime(MergeLanesMain);\n\nexport default MergeLanesMain;\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;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;AAMA;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;AAEA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AAEA;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;AAEA;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;AAmBO,MAAMA,cAAc,CAAC;EAC1BC,WAAW,CACDC,SAAgC,EAChCC,OAAoB,EACpBC,KAAgB,EAChBC,MAAc,EACdC,MAAkB,EAClBC,KAAgB,EAChBC,QAAoB,EAC5B;IAAA,KAPQN,SAAgC,GAAhCA,SAAgC;IAAA,KAChCC,OAAoB,GAApBA,OAAoB;IAAA,KACpBC,KAAgB,GAAhBA,KAAgB;IAAA,KAChBC,MAAc,GAAdA,MAAc;IAAA,KACdC,MAAkB,GAAlBA,MAAkB;IAAA,KAClBC,KAAgB,GAAhBA,KAAgB;IAAA,KAChBC,QAAoB,GAApBA,QAAoB;EAC3B;EAEH,MAAMC,SAAS,CACbC,QAAgB,EAChBC,OAAyB,EACoF;IAC7G,IAAI,CAAC,IAAI,CAACT,SAAS,EAAE;MACnB,MAAM,KAAIU,oBAAQ,EAAE,iDAAgD,CAAC;IACvE;IACA,MAAMC,QAAQ,GAAG,IAAI,CAACX,SAAS,CAACW,QAAQ;IAExC,MAAM;MACJC,aAAa;MACbC,MAAM;MACNC,GAAG;MACHC,WAAW;MACXC,uBAAuB;MACvBC,KAAK;MACLC,UAAU;MACVC,QAAQ;MACRC,OAAO;MACPC,WAAW;MACXC,0BAA0B;MAC1BC,gBAAgB;MAChBC,mBAAmB;MACnBC;IACF,CAAC,GAAGhB,OAAO;IAEX,MAAMiB,aAAa,GAAGf,QAAQ,CAACgB,gBAAgB,EAAE;IACjD,IAAIb,GAAG,IAAI,CAACY,aAAa,CAACE,SAAS,EAAE,EAAE;MACrC,MAAM,KAAIlB,oBAAQ,EAAE,8DAA6DgB,aAAa,CAACG,QAAQ,EAAG,EAAC,CAAC;IAC9G;IACA,MAAMC,WAAW,GAAG,MAAMnB,QAAQ,CAACoB,eAAe,CAACvB,QAAQ,CAAC;IAC5D,IAAIsB,WAAW,CAACE,OAAO,CAACN,aAAa,CAAC,EAAE;MACtC,MAAM,KAAIhB,oBAAQ,EACf,yBAAwBoB,WAAW,CAACD,QAAQ,EAAG,gFAA+E,CAChI;IACH;IACA,MAAMI,WAAW,GAAGP,aAAa,CAACE,SAAS,EAAE,GAAG,IAAI,GAAG,MAAMjB,QAAQ,CAACN,KAAK,CAAC6B,QAAQ,CAACR,aAAa,CAAC;IACnG,MAAMS,aAAa,GAAGL,WAAW,CAACF,SAAS,EAAE;IAC7C,MAAMQ,YAAY,GAAG,YAAY;MAC/B,IAAID,aAAa,EAAE;QACjB,IAAI,CAACV,SAAS,EAAE;UACd,MAAM,IAAI,CAACvB,KAAK,CAACmC,QAAQ,CAACC,4BAA4B,CAAC,CAAAL,WAAW,aAAXA,WAAW,uBAAXA,WAAW,CAAEM,QAAQ,EAAE,CAACC,eAAe,EAAE,KAAI,EAAE,CAAC;QACzG;QACA,OAAOC,SAAS;MAClB;MACA,IAAIC,IAAI,GAAG,MAAM/B,QAAQ,CAACN,KAAK,CAAC6B,QAAQ,CAACJ,WAAW,CAAC;MACrD,MAAMa,WAAW,GAAG,CAACD,IAAI,IAAK,CAACjB,SAAS,IAAI,CAACiB,IAAI,CAACE,KAAM;MACxD,IAAID,WAAW,EAAE;QACf;QACA,MAAM,IAAI,CAACzC,KAAK,CAAC2C,0BAA0B,CAACf,WAAW,CAAC;QACxDY,IAAI,GAAG,MAAM/B,QAAQ,CAACN,KAAK,CAAC6B,QAAQ,CAACJ,WAAW,CAAC;MACnD;MACA,OAAOY,IAAI;IACb,CAAC;IACD,MAAMI,SAAS,GAAG,MAAMV,YAAY,EAAE;IACtC,MAAMW,SAAS,GAAG,YAAY;MAC5B,IAAIZ,aAAa,EAAE;QACjB,IAAI,CAACF,WAAW,EAAE,MAAM,IAAIe,KAAK,CAAE,mBAAkBC,sBAAa,kCAAiC,CAAC;QACpG,OAAO,IAAI,CAACC,iBAAiB,CAACjB,WAAW,CAAC;MAC5C;MACA,IAAI,CAACa,SAAS,EAAE,MAAM,IAAIE,KAAK,CAAE,sCAAqC,CAAC;MACvE,OAAOF,SAAS,CAACP,QAAQ,EAAE;IAC7B,CAAC;IACD,MAAMY,MAAM,GAAG,MAAMJ,SAAS,EAAE;IAChC,IAAI,CAAC5C,MAAM,CAACiD,KAAK,CAAE,iCAAgCD,MAAM,CAACtB,QAAQ,EAAG,EAAC,CAAC;IAEvE,IAAIwB,mBAAmB,GAAG,MAAM,IAAI,CAACpD,OAAO,CAACqD,cAAc,CAACH,MAAM,EAAElB,WAAW,EAAEa,SAAS,EAAE;MAC1FvB,gBAAgB;MAChBC;IACF,CAAC,CAAC;IACF,MAAM+B,YAAY,GAAG7B,aAAa,CAACE,SAAS,EAAE,IAAI,CAACT,QAAQ;IAE3D,IAAIC,OAAO,EAAE;MACX,MAAMoC,YAAY,GAAG,MAAM,IAAI,CAACxD,SAAS,CAACyD,2BAA2B,CAACN,MAAM,CAAC;MAC7E,MAAMO,kBAAkB,GAAG,IAAI,CAAC1D,SAAS,CAACK,KAAK,CAACsD,6BAA6B,CAACvC,OAAO,EAAEoC,YAAY,CAAC;MACpGH,mBAAmB,GAAG,MAAMO,sBAAsB,CAChDP,mBAAmB,EACnBK,kBAAkB,EAClBP,MAAM,EACN,IAAI,CAACnD,SAAS,EACdqB,WAAW,EACXyB,SAAS,IAAIL,SAAS,EACtBc,YAAY,CACb;MACDJ,MAAM,CAACU,OAAO,CAAEC,KAAK,IAAK;QACxB,IAAI,CAACT,mBAAmB,CAACU,IAAI,CAAEC,CAAC,IAAKA,CAAC,CAACC,EAAE,CAACC,qBAAqB,CAACJ,KAAK,CAAC,CAAC,EAAE;UACvET,mBAAmB,CAACc,IAAI,CAAC;YAAEF,EAAE,EAAEH,KAAK;YAAEM,oBAAoB,EAAE,IAAI;YAAEC,eAAe,EAAG;UAAqB,CAAC,CAAC;QAC7G;MACF,CAAC,CAAC;IACJ;IACA,IAAIrD,uBAAuB,EAAE;MAC3B,MAAMsD,YAAY,GAAG,MAAM,IAAI,CAACtE,SAAS,CAACuE,OAAO,EAAE;MACnD,MAAMb,kBAAkB,GAAGY,YAAY,CAACE,MAAM,CAAEP,EAAE,IAChDZ,mBAAmB,CAACU,IAAI,CAAEC,CAAC,IAAKA,CAAC,CAACC,EAAE,CAACC,qBAAqB,CAACD,EAAE,CAACQ,OAAO,CAAC,CAAC,CACxE;MACDpB,mBAAmB,GAAG,MAAMO,sBAAsB,CAChDP,mBAAmB,EACnBK,kBAAkB,EAClBP,MAAM,EACN,IAAI,CAACnD,SAAS,EACdqB,WAAW,EACXyB,SAAS,IAAIL,SAAS,EACtBc,YAAY,CACb;MACDJ,MAAM,CAACU,OAAO,CAAEC,KAAK,IAAK;QACxB,IAAI,CAACT,mBAAmB,CAACU,IAAI,CAAEC,CAAC,IAAKA,CAAC,CAACC,EAAE,CAACC,qBAAqB,CAACJ,KAAK,CAAC,CAAC,EAAE;UACvET,mBAAmB,CAACc,IAAI,CAAC;YAAEF,EAAE,EAAEH,KAAK;YAAEM,oBAAoB,EAAE,IAAI;YAAEC,eAAe,EAAG;UAAsB,CAAC,CAAC;QAC9G;MACF,CAAC,CAAC;IACJ;IAEAK,gBAAgB,EAAE;IAElB,IAAInB,YAAY,EAAE;MAChB,MAAMoB,WAAW,CAACtB,mBAAmB,EAAEvB,WAAW,EAAEnB,QAAQ,CAAC;IAC/D;IAEA,MAAMiE,YAAY,GAAG,MAAM,IAAI,CAAC3E,OAAO,CAAC4E,UAAU,CAAC;MACjDjE,aAAa;MACbyC,mBAAmB;MACnByB,MAAM,EAAEhD,WAAW;MACnBiD,SAAS,EAAE9C,WAAW;MACtBpB,MAAM;MACNC,GAAG;MACHC,WAAW;MACXE,KAAK;MACLK;IACF,CAAC,CAAC;IAEF,MAAM0D,kBAAkB,GACtB,CAACJ,YAAY,CAACK,gBAAgB,IAC9BL,YAAY,CAACK,gBAAgB,CAACC,MAAM,KAAK,CAAC,IAC1CN,YAAY,CAACK,gBAAgB,CAACE,KAAK,CAAEC,eAAe,IAAKA,eAAe,CAACC,qBAAqB,CAAC;IAEjG,IAAIC,aAAa,GAAG,CAAC,CAAC;IAEtB,IAAI,CAACpE,UAAU,IAAI4B,SAAS,IAAIA,SAAS,CAACyC,eAAe,IAAIP,kBAAkB,EAAE;MAAA;MAC/E,MAAMQ,iBAAiB,GAAG1C,SAAS,CAACyC,eAAe,CAACtB,EAAE,CACnDwB,aAAa,0BAAC3C,SAAS,CAACyC,eAAe,oFAAzB,sBAA2BG,IAAI,2DAA/B,uBAAiCC,IAAI,CAAC,CACpD9D,QAAQ,EAAE;MAEbyD,aAAa,GAAG,MAAM,IAAI,CAAClF,MAAM,CAACA,MAAM,CAAC;QACvCwF,iBAAiB,EAAEJ,iBAAiB;QACpCK,KAAK,EAAE,KAAK;QACZC,MAAM,EAAE,KAAK;QACbC,KAAK,EAAE,KAAK;QACZC,WAAW,EAAE,IAAI;QACjBC,QAAQ,EAAE;MACZ,CAAC,CAAC;IACJ,CAAC,MAAM,IAAInD,SAAS,IAAI,CAACA,SAAS,CAACyC,eAAe,EAAE;MAClDD,aAAa,GAAG;QAAEY,YAAY,EAAG,UAASpD,SAAS,CAACqD,IAAK;MAAkC,CAAC;IAC9F;IACA,MAAMC,kBAAkB,GAAG/C,mBAAmB,CAACgD,GAAG,CAAErC,CAAC,IAAKA,CAAC,CAACsC,iBAAiB,CAAC;IAE9E,MAAM,IAAI,CAACtG,SAAS,CAACW,QAAQ,CAAC4F,SAAS,EAAE;IAEzC,OAAO;MAAE3B,YAAY;MAAEU,aAAa;MAAEc,kBAAkB,EAAE,IAAAI,iBAAO,EAACJ,kBAAkB;IAAE,CAAC;IAEvF,SAAS1B,gBAAgB,GAAG;MAC1B,MAAMO,gBAAgB,GAAG5B,mBAAmB,CAACmB,MAAM,CAAER,CAAC,IAAKA,CAAC,CAACK,eAAe,IAAI,CAACL,CAAC,CAACI,oBAAoB,CAAC;MACxG,IAAIa,gBAAgB,CAACC,MAAM,EAAE;QAC3B,MAAMuB,WAAW,GAAGxB,gBAAgB,CACjCoB,GAAG,CACDjB,eAAe,IACb,GAAEsB,gBAAK,CAACC,IAAI,CAACvB,eAAe,CAACnB,EAAE,CAACpC,QAAQ,EAAE,CAAE,MAAK6E,gBAAK,CAACE,GAAG,CAACxB,eAAe,CAACf,eAAe,CAAY,EAAC,CAC3G,CACAwC,IAAI,CAAC,IAAI,CAAC;QACb,MAAM,KAAInG,oBAAQ,EAAE,mDAAkD+F,WAAY,EAAC,CAAC;MACtF;IACF;EACF;EAEA,MAAcvD,iBAAiB,CAACR,IAAU,EAAE;IAC1C,MAAMoE,OAAO,GAAGpE,IAAI,CAACH,QAAQ,EAAE;IAC/B,IAAI,CAAC,IAAI,CAACvC,SAAS,EAAE;MACnB,MAAM,KAAIU,oBAAQ,EAAE,mCAAkC,CAAC;IACzD;IACA,MAAM4D,YAAY,GAAG,CAAC,MAAM,IAAI,CAACtE,SAAS,CAACuE,OAAO,EAAE,EAAE8B,GAAG,CAAEpC,EAAE,IAAKA,EAAE,CAACQ,OAAO,CAAC;IAC7E,MAAMsC,aAAa,GAAGzC,YAAY,CAACE,MAAM,CAAEP,EAAE,IAAK,CAAC6C,OAAO,CAAC/C,IAAI,CAAEe,MAAM,IAAKA,MAAM,CAACZ,qBAAqB,CAACD,EAAE,CAAC,CAAC,CAAC;IAC9G,MAAM+C,GAAG,GAAG,CAAC,GAAGF,OAAO,EAAE,GAAGC,aAAa,CAAC,CAACvC,MAAM,CAAEP,EAAE,IAAKA,EAAE,CAACgD,QAAQ,EAAE,CAAC;IACxE,MAAMC,eAAe,GAAG,MAAMC,OAAO,CAACC,GAAG,CAACJ,GAAG,CAACX,GAAG,CAAEpC,EAAE,IAAK,IAAI,CAAC5D,KAAK,CAACgH,WAAW,CAACC,iBAAiB,CAACrD,EAAE,CAAC,CAAC,CAAC;IACxG,OAAO,IAAAuC,iBAAO,EACZU,eAAe,CAACb,GAAG,CAAErC,CAAC,IAAK;MACzB,IAAI,CAACA,CAAC,CAAC0B,IAAI,EAAE,OAAO,IAAI,CAAC,CAAC;MAC1B,OAAO1B,CAAC,CAACuD,OAAO,EAAE,CAAC9B,aAAa,CAACzB,CAAC,CAAC0B,IAAI,CAAC7D,QAAQ,EAAE,CAAC;IACrD,CAAC,CAAC,CACH;EACH;EAEA,MAAM2F,cAAc,CAClBvB,QAAgB,EAChBwB,MAAc,EACdhH,OAAuD,EAKtD;IACD,IAAI,IAAI,CAACT,SAAS,EAAE;MAClB,MAAM,KAAIU,oBAAQ,EACf,mGAAkG,CACpG;IACH;IACA,MAAMgH,UAAU,GAAGC,gBAAM,CAACC,KAAK,CAAC3B,QAAQ,CAAC;IACzC,MAAM4B,WAAW,GAAG,MAAM,IAAI,CAAC3H,KAAK,CAAC4H,gBAAgB,CAACJ,UAAU,CAAC;IACjE,MAAMK,QAAQ,GAAGN,MAAM,KAAKxE,sBAAY,GAAG,IAAI,CAAC/C,KAAK,CAAC8H,gBAAgB,EAAE,GAAGL,gBAAM,CAACC,KAAK,CAACH,MAAM,CAAC;IAC/F,MAAMQ,SAAS,GAAGF,QAAQ,CAACnG,SAAS,EAAE,GAAGa,SAAS,GAAG,MAAM,IAAI,CAACvC,KAAK,CAAC4H,gBAAgB,CAACC,QAAQ,CAAC;IAChG,MAAMG,cAAc,GAAGL,WAAW,CAACtF,QAAQ,EAAE;IAC7C,MAAM4F,aAAa,GAAG,YAA6B;MACjD,IAAI,CAAC1H,OAAO,CAACW,OAAO,EAAE,OAAO8G,cAAc;MAC3C,MAAME,WAAW,GAAG,MAAM,IAAI,CAAC/H,KAAK,CAACoD,2BAA2B,CAACyE,cAAc,CAAC;MAChF,MAAMlB,GAAG,GAAG,IAAI,CAAC3G,KAAK,CAACsD,6BAA6B,CAAClD,OAAO,CAACW,OAAO,EAAEgH,WAAW,CAAC;MAClF,OAAOC,eAAM,CAACC,SAAS,CAACtB,GAAG,CAACX,GAAG,CAAEpC,EAAE,IAAKA,EAAE,CAACQ,OAAO,CAAC,CAAC;IACtD,CAAC;IACD,MAAM8D,UAAU,GAAG,MAAMJ,aAAa,EAAE;IACxC,MAAMK,uBAAuB,GAAGC,kCAAuB,CAACC,WAAW,CAAC,IAAI,CAACrI,KAAK,CAACgH,WAAW,CAAC;IAC3F,MAAMmB,uBAAuB,CAACG,0BAA0B,CAAC;MACvD3B,GAAG,EAAEuB,UAAU;MACfK,QAAQ,EAAE,IAAI;MACdlG,IAAI,EAAEmF,WAAW;MACjBgB,iBAAiB,EAAE;IACrB,CAAC,CAAC;IACF;IACA,MAAML,uBAAuB,CAACG,0BAA0B,CAAC;MACvD3B,GAAG,EAAEuB,UAAU,CAAC/F,eAAe,EAAE;MACjCoG,QAAQ,EAAE,IAAI;MACdC,iBAAiB,EAAE,IAAI;MACvBnG,IAAI,EAAEuF;IACR,CAAC,CAAC;IACF,MAAM,IAAI,CAACa,kBAAkB,CAACpB,UAAU,EAAEK,QAAQ,CAAC;IACnD,MAAMgB,IAAI,GAAG,IAAI,CAAC1I,KAAK,CAACgH,WAAW,CAAC2B,OAAO;IAC3C;IACA;IACA;IACA,MAAMC,gBAAyB,GAAG,EAAE;IACpC,MAAMC,SAAkB,GAAG,EAAE;IAC7B,MAAM3F,YAAY,GAAG,CAAC0E,SAAS,IAAI,CAACxH,OAAO,CAACU,QAAQ,CAAC,CAAC;IACtD,MAAMgI,iBAAiB,GAAG,MAAM,IAAAC,qBAAU,EAACb,UAAU,EAAE,MAAOtE,EAAE,IAAK;MAAA;MACnE,MAAMoF,cAAc,GAAG,MAAM,IAAI,CAAChJ,KAAK,CAACgH,WAAW,CAACC,iBAAiB,CAACrD,EAAE,CAAC;MACzE,MAAMqF,cAAc,GAAG,MAAMD,cAAc,CAACE,WAAW,CAACtF,EAAE,CAACuF,OAAO,EAAYT,IAAI,CAAC;MACnF,IAAIO,cAAc,CAACG,SAAS,EAAE,EAAE,OAAOhH,SAAS;MAChD,MAAMiH,YAAY,GAAGL,cAAc,CAACM,MAAM,CAAC1F,EAAE,CAACuF,OAAO,CAAW;MAChE,IAAI,CAACE,YAAY,EAAE,MAAM,IAAI1G,KAAK,CAAE,iCAAgCiB,EAAE,CAACpC,QAAQ,EAAG,EAAC,CAAC;MACpF,MAAM+H,UAAU,GAAG3B,SAAS,4BAAGA,SAAS,CAAC4B,YAAY,CAAC5F,EAAE,CAAC,0DAA1B,sBAA4ByB,IAAI,GAAG2D,cAAc,CAAC3D,IAAI,IAAI,IAAI;MAC7F,IAAIkE,UAAU,aAAVA,UAAU,eAAVA,UAAU,CAAE5H,OAAO,CAAC0H,YAAY,CAAC,EAAE;QACrCT,gBAAgB,CAAC9E,IAAI,CAACF,EAAE,CAAC;QACzB,OAAOxB,SAAS;MAClB;MACA;MACA;MACA;MACA,MAAMqH,WAAW,GAAG,MAAM,IAAAC,gCAAc,EAAC;QACvChB,IAAI;QACJM,cAAc;QACdW,UAAU,EAAEJ,UAAU;QACtBK,UAAU,EAAEP;MACd,CAAC,CAAC;MACF,MAAMQ,eAAe,GAAG3G,YAAY,GAChC4G,aAAa,CAAClH,sBAAY,EAAEyE,UAAU,EAAEzD,EAAE,EAAE6F,WAAW,EAAER,cAAc,CAAC,GACxE7G,SAAS;MACb,MAAMuG,OAAoB,GAAG,EAAE;MAC/B,IAAIkB,eAAe,EAAElB,OAAO,CAAC7E,IAAI,CAAC+F,eAAe,CAAC;MAClD,IAAIjC,SAAS,EAAE;QACbA,SAAS,CAACmC,YAAY,CAAC;UAAEnG,EAAE,EAAEA,EAAE,CAACwB,aAAa,CAAChD,SAAS,CAAC;UAAEiD,IAAI,EAAEgE;QAAa,CAAC,CAAC;MACjF,CAAC,MAAM;QACLL,cAAc,CAACgB,OAAO,CAACX,YAAY,CAAC;QACpCV,OAAO,CAAC7E,IAAI,CAACkF,cAAc,CAAC;MAC9B;MACAH,SAAS,CAAC/E,IAAI,CAACF,EAAE,CAAC;MAClB,OAAO;QAAEA,EAAE;QAAE+E;MAAQ,CAAC;IACxB,CAAC,CAAC;IACF,MAAMsB,UAAU,GAAG,IAAA9D,iBAAO,EAAC2C,iBAAiB,CAAC,CAAC9C,GAAG,CAAEkE,CAAC,IAAKA,CAAC,CAACvB,OAAO,CAAC;IACnE,MAAMwB,cAAc,GAAGF,UAAU,CAACG,IAAI,EAAE;IACxC,IAAIxC,SAAS,EAAEuC,cAAc,CAACrG,IAAI,CAAC8D,SAAS,CAAC;IAC7C,MAAMc,IAAI,CAAC2B,mBAAmB,CAACF,cAAc,CAAC;IAC9C,IAAIG,WAAqB,GAAG,EAAE;IAC9B,IAAIlK,OAAO,CAAC0D,IAAI,EAAE;MAChB,MAAM6C,GAAG,GAAG,IAAAR,iBAAO,EAAC2C,iBAAiB,CAAC,CAAC9C,GAAG,CAAEkE,CAAC,IAAKA,CAAC,CAACtG,EAAE,CAAC;MACvD,MAAMd,MAAM,GAAGkF,eAAM,CAACC,SAAS,CAACtB,GAAG,CAAC;MACpC,MAAM;QAAE4D;MAAS,CAAC,GAAG,MAAM,IAAI,CAACtK,QAAQ,CAACuK,UAAU,CAAC;QAClDxK,KAAK,EAAE,IAAI,CAACA,KAAK,CAACgH,WAAW;QAC7BL,GAAG,EAAEzD,YAAY,GAAGJ,MAAM,GAAG,KAAIkF,eAAM,GAAE;QACzCyC,kBAAkB,EAAEvH,YAAY,GAAGJ,MAAM,GAAG,KAAIkF,eAAM,GAAE;QACxD0C,UAAU,EAAE9C,SAAS;QACrB+C,WAAW,EAAE,KAAK;QAClB;QACA;QACAC,eAAe,EAAE1H;MACnB,CAAC,CAAC;MACFoH,WAAW,GAAGC,QAAQ,CAACvE,GAAG,CAAEpC,EAAE,IAAKA,EAAE,CAACpC,QAAQ,EAAE,CAAC;IACnD;IAEA,OAAO;MACLoH,gBAAgB,EAAEA,gBAAgB,CAAC5C,GAAG,CAAEpC,EAAE,IAAKA,EAAE,CAACpC,QAAQ,EAAE,CAAC;MAC7DqH,SAAS,EAAEA,SAAS,CAAC7C,GAAG,CAAEpC,EAAE,IAAKA,EAAE,CAACpC,QAAQ,EAAE,CAAC;MAC/C8I;IACF,CAAC;EACH;EACA,MAAc7B,kBAAkB,CAACpB,UAAkB,EAAEK,QAAgB,EAAE;IACrE,MAAMmD,MAAM,GAAG,MAAM,IAAI,CAAChL,KAAK,CAACiL,UAAU,CAACzD,UAAU,EAAEK,QAAQ,EAAE;MAAEqD,WAAW,EAAE;IAAK,CAAC,CAAC;IACvF,MAAMC,gBAAgB,GAAGH,MAAM,CAACI,gBAAgB,CAAC9G,MAAM,CAAE+G,CAAC,IAAK,CAACA,CAAC,CAACC,QAAQ,CAAC;IAC3E,IAAIH,gBAAgB,CAACnG,MAAM,EAAE;MAC3B,MAAM,IAAIlC,KAAK,CAAE;AACvB,EAAEqI,gBAAgB,CAAChF,GAAG,CAAEkF,CAAC,IAAKA,CAAC,CAACE,WAAW,CAAC5J,QAAQ,EAAE,CAAC,CAACgF,IAAI,CAAC,IAAI,CAAE,EAAC,CAAC;IACjE;EACF;EAeA,aAAa6E,QAAQ,CAAC,CAACxL,KAAK,EAAEyL,GAAG,EAAE3L,SAAS,EAAEC,OAAO,EAAE2L,UAAU,EAAExL,MAAM,EAAEC,KAAK,EAAEC,QAAQ,CASzF,EAAE;IAAA;IACD,MAAMH,MAAM,GAAGyL,UAAU,CAACC,YAAY,CAACC,8BAAgB,CAAC7H,EAAE,CAAC;IAC3D,MAAM8H,YAAY,GAAGJ,GAAG,CAACK,UAAU,CAAC,MAAM,CAAC;IAC3C,MAAMC,cAAc,GAAG,IAAInM,cAAc,CAACE,SAAS,EAAEC,OAAO,EAAEC,KAAK,EAAEC,MAAM,EAAEC,MAAM,EAAEC,KAAK,EAAEC,QAAQ,CAAC;IACrGyL,YAAY,aAAZA,YAAY,gDAAZA,YAAY,CAAEG,QAAQ,0DAAtB,sBAAwB/H,IAAI,CAAC,KAAIgI,yBAAY,EAACF,cAAc,CAAC,CAAC;IAC9DN,GAAG,CAACS,QAAQ,CAAC,KAAIC,2CAAqB,EAACJ,cAAc,CAAC,CAAC;IACvD,OAAOA,cAAc;EACvB;AACF;AAAC;AAAA,gCA5VYnM,cAAc,WA8TV,EAAE;AAAA,gCA9TNA,cAAc,kBA+TH,CACpBwM,oBAAW,EACXC,gBAAS,EACTC,oBAAe,EACfC,kBAAa,EACbC,sBAAY,EACZC,sBAAY,EACZC,oBAAW,EACXC,sBAAY,CACb;AAAA,gCAxUU/M,cAAc,aAyURgN,kBAAW;AAqB9B,eAAelJ,sBAAsB,CACnCP,mBAA2C,EAC3C0J,aAA4B,EAC5BC,SAAkB,EAClBhN,SAAoB,EACpBqB,WAAW,GAAG,KAAK,EACnByB,SAAgB;AAAE;AAClBS,YAAsB,EACW;EACjC,MAAM0J,iBAAiB,GAAG5E,eAAM,CAACC,SAAS,CAACyE,aAAa,CAAC1G,GAAG,CAAErC,CAAC,IAAKA,CAAC,CAACS,OAAO,CAAC,CAAC;EAC/E,MAAMyI,oBAAoB,GAAGF,SAAS,CAACxI,MAAM,CAAEV,KAAK,IAAK,CAACmJ,iBAAiB,CAACE,iBAAiB,CAACrJ,KAAK,CAAC,CAAC;EACrG,MAAMsJ,uBAA+C,GAAG,EAAE;EAC1D,MAAMC,SAAkB,GAAG,EAAE;EAC7B,MAAM,IAAAjE,qBAAU,EAAC2D,aAAa,EAAE,MAAOO,MAAM,IAAK;IAChD,MAAMC,UAAU,GAAGlK,mBAAmB,CAACU,IAAI,CAAEC,CAAC,IAAKA,CAAC,CAACC,EAAE,CAACC,qBAAqB,CAACoJ,MAAM,CAAC7I,OAAO,CAAC,CAAC;IAC9F,IAAI,CAAC8I,UAAU,EAAE;MACf,MAAM,IAAIvK,KAAK,CAAE,0CAAyCsK,MAAM,CAACzL,QAAQ,EAAG,sBAAqB,CAAC;IACpG;IACAuL,uBAAuB,CAACjJ,IAAI,CAACoJ,UAAU,CAAC;IACxC,IAAIA,UAAU,CAAClJ,eAAe,EAAE;MAC9B;IACF;IACA,IAAI,CAACvB,SAAS,EAAE;MACd;MACA;IACF;IACA,MAAM;MAAEgH;IAAY,CAAC,GAAGyD,UAAU;IAClC,IAAI,CAACzD,WAAW,EAAE;MAChB,MAAM,IAAI9G,KAAK,CAAE,0DAAyDsK,MAAM,CAACzL,QAAQ,EAAG,EAAC,CAAC;IAChG;IACA,IAAI2L,cAAc,GAAG1D,WAAW,CAAC2D,iBAAiB;IAClD,IAAI,CAACD,cAAc,CAACtI,MAAM,EAAE;MAC1B;IACF;IACA,MAAMmE,cAAc,GAAG,MAAMrJ,SAAS,CAACW,QAAQ,CAACN,KAAK,CAACiH,iBAAiB,CAACgG,MAAM,CAAC7I,OAAO,CAAC;IACvF,IAAIlB,YAAY,EAAE;MAAA;MAChB;MACA,MAAMmK,YAAY,GAAG5K,SAAS,4BAAGA,SAAS,CAAC+G,YAAY,CAACyD,MAAM,CAAC7I,OAAO,CAAC,0DAAtC,sBAAwCiB,IAAI,GAAG2D,cAAc,CAAC3D,IAAI;MACnG,IAAI,CAACgI,YAAY,EAAE;QACjB,MAAM,IAAI1K,KAAK,CAAE,mDAAkDsK,MAAM,CAACzL,QAAQ,EAAG,EAAC,CAAC;MACzF;MACA2L,cAAc,GAAG,CAACE,YAAY,CAAC;IACjC;IAEA,MAAM,IAAAtE,qBAAU,EAACoE,cAAc,EAAE,MAAOG,aAAa,IAAK;MACxD,MAAMC,UAAU,GAAG,MAAMvE,cAAc,CAACE,WAAW,CAACoE,aAAa,CAAC9L,QAAQ,EAAE,EAAE7B,SAAS,CAACW,QAAQ,CAACN,KAAK,CAAC2I,OAAO,CAAC;MAC/G,MAAM6E,aAAa,GAAGD,UAAU,CAACE,2BAA2B,EAAE;MAC9D,MAAMC,uBAAuB,GAAGF,aAAa,CAACrJ,MAAM,CAAEP,EAAE,IACtDiJ,oBAAoB,CAACnJ,IAAI,CAAED,KAAK,IAAKA,KAAK,CAACI,qBAAqB,CAACD,EAAE,CAAC,CAAC,CACtE;MACD,IAAI,CAAC8J,uBAAuB,CAAC7I,MAAM,EAAE;QACnC;MACF;MACA,MAAM8I,UAAmB,GAAG,EAAE;MAC9B,MAAM7G,OAAO,CAACC,GAAG,CACf2G,uBAAuB,CAAC1H,GAAG,CAAC,MAAO4H,GAAG,IAAK;QACzC,MAAMC,QAAQ,GAAG,MAAMlO,SAAS,CAACW,QAAQ,CAACN,KAAK,CAAC8N,UAAU,CAACF,GAAG,EAAEnL,SAAS,CAAC;QAC1E,IAAIoL,QAAQ,EAAE;UACZF,UAAU,CAAC7J,IAAI,CAAC8J,GAAG,CAAC;QACtB;MACF,CAAC,CAAC,CACH;MACD,IAAI,CAACD,UAAU,CAAC9I,MAAM,EAAE;QACtB;MACF;MACA,IAAI,CAAC7D,WAAW,EAAE;QAChB,MAAM,KAAIX,oBAAQ,EAAE,mBAAkB4M,MAAM,CAACzL,QAAQ,EAAG;AAChE,qBAAqB8L,aAAa,CAAC9L,QAAQ,EAAG;AAC9C,EAAEmM,UAAU,CAAC3H,GAAG,CAAE+H,CAAC,IAAKA,CAAC,CAACvM,QAAQ,EAAE,CAAC,CAACgF,IAAI,CAAC,IAAI,CAAE,EAAC,CAAC;MAC7C;MACAwG,SAAS,CAAClJ,IAAI,CAAC,GAAG6J,UAAU,CAAC;IAC/B,CAAC,CAAC;EACJ,CAAC,CAAC;EACF,IAAIX,SAAS,CAACnI,MAAM,EAAE;IACpB,MAAMmJ,QAAQ,GAAGhG,eAAM,CAACiG,aAAa,CAACjB,SAAS,CAAC;IAChDgB,QAAQ,CAACxK,OAAO,CAAEI,EAAE,IAAK;MACvB,MAAMsJ,UAAU,GAAGlK,mBAAmB,CAACU,IAAI,CAAEC,CAAC,IAAKA,CAAC,CAACC,EAAE,CAACC,qBAAqB,CAACD,EAAE,CAAC,CAAC;MAClF,IAAI,CAACsJ,UAAU,EAAE;QACf,MAAM,IAAIvK,KAAK,CAAE,0CAAyCiB,EAAE,CAACpC,QAAQ,EAAG,sBAAqB,CAAC;MAChG;MACAuL,uBAAuB,CAACjJ,IAAI,CAACoJ,UAAU,CAAC;IAC1C,CAAC,CAAC;EACJ;EACA,OAAOH,uBAAuB;AAChC;AAEA,eAAezI,WAAW,CAACtB,mBAA2C,EAAEvB,WAAmB,EAAEnB,QAAkB,EAAE;EAC/G,MAAM4N,eAAe,GAAG5N,QAAQ,CAACgB,gBAAgB,EAAE,CAACwE,IAAI;EACxD,MAAMqI,mBAAmB,GAAGnL,mBAAmB,CAACmB,MAAM,CAAER,CAAC,IAAK,CAACA,CAAC,CAACK,eAAe,CAAC;EACjF,MAAM8C,OAAO,CAACC,GAAG,CACfoH,mBAAmB,CAACnI,GAAG,CAAC,OAAO;IAAEpC,EAAE;IAAE6F,WAAW;IAAE2E;EAAmB,CAAC,KAAK;IACzE,IAAI,CAAC3E,WAAW,EAAE;MAChB,MAAM,IAAI9G,KAAK,CAAE,iDAAgDiB,EAAE,CAACpC,QAAQ,EAAG,EAAC,CAAC;IACnF;IACA,MAAM6M,YAAY,GAAGvE,aAAa,CAACoE,eAAe,EAAEzM,WAAW,EAAEmC,EAAE,EAAE6F,WAAW,EAAE2E,kBAAkB,CAAC;IACrG,IAAIC,YAAY,EAAE;MAChB/N,QAAQ,CAACN,KAAK,CAAC2I,OAAO,CAAC2F,GAAG,CAACD,YAAY,CAAC;MACxC,MAAMrF,cAAc,GAAG,MAAM1I,QAAQ,CAACN,KAAK,CAACiH,iBAAiB,CAACrD,EAAE,CAAC;MACjE,MAAM2K,cAAc,GAAG,MAAMvF,cAAc,CAACwF,2BAA2B,CAAClO,QAAQ,CAACN,KAAK,CAAC2I,OAAO,EAAE,CAAC0F,YAAY,CAAC,CAAC;MAC/G,IAAIE,cAAc,EAAEjO,QAAQ,CAACN,KAAK,CAAC2I,OAAO,CAAC2F,GAAG,CAACC,cAAc,CAAC;IAChE;EACF,CAAC,CAAC,CACH;AACH;;AAEA;AACA;AACA;AACA,SAASzE,aAAa,CACpBoE,eAAuB,EACvBzM,WAAmB,EACnBmC,EAAS,EACT6F,WAA0B,EAC1B2E,kBAA4B,EACP;EACrB,IAAI3E,WAAW,CAACgF,UAAU,EAAE,EAAE;IAC5B,MAAM,KAAIpO,oBAAQ,EAAE,4BAA2BuD,EAAE,CAACpC,QAAQ,EAAG;AACjE,yBACMC,WAAW,CAACqE,IACb,qBAAoBoI,eAAgB,8BAA6BA,eAAgB,kBAChFzM,WAAW,CAACqE,IACb;AACL,uEAAuErE,WAAW,CAACqE,IAAK,GAAE,CAAC;EACzF;EACA,IAAI2D,WAAW,CAACiF,aAAa,EAAE,EAAE;IAC/B;IACA,OAAOtM,SAAS;EAClB;EACA,IAAI,CAACqH,WAAW,CAACkF,aAAa,EAAE,EAAE;IAChC;IACA,OAAOvM,SAAS;EAClB;EACA;EACA,MAAMwM,WAAW,GAAGnF,WAAW,CAAC2D,iBAAiB;EACjD,IAAIwB,WAAW,CAAC/J,MAAM,KAAK,CAAC,EAAE;IAC5B,MAAM,IAAIlC,KAAK,CAAE,sDAAqD,CAAC;EACzE;EACA;EACA;EACA;EACA;EACA;EACA;EACA,IAAI,CAACyL,kBAAkB,EAAE;IACvB,MAAM,IAAIzL,KAAK,CAAC,qDAAqD,CAAC;EACxE;EAEA,MAAMkM,cAAc,GAAGT,kBAAkB,CAACU,OAAO;;EAEjD;EACA,IAAIrF,WAAW,CAACsF,uBAAuB,EAAE;IACvCX,kBAAkB,CAACY,eAAe,CAACvF,WAAW,CAACsF,uBAAuB,CAAC;EACzE,CAAC,MAAM;IACL;IACAX,kBAAkB,CAACU,OAAO,CAACtL,OAAO,CAAEyL,GAAG,IAAKb,kBAAkB,CAACc,YAAY,CAACD,GAAG,CAAC,CAAC;EACnF;EACAb,kBAAkB,CAACe,WAAW,CAAC;IAAEC,eAAe,EAAEP,cAAc;IAAEpK,MAAM,EAAEhD;EAAY,CAAC,CAAC;EACxF,OAAO2M,kBAAkB;AAC3B;AAEA3C,8BAAgB,CAAC4D,UAAU,CAAC5P,cAAc,CAAC;AAAC,eAE7BA,cAAc;AAAA"}
+{"version":3,"names":["MergeLanesMain","constructor","workspace","merging","lanes","logger","remove","scope","exporter","mergeLane","laneName","options","BitError","consumer","mergeStrategy","noSnap","tag","snapMessage","existingOnWorkspaceOnly","build","keepReadme","noSquash","pattern","includeDeps","skipDependencyInstallation","resolveUnrelated","ignoreConfigChanges","skipFetch","currentLaneId","getCurrentLaneId","isDefault","toString","otherLaneId","getParsedLaneId","isEqual","currentLane","loadLane","isDefaultLane","getOtherLane","importer","importObjectsFromMainIfExist","toBitIds","toVersionLatest","undefined","lane","shouldFetch","isNew","otherLane","fetchLaneWithItsComponents","allIds","laneComps","getManyConsumerComponents","allRefs","map","comp","getRefsFromExtensions","extensions","flat","allRefsUniq","uniq","r","scopeImporter","importManyObjects","err","error","getBitIds","Error","DEFAULT_LANE","getMainIdsToMerge","bitIds","debug","allComponentsStatus","getMergeStatus","shouldSquash","componentIds","resolveMultipleComponentIds","compIdsFromPattern","filterIdsFromPoolIdsByPattern","filterComponentsStatus","forEach","bitId","find","c","id","isEqualWithoutVersion","push","unmergedLegitimately","unmergedMessage","workspaceIds","listIds","filter","_legacy","throwForFailures","squashSnaps","mergeResults","mergeSnaps","laneId","localLane","mergedSuccessfully","failedComponents","length","every","failedComponent","unchangedLegitimately","deleteResults","readmeComponent","readmeComponentId","changeVersion","head","hash","componentsPattern","force","remote","track","deleteFiles","fromLane","readmeResult","name","configMergeResults","configMergeResult","onDestroy","compact","failureMsgs","chalk","bold","red","join","laneIds","mainNotOnLane","ids","hasScope","modelComponents","Promise","all","legacyScope","getModelComponent","toBitId","mergeFromScope","toLane","fromLaneId","LaneId","parse","fromLaneObj","importLaneObject","toLaneId","getDefaultLaneId","toLaneObj","fromLaneBitIds","getIdsToMerge","laneCompIds","BitIds","fromArray","idsToMerge","scopeComponentsImporter","ScopeComponentsImporter","getInstance","importManyDeltaWithoutDeps","fromHead","ignoreMissingHead","throwIfNotUpToDate","repo","objects","mergedPreviously","mergedNow","bitObjectsPerComp","pMapSeries","modelComponent","fromVersionObj","loadVersion","version","isRemoved","fromLaneHead","getRef","toLaneHead","getComponent","divergeData","getDivergeData","sourceHead","targetHead","modifiedVersion","squashOneComp","addComponent","setHead","bitObjects","b","bitObjectsFlat","writeObjectsToTheFS","exportedIds","exported","exportMany","idsWithFutureScope","laneObject","allVersions","exportHeadsOnly","status","diffStatus","skipChanges","compsNotUpToDate","componentsStatus","s","upToDate","componentId","provider","cli","loggerMain","createLogger","MergeLanesAspect","lanesCommand","getCommand","mergeLanesMain","commands","MergeLaneCmd","register","MergeLaneFromScopeCmd","LanesAspect","CLIAspect","WorkspaceAspect","MergingAspect","LoggerAspect","RemoveAspect","ScopeAspect","ExportAspect","MainRuntime","compIdsToKeep","allBitIds","bitIdsFromPattern","bitIdsNotFromPattern","hasWithoutVersion","filteredComponentStatus","depsToAdd","compId","fromStatus","targetVersions","snapsOnTargetOnly","headOnTarget","remoteVersion","versionObj","flattenedDeps","getAllFlattenedDependencies","depsNotIncludeInPattern","depsOnLane","dep","isOnLane","isIdOnLane","d","depsUniq","uniqFromArray","currentLaneName","succeededComponents","componentFromModel","modifiedComp","add","versionHistory","updateRebasedVersionHistory","isDiverged","isSourceAhead","isTargetAhead","remoteSnaps","currentParents","parents","commonSnapBeforeDiverge","addAsOnlyParent","ref","removeParent","setSquashed","previousParents","addRuntime"],"sources":["merge-lanes.main.runtime.ts"],"sourcesContent":["import { BitError } from '@teambit/bit-error';\nimport { CLIAspect, CLIMain, MainRuntime } from '@teambit/cli';\nimport { LanesAspect, LanesMain } from '@teambit/lanes';\nimport MergingAspect, {\n  MergingMain,\n  ComponentMergeStatus,\n  ConfigMergeResult,\n  ApplyVersionResults,\n} from '@teambit/merging';\nimport WorkspaceAspect, { Workspace } from '@teambit/workspace';\nimport chalk from 'chalk';\nimport { BitId } from '@teambit/legacy-bit-id';\nimport pMapSeries from 'p-map-series';\nimport { Consumer } from '@teambit/legacy/dist/consumer';\nimport { MergeStrategy } from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport { BitIds } from '@teambit/legacy/dist/bit-id';\nimport { ScopeAspect, ScopeMain } from '@teambit/scope';\nimport ScopeComponentsImporter from '@teambit/legacy/dist/scope/component-ops/scope-components-importer';\nimport { ComponentID } from '@teambit/component-id';\nimport { DEFAULT_LANE, LaneId } from '@teambit/lane-id';\nimport { Lane, Version } from '@teambit/legacy/dist/scope/models';\nimport { getRefsFromExtensions } from '@teambit/legacy/dist/consumer/component/sources/artifact-files';\nimport { Logger, LoggerAspect, LoggerMain } from '@teambit/logger';\nimport { SnapsDistance } from '@teambit/legacy/dist/scope/component-ops/snaps-distance';\nimport { RemoveAspect, RemoveMain } from '@teambit/remove';\nimport { compact, uniq } from 'lodash';\nimport { ExportAspect, ExportMain } from '@teambit/export';\nimport { BitObject } from '@teambit/legacy/dist/scope/objects';\nimport { getDivergeData } from '@teambit/legacy/dist/scope/component-ops/get-diverge-data';\nimport { MergeLanesAspect } from './merge-lanes.aspect';\nimport { MergeLaneCmd } from './merge-lane.cmd';\nimport { MergeLaneFromScopeCmd } from './merge-lane-from-scope.cmd';\n\nexport type MergeLaneOptions = {\n  mergeStrategy: MergeStrategy;\n  noSnap: boolean;\n  snapMessage: string;\n  existingOnWorkspaceOnly: boolean;\n  build: boolean;\n  keepReadme: boolean;\n  noSquash: boolean;\n  tag?: boolean;\n  pattern?: string;\n  includeDeps?: boolean;\n  skipDependencyInstallation?: boolean;\n  resolveUnrelated?: MergeStrategy;\n  ignoreConfigChanges?: boolean;\n  skipFetch?: boolean;\n};\n\nexport class MergeLanesMain {\n  constructor(\n    private workspace: Workspace | undefined,\n    private merging: MergingMain,\n    private lanes: LanesMain,\n    private logger: Logger,\n    private remove: RemoveMain,\n    private scope: ScopeMain,\n    private exporter: ExportMain\n  ) {}\n\n  async mergeLane(\n    laneName: string,\n    options: MergeLaneOptions\n  ): Promise<{ mergeResults: ApplyVersionResults; deleteResults: any; configMergeResults: ConfigMergeResult[] }> {\n    if (!this.workspace) {\n      throw new BitError(`unable to merge a lane outside of Bit workspace`);\n    }\n    const consumer = this.workspace.consumer;\n\n    const {\n      mergeStrategy,\n      noSnap,\n      tag,\n      snapMessage,\n      existingOnWorkspaceOnly,\n      build,\n      keepReadme,\n      noSquash,\n      pattern,\n      includeDeps,\n      skipDependencyInstallation,\n      resolveUnrelated,\n      ignoreConfigChanges,\n      skipFetch,\n    } = options;\n\n    const currentLaneId = consumer.getCurrentLaneId();\n    if (tag && !currentLaneId.isDefault()) {\n      throw new BitError(`--tag only possible when on main. currently checked out to ${currentLaneId.toString()}`);\n    }\n    const otherLaneId = await consumer.getParsedLaneId(laneName);\n    if (otherLaneId.isEqual(currentLaneId)) {\n      throw new BitError(\n        `unable to merge lane \"${otherLaneId.toString()}\", you're already at this lane. to get updates, simply run \"bit checkout head\"`\n      );\n    }\n    const currentLane = currentLaneId.isDefault() ? null : await consumer.scope.loadLane(currentLaneId);\n    const isDefaultLane = otherLaneId.isDefault();\n    const getOtherLane = async () => {\n      if (isDefaultLane) {\n        if (!skipFetch) {\n          await this.lanes.importer.importObjectsFromMainIfExist(currentLane?.toBitIds().toVersionLatest() || []);\n        }\n        return undefined;\n      }\n      let lane = await consumer.scope.loadLane(otherLaneId);\n      const shouldFetch = !lane || (!skipFetch && !lane.isNew);\n      if (shouldFetch) {\n        // don't assign `lane` to the result of this command. otherwise, if you have local snaps, it'll ignore them and use the remote-lane.\n        const otherLane = await this.lanes.fetchLaneWithItsComponents(otherLaneId);\n\n        // get all artifacts\n        const allIds = otherLane.toBitIds();\n        const laneComps = await consumer.scope.getManyConsumerComponents(allIds);\n        const allRefs = laneComps.map((comp) => getRefsFromExtensions(comp.extensions)).flat();\n        const allRefsUniq = uniq(allRefs.map((r) => r.toString()));\n        try {\n          await consumer.scope.scopeImporter.importManyObjects({ [otherLaneId.scope]: allRefsUniq });\n        } catch (err) {\n          this.logger.error(`failed fetching artifacts for lane ${otherLaneId.toString()}`, err);\n        }\n\n        lane = await consumer.scope.loadLane(otherLaneId);\n      }\n      return lane;\n    };\n    const otherLane = await getOtherLane();\n    const getBitIds = async () => {\n      if (isDefaultLane) {\n        if (!currentLane) throw new Error(`unable to merge ${DEFAULT_LANE}, the current lane was not found`);\n        return this.getMainIdsToMerge(currentLane);\n      }\n      if (!otherLane) throw new Error(`lane must be defined for non-default`);\n      return otherLane.toBitIds();\n    };\n    const bitIds = await getBitIds();\n    this.logger.debug(`merging the following bitIds: ${bitIds.toString()}`);\n\n    let allComponentsStatus = await this.merging.getMergeStatus(bitIds, currentLane, otherLane, {\n      resolveUnrelated,\n      ignoreConfigChanges,\n    });\n    const shouldSquash = currentLaneId.isDefault() && !noSquash;\n\n    if (pattern) {\n      const componentIds = await this.workspace.resolveMultipleComponentIds(bitIds);\n      const compIdsFromPattern = this.workspace.scope.filterIdsFromPoolIdsByPattern(pattern, componentIds);\n      allComponentsStatus = await filterComponentsStatus(\n        allComponentsStatus,\n        compIdsFromPattern,\n        bitIds,\n        this.workspace,\n        includeDeps,\n        otherLane || undefined,\n        shouldSquash\n      );\n      bitIds.forEach((bitId) => {\n        if (!allComponentsStatus.find((c) => c.id.isEqualWithoutVersion(bitId))) {\n          allComponentsStatus.push({ id: bitId, unmergedLegitimately: true, unmergedMessage: `excluded by pattern` });\n        }\n      });\n    }\n    if (existingOnWorkspaceOnly) {\n      const workspaceIds = await this.workspace.listIds();\n      const compIdsFromPattern = workspaceIds.filter((id) =>\n        allComponentsStatus.find((c) => c.id.isEqualWithoutVersion(id._legacy))\n      );\n      allComponentsStatus = await filterComponentsStatus(\n        allComponentsStatus,\n        compIdsFromPattern,\n        bitIds,\n        this.workspace,\n        includeDeps,\n        otherLane || undefined,\n        shouldSquash\n      );\n      bitIds.forEach((bitId) => {\n        if (!allComponentsStatus.find((c) => c.id.isEqualWithoutVersion(bitId))) {\n          allComponentsStatus.push({ id: bitId, unmergedLegitimately: true, unmergedMessage: `not in the workspace` });\n        }\n      });\n    }\n\n    throwForFailures();\n\n    if (shouldSquash) {\n      await squashSnaps(allComponentsStatus, otherLaneId, consumer);\n    }\n\n    const mergeResults = await this.merging.mergeSnaps({\n      mergeStrategy,\n      allComponentsStatus,\n      laneId: otherLaneId,\n      localLane: currentLane,\n      noSnap,\n      tag,\n      snapMessage,\n      build,\n      skipDependencyInstallation,\n    });\n\n    const mergedSuccessfully =\n      !mergeResults.failedComponents ||\n      mergeResults.failedComponents.length === 0 ||\n      mergeResults.failedComponents.every((failedComponent) => failedComponent.unchangedLegitimately);\n\n    let deleteResults = {};\n\n    if (!keepReadme && otherLane && otherLane.readmeComponent && mergedSuccessfully) {\n      const readmeComponentId = otherLane.readmeComponent.id\n        .changeVersion(otherLane.readmeComponent?.head?.hash)\n        .toString();\n\n      deleteResults = await this.remove.remove({\n        componentsPattern: readmeComponentId,\n        force: false,\n        remote: false,\n        track: false,\n        deleteFiles: true,\n        fromLane: false,\n      });\n    } else if (otherLane && !otherLane.readmeComponent) {\n      deleteResults = { readmeResult: `\\nlane ${otherLane.name} doesn't have a readme component` };\n    }\n    const configMergeResults = allComponentsStatus.map((c) => c.configMergeResult);\n\n    await this.workspace.consumer.onDestroy();\n\n    return { mergeResults, deleteResults, configMergeResults: compact(configMergeResults) };\n\n    function throwForFailures() {\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  }\n\n  private async getMainIdsToMerge(lane: Lane) {\n    const laneIds = lane.toBitIds();\n    if (!this.workspace) {\n      throw new BitError(`getMainIdsToMerge needs workspace`);\n    }\n    const workspaceIds = (await this.workspace.listIds()).map((id) => id._legacy);\n    const mainNotOnLane = workspaceIds.filter((id) => !laneIds.find((laneId) => laneId.isEqualWithoutVersion(id)));\n    const ids = [...laneIds, ...mainNotOnLane].filter((id) => id.hasScope());\n    const modelComponents = await Promise.all(ids.map((id) => this.scope.legacyScope.getModelComponent(id)));\n    return compact(\n      modelComponents.map((c) => {\n        if (!c.head) return null; // probably the component was never merged to main\n        return c.toBitId().changeVersion(c.head.toString());\n      })\n    );\n  }\n\n  async mergeFromScope(\n    fromLane: string,\n    toLane: string,\n    options: Partial<MergeLaneOptions> & { push?: boolean }\n  ): Promise<{\n    mergedPreviously: string[];\n    mergedNow: string[];\n    exportedIds: string[];\n  }> {\n    if (this.workspace) {\n      throw new BitError(\n        `unable to run this command from a workspace, please create a new bare-scope and run it from there`\n      );\n    }\n    const fromLaneId = LaneId.parse(fromLane);\n    const fromLaneObj = await this.lanes.importLaneObject(fromLaneId);\n    const toLaneId = toLane === DEFAULT_LANE ? this.lanes.getDefaultLaneId() : LaneId.parse(toLane);\n    const toLaneObj = toLaneId.isDefault() ? undefined : await this.lanes.importLaneObject(toLaneId);\n    const fromLaneBitIds = fromLaneObj.toBitIds();\n    const getIdsToMerge = async (): Promise<BitIds> => {\n      if (!options.pattern) return fromLaneBitIds;\n      const laneCompIds = await this.scope.resolveMultipleComponentIds(fromLaneBitIds);\n      const ids = this.scope.filterIdsFromPoolIdsByPattern(options.pattern, laneCompIds);\n      return BitIds.fromArray(ids.map((id) => id._legacy));\n    };\n    const idsToMerge = await getIdsToMerge();\n    const scopeComponentsImporter = ScopeComponentsImporter.getInstance(this.scope.legacyScope);\n    await scopeComponentsImporter.importManyDeltaWithoutDeps({\n      ids: idsToMerge,\n      fromHead: true,\n      lane: fromLaneObj,\n      ignoreMissingHead: true,\n    });\n    // get their main/to-lane as well\n    await scopeComponentsImporter.importManyDeltaWithoutDeps({\n      ids: idsToMerge.toVersionLatest(),\n      fromHead: true,\n      ignoreMissingHead: true,\n      lane: toLaneObj,\n    });\n    await this.throwIfNotUpToDate(fromLaneId, toLaneId);\n    const repo = this.scope.legacyScope.objects;\n    // loop through all components, make sure they're all ahead of main (it might not be on main yet).\n    // then, change the version object to include an extra parent to point to the main.\n    // then, change the component object head to point to this changed version\n    const mergedPreviously: BitId[] = [];\n    const mergedNow: BitId[] = [];\n    const shouldSquash = !toLaneObj && !options.noSquash; // only when merging to main we squash.\n    const bitObjectsPerComp = await pMapSeries(idsToMerge, async (id) => {\n      const modelComponent = await this.scope.legacyScope.getModelComponent(id);\n      const fromVersionObj = await modelComponent.loadVersion(id.version as string, repo);\n      if (fromVersionObj.isRemoved()) return undefined;\n      const fromLaneHead = modelComponent.getRef(id.version as string);\n      if (!fromLaneHead) throw new Error(`lane head must be defined for ${id.toString()}`);\n      const toLaneHead = toLaneObj ? toLaneObj.getComponent(id)?.head : modelComponent.head || null;\n      if (toLaneHead?.isEqual(fromLaneHead)) {\n        mergedPreviously.push(id);\n        return undefined;\n      }\n      // this might be confusing, we pass the toLaneHead as the sourceHead and the fromLaneHead as the targetHead.\n      // this is because normally, in the workspace, we merge another lane (target) into the current lane (source).\n      // so effectively, in the workspace, we merge fromLane=target into toLane=source.\n      const divergeData = await getDivergeData({\n        repo,\n        modelComponent,\n        sourceHead: toLaneHead,\n        targetHead: fromLaneHead,\n      });\n      const modifiedVersion = shouldSquash\n        ? squashOneComp(DEFAULT_LANE, fromLaneId, id, divergeData, fromVersionObj)\n        : undefined;\n      const objects: BitObject[] = [];\n      if (modifiedVersion) objects.push(modifiedVersion);\n      if (toLaneObj) {\n        toLaneObj.addComponent({ id: id.changeVersion(undefined), head: fromLaneHead });\n      } else {\n        modelComponent.setHead(fromLaneHead);\n        objects.push(modelComponent);\n      }\n      mergedNow.push(id);\n      return { id, objects };\n    });\n    const bitObjects = compact(bitObjectsPerComp).map((b) => b.objects);\n    const bitObjectsFlat = bitObjects.flat();\n    if (toLaneObj) bitObjectsFlat.push(toLaneObj);\n    await repo.writeObjectsToTheFS(bitObjectsFlat);\n    let exportedIds: string[] = [];\n    if (options.push) {\n      const ids = compact(bitObjectsPerComp).map((b) => b.id);\n      const bitIds = BitIds.fromArray(ids);\n      const { exported } = await this.exporter.exportMany({\n        scope: this.scope.legacyScope,\n        ids: shouldSquash ? bitIds : new BitIds(),\n        idsWithFutureScope: shouldSquash ? bitIds : new BitIds(),\n        laneObject: toLaneObj,\n        allVersions: false,\n        // no need to export anything else other than the head. the normal calculation of what to export won't apply here\n        // as it is done from the scope.\n        exportHeadsOnly: shouldSquash,\n      });\n      exportedIds = exported.map((id) => id.toString());\n    }\n\n    return {\n      mergedPreviously: mergedPreviously.map((id) => id.toString()),\n      mergedNow: mergedNow.map((id) => id.toString()),\n      exportedIds,\n    };\n  }\n  private async throwIfNotUpToDate(fromLaneId: LaneId, toLaneId: LaneId) {\n    const status = await this.lanes.diffStatus(fromLaneId, toLaneId, { skipChanges: true });\n    const compsNotUpToDate = status.componentsStatus.filter((s) => !s.upToDate);\n    if (compsNotUpToDate.length) {\n      throw new Error(`unable to merge, the following components are not up-to-date:\n${compsNotUpToDate.map((s) => s.componentId.toString()).join('\\n')}`);\n    }\n  }\n\n  static slots = [];\n  static dependencies = [\n    LanesAspect,\n    CLIAspect,\n    WorkspaceAspect,\n    MergingAspect,\n    LoggerAspect,\n    RemoveAspect,\n    ScopeAspect,\n    ExportAspect,\n  ];\n  static runtime = MainRuntime;\n\n  static async provider([lanes, cli, workspace, merging, loggerMain, remove, scope, exporter]: [\n    LanesMain,\n    CLIMain,\n    Workspace,\n    MergingMain,\n    LoggerMain,\n    RemoveMain,\n    ScopeMain,\n    ExportMain\n  ]) {\n    const logger = loggerMain.createLogger(MergeLanesAspect.id);\n    const lanesCommand = cli.getCommand('lane');\n    const mergeLanesMain = new MergeLanesMain(workspace, merging, lanes, logger, remove, scope, exporter);\n    lanesCommand?.commands?.push(new MergeLaneCmd(mergeLanesMain));\n    cli.register(new MergeLaneFromScopeCmd(mergeLanesMain));\n    return mergeLanesMain;\n  }\n}\n\nasync function filterComponentsStatus(\n  allComponentsStatus: ComponentMergeStatus[],\n  compIdsToKeep: ComponentID[],\n  allBitIds: BitId[],\n  workspace: Workspace,\n  includeDeps = false,\n  otherLane?: Lane, // lane that gets merged into the current lane. if not provided, it's main that gets merged into the current lane\n  shouldSquash?: boolean\n): Promise<ComponentMergeStatus[]> {\n  const bitIdsFromPattern = BitIds.fromArray(compIdsToKeep.map((c) => c._legacy));\n  const bitIdsNotFromPattern = allBitIds.filter((bitId) => !bitIdsFromPattern.hasWithoutVersion(bitId));\n  const filteredComponentStatus: ComponentMergeStatus[] = [];\n  const depsToAdd: BitId[] = [];\n  await pMapSeries(compIdsToKeep, async (compId) => {\n    const fromStatus = allComponentsStatus.find((c) => c.id.isEqualWithoutVersion(compId._legacy));\n    if (!fromStatus) {\n      throw new Error(`filterComponentsStatus: unable to find ${compId.toString()} in component-status`);\n    }\n    filteredComponentStatus.push(fromStatus);\n    if (fromStatus.unmergedMessage) {\n      return;\n    }\n    if (!otherLane) {\n      // if merging main, no need to check whether the deps are included in the pattern.\n      return;\n    }\n    const { divergeData } = fromStatus;\n    if (!divergeData) {\n      throw new Error(`filterComponentsStatus: unable to find divergeData for ${compId.toString()}`);\n    }\n    let targetVersions = divergeData.snapsOnTargetOnly;\n    if (!targetVersions.length) {\n      return;\n    }\n    const modelComponent = await workspace.consumer.scope.getModelComponent(compId._legacy);\n    if (shouldSquash) {\n      // no need to check all versions, we merge only the head\n      const headOnTarget = otherLane ? otherLane.getComponent(compId._legacy)?.head : modelComponent.head;\n      if (!headOnTarget) {\n        throw new Error(`filterComponentsStatus: unable to find head for ${compId.toString()}`);\n      }\n      targetVersions = [headOnTarget];\n    }\n\n    await pMapSeries(targetVersions, async (remoteVersion) => {\n      const versionObj = await modelComponent.loadVersion(remoteVersion.toString(), workspace.consumer.scope.objects);\n      const flattenedDeps = versionObj.getAllFlattenedDependencies();\n      const depsNotIncludeInPattern = flattenedDeps.filter((id) =>\n        bitIdsNotFromPattern.find((bitId) => bitId.isEqualWithoutVersion(id))\n      );\n      if (!depsNotIncludeInPattern.length) {\n        return;\n      }\n      const depsOnLane: BitId[] = [];\n      await Promise.all(\n        depsNotIncludeInPattern.map(async (dep) => {\n          const isOnLane = await workspace.consumer.scope.isIdOnLane(dep, otherLane);\n          if (isOnLane) {\n            depsOnLane.push(dep);\n          }\n        })\n      );\n      if (!depsOnLane.length) {\n        return;\n      }\n      if (!includeDeps) {\n        throw new BitError(`unable to merge ${compId.toString()}.\nit has (in version ${remoteVersion.toString()}) the following dependencies which were not included in the pattern. consider adding \"--include-deps\" flag\n${depsOnLane.map((d) => d.toString()).join('\\n')}`);\n      }\n      depsToAdd.push(...depsOnLane);\n    });\n  });\n  if (depsToAdd.length) {\n    const depsUniq = BitIds.uniqFromArray(depsToAdd);\n    depsUniq.forEach((id) => {\n      const fromStatus = allComponentsStatus.find((c) => c.id.isEqualWithoutVersion(id));\n      if (!fromStatus) {\n        throw new Error(`filterComponentsStatus: unable to find ${id.toString()} in component-status`);\n      }\n      filteredComponentStatus.push(fromStatus);\n    });\n  }\n  return filteredComponentStatus;\n}\n\nasync function squashSnaps(allComponentsStatus: ComponentMergeStatus[], otherLaneId: LaneId, consumer: Consumer) {\n  const currentLaneName = consumer.getCurrentLaneId().name;\n  const succeededComponents = allComponentsStatus.filter((c) => !c.unmergedMessage);\n  await Promise.all(\n    succeededComponents.map(async ({ id, divergeData, componentFromModel }) => {\n      if (!divergeData) {\n        throw new Error(`unable to squash. divergeData is missing from ${id.toString()}`);\n      }\n      const modifiedComp = squashOneComp(currentLaneName, otherLaneId, id, divergeData, componentFromModel);\n      if (modifiedComp) {\n        consumer.scope.objects.add(modifiedComp);\n        const modelComponent = await consumer.scope.getModelComponent(id);\n        const versionHistory = await modelComponent.updateRebasedVersionHistory(consumer.scope.objects, [modifiedComp]);\n        if (versionHistory) consumer.scope.objects.add(versionHistory);\n      }\n    })\n  );\n}\n\n/**\n * returns Version object if it was modified. otherwise, returns undefined\n */\nfunction squashOneComp(\n  currentLaneName: string,\n  otherLaneId: LaneId,\n  id: BitId,\n  divergeData: SnapsDistance,\n  componentFromModel?: Version\n): Version | undefined {\n  if (divergeData.isDiverged()) {\n    throw new BitError(`unable to squash because ${id.toString()} is diverged in history.\nconsider switching to \"${\n      otherLaneId.name\n    }\" first, merging \"${currentLaneName}\", then switching back to \"${currentLaneName}\" and merging \"${\n      otherLaneId.name\n    }\"\nalternatively, use \"--no-squash\" flag to keep the entire history of \"${otherLaneId.name}\"`);\n  }\n  if (divergeData.isSourceAhead()) {\n    // nothing to do. current is ahead, nothing to merge. (it was probably filtered out already as a \"failedComponent\")\n    return undefined;\n  }\n  if (!divergeData.isTargetAhead()) {\n    // nothing to do. current and remote are the same, nothing to merge. (it was probably filtered out already as a \"failedComponent\")\n    return undefined;\n  }\n  // remote is ahead and was not diverge.\n  const remoteSnaps = divergeData.snapsOnTargetOnly;\n  if (remoteSnaps.length === 0) {\n    throw new Error(`remote is ahead but it has no snaps. it's impossible`);\n  }\n  // no need to check this case. even if it has only one snap ahead, we want to do the \"squash\", and run \"addAsOnlyParent\"\n  // to make sure it doesn't not have two parents.\n  // if (remoteSnaps.length === 1) {\n  //   // nothing to squash. it has only one commit.\n  //   return;\n  // }\n  if (!componentFromModel) {\n    throw new Error('unable to squash, the componentFromModel is missing');\n  }\n\n  const currentParents = componentFromModel.parents;\n\n  // do the squash.\n  if (divergeData.commonSnapBeforeDiverge) {\n    componentFromModel.addAsOnlyParent(divergeData.commonSnapBeforeDiverge);\n  } else {\n    // there is no commonSnapBeforeDiverge. the local has no snaps, all are remote, no need for parents. keep only head.\n    componentFromModel.parents.forEach((ref) => componentFromModel.removeParent(ref));\n  }\n  componentFromModel.setSquashed({ previousParents: currentParents, laneId: otherLaneId });\n  return componentFromModel;\n}\n\nMergeLanesAspect.addRuntime(MergeLanesMain);\n\nexport default MergeLanesMain;\n"],"mappings":"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"}

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@teambit/merge-lanes",
-  "version": "0.0.176",
+  "version": "0.0.178",
   "homepage": "https://bit.dev/teambit/lanes/merge-lanes",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.lanes",
     "name": "merge-lanes",
-    "version": "0.0.176"
+    "version": "0.0.178"
   },
   "dependencies": {
     "chalk": "2.4.2",
@@ -16,17 +16,17 @@
     "@babel/runtime": "7.20.0",
     "@teambit/harmony": "0.4.6",
     "@teambit/bit-error": "0.0.402",
-    "@teambit/cli": "0.0.670",
-    "@teambit/lane-id": "0.0.187",
-    "@teambit/merging": "0.0.314",
+    "@teambit/cli": "0.0.672",
+    "@teambit/lane-id": "0.0.189",
+    "@teambit/merging": "0.0.316",
     "@teambit/component-id": "0.0.427",
-    "@teambit/export": "0.0.999",
-    "@teambit/lanes": "0.0.571",
+    "@teambit/export": "0.0.1001",
+    "@teambit/lanes": "0.0.573",
     "@teambit/legacy-bit-id": "0.0.423",
-    "@teambit/logger": "0.0.763",
-    "@teambit/remove": "0.0.176",
-    "@teambit/scope": "0.0.999",
-    "@teambit/workspace": "0.0.999"
+    "@teambit/logger": "0.0.765",
+    "@teambit/remove": "0.0.178",
+    "@teambit/scope": "0.0.1001",
+    "@teambit/workspace": "0.0.1001"
   },
   "devDependencies": {
     "@types/lodash": "4.14.165",
@@ -38,7 +38,7 @@
     "@types/testing-library__jest-dom": "5.9.5"
   },
   "peerDependencies": {
-    "@teambit/legacy": "1.0.452",
+    "@teambit/legacy": "1.0.454",
     "react": "^16.8.0 || ^17.0.0",
     "react-dom": "^16.8.0 || ^17.0.0"
   },