@teambit/merge-lanes 0.0.120 → 0.0.121

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

@@ -215,10 +215,11 @@ class MergeLanesMain {
       resolveUnrelated,
       ignoreConfigChanges
     });
+    const shouldSquash = currentLaneId.isDefault() && !noSquash;
     if (pattern) {
       const componentIds = await this.workspace.resolveMultipleComponentIds(bitIds);
       const compIdsFromPattern = this.workspace.scope.filterIdsFromPoolIdsByPattern(pattern, componentIds);
-      allComponentsStatus = await filterComponentsStatus(allComponentsStatus, compIdsFromPattern, bitIds, this.workspace, includeDeps, otherLane || undefined);
+      allComponentsStatus = await filterComponentsStatus(allComponentsStatus, compIdsFromPattern, bitIds, this.workspace, includeDeps, otherLane || undefined, shouldSquash);
       bitIds.forEach(bitId => {
         if (!allComponentsStatus.find(c => c.id.isEqualWithoutVersion(bitId))) {
           allComponentsStatus.push({
@@ -232,7 +233,7 @@ class MergeLanesMain {
     if (existingOnWorkspaceOnly) {
       const workspaceIds = await this.workspace.listIds();
       const compIdsFromPattern = workspaceIds.filter(id => allComponentsStatus.find(c => c.id.isEqualWithoutVersion(id._legacy)));
-      allComponentsStatus = await filterComponentsStatus(allComponentsStatus, compIdsFromPattern, bitIds, this.workspace, includeDeps);
+      allComponentsStatus = await filterComponentsStatus(allComponentsStatus, compIdsFromPattern, bitIds, this.workspace, includeDeps, otherLane || undefined, shouldSquash);
       bitIds.forEach(bitId => {
         if (!allComponentsStatus.find(c => c.id.isEqualWithoutVersion(bitId))) {
           allComponentsStatus.push({
@@ -244,7 +245,7 @@ class MergeLanesMain {
       });
     }
     throwForFailures();
-    if (currentLaneId.isDefault() && !noSquash) {
+    if (shouldSquash) {
       await squashSnaps(allComponentsStatus, otherLaneId, consumer);
     }
     const mergeResults = await this.merging.mergeSnaps({
@@ -386,7 +387,9 @@ exports.MergeLanesMain = MergeLanesMain;
 (0, _defineProperty2().default)(MergeLanesMain, "slots", []);
 (0, _defineProperty2().default)(MergeLanesMain, "dependencies", [_lanes().LanesAspect, _cli().CLIAspect, _workspace().default, _merging().default, _logger().LoggerAspect, _remove().RemoveAspect, _scope().ScopeAspect, _export().ExportAspect]);
 (0, _defineProperty2().default)(MergeLanesMain, "runtime", _cli().MainRuntime);
-async function filterComponentsStatus(allComponentsStatus, compIdsToKeep, allBitIds, workspace, includeDeps = false, lane) {
+async function filterComponentsStatus(allComponentsStatus, compIdsToKeep, allBitIds, workspace, includeDeps = false, otherLane,
+// lane that gets merged into the current lane. if not provided, it's main that gets merged into the current lane
+shouldSquash) {
   const bitIdsFromPattern = _bitId().BitIds.fromArray(compIdsToKeep.map(c => c._legacy));
   const bitIdsNotFromPattern = allBitIds.filter(bitId => !bitIdsFromPattern.hasWithoutVersion(bitId));
   const filteredComponentStatus = [];
@@ -400,19 +403,31 @@ async function filterComponentsStatus(allComponentsStatus, compIdsToKeep, allBit
     if (fromStatus.unmergedMessage) {
       return;
     }
+    if (!otherLane) {
+      // if merging main, no need to check whether the deps are included in the pattern.
+      return;
+    }
     const {
       divergeData
     } = fromStatus;
     if (!divergeData) {
       throw new Error(`filterComponentsStatus: unable to find divergeData for ${compId.toString()}`);
     }
-    const remoteVersions = divergeData.snapsOnTargetOnly;
-    if (!remoteVersions.length) {
+    let targetVersions = divergeData.snapsOnTargetOnly;
+    if (!targetVersions.length) {
       return;
     }
     const modelComponent = await workspace.consumer.scope.getModelComponent(compId._legacy);
-    // optimization suggestion: if squash is given, check only the last version.
-    await (0, _pMapSeries().default)(remoteVersions, async remoteVersion => {
+    if (shouldSquash) {
+      var _otherLane$getCompone;
+      // no need to check all versions, we merge only the head
+      const headOnTarget = otherLane ? (_otherLane$getCompone = otherLane.getComponent(compId._legacy)) === null || _otherLane$getCompone === void 0 ? void 0 : _otherLane$getCompone.head : modelComponent.head;
+      if (!headOnTarget) {
+        throw new Error(`filterComponentsStatus: unable to find head for ${compId.toString()}`);
+      }
+      targetVersions = [headOnTarget];
+    }
+    await (0, _pMapSeries().default)(targetVersions, async remoteVersion => {
       const versionObj = await modelComponent.loadVersion(remoteVersion.toString(), workspace.consumer.scope.objects);
       const flattenedDeps = versionObj.getAllFlattenedDependencies();
       const depsNotIncludeInPattern = flattenedDeps.filter(id => bitIdsNotFromPattern.find(bitId => bitId.isEqualWithoutVersion(id)));
@@ -421,7 +436,7 @@ async function filterComponentsStatus(allComponentsStatus, compIdsToKeep, allBit
       }
       const depsOnLane = [];
       await Promise.all(depsNotIncludeInPattern.map(async dep => {
-        const isOnLane = await workspace.consumer.scope.isIdOnLane(dep, lane);
+        const isOnLane = await workspace.consumer.scope.isIdOnLane(dep, otherLane);
         if (isOnLane) {
           depsOnLane.push(dep);
         }

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","configMergeResults","map","configMergeResult","onDestroy","compact","failureMsgs","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","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, ConfigMergeResult } 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; 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      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    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  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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"}
+{"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","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","track","deleteFiles","fromLane","readmeResult","name","configMergeResults","map","configMergeResult","onDestroy","compact","failureMsgs","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","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","targetVersions","snapsOnTargetOnly","headOnTarget","getComponent","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, ConfigMergeResult } 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; 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      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    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  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  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;AACA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AACA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AAEA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AAGA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AACA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AACA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;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,OAAOE,SAAS;MAClB;MACA,MAAMC,IAAI,GAAG,MAAM3B,QAAQ,CAACN,KAAK,CAAC6B,QAAQ,CAACJ,WAAW,CAAC;MACvD,IAAIL,MAAM,IAAI,CAACa,IAAI,EAAE;QACnB,OAAO,IAAI,CAACpC,KAAK,CAACqC,0BAA0B,CAACT,WAAW,CAAC;MAC3D;MACA,OAAOQ,IAAI;IACb,CAAC;IACD,MAAME,SAAS,GAAG,MAAMJ,YAAY,EAAE;IACtC,MAAMK,SAAS,GAAG,YAAY;MAC5B,IAAIN,aAAa,EAAE;QACjB,IAAI,CAACF,WAAW,EAAE,MAAM,IAAIS,KAAK,CAAE,mBAAkBC,sBAAa,kCAAiC,CAAC;QACpG,OAAOhC,QAAQ,CAACN,KAAK,CAACuC,yBAAyB,CAACX,WAAW,CAAC;MAC9D;MACA,IAAI,CAACO,SAAS,EAAE,MAAM,IAAIE,KAAK,CAAE,sCAAqC,CAAC;MACvE,OAAOF,SAAS,CAACK,QAAQ,EAAE;IAC7B,CAAC;IACD,MAAMC,MAAM,GAAG,MAAML,SAAS,EAAE;IAChC,IAAI,CAACtC,MAAM,CAAC4C,KAAK,CAAE,iCAAgCD,MAAM,CAACjB,QAAQ,EAAG,EAAC,CAAC;IAEvE,IAAImB,mBAAmB,GAAG,MAAM,IAAI,CAAC/C,OAAO,CAACgD,cAAc,CAACH,MAAM,EAAEb,WAAW,EAAEO,SAAS,EAAE;MAC1FjB,gBAAgB;MAChBC;IACF,CAAC,CAAC;IACF,MAAM0B,YAAY,GAAGxB,aAAa,CAACE,SAAS,EAAE,IAAI,CAACT,QAAQ;IAE3D,IAAIC,OAAO,EAAE;MACX,MAAM+B,YAAY,GAAG,MAAM,IAAI,CAACnD,SAAS,CAACoD,2BAA2B,CAACN,MAAM,CAAC;MAC7E,MAAMO,kBAAkB,GAAG,IAAI,CAACrD,SAAS,CAACK,KAAK,CAACiD,6BAA6B,CAAClC,OAAO,EAAE+B,YAAY,CAAC;MACpGH,mBAAmB,GAAG,MAAMO,sBAAsB,CAChDP,mBAAmB,EACnBK,kBAAkB,EAClBP,MAAM,EACN,IAAI,CAAC9C,SAAS,EACdqB,WAAW,EACXmB,SAAS,IAAIH,SAAS,EACtBa,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,IAAIhD,uBAAuB,EAAE;MAC3B,MAAMiD,YAAY,GAAG,MAAM,IAAI,CAACjE,SAAS,CAACkE,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,CAAC9C,SAAS,EACdqB,WAAW,EACXmB,SAAS,IAAIH,SAAS,EACtBa,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,EAAElB,WAAW,EAAEnB,QAAQ,CAAC;IAC/D;IAEA,MAAM4D,YAAY,GAAG,MAAM,IAAI,CAACtE,OAAO,CAACuE,UAAU,CAAC;MACjD5D,aAAa;MACboC,mBAAmB;MACnByB,MAAM,EAAE3C,WAAW;MACnB4C,SAAS,EAAEzC,WAAW;MACtBpB,MAAM;MACNC,GAAG;MACHC,WAAW;MACXE,KAAK;MACLK;IACF,CAAC,CAAC;IAEF,MAAMqD,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,CAAC/D,UAAU,IAAIsB,SAAS,IAAIA,SAAS,CAAC0C,eAAe,IAAIP,kBAAkB,EAAE;MAAA;MAC/E,MAAMQ,iBAAiB,GAAG3C,SAAS,CAAC0C,eAAe,CAACtB,EAAE,CACnDwB,aAAa,0BAAC5C,SAAS,CAAC0C,eAAe,oFAAzB,sBAA2BG,IAAI,2DAA/B,uBAAiCC,IAAI,CAAC,CACpDzD,QAAQ,EAAE;MAEboD,aAAa,GAAG,MAAM,IAAI,CAAC7E,MAAM,CAACA,MAAM,CAAC;QACvCmF,iBAAiB,EAAEJ,iBAAiB;QACpCK,KAAK,EAAE,KAAK;QACZ/D,MAAM,EAAE,KAAK;QACbgE,KAAK,EAAE,KAAK;QACZC,WAAW,EAAE,IAAI;QACjBC,QAAQ,EAAE;MACZ,CAAC,CAAC;IACJ,CAAC,MAAM,IAAInD,SAAS,IAAI,CAACA,SAAS,CAAC0C,eAAe,EAAE;MAClDD,aAAa,GAAG;QAAEW,YAAY,EAAG,UAASpD,SAAS,CAACqD,IAAK;MAAkC,CAAC;IAC9F;IACA,MAAMC,kBAAkB,GAAG9C,mBAAmB,CAAC+C,GAAG,CAAEpC,CAAC,IAAKA,CAAC,CAACqC,iBAAiB,CAAC;IAE9E,MAAM,IAAI,CAAChG,SAAS,CAACW,QAAQ,CAACsF,SAAS,EAAE;IAEzC,OAAO;MAAE1B,YAAY;MAAEU,aAAa;MAAEa,kBAAkB,EAAE,IAAAI,iBAAO,EAACJ,kBAAkB;IAAE,CAAC;IAEvF,SAASzB,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,MAAMsB,WAAW,GAAGvB,gBAAgB,CACjCmB,GAAG,CACDhB,eAAe,IACb,GAAEqB,gBAAK,CAACC,IAAI,CAACtB,eAAe,CAACnB,EAAE,CAAC/B,QAAQ,EAAE,CAAE,MAAKuE,gBAAK,CAACE,GAAG,CAACvB,eAAe,CAACf,eAAe,CAAY,EAAC,CAC3G,CACAuC,IAAI,CAAC,IAAI,CAAC;QACb,MAAM,KAAI7F,oBAAQ,EAAE,mDAAkDyF,WAAY,EAAC,CAAC;MACtF;IACF;EACF;EAEA,MAAMK,cAAc,CAClBhG,QAAgB,EAChBC,OAAuD,EAKtD;IACD,IAAI,IAAI,CAACT,SAAS,EAChB,MAAM,KAAIU,oBAAQ,EACf,mGAAkG,CACpG;IACH,MAAM+D,MAAM,GAAGgC,gBAAM,CAACC,KAAK,CAAClG,QAAQ,CAAC;IACrC,MAAM8B,IAAI,GAAG,MAAM,IAAI,CAACpC,KAAK,CAACyG,gBAAgB,CAAClC,MAAM,CAAC;IACtD,MAAMmC,OAAO,GAAGtE,IAAI,CAACO,QAAQ,EAAE;IAC/B,MAAMgE,aAAa,GAAG,YAA6B;MACjD,IAAI,CAACpG,OAAO,CAACW,OAAO,EAAE,OAAOwF,OAAO;MACpC,MAAME,WAAW,GAAG,MAAM,IAAI,CAACzG,KAAK,CAAC+C,2BAA2B,CAACwD,OAAO,CAAC;MACzE,MAAMG,GAAG,GAAG,IAAI,CAAC1G,KAAK,CAACiD,6BAA6B,CAAC7C,OAAO,CAACW,OAAO,EAAE0F,WAAW,CAAC;MAClF,OAAOE,eAAM,CAACC,SAAS,CAACF,GAAG,CAAChB,GAAG,CAAEnC,EAAE,IAAKA,EAAE,CAACQ,OAAO,CAAC,CAAC;IACtD,CAAC;IACD,MAAM8C,UAAU,GAAG,MAAML,aAAa,EAAE;IACxC,MAAMM,uBAAuB,GAAGC,kCAAuB,CAACC,WAAW,CAAC,IAAI,CAAChH,KAAK,CAACiH,WAAW,CAAC;IAC3F,MAAMH,uBAAuB,CAACI,0BAA0B,CAAC;MACvDR,GAAG,EAAEG,UAAU;MACfM,QAAQ,EAAE,IAAI;MACdlF,IAAI;MACJmF,iBAAiB,EAAE;IACrB,CAAC,CAAC;IACF;IACA,MAAMN,uBAAuB,CAACI,0BAA0B,CAAC;MACvDR,GAAG,EAAEG,UAAU,CAACQ,eAAe,EAAE;MACjCF,QAAQ,EAAE,IAAI;MACdC,iBAAiB,EAAE;IACrB,CAAC,CAAC;IACF,MAAME,IAAI,GAAG,IAAI,CAACtH,KAAK,CAACiH,WAAW,CAACM,OAAO;IAC3C;IACA;IACA;IACA,MAAMC,gBAAyB,GAAG,EAAE;IACpC,MAAMC,SAAkB,GAAG,EAAE;IAC7B,MAAMC,iBAAiB,GAAG,MAAM,IAAAC,qBAAU,EAACd,UAAU,EAAE,MAAOtD,EAAE,IAAK;MACnE,MAAMqE,cAAc,GAAG,MAAM,IAAI,CAAC5H,KAAK,CAACiH,WAAW,CAACY,iBAAiB,CAACtE,EAAE,CAAC;MACzE,MAAMuE,UAAU,GAAG,MAAMF,cAAc,CAACG,WAAW,CAACxE,EAAE,CAACyE,OAAO,EAAYV,IAAI,CAAC;MAC/E,MAAMW,QAAQ,GAAGL,cAAc,CAACM,MAAM,CAAC3E,EAAE,CAACyE,OAAO,CAAW;MAC5D,IAAI,CAACC,QAAQ,EAAE,MAAM,IAAI5F,KAAK,CAAE,iCAAgCkB,EAAE,CAAC/B,QAAQ,EAAG,EAAC,CAAC;MAChF,MAAM2G,QAAQ,GAAGP,cAAc,CAAC5C,IAAI,IAAI,IAAI;MAC5C,IAAImD,QAAQ,aAARA,QAAQ,eAARA,QAAQ,CAAExG,OAAO,CAACsG,QAAQ,CAAC,EAAE;QAC/BT,gBAAgB,CAAC/D,IAAI,CAACF,EAAE,CAAC;QACzB,OAAOvB,SAAS;MAClB;MACA,MAAMoG,WAAW,GAAG,MAAM,IAAAC,gCAAc,EAAC;QACvCf,IAAI;QACJM,cAAc;QACdU,UAAU,EAAEH,QAAQ;QACpBI,UAAU,EAAEN;MACd,CAAC,CAAC;MACF,MAAMO,eAAe,GAAGC,aAAa,CAACnG,sBAAY,EAAE8B,MAAM,EAAEb,EAAE,EAAE6E,WAAW,EAAEN,UAAU,CAAC;MACxFF,cAAc,CAACc,OAAO,CAACT,QAAQ,CAAC;MAChC,MAAMV,OAAO,GAAG,CAACK,cAAc,EAAEY,eAAe,CAAC;MACjDf,SAAS,CAAChE,IAAI,CAACF,EAAE,CAAC;MAClB,OAAO;QAAEA,EAAE;QAAEgE;MAAQ,CAAC;IACxB,CAAC,CAAC;IACF,MAAMoB,UAAU,GAAG,IAAA9C,iBAAO,EAAC6B,iBAAiB,CAAC,CAAChC,GAAG,CAAEkD,CAAC,IAAKA,CAAC,CAACrB,OAAO,CAAC;IACnE,MAAMD,IAAI,CAACuB,mBAAmB,CAACF,UAAU,CAACG,IAAI,EAAE,CAAgB;IAChE,IAAIC,WAAqB,GAAG,EAAE;IAC9B,IAAI3I,OAAO,CAACqD,IAAI,EAAE;MAChB,MAAMiD,GAAG,GAAG,IAAAb,iBAAO,EAAC6B,iBAAiB,CAAC,CAAChC,GAAG,CAAEkD,CAAC,IAAKA,CAAC,CAACrF,EAAE,CAAC;MACvD,MAAMd,MAAM,GAAGkE,eAAM,CAACC,SAAS,CAACF,GAAG,CAAC;MACpC,MAAM;QAAEsC;MAAS,CAAC,GAAG,MAAM,IAAI,CAAC/I,QAAQ,CAACgJ,UAAU,CAAC;QAClDjJ,KAAK,EAAE,IAAI,CAACA,KAAK,CAACiH,WAAW;QAC7BP,GAAG,EAAEjE,MAAM;QACXyG,kBAAkB,EAAEzG,MAAM;QAC1B0G,WAAW,EAAE,KAAK;QAClB;QACA;QACAC,eAAe,EAAE;MACnB,CAAC,CAAC;MACFL,WAAW,GAAGC,QAAQ,CAACtD,GAAG,CAAEnC,EAAE,IAAKA,EAAE,CAAC/B,QAAQ,EAAE,CAAC;IACnD;IAEA,OAAO;MACLgG,gBAAgB,EAAEA,gBAAgB,CAAC9B,GAAG,CAAEnC,EAAE,IAAKA,EAAE,CAAC/B,QAAQ,EAAE,CAAC;MAC7DiG,SAAS,EAAEA,SAAS,CAAC/B,GAAG,CAAEnC,EAAE,IAAKA,EAAE,CAAC/B,QAAQ,EAAE,CAAC;MAC/CuH;IACF,CAAC;EACH;EAeA,aAAaM,QAAQ,CAAC,CAACxJ,KAAK,EAAEyJ,GAAG,EAAE3J,SAAS,EAAEC,OAAO,EAAE2J,UAAU,EAAExJ,MAAM,EAAEC,KAAK,EAAEC,QAAQ,CASzF,EAAE;IAAA;IACD,MAAMH,MAAM,GAAGyJ,UAAU,CAACC,YAAY,CAACC,8BAAgB,CAAClG,EAAE,CAAC;IAC3D,MAAMmG,YAAY,GAAGJ,GAAG,CAACK,UAAU,CAAC,MAAM,CAAC;IAC3C,MAAMC,cAAc,GAAG,IAAInK,cAAc,CAACE,SAAS,EAAEC,OAAO,EAAEC,KAAK,EAAEC,MAAM,EAAEC,MAAM,EAAEC,KAAK,EAAEC,QAAQ,CAAC;IACrGyJ,YAAY,aAAZA,YAAY,gDAAZA,YAAY,CAAEG,QAAQ,0DAAtB,sBAAwBpG,IAAI,CAAC,KAAIqG,yBAAY,EAACF,cAAc,CAAC,CAAC;IAC9DN,GAAG,CAACS,QAAQ,CAAC,KAAIC,2CAAqB,EAACJ,cAAc,CAAC,CAAC;IACvD,OAAOA,cAAc;EACvB;AACF;AAAC;AAAA,gCAvSYnK,cAAc,WAyQV,EAAE;AAAA,gCAzQNA,cAAc,kBA0QH,CACpBwK,oBAAW,EACXC,gBAAS,EACTC,oBAAe,EACfC,kBAAa,EACbC,sBAAY,EACZC,sBAAY,EACZC,oBAAW,EACXC,sBAAY,CACb;AAAA,gCAnRU/K,cAAc,aAoRRgL,kBAAW;AAqB9B,eAAevH,sBAAsB,CACnCP,mBAA2C,EAC3C+H,aAA4B,EAC5BC,SAAkB,EAClBhL,SAAoB,EACpBqB,WAAW,GAAG,KAAK,EACnBmB,SAAgB;AAAE;AAClBU,YAAsB,EACW;EACjC,MAAM+H,iBAAiB,GAAGjE,eAAM,CAACC,SAAS,CAAC8D,aAAa,CAAChF,GAAG,CAAEpC,CAAC,IAAKA,CAAC,CAACS,OAAO,CAAC,CAAC;EAC/E,MAAM8G,oBAAoB,GAAGF,SAAS,CAAC7G,MAAM,CAAEV,KAAK,IAAK,CAACwH,iBAAiB,CAACE,iBAAiB,CAAC1H,KAAK,CAAC,CAAC;EACrG,MAAM2H,uBAA+C,GAAG,EAAE;EAC1D,MAAMC,SAAkB,GAAG,EAAE;EAC7B,MAAM,IAAArD,qBAAU,EAAC+C,aAAa,EAAE,MAAOO,MAAM,IAAK;IAChD,MAAMC,UAAU,GAAGvI,mBAAmB,CAACU,IAAI,CAAEC,CAAC,IAAKA,CAAC,CAACC,EAAE,CAACC,qBAAqB,CAACyH,MAAM,CAAClH,OAAO,CAAC,CAAC;IAC9F,IAAI,CAACmH,UAAU,EAAE;MACf,MAAM,IAAI7I,KAAK,CAAE,0CAAyC4I,MAAM,CAACzJ,QAAQ,EAAG,sBAAqB,CAAC;IACpG;IACAuJ,uBAAuB,CAACtH,IAAI,CAACyH,UAAU,CAAC;IACxC,IAAIA,UAAU,CAACvH,eAAe,EAAE;MAC9B;IACF;IACA,IAAI,CAACxB,SAAS,EAAE;MACd;MACA;IACF;IACA,MAAM;MAAEiG;IAAY,CAAC,GAAG8C,UAAU;IAClC,IAAI,CAAC9C,WAAW,EAAE;MAChB,MAAM,IAAI/F,KAAK,CAAE,0DAAyD4I,MAAM,CAACzJ,QAAQ,EAAG,EAAC,CAAC;IAChG;IACA,IAAI2J,cAAc,GAAG/C,WAAW,CAACgD,iBAAiB;IAClD,IAAI,CAACD,cAAc,CAAC3G,MAAM,EAAE;MAC1B;IACF;IACA,MAAMoD,cAAc,GAAG,MAAMjI,SAAS,CAACW,QAAQ,CAACN,KAAK,CAAC6H,iBAAiB,CAACoD,MAAM,CAAClH,OAAO,CAAC;IACvF,IAAIlB,YAAY,EAAE;MAAA;MAChB;MACA,MAAMwI,YAAY,GAAGlJ,SAAS,4BAAGA,SAAS,CAACmJ,YAAY,CAACL,MAAM,CAAClH,OAAO,CAAC,0DAAtC,sBAAwCiB,IAAI,GAAG4C,cAAc,CAAC5C,IAAI;MACnG,IAAI,CAACqG,YAAY,EAAE;QACjB,MAAM,IAAIhJ,KAAK,CAAE,mDAAkD4I,MAAM,CAACzJ,QAAQ,EAAG,EAAC,CAAC;MACzF;MACA2J,cAAc,GAAG,CAACE,YAAY,CAAC;IACjC;IAEA,MAAM,IAAA1D,qBAAU,EAACwD,cAAc,EAAE,MAAOI,aAAa,IAAK;MACxD,MAAMzD,UAAU,GAAG,MAAMF,cAAc,CAACG,WAAW,CAACwD,aAAa,CAAC/J,QAAQ,EAAE,EAAE7B,SAAS,CAACW,QAAQ,CAACN,KAAK,CAACuH,OAAO,CAAC;MAC/G,MAAMiE,aAAa,GAAG1D,UAAU,CAAC2D,2BAA2B,EAAE;MAC9D,MAAMC,uBAAuB,GAAGF,aAAa,CAAC1H,MAAM,CAAEP,EAAE,IACtDsH,oBAAoB,CAACxH,IAAI,CAAED,KAAK,IAAKA,KAAK,CAACI,qBAAqB,CAACD,EAAE,CAAC,CAAC,CACtE;MACD,IAAI,CAACmI,uBAAuB,CAAClH,MAAM,EAAE;QACnC;MACF;MACA,MAAMmH,UAAmB,GAAG,EAAE;MAC9B,MAAMC,OAAO,CAACC,GAAG,CACfH,uBAAuB,CAAChG,GAAG,CAAC,MAAOoG,GAAG,IAAK;QACzC,MAAMC,QAAQ,GAAG,MAAMpM,SAAS,CAACW,QAAQ,CAACN,KAAK,CAACgM,UAAU,CAACF,GAAG,EAAE3J,SAAS,CAAC;QAC1E,IAAI4J,QAAQ,EAAE;UACZJ,UAAU,CAAClI,IAAI,CAACqI,GAAG,CAAC;QACtB;MACF,CAAC,CAAC,CACH;MACD,IAAI,CAACH,UAAU,CAACnH,MAAM,EAAE;QACtB;MACF;MACA,IAAI,CAACxD,WAAW,EAAE;QAChB,MAAM,KAAIX,oBAAQ,EAAE,mBAAkB4K,MAAM,CAACzJ,QAAQ,EAAG;AAChE,qBAAqB+J,aAAa,CAAC/J,QAAQ,EAAG;AAC9C,EAAEmK,UAAU,CAACjG,GAAG,CAAEuG,CAAC,IAAKA,CAAC,CAACzK,QAAQ,EAAE,CAAC,CAAC0E,IAAI,CAAC,IAAI,CAAE,EAAC,CAAC;MAC7C;MACA8E,SAAS,CAACvH,IAAI,CAAC,GAAGkI,UAAU,CAAC;IAC/B,CAAC,CAAC;EACJ,CAAC,CAAC;EACF,IAAIX,SAAS,CAACxG,MAAM,EAAE;IACpB,MAAM0H,QAAQ,GAAGvF,eAAM,CAACwF,aAAa,CAACnB,SAAS,CAAC;IAChDkB,QAAQ,CAAC/I,OAAO,CAAEI,EAAE,IAAK;MACvB,MAAM2H,UAAU,GAAGvI,mBAAmB,CAACU,IAAI,CAAEC,CAAC,IAAKA,CAAC,CAACC,EAAE,CAACC,qBAAqB,CAACD,EAAE,CAAC,CAAC;MAClF,IAAI,CAAC2H,UAAU,EAAE;QACf,MAAM,IAAI7I,KAAK,CAAE,0CAAyCkB,EAAE,CAAC/B,QAAQ,EAAG,sBAAqB,CAAC;MAChG;MACAuJ,uBAAuB,CAACtH,IAAI,CAACyH,UAAU,CAAC;IAC1C,CAAC,CAAC;EACJ;EACA,OAAOH,uBAAuB;AAChC;AAEA,eAAe9G,WAAW,CAACtB,mBAA2C,EAAElB,WAAmB,EAAEnB,QAAkB,EAAE;EAC/G,MAAM8L,eAAe,GAAG9L,QAAQ,CAACgB,gBAAgB,EAAE,CAACkE,IAAI;EACxD,MAAM6G,mBAAmB,GAAG1J,mBAAmB,CAACmB,MAAM,CAAER,CAAC,IAAK,CAACA,CAAC,CAACK,eAAe,CAAC;EACjF,MAAMiI,OAAO,CAACC,GAAG,CACfQ,mBAAmB,CAAC3G,GAAG,CAAC,OAAO;IAAEnC,EAAE;IAAE6E,WAAW;IAAEkE;EAAmB,CAAC,KAAK;IACzE,IAAI,CAAClE,WAAW,EAAE;MAChB,MAAM,IAAI/F,KAAK,CAAE,iDAAgDkB,EAAE,CAAC/B,QAAQ,EAAG,EAAC,CAAC;IACnF;IACA,MAAM+K,YAAY,GAAG9D,aAAa,CAAC2D,eAAe,EAAE3K,WAAW,EAAE8B,EAAE,EAAE6E,WAAW,EAAEkE,kBAAkB,CAAC;IACrG,IAAIC,YAAY,EAAE;MAChBjM,QAAQ,CAACN,KAAK,CAACuH,OAAO,CAACiF,GAAG,CAACD,YAAY,CAAC;MACxC,MAAM3E,cAAc,GAAG,MAAMtH,QAAQ,CAACN,KAAK,CAAC6H,iBAAiB,CAACtE,EAAE,CAAC;MACjE,MAAMkJ,cAAc,GAAG,MAAM7E,cAAc,CAAC8E,2BAA2B,CAACpM,QAAQ,CAACN,KAAK,CAACuH,OAAO,EAAE,CAACgF,YAAY,CAAC,CAAC;MAC/G,IAAIE,cAAc,EAAEnM,QAAQ,CAACN,KAAK,CAACuH,OAAO,CAACiF,GAAG,CAACC,cAAc,CAAC;IAChE;EACF,CAAC,CAAC,CACH;AACH;;AAEA;AACA;AACA;AACA,SAAShE,aAAa,CACpB2D,eAAuB,EACvB3K,WAAmB,EACnB8B,EAAS,EACT6E,WAA0B,EAC1BkE,kBAA4B,EACP;EACrB,IAAIlE,WAAW,CAACuE,UAAU,EAAE,EAAE;IAC5B,MAAM,KAAItM,oBAAQ,EAAE,4BAA2BkD,EAAE,CAAC/B,QAAQ,EAAG;AACjE,yBACMC,WAAW,CAAC+D,IACb,qBAAoB4G,eAAgB,8BAA6BA,eAAgB,kBAChF3K,WAAW,CAAC+D,IACb;AACL,uEAAuE/D,WAAW,CAAC+D,IAAK,GAAE,CAAC;EACzF;EACA,IAAI4C,WAAW,CAACwE,aAAa,EAAE,EAAE;IAC/B;IACA,OAAO5K,SAAS;EAClB;EACA,IAAI,CAACoG,WAAW,CAACyE,aAAa,EAAE,EAAE;IAChC;IACA,OAAO7K,SAAS;EAClB;EACA;EACA,MAAM8K,WAAW,GAAG1E,WAAW,CAACgD,iBAAiB;EACjD,IAAI0B,WAAW,CAACtI,MAAM,KAAK,CAAC,EAAE;IAC5B,MAAM,IAAInC,KAAK,CAAE,sDAAqD,CAAC;EACzE;EACA;EACA;EACA;EACA;EACA;EACA;EACA,IAAI,CAACiK,kBAAkB,EAAE;IACvB,MAAM,IAAIjK,KAAK,CAAC,qDAAqD,CAAC;EACxE;EAEA,MAAM0K,cAAc,GAAGT,kBAAkB,CAACU,OAAO;;EAEjD;EACA,IAAI5E,WAAW,CAAC6E,uBAAuB,EAAE;IACvCX,kBAAkB,CAACY,eAAe,CAAC9E,WAAW,CAAC6E,uBAAuB,CAAC;EACzE,CAAC,MAAM;IACL;IACAX,kBAAkB,CAACU,OAAO,CAAC7J,OAAO,CAAEgK,GAAG,IAAKb,kBAAkB,CAACc,YAAY,CAACD,GAAG,CAAC,CAAC;EACnF;EACAb,kBAAkB,CAACe,WAAW,CAAC;IAAEC,eAAe,EAAEP,cAAc;IAAE3I,MAAM,EAAE3C;EAAY,CAAC,CAAC;EACxF,OAAO6K,kBAAkB;AAC3B;AAEA7C,8BAAgB,CAAC8D,UAAU,CAAC9N,cAAc,CAAC;AAAC,eAE7BA,cAAc;AAAA"}

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@teambit/merge-lanes",
-  "version": "0.0.120",
+  "version": "0.0.121",
   "homepage": "https://bit.dev/teambit/lanes/merge-lanes",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.lanes",
     "name": "merge-lanes",
-    "version": "0.0.120"
+    "version": "0.0.121"
   },
   "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.632",
-    "@teambit/merging": "0.0.258",
+    "@teambit/cli": "0.0.633",
+    "@teambit/merging": "0.0.259",
     "@teambit/component-id": "0.0.425",
-    "@teambit/export": "0.0.943",
-    "@teambit/lane-id": "0.0.150",
-    "@teambit/lanes": "0.0.515",
+    "@teambit/export": "0.0.944",
+    "@teambit/lane-id": "0.0.151",
+    "@teambit/lanes": "0.0.516",
     "@teambit/legacy-bit-id": "0.0.421",
-    "@teambit/logger": "0.0.725",
-    "@teambit/remove": "0.0.120",
-    "@teambit/scope": "0.0.943",
-    "@teambit/workspace": "0.0.943"
+    "@teambit/logger": "0.0.726",
+    "@teambit/remove": "0.0.121",
+    "@teambit/scope": "0.0.944",
+    "@teambit/workspace": "0.0.944"
   },
   "devDependencies": {
     "@types/lodash": "4.14.165",
@@ -38,7 +38,7 @@
     "@types/testing-library__jest-dom": "5.9.5"
   },
   "peerDependencies": {
-    "@teambit/legacy": "1.0.413",
+    "@teambit/legacy": "1.0.414",
     "react": "^16.8.0 || ^17.0.0",
     "react-dom": "^16.8.0 || ^17.0.0"
   },