@teambit/merge-lanes 0.0.31 → 0.0.33

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

@@ -391,7 +391,6 @@ async function filterComponentsStatus(allComponentsStatus, compIdsToKeep, allBit
 
     const modelComponent = await workspace.consumer.scope.getModelComponent(compId._legacy); // optimization suggestion: if squash is given, check only the last version.
 
-    const laneIds = lane === null || lane === void 0 ? void 0 : lane.toBitIds();
     await (0, _pMapSeries().default)(remoteVersions, async remoteVersion => {
       const versionObj = await modelComponent.loadVersion(remoteVersion.toString(), workspace.consumer.scope.objects);
       const flattenedDeps = versionObj.getAllFlattenedDependencies();
@@ -403,7 +402,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, laneIds);
+        const isOnLane = await workspace.consumer.scope.isIdOnLane(dep, lane);
 
         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","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","scope","loadLane","isDefaultLane","getOtherLane","undefined","lane","fetchLaneWithItsComponents","otherLane","getBitIds","Error","DEFAULT_LANE","getDefaultLaneIdsFromLane","toBitIds","bitIds","debug","otherLaneName","getAllComponentsStatus","tmp","Tmp","componentsStatus","Promise","all","map","bitId","getComponentMergeStatus","clear","err","allComponentsStatus","componentIds","resolveMultipleComponentIds","compIdsFromPattern","filterIdsFromPoolIdsByPattern","filterComponentsStatus","forEach","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","chalk","bold","red","join","provider","cli","loggerMain","createLogger","MergeLanesAspect","lanesCommand","getCommand","mergeLanesMain","commands","MergeLaneCmd","LanesAspect","CLIAspect","WorkspaceAspect","MergingAspect","LoggerAspect","RemoveAspect","MainRuntime","compIdsToKeep","allBitIds","bitIdsFromPattern","BitIds","fromArray","bitIdsNotFromPattern","hasWithoutVersion","filteredComponentStatus","depsToAdd","pMapSeries","compId","fromStatus","divergeData","remoteVersions","snapsOnRemoteOnly","modelComponent","getModelComponent","laneIds","remoteVersion","versionObj","loadVersion","objects","flattenedDeps","getAllFlattenedDependencies","depsNotIncludeInPattern","depsOnLane","dep","isOnLane","isIdOnLane","d","depsUniq","uniqFromArray","currentLaneName","succeededComponents","componentFromModel","isDiverged","isLocalAhead","isRemoteAhead","remoteSnaps","currentParents","parents","commonSnapBeforeDiverge","addAsOnlyParent","ref","removeParent","setSquashed","previousParents","add","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 { ComponentID } from '@teambit/component-id';\nimport { DEFAULT_LANE, LaneId } from '@teambit/lane-id';\nimport { Lane } from '@teambit/legacy/dist/scope/models';\nimport { Tmp } from '@teambit/legacy/dist/scope/repositories';\nimport { Logger, LoggerAspect, LoggerMain } from '@teambit/logger';\nimport { RemoveAspect, RemoveMain } from '@teambit/remove';\nimport { MergeLanesAspect } from './merge-lanes.aspect';\nimport { MergeLaneCmd } from './merge-lane.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  ) {}\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    const otherLaneName = isDefaultLane ? DEFAULT_LANE : otherLaneId.toString();\n\n    const getAllComponentsStatus = async (): Promise<ComponentMergeStatus[]> => {\n      const tmp = new Tmp(consumer.scope);\n      try {\n        const componentsStatus = await Promise.all(\n          bitIds.map((bitId) =>\n            this.merging.getComponentMergeStatus(bitId, currentLane, otherLaneName, {\n              resolveUnrelated,\n              ignoreConfigChanges,\n            })\n          )\n        );\n        await tmp.clear();\n        return componentsStatus;\n      } catch (err: any) {\n        await tmp.clear();\n        throw err;\n      }\n    };\n    let allComponentsStatus = await getAllComponentsStatus();\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  static slots = [];\n  static dependencies = [LanesAspect, CLIAspect, WorkspaceAspect, MergingAspect, LoggerAspect, RemoveAspect];\n  static runtime = MainRuntime;\n\n  static async provider([lanes, cli, workspace, merging, loggerMain, remove]: [\n    LanesMain,\n    CLIMain,\n    Workspace,\n    MergingMain,\n    LoggerMain,\n    RemoveMain\n  ]) {\n    const logger = loggerMain.createLogger(MergeLanesAspect.id);\n    const lanesCommand = cli.getCommand('lane');\n    const mergeLanesMain = new MergeLanesMain(workspace, merging, lanes, logger, remove);\n    lanesCommand?.commands?.push(new MergeLaneCmd(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    const laneIds = lane?.toBitIds();\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, laneIds);\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    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;\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;\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    // 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    consumer.scope.objects.add(componentFromModel);\n  });\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","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","scope","loadLane","isDefaultLane","getOtherLane","undefined","lane","fetchLaneWithItsComponents","otherLane","getBitIds","Error","DEFAULT_LANE","getDefaultLaneIdsFromLane","toBitIds","bitIds","debug","otherLaneName","getAllComponentsStatus","tmp","Tmp","componentsStatus","Promise","all","map","bitId","getComponentMergeStatus","clear","err","allComponentsStatus","componentIds","resolveMultipleComponentIds","compIdsFromPattern","filterIdsFromPoolIdsByPattern","filterComponentsStatus","forEach","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","chalk","bold","red","join","provider","cli","loggerMain","createLogger","MergeLanesAspect","lanesCommand","getCommand","mergeLanesMain","commands","MergeLaneCmd","LanesAspect","CLIAspect","WorkspaceAspect","MergingAspect","LoggerAspect","RemoveAspect","MainRuntime","compIdsToKeep","allBitIds","bitIdsFromPattern","BitIds","fromArray","bitIdsNotFromPattern","hasWithoutVersion","filteredComponentStatus","depsToAdd","pMapSeries","compId","fromStatus","divergeData","remoteVersions","snapsOnRemoteOnly","modelComponent","getModelComponent","remoteVersion","versionObj","loadVersion","objects","flattenedDeps","getAllFlattenedDependencies","depsNotIncludeInPattern","depsOnLane","dep","isOnLane","isIdOnLane","d","depsUniq","uniqFromArray","currentLaneName","succeededComponents","componentFromModel","isDiverged","isLocalAhead","isRemoteAhead","remoteSnaps","currentParents","parents","commonSnapBeforeDiverge","addAsOnlyParent","ref","removeParent","setSquashed","previousParents","add","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 { ComponentID } from '@teambit/component-id';\nimport { DEFAULT_LANE, LaneId } from '@teambit/lane-id';\nimport { Lane } from '@teambit/legacy/dist/scope/models';\nimport { Tmp } from '@teambit/legacy/dist/scope/repositories';\nimport { Logger, LoggerAspect, LoggerMain } from '@teambit/logger';\nimport { RemoveAspect, RemoveMain } from '@teambit/remove';\nimport { MergeLanesAspect } from './merge-lanes.aspect';\nimport { MergeLaneCmd } from './merge-lane.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  ) {}\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    const otherLaneName = isDefaultLane ? DEFAULT_LANE : otherLaneId.toString();\n\n    const getAllComponentsStatus = async (): Promise<ComponentMergeStatus[]> => {\n      const tmp = new Tmp(consumer.scope);\n      try {\n        const componentsStatus = await Promise.all(\n          bitIds.map((bitId) =>\n            this.merging.getComponentMergeStatus(bitId, currentLane, otherLaneName, {\n              resolveUnrelated,\n              ignoreConfigChanges,\n            })\n          )\n        );\n        await tmp.clear();\n        return componentsStatus;\n      } catch (err: any) {\n        await tmp.clear();\n        throw err;\n      }\n    };\n    let allComponentsStatus = await getAllComponentsStatus();\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  static slots = [];\n  static dependencies = [LanesAspect, CLIAspect, WorkspaceAspect, MergingAspect, LoggerAspect, RemoveAspect];\n  static runtime = MainRuntime;\n\n  static async provider([lanes, cli, workspace, merging, loggerMain, remove]: [\n    LanesMain,\n    CLIMain,\n    Workspace,\n    MergingMain,\n    LoggerMain,\n    RemoveMain\n  ]) {\n    const logger = loggerMain.createLogger(MergeLanesAspect.id);\n    const lanesCommand = cli.getCommand('lane');\n    const mergeLanesMain = new MergeLanesMain(workspace, merging, lanes, logger, remove);\n    lanesCommand?.commands?.push(new MergeLaneCmd(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    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;\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;\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    // 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    consumer.scope.objects.add(componentFromModel);\n  });\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.31",
+  "version": "0.0.33",
   "homepage": "https://bit.dev/teambit/lanes/merge-lanes",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.lanes",
     "name": "merge-lanes",
-    "version": "0.0.31"
+    "version": "0.0.33"
   },
   "dependencies": {
     "chalk": "2.4.2",
@@ -14,16 +14,16 @@
     "@babel/runtime": "7.12.18",
     "core-js": "^3.0.0",
     "@teambit/bit-error": "0.0.400",
-    "@teambit/cli": "0.0.567",
-    "@teambit/merging": "0.0.169",
+    "@teambit/cli": "0.0.568",
+    "@teambit/merging": "0.0.171",
     "@teambit/harmony": "0.3.3",
     "@teambit/component-id": "0.0.417",
-    "@teambit/lane-id": "0.0.86",
-    "@teambit/lanes": "0.0.426",
+    "@teambit/lane-id": "0.0.87",
+    "@teambit/lanes": "0.0.428",
     "@teambit/legacy-bit-id": "0.0.414",
-    "@teambit/logger": "0.0.660",
-    "@teambit/remove": "0.0.31",
-    "@teambit/workspace": "0.0.854"
+    "@teambit/logger": "0.0.661",
+    "@teambit/remove": "0.0.33",
+    "@teambit/workspace": "0.0.856"
   },
   "devDependencies": {
     "@types/mocha": "9.1.0",
@@ -34,7 +34,7 @@
     "@types/node": "12.20.4"
   },
   "peerDependencies": {
-    "@teambit/legacy": "1.0.348",
+    "@teambit/legacy": "1.0.349",
     "react-dom": "^16.8.0 || ^17.0.0",
     "react": "^16.8.0 || ^17.0.0"
   },