@teambit/lanes 0.0.683 → 0.0.684

package/dist/{preview-1689823719636.js → preview-1689909446382.js}

@@ -1,5 +1,5 @@
-import * as compositions_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.lanes_lanes@0.0.683/dist/lanes.composition.js';
-import * as overview_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.lanes_lanes@0.0.683/dist/lanes.docs.mdx';
+import * as compositions_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.lanes_lanes@0.0.684/dist/lanes.composition.js';
+import * as overview_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.lanes_lanes@0.0.684/dist/lanes.docs.mdx';
 
 export const compositions = [compositions_0];
 export const overview = [overview_0];

package/dist/switch-lanes.d.ts

@@ -1,7 +1,7 @@
 import { BitId } from '@teambit/legacy-bit-id';
 import { ApplyVersionResults } from '@teambit/merging';
 import { Lane } from '@teambit/legacy/dist/scope/models';
-import { CheckoutProps } from '@teambit/checkout';
+import { CheckoutPropsLegacy } from '@teambit/checkout';
 import { Workspace } from '@teambit/workspace';
 import { Logger } from '@teambit/logger';
 import { LanesMain } from './lanes.main.runtime';
@@ -23,7 +23,7 @@ export declare class LaneSwitcher {
     private consumer;
     private laneIdToSwitchTo;
     private laneToSwitchTo;
-    constructor(workspace: Workspace, logger: Logger, switchProps: SwitchProps, checkoutProps: CheckoutProps, Lanes: LanesMain);
+    constructor(workspace: Workspace, logger: Logger, switchProps: SwitchProps, checkoutProps: CheckoutPropsLegacy, Lanes: LanesMain);
     switch(): Promise<ApplyVersionResults>;
     private populateSwitchProps;
     private populatePropsAccordingToRemoteLane;

package/dist/switch-lanes.js

@@ -242,7 +242,7 @@ async function getComponentStatus(consumer, id, switchProps) {
   }
   const unmerged = consumer.scope.objects.unmergedComponents.getEntry(id.name);
   if (unmerged) {
-    return returnFailure(`component ${id.toStringWithoutVersion()} is in during-merge state, please snap/tag it first (or use bit merge --resolve/--abort)`);
+    return returnFailure(`component ${id.toStringWithoutVersion()} is in during-merge state, please snap/tag it first (or use "bit lane merge-abort"/"bit merge --resolve/--abort")`);
   }
   const version = id.version;
   if (!version) {

package/dist/switch-lanes.js.map

@@ -1 +1 @@
-{"version":3,"names":["LaneSwitcher","constructor","workspace","logger","switchProps","checkoutProps","Lanes","consumer","switch","setStatusLine","isOnMain","throwForStagedComponents","populateSwitchProps","allComponentsStatus","getAllComponentsStatus","componentWithConflict","find","component","mergeResults","hasConflicts","promptMergeOptions","mergeStrategy","GeneralError","id","toStringWithoutVersion","getMergeStrategyInteractive","failedComponents","filter","componentStatus","failureMessage","map","unchangedLegitimately","succeededComponents","componentsResults","mapSeries","currentComponent","componentFromFS","applyVersion","markFilesToBeRemovedIfNeeded","saveLanesData","components","c","manyComponentsWriterOpts","skipDependencyInstallation","skipNpmInstall","verbose","writeConfig","installationError","compilationError","componentWriter","writeMany","deleteFilesIfNeeded","appliedVersionComponents","applyVersionResult","onDestroy","laneId","scope","lanes","parseLaneIdFromString","laneName","localLane","loadLane","isDefault","populatePropsAccordingToDefaultLane","populatePropsAccordingToLocalLane","populatePropsAccordingToRemoteLane","pattern","bitMap","getAllBitIdsFromAllLanes","length","BitError","allIds","resolveMultipleComponentIds","ids","patternIds","filterIdsFromPoolIdsByPattern","_legacy","remoteLaneId","laneIdToSwitchTo","debug","toString","getCurrentLaneId","isEqual","remoteLane","fetchLaneWithItsComponents","name","l","changeVersion","head","localTrackedLane","getAliasByLaneId","undefined","laneToSwitchTo","isOnLane","getIdsOfDefaultLane","LaneId","from","DEFAULT_LANE","toLaneId","tmp","Tmp","componentsStatusP","getComponentStatus","componentsStatus","Promise","all","clear","err","localLaneName","alias","trackLane","remoteScope","setCurrentLane","isNew","syncWithLanes","returnFailure","msg","modelComponent","getModelComponentIfExist","unmerged","objects","unmergedComponents","getEntry","version","existingBitMapId","getBitIdIfExist","ignoreVersion","componentOnLane","loadVersion","isRemoved","existingOnWorkspaceOnly","componentFromModel","hasVersion","currentlyUsedVersion","baseComponent","loadComponent","isModified","isComponentSourceCodeModified","isHeadSameAsMain","getHead","tagVersion","getTagOfRefIfExists","headVersion","otherComponent","threeWayMerge","otherLabel","currentLabel"],"sources":["switch-lanes.ts"],"sourcesContent":["import mapSeries from 'p-map-series';\nimport { Consumer } from '@teambit/legacy/dist/consumer';\nimport GeneralError from '@teambit/legacy/dist/error/general-error';\nimport { LaneId, DEFAULT_LANE } from '@teambit/lane-id';\nimport { BitId } from '@teambit/legacy-bit-id';\nimport ConsumerComponent from '@teambit/legacy/dist/consumer/component';\nimport { ApplyVersionResults } from '@teambit/merging';\nimport { Version, Lane } from '@teambit/legacy/dist/scope/models';\nimport { Tmp } from '@teambit/legacy/dist/scope/repositories';\nimport {\n  applyVersion,\n  ComponentStatus,\n  CheckoutProps,\n  deleteFilesIfNeeded,\n  markFilesToBeRemovedIfNeeded,\n} from '@teambit/checkout';\nimport {\n  FailedComponents,\n  getMergeStrategyInteractive,\n} from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport threeWayMerge, {\n  MergeResultsThreeWay,\n} from '@teambit/legacy/dist/consumer/versions-ops/merge-version/three-way-merge';\nimport { Workspace } from '@teambit/workspace';\nimport { Logger } from '@teambit/logger';\nimport { BitError } from '@teambit/bit-error';\nimport { LanesMain } from './lanes.main.runtime';\nimport { throwForStagedComponents } from './create-lane';\n\nexport type SwitchProps = {\n  laneName: string;\n  ids?: BitId[];\n  pattern?: string;\n  existingOnWorkspaceOnly: boolean;\n  remoteLane?: Lane;\n  localTrackedLane?: string;\n  alias?: string;\n};\n\nexport class LaneSwitcher {\n  private consumer: Consumer;\n  private laneIdToSwitchTo: LaneId; // populated by `this.populateSwitchProps()`\n  private laneToSwitchTo: Lane | undefined; // populated by `this.populateSwitchProps()`, if default-lane, it's undefined\n  constructor(\n    private workspace: Workspace,\n    private logger: Logger,\n    private switchProps: SwitchProps,\n    private checkoutProps: CheckoutProps,\n    private Lanes: LanesMain\n  ) {\n    this.consumer = this.workspace.consumer;\n  }\n\n  async switch(): Promise<ApplyVersionResults> {\n    this.logger.setStatusLine(`switching lanes`);\n    if (this.workspace.isOnMain()) {\n      await throwForStagedComponents(this.consumer);\n    }\n    await this.populateSwitchProps();\n    const allComponentsStatus: ComponentStatus[] = await this.getAllComponentsStatus();\n    const componentWithConflict = allComponentsStatus.find(\n      (component) => component.mergeResults && component.mergeResults.hasConflicts\n    );\n    if (componentWithConflict) {\n      if (!this.checkoutProps.promptMergeOptions && !this.checkoutProps.mergeStrategy) {\n        throw new GeneralError(\n          `automatic merge has failed for component ${componentWithConflict.id.toStringWithoutVersion()}.\\nplease use \"--manual\" to manually merge changes or use \"--theirs / --ours\" to choose one of the conflicted versions`\n        );\n      }\n      if (!this.checkoutProps.mergeStrategy) this.checkoutProps.mergeStrategy = await getMergeStrategyInteractive();\n    }\n    const failedComponents: FailedComponents[] = allComponentsStatus\n      .filter((componentStatus) => componentStatus.failureMessage)\n      .map((componentStatus) => ({\n        id: componentStatus.id,\n        failureMessage: componentStatus.failureMessage as string,\n        unchangedLegitimately: componentStatus.unchangedLegitimately,\n      }));\n\n    const succeededComponents = allComponentsStatus.filter((componentStatus) => !componentStatus.failureMessage);\n    // do not use Promise.all for applyVersion. otherwise, it'll write all components in parallel,\n    // which can be an issue when some components are also dependencies of others\n    const componentsResults = await mapSeries(\n      succeededComponents,\n      ({ id, currentComponent: componentFromFS, mergeResults }) => {\n        return applyVersion(this.consumer, id, componentFromFS, mergeResults, this.checkoutProps);\n      }\n    );\n\n    markFilesToBeRemovedIfNeeded(succeededComponents, componentsResults);\n\n    await this.saveLanesData();\n\n    const components = componentsResults.map((c) => c.component).filter((c) => c) as ConsumerComponent[];\n\n    const manyComponentsWriterOpts = {\n      components,\n      skipDependencyInstallation: this.checkoutProps.skipNpmInstall,\n      verbose: this.checkoutProps.verbose,\n      writeConfig: this.checkoutProps.writeConfig,\n    };\n    const { installationError, compilationError } = await this.Lanes.componentWriter.writeMany(\n      manyComponentsWriterOpts\n    );\n    await deleteFilesIfNeeded(componentsResults, this.workspace);\n\n    const appliedVersionComponents = componentsResults.map((c) => c.applyVersionResult);\n\n    await this.consumer.onDestroy();\n\n    return { components: appliedVersionComponents, failedComponents, installationError, compilationError };\n  }\n\n  private async populateSwitchProps() {\n    const laneId = await this.consumer.scope.lanes.parseLaneIdFromString(this.switchProps.laneName);\n\n    const localLane = await this.consumer.scope.loadLane(laneId);\n    if (laneId.isDefault()) {\n      await this.populatePropsAccordingToDefaultLane();\n    } else if (localLane) {\n      this.populatePropsAccordingToLocalLane(localLane);\n    } else {\n      await this.populatePropsAccordingToRemoteLane(laneId);\n    }\n\n    if (this.switchProps.pattern) {\n      if (this.consumer.bitMap.getAllBitIdsFromAllLanes().length) {\n        // if the workspace is not empty, it's possible that it has components from lane-x, and is now switching\n        // partially to lane-y, while lane-y has the same components as lane-x. in which case, the user ends up with\n        // an invalid state of components from lane-x and lane-y together.\n        throw new BitError('error: use --pattern only when the workspace is empty');\n      }\n      const allIds = await this.workspace.resolveMultipleComponentIds(this.switchProps.ids || []);\n      const patternIds = this.workspace.scope.filterIdsFromPoolIdsByPattern(this.switchProps.pattern, allIds);\n      this.switchProps.ids = patternIds.map((id) => id._legacy);\n    }\n  }\n\n  private async populatePropsAccordingToRemoteLane(remoteLaneId: LaneId) {\n    this.laneIdToSwitchTo = remoteLaneId;\n    this.logger.debug(`populatePropsAccordingToRemoteLane, remoteLaneId: ${remoteLaneId.toString()}`);\n    if (this.consumer.getCurrentLaneId().isEqual(remoteLaneId)) {\n      throw new BitError(`already checked out to \"${remoteLaneId.toString()}\"`);\n    }\n    const remoteLane = await this.Lanes.fetchLaneWithItsComponents(remoteLaneId);\n    this.switchProps.laneName = remoteLaneId.name;\n    this.switchProps.ids = remoteLane.components.map((l) => l.id.changeVersion(l.head.toString()));\n    this.switchProps.localTrackedLane = this.consumer.scope.lanes.getAliasByLaneId(remoteLaneId) || undefined;\n    this.switchProps.remoteLane = remoteLane;\n    this.laneToSwitchTo = remoteLane;\n    this.logger.debug(`populatePropsAccordingToRemoteLane, completed`);\n  }\n\n  private async populatePropsAccordingToDefaultLane() {\n    if (!this.consumer.isOnLane()) {\n      throw new BitError(`already checked out to \"${this.switchProps.laneName}\"`);\n    }\n    this.switchProps.ids = await this.consumer.getIdsOfDefaultLane();\n    this.laneIdToSwitchTo = LaneId.from(DEFAULT_LANE, this.consumer.scope.name);\n  }\n\n  private populatePropsAccordingToLocalLane(localLane: Lane) {\n    if (this.consumer.getCurrentLaneId().name === this.switchProps.laneName) {\n      throw new BitError(`already checked out to \"${this.switchProps.laneName}\"`);\n    }\n    this.switchProps.ids = localLane.components.map((c) => c.id.changeVersion(c.head.toString()));\n    this.laneIdToSwitchTo = localLane.toLaneId();\n    this.laneToSwitchTo = localLane;\n  }\n\n  private async getAllComponentsStatus(): Promise<ComponentStatus[]> {\n    const { ids } = this.switchProps;\n    const tmp = new Tmp(this.consumer.scope);\n    try {\n      const componentsStatusP = (ids as BitId[]).map((id) => getComponentStatus(this.consumer, id, this.switchProps));\n      const componentsStatus = await Promise.all(componentsStatusP);\n      await tmp.clear();\n      // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n      return componentsStatus;\n    } catch (err: any) {\n      await tmp.clear();\n      throw err;\n    }\n  }\n\n  private async saveLanesData() {\n    const localLaneName = this.switchProps.alias || this.laneIdToSwitchTo.name;\n    if (this.switchProps.remoteLane) {\n      if (!this.switchProps.localTrackedLane) {\n        this.consumer.scope.lanes.trackLane({\n          localLane: localLaneName,\n          remoteLane: this.laneIdToSwitchTo.name,\n          remoteScope: this.laneIdToSwitchTo.scope,\n        });\n      }\n    }\n\n    this.consumer.setCurrentLane(this.laneIdToSwitchTo, !this.laneToSwitchTo?.isNew);\n    this.consumer.bitMap.syncWithLanes(this.laneToSwitchTo);\n  }\n}\n\nasync function getComponentStatus(consumer: Consumer, id: BitId, switchProps: SwitchProps): Promise<ComponentStatus> {\n  const componentStatus: ComponentStatus = { id };\n  const returnFailure = (msg: string, unchangedLegitimately = false) => {\n    componentStatus.failureMessage = msg;\n    componentStatus.unchangedLegitimately = unchangedLegitimately;\n    return componentStatus;\n  };\n  const modelComponent = await consumer.scope.getModelComponentIfExist(id);\n  if (!modelComponent) {\n    return returnFailure(`component ${id.toString()} had never imported`, true);\n  }\n  const unmerged = consumer.scope.objects.unmergedComponents.getEntry(id.name);\n  if (unmerged) {\n    return returnFailure(\n      `component ${id.toStringWithoutVersion()} is in during-merge state, please snap/tag it first (or use bit merge --resolve/--abort)`\n    );\n  }\n  const version = id.version;\n  if (!version) {\n    return returnFailure(`component doesn't have any snaps on ${DEFAULT_LANE}`, true);\n  }\n  const existingBitMapId = consumer.bitMap.getBitIdIfExist(id, { ignoreVersion: true });\n  const componentOnLane: Version = await modelComponent.loadVersion(version, consumer.scope.objects);\n  if (componentOnLane.isRemoved()) {\n    return returnFailure(`component has been removed`, true);\n  }\n  if (!existingBitMapId) {\n    if (switchProps.existingOnWorkspaceOnly) {\n      return returnFailure(`component ${id.toStringWithoutVersion()} is not in the workspace`, true);\n    }\n    return { componentFromModel: componentOnLane, id };\n  }\n  if (!existingBitMapId.hasVersion()) {\n    // happens when switching from main to a lane and a component was snapped on the lane.\n    // in the .bitmap file, the version is \"latest\" or empty. so we just need to write the component according to the\n    // model. we don't care about the componentFromFS\n    return { componentFromModel: componentOnLane, id };\n  }\n  const currentlyUsedVersion = existingBitMapId.version;\n  if (currentlyUsedVersion === version) {\n    return returnFailure(`component ${id.toStringWithoutVersion()} is already at version ${version}`, true);\n  }\n  // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n  const baseComponent: Version = await modelComponent.loadVersion(currentlyUsedVersion, consumer.scope.objects);\n  const component = await consumer.loadComponent(existingBitMapId);\n  // don't use `consumer.isModified` here. otherwise, if there are dependency changes, the user can't discard them\n  // and won't be able to switch lanes.\n  const isModified = await consumer.isComponentSourceCodeModified(baseComponent, component);\n  let mergeResults: MergeResultsThreeWay | null | undefined;\n  const isHeadSameAsMain = () => {\n    const head = modelComponent.getHead();\n    if (!head) return false;\n    if (!existingBitMapId.version) return false;\n    const tagVersion = modelComponent.getTagOfRefIfExists(head);\n    const headVersion = tagVersion || head.toString();\n    return existingBitMapId.version === headVersion;\n  };\n  if (isModified) {\n    if (!isHeadSameAsMain()) {\n      throw new GeneralError(\n        `unable to checkout ${id.toStringWithoutVersion()}, the component is modified and belongs to another lane`\n      );\n    }\n\n    const otherComponent: Version = await modelComponent.loadVersion(\n      existingBitMapId.version as string, // we are here because the head is same as main. so, existingBitMapId.version must be set\n      consumer.scope.objects\n    );\n    mergeResults = await threeWayMerge({\n      consumer,\n      otherComponent,\n      otherLabel: version,\n      currentComponent: component,\n      currentLabel: `${currentlyUsedVersion} modified`,\n      baseComponent,\n    });\n  }\n  // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n  return { currentComponent: component, componentFromModel: componentOnLane, id, mergeResults };\n}\n"],"mappings":"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"}
+{"version":3,"names":["LaneSwitcher","constructor","workspace","logger","switchProps","checkoutProps","Lanes","consumer","switch","setStatusLine","isOnMain","throwForStagedComponents","populateSwitchProps","allComponentsStatus","getAllComponentsStatus","componentWithConflict","find","component","mergeResults","hasConflicts","promptMergeOptions","mergeStrategy","GeneralError","id","toStringWithoutVersion","getMergeStrategyInteractive","failedComponents","filter","componentStatus","failureMessage","map","unchangedLegitimately","succeededComponents","componentsResults","mapSeries","currentComponent","componentFromFS","applyVersion","markFilesToBeRemovedIfNeeded","saveLanesData","components","c","manyComponentsWriterOpts","skipDependencyInstallation","skipNpmInstall","verbose","writeConfig","installationError","compilationError","componentWriter","writeMany","deleteFilesIfNeeded","appliedVersionComponents","applyVersionResult","onDestroy","laneId","scope","lanes","parseLaneIdFromString","laneName","localLane","loadLane","isDefault","populatePropsAccordingToDefaultLane","populatePropsAccordingToLocalLane","populatePropsAccordingToRemoteLane","pattern","bitMap","getAllBitIdsFromAllLanes","length","BitError","allIds","resolveMultipleComponentIds","ids","patternIds","filterIdsFromPoolIdsByPattern","_legacy","remoteLaneId","laneIdToSwitchTo","debug","toString","getCurrentLaneId","isEqual","remoteLane","fetchLaneWithItsComponents","name","l","changeVersion","head","localTrackedLane","getAliasByLaneId","undefined","laneToSwitchTo","isOnLane","getIdsOfDefaultLane","LaneId","from","DEFAULT_LANE","toLaneId","tmp","Tmp","componentsStatusP","getComponentStatus","componentsStatus","Promise","all","clear","err","localLaneName","alias","trackLane","remoteScope","setCurrentLane","isNew","syncWithLanes","returnFailure","msg","modelComponent","getModelComponentIfExist","unmerged","objects","unmergedComponents","getEntry","version","existingBitMapId","getBitIdIfExist","ignoreVersion","componentOnLane","loadVersion","isRemoved","existingOnWorkspaceOnly","componentFromModel","hasVersion","currentlyUsedVersion","baseComponent","loadComponent","isModified","isComponentSourceCodeModified","isHeadSameAsMain","getHead","tagVersion","getTagOfRefIfExists","headVersion","otherComponent","threeWayMerge","otherLabel","currentLabel"],"sources":["switch-lanes.ts"],"sourcesContent":["import mapSeries from 'p-map-series';\nimport { Consumer } from '@teambit/legacy/dist/consumer';\nimport GeneralError from '@teambit/legacy/dist/error/general-error';\nimport { LaneId, DEFAULT_LANE } from '@teambit/lane-id';\nimport { BitId } from '@teambit/legacy-bit-id';\nimport ConsumerComponent from '@teambit/legacy/dist/consumer/component';\nimport { ApplyVersionResults } from '@teambit/merging';\nimport { Version, Lane } from '@teambit/legacy/dist/scope/models';\nimport { Tmp } from '@teambit/legacy/dist/scope/repositories';\nimport {\n  applyVersion,\n  ComponentStatus,\n  CheckoutPropsLegacy,\n  deleteFilesIfNeeded,\n  markFilesToBeRemovedIfNeeded,\n} from '@teambit/checkout';\nimport {\n  FailedComponents,\n  getMergeStrategyInteractive,\n} from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport threeWayMerge, {\n  MergeResultsThreeWay,\n} from '@teambit/legacy/dist/consumer/versions-ops/merge-version/three-way-merge';\nimport { Workspace } from '@teambit/workspace';\nimport { Logger } from '@teambit/logger';\nimport { BitError } from '@teambit/bit-error';\nimport { LanesMain } from './lanes.main.runtime';\nimport { throwForStagedComponents } from './create-lane';\n\nexport type SwitchProps = {\n  laneName: string;\n  ids?: BitId[];\n  pattern?: string;\n  existingOnWorkspaceOnly: boolean;\n  remoteLane?: Lane;\n  localTrackedLane?: string;\n  alias?: string;\n};\n\nexport class LaneSwitcher {\n  private consumer: Consumer;\n  private laneIdToSwitchTo: LaneId; // populated by `this.populateSwitchProps()`\n  private laneToSwitchTo: Lane | undefined; // populated by `this.populateSwitchProps()`, if default-lane, it's undefined\n  constructor(\n    private workspace: Workspace,\n    private logger: Logger,\n    private switchProps: SwitchProps,\n    private checkoutProps: CheckoutPropsLegacy,\n    private Lanes: LanesMain\n  ) {\n    this.consumer = this.workspace.consumer;\n  }\n\n  async switch(): Promise<ApplyVersionResults> {\n    this.logger.setStatusLine(`switching lanes`);\n    if (this.workspace.isOnMain()) {\n      await throwForStagedComponents(this.consumer);\n    }\n    await this.populateSwitchProps();\n    const allComponentsStatus: ComponentStatus[] = await this.getAllComponentsStatus();\n    const componentWithConflict = allComponentsStatus.find(\n      (component) => component.mergeResults && component.mergeResults.hasConflicts\n    );\n    if (componentWithConflict) {\n      if (!this.checkoutProps.promptMergeOptions && !this.checkoutProps.mergeStrategy) {\n        throw new GeneralError(\n          `automatic merge has failed for component ${componentWithConflict.id.toStringWithoutVersion()}.\\nplease use \"--manual\" to manually merge changes or use \"--theirs / --ours\" to choose one of the conflicted versions`\n        );\n      }\n      if (!this.checkoutProps.mergeStrategy) this.checkoutProps.mergeStrategy = await getMergeStrategyInteractive();\n    }\n    const failedComponents: FailedComponents[] = allComponentsStatus\n      .filter((componentStatus) => componentStatus.failureMessage)\n      .map((componentStatus) => ({\n        id: componentStatus.id,\n        failureMessage: componentStatus.failureMessage as string,\n        unchangedLegitimately: componentStatus.unchangedLegitimately,\n      }));\n\n    const succeededComponents = allComponentsStatus.filter((componentStatus) => !componentStatus.failureMessage);\n    // do not use Promise.all for applyVersion. otherwise, it'll write all components in parallel,\n    // which can be an issue when some components are also dependencies of others\n    const componentsResults = await mapSeries(\n      succeededComponents,\n      ({ id, currentComponent: componentFromFS, mergeResults }) => {\n        return applyVersion(this.consumer, id, componentFromFS, mergeResults, this.checkoutProps);\n      }\n    );\n\n    markFilesToBeRemovedIfNeeded(succeededComponents, componentsResults);\n\n    await this.saveLanesData();\n\n    const components = componentsResults.map((c) => c.component).filter((c) => c) as ConsumerComponent[];\n\n    const manyComponentsWriterOpts = {\n      components,\n      skipDependencyInstallation: this.checkoutProps.skipNpmInstall,\n      verbose: this.checkoutProps.verbose,\n      writeConfig: this.checkoutProps.writeConfig,\n    };\n    const { installationError, compilationError } = await this.Lanes.componentWriter.writeMany(\n      manyComponentsWriterOpts\n    );\n    await deleteFilesIfNeeded(componentsResults, this.workspace);\n\n    const appliedVersionComponents = componentsResults.map((c) => c.applyVersionResult);\n\n    await this.consumer.onDestroy();\n\n    return { components: appliedVersionComponents, failedComponents, installationError, compilationError };\n  }\n\n  private async populateSwitchProps() {\n    const laneId = await this.consumer.scope.lanes.parseLaneIdFromString(this.switchProps.laneName);\n\n    const localLane = await this.consumer.scope.loadLane(laneId);\n    if (laneId.isDefault()) {\n      await this.populatePropsAccordingToDefaultLane();\n    } else if (localLane) {\n      this.populatePropsAccordingToLocalLane(localLane);\n    } else {\n      await this.populatePropsAccordingToRemoteLane(laneId);\n    }\n\n    if (this.switchProps.pattern) {\n      if (this.consumer.bitMap.getAllBitIdsFromAllLanes().length) {\n        // if the workspace is not empty, it's possible that it has components from lane-x, and is now switching\n        // partially to lane-y, while lane-y has the same components as lane-x. in which case, the user ends up with\n        // an invalid state of components from lane-x and lane-y together.\n        throw new BitError('error: use --pattern only when the workspace is empty');\n      }\n      const allIds = await this.workspace.resolveMultipleComponentIds(this.switchProps.ids || []);\n      const patternIds = this.workspace.scope.filterIdsFromPoolIdsByPattern(this.switchProps.pattern, allIds);\n      this.switchProps.ids = patternIds.map((id) => id._legacy);\n    }\n  }\n\n  private async populatePropsAccordingToRemoteLane(remoteLaneId: LaneId) {\n    this.laneIdToSwitchTo = remoteLaneId;\n    this.logger.debug(`populatePropsAccordingToRemoteLane, remoteLaneId: ${remoteLaneId.toString()}`);\n    if (this.consumer.getCurrentLaneId().isEqual(remoteLaneId)) {\n      throw new BitError(`already checked out to \"${remoteLaneId.toString()}\"`);\n    }\n    const remoteLane = await this.Lanes.fetchLaneWithItsComponents(remoteLaneId);\n    this.switchProps.laneName = remoteLaneId.name;\n    this.switchProps.ids = remoteLane.components.map((l) => l.id.changeVersion(l.head.toString()));\n    this.switchProps.localTrackedLane = this.consumer.scope.lanes.getAliasByLaneId(remoteLaneId) || undefined;\n    this.switchProps.remoteLane = remoteLane;\n    this.laneToSwitchTo = remoteLane;\n    this.logger.debug(`populatePropsAccordingToRemoteLane, completed`);\n  }\n\n  private async populatePropsAccordingToDefaultLane() {\n    if (!this.consumer.isOnLane()) {\n      throw new BitError(`already checked out to \"${this.switchProps.laneName}\"`);\n    }\n    this.switchProps.ids = await this.consumer.getIdsOfDefaultLane();\n    this.laneIdToSwitchTo = LaneId.from(DEFAULT_LANE, this.consumer.scope.name);\n  }\n\n  private populatePropsAccordingToLocalLane(localLane: Lane) {\n    if (this.consumer.getCurrentLaneId().name === this.switchProps.laneName) {\n      throw new BitError(`already checked out to \"${this.switchProps.laneName}\"`);\n    }\n    this.switchProps.ids = localLane.components.map((c) => c.id.changeVersion(c.head.toString()));\n    this.laneIdToSwitchTo = localLane.toLaneId();\n    this.laneToSwitchTo = localLane;\n  }\n\n  private async getAllComponentsStatus(): Promise<ComponentStatus[]> {\n    const { ids } = this.switchProps;\n    const tmp = new Tmp(this.consumer.scope);\n    try {\n      const componentsStatusP = (ids as BitId[]).map((id) => getComponentStatus(this.consumer, id, this.switchProps));\n      const componentsStatus = await Promise.all(componentsStatusP);\n      await tmp.clear();\n      // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n      return componentsStatus;\n    } catch (err: any) {\n      await tmp.clear();\n      throw err;\n    }\n  }\n\n  private async saveLanesData() {\n    const localLaneName = this.switchProps.alias || this.laneIdToSwitchTo.name;\n    if (this.switchProps.remoteLane) {\n      if (!this.switchProps.localTrackedLane) {\n        this.consumer.scope.lanes.trackLane({\n          localLane: localLaneName,\n          remoteLane: this.laneIdToSwitchTo.name,\n          remoteScope: this.laneIdToSwitchTo.scope,\n        });\n      }\n    }\n\n    this.consumer.setCurrentLane(this.laneIdToSwitchTo, !this.laneToSwitchTo?.isNew);\n    this.consumer.bitMap.syncWithLanes(this.laneToSwitchTo);\n  }\n}\n\nasync function getComponentStatus(consumer: Consumer, id: BitId, switchProps: SwitchProps): Promise<ComponentStatus> {\n  const componentStatus: ComponentStatus = { id };\n  const returnFailure = (msg: string, unchangedLegitimately = false) => {\n    componentStatus.failureMessage = msg;\n    componentStatus.unchangedLegitimately = unchangedLegitimately;\n    return componentStatus;\n  };\n  const modelComponent = await consumer.scope.getModelComponentIfExist(id);\n  if (!modelComponent) {\n    return returnFailure(`component ${id.toString()} had never imported`, true);\n  }\n  const unmerged = consumer.scope.objects.unmergedComponents.getEntry(id.name);\n  if (unmerged) {\n    return returnFailure(\n      `component ${id.toStringWithoutVersion()} is in during-merge state, please snap/tag it first (or use \"bit lane merge-abort\"/\"bit merge --resolve/--abort\")`\n    );\n  }\n  const version = id.version;\n  if (!version) {\n    return returnFailure(`component doesn't have any snaps on ${DEFAULT_LANE}`, true);\n  }\n  const existingBitMapId = consumer.bitMap.getBitIdIfExist(id, { ignoreVersion: true });\n  const componentOnLane: Version = await modelComponent.loadVersion(version, consumer.scope.objects);\n  if (componentOnLane.isRemoved()) {\n    return returnFailure(`component has been removed`, true);\n  }\n  if (!existingBitMapId) {\n    if (switchProps.existingOnWorkspaceOnly) {\n      return returnFailure(`component ${id.toStringWithoutVersion()} is not in the workspace`, true);\n    }\n    return { componentFromModel: componentOnLane, id };\n  }\n  if (!existingBitMapId.hasVersion()) {\n    // happens when switching from main to a lane and a component was snapped on the lane.\n    // in the .bitmap file, the version is \"latest\" or empty. so we just need to write the component according to the\n    // model. we don't care about the componentFromFS\n    return { componentFromModel: componentOnLane, id };\n  }\n  const currentlyUsedVersion = existingBitMapId.version;\n  if (currentlyUsedVersion === version) {\n    return returnFailure(`component ${id.toStringWithoutVersion()} is already at version ${version}`, true);\n  }\n  // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n  const baseComponent: Version = await modelComponent.loadVersion(currentlyUsedVersion, consumer.scope.objects);\n  const component = await consumer.loadComponent(existingBitMapId);\n  // don't use `consumer.isModified` here. otherwise, if there are dependency changes, the user can't discard them\n  // and won't be able to switch lanes.\n  const isModified = await consumer.isComponentSourceCodeModified(baseComponent, component);\n  let mergeResults: MergeResultsThreeWay | null | undefined;\n  const isHeadSameAsMain = () => {\n    const head = modelComponent.getHead();\n    if (!head) return false;\n    if (!existingBitMapId.version) return false;\n    const tagVersion = modelComponent.getTagOfRefIfExists(head);\n    const headVersion = tagVersion || head.toString();\n    return existingBitMapId.version === headVersion;\n  };\n  if (isModified) {\n    if (!isHeadSameAsMain()) {\n      throw new GeneralError(\n        `unable to checkout ${id.toStringWithoutVersion()}, the component is modified and belongs to another lane`\n      );\n    }\n\n    const otherComponent: Version = await modelComponent.loadVersion(\n      existingBitMapId.version as string, // we are here because the head is same as main. so, existingBitMapId.version must be set\n      consumer.scope.objects\n    );\n    mergeResults = await threeWayMerge({\n      consumer,\n      otherComponent,\n      otherLabel: version,\n      currentComponent: component,\n      currentLabel: `${currentlyUsedVersion} modified`,\n      baseComponent,\n    });\n  }\n  // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n  return { currentComponent: component, componentFromModel: componentOnLane, id, mergeResults };\n}\n"],"mappings":"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"}

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@teambit/lanes",
-  "version": "0.0.683",
+  "version": "0.0.684",
   "homepage": "https://bit.cloud/teambit/lanes/lanes",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.lanes",
     "name": "lanes",
-    "version": "0.0.683"
+    "version": "0.0.684"
   },
   "dependencies": {
     "lodash": "4.17.21",
@@ -23,37 +23,37 @@
     "@teambit/scope.ui.scope-icon": "0.0.91",
     "@teambit/bit-error": "0.0.402",
     "@teambit/component-version": "0.0.409",
-    "@teambit/lane-id": "0.0.259",
-    "@teambit/scope": "0.0.1111",
-    "@teambit/snapping": "0.0.426",
-    "@teambit/workspace": "0.0.1111",
-    "@teambit/lanes.ui.models.lanes-model": "0.0.159",
-    "@teambit/cli": "0.0.743",
-    "@teambit/express": "0.0.841",
-    "@teambit/logger": "0.0.836",
-    "@teambit/graphql": "0.0.1111",
-    "@teambit/component-compare": "0.0.359",
-    "@teambit/component-writer": "0.0.147",
-    "@teambit/component": "0.0.1111",
-    "@teambit/export": "0.0.1111",
-    "@teambit/importer": "0.0.540",
-    "@teambit/lanes.entities.lane-diff": "0.0.104",
-    "@teambit/lanes.modules.diff": "0.0.377",
-    "@teambit/merging": "0.0.426",
-    "@teambit/remove": "0.0.288",
-    "@teambit/lanes.hooks.use-lanes": "0.0.206",
-    "@teambit/lanes.hooks.use-viewed-lane-from-url": "0.0.168",
-    "@teambit/lanes.ui.compare.lane-compare-page": "0.0.102",
-    "@teambit/lanes.ui.compare.lane-compare": "0.0.119",
-    "@teambit/lanes.ui.lane-overview": "0.0.161",
+    "@teambit/lane-id": "0.0.260",
+    "@teambit/scope": "0.0.1112",
+    "@teambit/snapping": "0.0.427",
+    "@teambit/workspace": "0.0.1112",
+    "@teambit/lanes.ui.models.lanes-model": "0.0.160",
+    "@teambit/cli": "0.0.744",
+    "@teambit/express": "0.0.842",
+    "@teambit/logger": "0.0.837",
+    "@teambit/graphql": "0.0.1112",
+    "@teambit/component-compare": "0.0.360",
+    "@teambit/component-writer": "0.0.148",
+    "@teambit/component": "0.0.1112",
+    "@teambit/export": "0.0.1112",
+    "@teambit/importer": "0.0.541",
+    "@teambit/lanes.entities.lane-diff": "0.0.105",
+    "@teambit/lanes.modules.diff": "0.0.378",
+    "@teambit/merging": "0.0.427",
+    "@teambit/remove": "0.0.289",
+    "@teambit/lanes.hooks.use-lanes": "0.0.207",
+    "@teambit/lanes.hooks.use-viewed-lane-from-url": "0.0.169",
+    "@teambit/lanes.ui.compare.lane-compare-page": "0.0.103",
+    "@teambit/lanes.ui.compare.lane-compare": "0.0.120",
+    "@teambit/lanes.ui.lane-overview": "0.0.162",
     "@teambit/lanes.ui.menus.lanes-overview-menu": "0.0.5",
-    "@teambit/lanes.ui.menus.use-lanes-menu": "0.0.159",
-    "@teambit/lanes.ui.navigation.lane-switcher": "0.0.163",
+    "@teambit/lanes.ui.menus.use-lanes-menu": "0.0.160",
+    "@teambit/lanes.ui.navigation.lane-switcher": "0.0.164",
     "@teambit/ui-foundation.ui.menu": "0.0.497",
     "@teambit/ui-foundation.ui.react-router.slot-router": "0.0.501",
     "@teambit/ui-foundation.ui.react-router.use-query": "0.0.496",
-    "@teambit/ui": "0.0.1111",
-    "@teambit/checkout": "0.0.280"
+    "@teambit/ui": "0.0.1112",
+    "@teambit/checkout": "0.0.281"
   },
   "devDependencies": {
     "@types/lodash": "4.14.165",
@@ -65,13 +65,13 @@
     "@types/react-dom": "^17.0.5",
     "@types/jest": "^26.0.0",
     "@types/testing-library__jest-dom": "5.9.5",
-    "@teambit/component.testing.mock-components": "0.0.106",
-    "@teambit/harmony.testing.load-aspect": "0.0.105",
+    "@teambit/component.testing.mock-components": "0.0.107",
+    "@teambit/harmony.testing.load-aspect": "0.0.106",
     "@teambit/workspace.testing.mock-workspace": "0.0.14"
   },
   "peerDependencies": {
     "react-router-dom": "^6.0.0",
-    "@teambit/legacy": "1.0.523",
+    "@teambit/legacy": "1.0.524",
     "react": "^16.8.0 || ^17.0.0",
     "react-dom": "^16.8.0 || ^17.0.0"
   },