@teambit/merge-lanes 0.0.97 → 0.0.99

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

@@ -245,7 +245,7 @@ class MergeLanesMain {
     }
     throwForFailures();
     if (currentLaneId.isDefault() && !noSquash) {
-      squashSnaps(allComponentsStatus, otherLaneId, consumer);
+      await squashSnaps(allComponentsStatus, otherLaneId, consumer);
     }
     const mergeResults = await this.merging.mergeSnaps({
       mergeStrategy,
@@ -333,8 +333,8 @@ class MergeLanesMain {
       const divergeData = await (0, _getDivergeData().getDivergeData)({
         repo,
         modelComponent,
-        remoteHead: laneHead,
-        checkedOutLocalHead: mainHead
+        sourceHead: mainHead,
+        targetHead: laneHead
       });
       const modifiedVersion = squashOneComp(_laneId().DEFAULT_LANE, laneId, id, divergeData, versionObj);
       modelComponent.setHead(laneHead);
@@ -404,7 +404,7 @@ async function filterComponentsStatus(allComponentsStatus, compIdsToKeep, allBit
     if (!divergeData) {
       throw new Error(`filterComponentsStatus: unable to find divergeData for ${compId.toString()}`);
     }
-    const remoteVersions = divergeData.snapsOnRemoteOnly;
+    const remoteVersions = divergeData.snapsOnTargetOnly;
     if (!remoteVersions.length) {
       return;
     }
@@ -447,10 +447,10 @@ ${depsOnLane.map(d => d.toString()).join('\n')}`);
   }
   return filteredComponentStatus;
 }
-function squashSnaps(allComponentsStatus, otherLaneId, consumer) {
+async function squashSnaps(allComponentsStatus, otherLaneId, consumer) {
   const currentLaneName = consumer.getCurrentLaneId().name;
   const succeededComponents = allComponentsStatus.filter(c => !c.unmergedMessage);
-  succeededComponents.forEach(({
+  await Promise.all(succeededComponents.map(async ({
     id,
     divergeData,
     componentFromModel
@@ -459,8 +459,13 @@ function squashSnaps(allComponentsStatus, otherLaneId, consumer) {
       throw new Error(`unable to squash. divergeData is missing from ${id.toString()}`);
     }
     const modifiedComp = squashOneComp(currentLaneName, otherLaneId, id, divergeData, componentFromModel);
-    if (modifiedComp) consumer.scope.objects.add(modifiedComp);
-  });
+    if (modifiedComp) {
+      consumer.scope.objects.add(modifiedComp);
+      const modelComponent = await consumer.scope.getModelComponent(id);
+      const versionHistory = await modelComponent.updateRebasedVersionHistory(consumer.scope.objects, [modifiedComp]);
+      if (versionHistory) consumer.scope.objects.add(versionHistory);
+    }
+  }));
 }
 
 /**
@@ -472,16 +477,16 @@ function squashOneComp(currentLaneName, otherLaneId, id, divergeData, componentF
 consider switching to "${otherLaneId.name}" first, merging "${currentLaneName}", then switching back to "${currentLaneName}" and merging "${otherLaneId.name}"
 alternatively, use "--no-squash" flag to keep the entire history of "${otherLaneId.name}"`);
   }
-  if (divergeData.isLocalAhead()) {
+  if (divergeData.isSourceAhead()) {
     // nothing to do. current is ahead, nothing to merge. (it was probably filtered out already as a "failedComponent")
     return undefined;
   }
-  if (!divergeData.isRemoteAhead()) {
+  if (!divergeData.isTargetAhead()) {
     // nothing to do. current and remote are the same, nothing to merge. (it was probably filtered out already as a "failedComponent")
     return undefined;
   }
   // remote is ahead and was not diverge.
-  const remoteSnaps = divergeData.snapsOnRemoteOnly;
+  const remoteSnaps = divergeData.snapsOnTargetOnly;
   if (remoteSnaps.length === 0) {
     throw new Error(`remote is ahead but it has no snaps. it's impossible`);
   }

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","remote","currentLaneId","getCurrentLaneId","isDefault","toString","otherLaneId","getParsedLaneId","isEqual","currentLane","loadLane","isDefaultLane","getOtherLane","undefined","lane","fetchLaneWithItsComponents","otherLane","getBitIds","Error","DEFAULT_LANE","getDefaultLaneIdsFromLane","toBitIds","bitIds","debug","allComponentsStatus","getMergeStatus","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","track","deleteFiles","fromLane","readmeResult","name","onDestroy","failureMsgs","map","chalk","bold","red","join","mergeFromScope","LaneId","parse","importLaneObject","laneIds","getIdsToMerge","laneCompIds","ids","BitIds","fromArray","idsToMerge","scopeComponentsImporter","ScopeComponentsImporter","getInstance","legacyScope","importManyDeltaWithoutDeps","fromHead","ignoreMissingHead","toVersionLatest","repo","objects","mergedPreviously","mergedNow","bitObjectsPerComp","pMapSeries","modelComponent","getModelComponent","versionObj","loadVersion","version","laneHead","getRef","mainHead","divergeData","getDivergeData","remoteHead","checkedOutLocalHead","modifiedVersion","squashOneComp","setHead","bitObjects","compact","b","writeObjectsToTheFS","flat","exportedIds","exported","exportMany","idsWithFutureScope","allVersions","exportHeadsOnly","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","remoteVersions","snapsOnRemoteOnly","remoteVersion","flattenedDeps","getAllFlattenedDependencies","depsNotIncludeInPattern","depsOnLane","Promise","all","dep","isOnLane","isIdOnLane","d","depsUniq","uniqFromArray","currentLaneName","succeededComponents","componentFromModel","modifiedComp","add","isDiverged","isLocalAhead","isRemoteAhead","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, { MergingMain, ComponentMergeStatus } 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, ApplyVersionResults } 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 { DivergeData } from '@teambit/legacy/dist/scope/component-ops/diverge-data';\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  remote?: 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 }> {\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      remote,\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        return undefined;\n      }\n      const lane = await consumer.scope.loadLane(otherLaneId);\n      if (remote || !lane) {\n        return this.lanes.fetchLaneWithItsComponents(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 consumer.scope.getDefaultLaneIdsFromLane(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\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      );\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      );\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 (currentLaneId.isDefault() && !noSquash) {\n      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\n    await this.workspace.consumer.onDestroy();\n\n    return { mergeResults, deleteResults };\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  async mergeFromScope(\n    laneName: 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    const laneId = LaneId.parse(laneName);\n    const lane = await this.lanes.importLaneObject(laneId);\n    const laneIds = lane.toBitIds();\n    const getIdsToMerge = async (): Promise<BitIds> => {\n      if (!options.pattern) return laneIds;\n      const laneCompIds = await this.scope.resolveMultipleComponentIds(laneIds);\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,\n      ignoreMissingHead: true,\n    });\n    // get their main as well\n    await scopeComponentsImporter.importManyDeltaWithoutDeps({\n      ids: idsToMerge.toVersionLatest(),\n      fromHead: true,\n      ignoreMissingHead: true,\n    });\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 bitObjectsPerComp = await pMapSeries(idsToMerge, async (id) => {\n      const modelComponent = await this.scope.legacyScope.getModelComponent(id);\n      const versionObj = await modelComponent.loadVersion(id.version as string, repo);\n      const laneHead = modelComponent.getRef(id.version as string);\n      if (!laneHead) throw new Error(`lane head must be defined for ${id.toString()}`);\n      const mainHead = modelComponent.head || null;\n      if (mainHead?.isEqual(laneHead)) {\n        mergedPreviously.push(id);\n        return undefined;\n      }\n      const divergeData = await getDivergeData({\n        repo,\n        modelComponent,\n        remoteHead: laneHead,\n        checkedOutLocalHead: mainHead,\n      });\n      const modifiedVersion = squashOneComp(DEFAULT_LANE, laneId, id, divergeData, versionObj);\n      modelComponent.setHead(laneHead);\n      const objects = [modelComponent, modifiedVersion];\n      mergedNow.push(id);\n      return { id, objects };\n    });\n    const bitObjects = compact(bitObjectsPerComp).map((b) => b.objects);\n    await repo.writeObjectsToTheFS(bitObjects.flat() as BitObject[]);\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: bitIds,\n        idsWithFutureScope: bitIds,\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: true,\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\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  lane?: Lane\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    const { divergeData } = fromStatus;\n    if (!divergeData) {\n      throw new Error(`filterComponentsStatus: unable to find divergeData for ${compId.toString()}`);\n    }\n    const remoteVersions = divergeData.snapsOnRemoteOnly;\n    if (!remoteVersions.length) {\n      return;\n    }\n    const modelComponent = await workspace.consumer.scope.getModelComponent(compId._legacy);\n    // optimization suggestion: if squash is given, check only the last version.\n    await pMapSeries(remoteVersions, 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, lane);\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\nfunction squashSnaps(allComponentsStatus: ComponentMergeStatus[], otherLaneId: LaneId, consumer: Consumer) {\n  const currentLaneName = consumer.getCurrentLaneId().name;\n  const succeededComponents = allComponentsStatus.filter((c) => !c.unmergedMessage);\n  succeededComponents.forEach(({ 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) consumer.scope.objects.add(modifiedComp);\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: DivergeData,\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.isLocalAhead()) {\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.isRemoteAhead()) {\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.snapsOnRemoteOnly;\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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"}
+{"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","remote","currentLaneId","getCurrentLaneId","isDefault","toString","otherLaneId","getParsedLaneId","isEqual","currentLane","loadLane","isDefaultLane","getOtherLane","undefined","lane","fetchLaneWithItsComponents","otherLane","getBitIds","Error","DEFAULT_LANE","getDefaultLaneIdsFromLane","toBitIds","bitIds","debug","allComponentsStatus","getMergeStatus","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","track","deleteFiles","fromLane","readmeResult","name","onDestroy","failureMsgs","map","chalk","bold","red","join","mergeFromScope","LaneId","parse","importLaneObject","laneIds","getIdsToMerge","laneCompIds","ids","BitIds","fromArray","idsToMerge","scopeComponentsImporter","ScopeComponentsImporter","getInstance","legacyScope","importManyDeltaWithoutDeps","fromHead","ignoreMissingHead","toVersionLatest","repo","objects","mergedPreviously","mergedNow","bitObjectsPerComp","pMapSeries","modelComponent","getModelComponent","versionObj","loadVersion","version","laneHead","getRef","mainHead","divergeData","getDivergeData","sourceHead","targetHead","modifiedVersion","squashOneComp","setHead","bitObjects","compact","b","writeObjectsToTheFS","flat","exportedIds","exported","exportMany","idsWithFutureScope","allVersions","exportHeadsOnly","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","remoteVersions","snapsOnTargetOnly","remoteVersion","flattenedDeps","getAllFlattenedDependencies","depsNotIncludeInPattern","depsOnLane","Promise","all","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, { MergingMain, ComponentMergeStatus } 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, ApplyVersionResults } 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  remote?: 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 }> {\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      remote,\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        return undefined;\n      }\n      const lane = await consumer.scope.loadLane(otherLaneId);\n      if (remote || !lane) {\n        return this.lanes.fetchLaneWithItsComponents(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 consumer.scope.getDefaultLaneIdsFromLane(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\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      );\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      );\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 (currentLaneId.isDefault() && !noSquash) {\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\n    await this.workspace.consumer.onDestroy();\n\n    return { mergeResults, deleteResults };\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  async mergeFromScope(\n    laneName: 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    const laneId = LaneId.parse(laneName);\n    const lane = await this.lanes.importLaneObject(laneId);\n    const laneIds = lane.toBitIds();\n    const getIdsToMerge = async (): Promise<BitIds> => {\n      if (!options.pattern) return laneIds;\n      const laneCompIds = await this.scope.resolveMultipleComponentIds(laneIds);\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,\n      ignoreMissingHead: true,\n    });\n    // get their main as well\n    await scopeComponentsImporter.importManyDeltaWithoutDeps({\n      ids: idsToMerge.toVersionLatest(),\n      fromHead: true,\n      ignoreMissingHead: true,\n    });\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 bitObjectsPerComp = await pMapSeries(idsToMerge, async (id) => {\n      const modelComponent = await this.scope.legacyScope.getModelComponent(id);\n      const versionObj = await modelComponent.loadVersion(id.version as string, repo);\n      const laneHead = modelComponent.getRef(id.version as string);\n      if (!laneHead) throw new Error(`lane head must be defined for ${id.toString()}`);\n      const mainHead = modelComponent.head || null;\n      if (mainHead?.isEqual(laneHead)) {\n        mergedPreviously.push(id);\n        return undefined;\n      }\n      const divergeData = await getDivergeData({\n        repo,\n        modelComponent,\n        sourceHead: mainHead,\n        targetHead: laneHead,\n      });\n      const modifiedVersion = squashOneComp(DEFAULT_LANE, laneId, id, divergeData, versionObj);\n      modelComponent.setHead(laneHead);\n      const objects = [modelComponent, modifiedVersion];\n      mergedNow.push(id);\n      return { id, objects };\n    });\n    const bitObjects = compact(bitObjectsPerComp).map((b) => b.objects);\n    await repo.writeObjectsToTheFS(bitObjects.flat() as BitObject[]);\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: bitIds,\n        idsWithFutureScope: bitIds,\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: true,\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\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  lane?: Lane\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    const { divergeData } = fromStatus;\n    if (!divergeData) {\n      throw new Error(`filterComponentsStatus: unable to find divergeData for ${compId.toString()}`);\n    }\n    const remoteVersions = divergeData.snapsOnTargetOnly;\n    if (!remoteVersions.length) {\n      return;\n    }\n    const modelComponent = await workspace.consumer.scope.getModelComponent(compId._legacy);\n    // optimization suggestion: if squash is given, check only the last version.\n    await pMapSeries(remoteVersions, 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, lane);\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.97",
+  "version": "0.0.99",
   "homepage": "https://bit.dev/teambit/lanes/merge-lanes",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.lanes",
     "name": "merge-lanes",
-    "version": "0.0.97"
+    "version": "0.0.99"
   },
   "dependencies": {
     "chalk": "2.4.2",
@@ -16,17 +16,17 @@
     "core-js": "^3.0.0",
     "@teambit/harmony": "0.3.3",
     "@teambit/bit-error": "0.0.402",
-    "@teambit/cli": "0.0.616",
-    "@teambit/merging": "0.0.235",
+    "@teambit/cli": "0.0.617",
+    "@teambit/merging": "0.0.237",
     "@teambit/component-id": "0.0.425",
-    "@teambit/export": "0.0.920",
-    "@teambit/lane-id": "0.0.134",
-    "@teambit/lanes": "0.0.492",
+    "@teambit/export": "0.0.922",
+    "@teambit/lane-id": "0.0.135",
+    "@teambit/lanes": "0.0.494",
     "@teambit/legacy-bit-id": "0.0.421",
-    "@teambit/logger": "0.0.709",
-    "@teambit/remove": "0.0.97",
-    "@teambit/scope": "0.0.920",
-    "@teambit/workspace": "0.0.920"
+    "@teambit/logger": "0.0.710",
+    "@teambit/remove": "0.0.99",
+    "@teambit/scope": "0.0.922",
+    "@teambit/workspace": "0.0.922"
   },
   "devDependencies": {
     "@types/lodash": "4.14.165",
@@ -38,7 +38,7 @@
     "@types/node": "12.20.4"
   },
   "peerDependencies": {
-    "@teambit/legacy": "1.0.397",
+    "@teambit/legacy": "1.0.398",
     "react-dom": "^16.8.0 || ^17.0.0",
     "react": "^16.8.0 || ^17.0.0"
   },