@teambit/checkout 0.0.66 → 0.0.67

package/dist/checkout.main.runtime.d.ts

@@ -1,7 +1,10 @@
 import { CLIMain } from '@teambit/cli';
 import { Logger, LoggerMain } from '@teambit/logger';
 import { Workspace } from '@teambit/workspace';
+import { BitId } from '@teambit/legacy-bit-id';
 import { ApplyVersionResults, MergeStrategy } from '@teambit/legacy/dist/consumer/versions-ops/merge-version';
+import { Version, ModelComponent } from '@teambit/legacy/dist/scope/models';
+import ConsumerComponent from '@teambit/legacy/dist/consumer/component';
 import { ComponentID } from '@teambit/component-id';
 export declare type CheckoutProps = {
     version?: string;
@@ -16,6 +19,17 @@ export declare type CheckoutProps = {
     all?: boolean;
     isLane?: boolean;
 };
+export declare type ComponentStatusBeforeMergeAttempt = {
+    componentFromFS?: ConsumerComponent;
+    componentFromModel?: Version;
+    id: BitId;
+    failureMessage?: string;
+    unchangedLegitimately?: boolean;
+    propsForMerge?: {
+        currentlyUsedVersion: string;
+        componentModel: ModelComponent;
+    };
+};
 declare type CheckoutTo = 'head' | 'reset' | string;
 export declare class CheckoutMain {
     private workspace;
@@ -25,7 +39,8 @@ export declare class CheckoutMain {
     checkoutByCLIValues(to: CheckoutTo, componentPattern: string, checkoutProps: CheckoutProps): Promise<ApplyVersionResults>;
     private syncNewComponents;
     private parseValues;
-    private getComponentStatus;
+    private getComponentStatusBeforeMergeAttempt;
+    private getMergeStatus;
     static slots: never[];
     static dependencies: import("@teambit/harmony").Aspect[];
     static runtime: import("@teambit/harmony").RuntimeDefinition;

package/dist/checkout.main.runtime.js

@@ -1,7 +1,9 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+require("core-js/modules/es.array.flat.js");
 require("core-js/modules/es.array.iterator.js");
+require("core-js/modules/es.array.unscopables.flat.js");
 require("core-js/modules/es.promise.js");
 Object.defineProperty(exports, "__esModule", {
   value: true
@@ -154,19 +156,34 @@ class CheckoutMain {
     const {
       components
     } = await consumer.loadComponents(bitIds);
-    const getAllComponentsStatus = async () => {
+    const allComponentStatusBeforeMerge = await Promise.all(components.map(component => this.getComponentStatusBeforeMergeAttempt(component, checkoutProps)));
+    const compsNeedMerge = allComponentStatusBeforeMerge.filter(c => c.propsForMerge);
+    const compsNotNeedMerge = allComponentStatusBeforeMerge.filter(c => !c.propsForMerge);
+
+    // in case the requested versions to checkout don't exist locally, import them.
+    const toImport = allComponentStatusBeforeMerge.map(compStatus => {
+      const idsToImport = [compStatus.id];
+      if (compStatus.propsForMerge) {
+        idsToImport.push(compStatus.id.changeVersion(compStatus.propsForMerge.currentlyUsedVersion));
+      }
+      return idsToImport;
+    }).flat();
+    await this.workspace.scope.legacyScope.scopeImporter.importManyIfMissingWithoutDeps({
+      ids: _bitId().BitIds.fromArray(toImport)
+    });
+    const getComponentsStatusOfMergeNeeded = async () => {
       const tmp = new (_repositories().Tmp)(consumer.scope);
       try {
-        const componentsStatusP = components.map(component => this.getComponentStatus(component, checkoutProps));
-        const componentsStatus = await Promise.all(componentsStatusP);
+        const afterMergeAttempt = await Promise.all(compsNeedMerge.map(c => this.getMergeStatus(c)));
         await tmp.clear();
-        return componentsStatus;
+        return afterMergeAttempt;
       } catch (err) {
         await tmp.clear();
         throw err;
       }
     };
-    const allComponentsStatus = await getAllComponentsStatus();
+    const compStatusMergeNeeded = await getComponentsStatusOfMergeNeeded();
+    const allComponentsStatus = [...compStatusMergeNeeded, ...compsNotNeedMerge];
     const componentWithConflict = allComponentsStatus.find(component => component.mergeResults && component.mergeResults.hasConflicts);
     if (componentWithConflict) {
       if (!promptMergeOptions && !checkoutProps.mergeStrategy) {
@@ -232,7 +249,10 @@ class CheckoutMain {
     const notExported = ids === null || ids === void 0 ? void 0 : ids.filter(id => !id._legacy.hasScope()).map(id => id._legacy.changeScope(id.scope));
     const scopeComponentsImporter = this.workspace.consumer.scope.scopeImporter;
     try {
-      await scopeComponentsImporter.importManyDeltaWithoutDeps(_bitId().BitIds.fromArray(notExported || []), true);
+      await scopeComponentsImporter.importManyDeltaWithoutDeps({
+        ids: _bitId().BitIds.fromArray(notExported || []),
+        fromHead: true
+      });
     } catch (err) {
       // don't stop the process. it's possible that the scope doesn't exist yet because these are new components
       this.logger.error(`unable to sync new components due to an error`, err);
@@ -264,7 +284,7 @@ class CheckoutMain {
     const ids = componentPattern ? await this.workspace.idsByPattern(componentPattern) : await this.workspace.listIds();
     checkoutProps.ids = ids.map(id => checkoutProps.head || checkoutProps.latest ? id.changeVersion(_constants().LATEST) : id);
   }
-  async getComponentStatus(component, checkoutProps) {
+  async getComponentStatusBeforeMergeAttempt(component, checkoutProps) {
     const consumer = this.workspace.consumer;
     const {
       version,
@@ -310,7 +330,7 @@ class CheckoutMain {
     }
     if (version && currentlyUsedVersion === version) {
       // it won't be relevant for 'reset' as it doesn't have a version
-      return returnFailure(`component ${component.id.toStringWithoutVersion()} is already at version ${version}`);
+      return returnFailure(`component ${component.id.toStringWithoutVersion()} is already at version ${version}`, true);
     }
     if (headVersion && currentlyUsedVersion === newVersion) {
       return returnFailure(`component ${component.id.toStringWithoutVersion()} is already at the latest version, which is ${newVersion}`, true);
@@ -318,8 +338,47 @@ class CheckoutMain {
     const currentVersionObject = await componentModel.loadVersion(currentlyUsedVersion, repo);
     const isModified = await consumer.isComponentModified(currentVersionObject, component);
     if (!isModified && reset) {
-      return returnFailure(`component ${component.id.toStringWithoutVersion()} is not modified`);
+      return returnFailure(`component ${component.id.toStringWithoutVersion()} is not modified`, true);
+    }
+    const versionRef = componentModel.getRef(newVersion);
+    if (!versionRef) throw new Error(`unable to get ref ${newVersion} from ${componentModel.id()}`);
+    const componentVersion = await consumer.scope.getObject(versionRef.hash);
+    const newId = component.id.changeVersion(newVersion);
+    if (reset || !isModified) {
+      // if the component is not modified, no need to try merge the files, they will be written later on according to the
+      // checked out version. same thing when no version is specified, it'll be reset to the model-version later.
+      return {
+        componentFromFS: component,
+        componentFromModel: componentVersion,
+        id: newId
+      };
     }
+    const propsForMerge = {
+      currentlyUsedVersion,
+      componentModel
+    };
+    return {
+      componentFromFS: component,
+      componentFromModel: componentVersion,
+      id: newId,
+      propsForMerge
+    };
+  }
+  async getMergeStatus({
+    componentFromFS,
+    componentFromModel,
+    id,
+    propsForMerge
+  }) {
+    if (!propsForMerge) throw new Error(`propsForMerge is missing for ${id.toString()}`);
+    if (!componentFromFS) throw new Error(`componentFromFS is missing for ${id.toString()}`);
+    const consumer = this.workspace.consumer;
+    const repo = consumer.scope.objects;
+    const {
+      currentlyUsedVersion,
+      componentModel
+    } = propsForMerge;
+
     // this is tricky. imagine the user is 0.0.2+modification and wants to checkout to 0.0.1.
     // the base is 0.0.1, as it's the common version for 0.0.1 and 0.0.2. however, if we let git merge-file use the 0.0.1
     // as the base, then, it'll get the changes done since 0.0.1 to 0.0.1, which is nothing, and put them on top of
@@ -329,30 +388,21 @@ class CheckoutMain {
     // to be added to 0.0.1
     // if there is no modification, it doesn't go the threeWayMerge anyway, so it doesn't matter what the base is.
     const baseVersion = currentlyUsedVersion;
+    const newVersion = id.version;
     const baseComponent = await componentModel.loadVersion(baseVersion, repo);
-    let mergeResults;
-    // if the component is not modified, no need to try merge the files, they will be written later on according to the
-    // checked out version. same thing when no version is specified, it'll be reset to the model-version later.
-    if (!reset && isModified) {
-      const otherComponent = await componentModel.loadVersion(newVersion, repo);
-      mergeResults = await (0, _mergeVersion().threeWayMerge)({
-        consumer,
-        otherComponent,
-        otherLabel: newVersion,
-        currentComponent: component,
-        currentLabel: `${currentlyUsedVersion} modified`,
-        baseComponent
-      });
-    }
-    const versionRef = componentModel.getRef(newVersion);
-    // @ts-ignore
-    const componentVersion = await consumer.scope.getObject(versionRef.hash);
-    const newId = component.id.changeVersion(newVersion);
-    // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!
+    const otherComponent = await componentModel.loadVersion(newVersion, repo);
+    const mergeResults = await (0, _mergeVersion().threeWayMerge)({
+      consumer,
+      otherComponent,
+      otherLabel: newVersion,
+      currentComponent: componentFromFS,
+      currentLabel: `${currentlyUsedVersion} modified`,
+      baseComponent
+    });
     return {
-      componentFromFS: component,
-      componentFromModel: componentVersion,
-      id: newId,
+      componentFromFS,
+      componentFromModel,
+      id,
       mergeResults
     };
   }

package/dist/checkout.main.runtime.js.map

@@ -1 +1 @@
-{"version":3,"names":["CheckoutMain","constructor","workspace","logger","checkout","checkoutProps","consumer","version","ids","promptMergeOptions","syncNewComponents","bitIds","BitIds","fromArray","map","id","_legacy","scope","import","components","loadComponents","getAllComponentsStatus","tmp","Tmp","componentsStatusP","component","getComponentStatus","componentsStatus","Promise","all","clear","err","allComponentsStatus","componentWithConflict","find","mergeResults","hasConflicts","mergeStrategy","GeneralError","toStringWithoutVersion","getMergeStrategyInteractive","failedComponents","filter","componentStatus","failureMessage","unchangedLegitimately","succeededComponents","checkoutPropsLegacy","componentsResults","mapSeries","componentFromFS","applyVersion","markFilesToBeRemovedIfNeeded","componentsWithDependencies","c","leftUnresolvedConflicts","length","manyComponentsWriter","ManyComponentsWriter","installNpmPackages","skipNpmInstall","override","verbose","resetConfig","reset","writeAll","deleteFilesIfNeeded","appliedVersionComponents","applyVersionResult","checkoutByCLIValues","to","componentPattern","setStatusLine","BEFORE_CHECKOUT","ConsumerNotFound","parseValues","checkoutResults","onDestroy","head","notExported","hasScope","changeScope","scopeComponentsImporter","scopeImporter","importManyDeltaWithoutDeps","error","HEAD","LATEST","latest","BitId","isValidVersion","BitError","console","idsByPattern","listIds","changeVersion","headVersion","latestVersion","repo","objects","componentModel","getModelComponentIfExist","returnFailure","msg","toString","unmerged","unmergedComponents","getEntry","name","getNewVersion","headIncludeRemote","newVersion","hasVersion","existingBitMapId","bitMap","getBitId","ignoreVersion","currentlyUsedVersion","currentVersionObject","loadVersion","isModified","isComponentModified","baseVersion","baseComponent","otherComponent","threeWayMerge","otherLabel","currentComponent","currentLabel","versionRef","getRef","componentVersion","getObject","hash","newId","componentFromModel","provider","cli","loggerMain","createLogger","CheckoutAspect","checkoutMain","register","CheckoutCmd","CLIAspect","WorkspaceAspect","LoggerAspect","MainRuntime","addRuntime"],"sources":["checkout.main.runtime.ts"],"sourcesContent":["import { CLIAspect, CLIMain, MainRuntime } from '@teambit/cli';\nimport { Logger, LoggerAspect, LoggerMain } from '@teambit/logger';\nimport WorkspaceAspect, { Workspace } from '@teambit/workspace';\nimport { BitId } from '@teambit/legacy-bit-id';\nimport { BitError } from '@teambit/bit-error';\nimport { BEFORE_CHECKOUT } from '@teambit/legacy/dist/cli/loader/loader-messages';\nimport { HEAD, LATEST } from '@teambit/legacy/dist/constants';\nimport {\n  applyVersion,\n  markFilesToBeRemovedIfNeeded,\n  ComponentStatus,\n  deleteFilesIfNeeded,\n} from '@teambit/legacy/dist/consumer/versions-ops/checkout-version';\nimport {\n  ApplyVersionResults,\n  FailedComponents,\n  getMergeStrategyInteractive,\n  MergeStrategy,\n  threeWayMerge,\n} from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport GeneralError from '@teambit/legacy/dist/error/general-error';\nimport { ConsumerNotFound } from '@teambit/legacy/dist/consumer/exceptions';\nimport mapSeries from 'p-map-series';\nimport { BitIds } from '@teambit/legacy/dist/bit-id';\nimport { ComponentWithDependencies } from '@teambit/legacy/dist/scope';\nimport Version from '@teambit/legacy/dist/scope/models/version';\nimport { Tmp } from '@teambit/legacy/dist/scope/repositories';\nimport ManyComponentsWriter from '@teambit/legacy/dist/consumer/component-ops/many-components-writer';\nimport { MergeResultsThreeWay } from '@teambit/legacy/dist/consumer/versions-ops/merge-version/three-way-merge';\nimport ConsumerComponent from '@teambit/legacy/dist/consumer/component';\nimport { ComponentID } from '@teambit/component-id';\nimport { CheckoutCmd } from './checkout-cmd';\nimport { CheckoutAspect } from './checkout.aspect';\n\nexport type CheckoutProps = {\n  version?: string; // if reset is true, the version is undefined\n  ids?: ComponentID[];\n  head?: boolean;\n  latest?: boolean;\n  promptMergeOptions?: boolean;\n  mergeStrategy?: MergeStrategy | null;\n  verbose?: boolean;\n  skipNpmInstall?: boolean;\n  reset?: boolean; // remove local changes. if set, the version is undefined.\n  all?: boolean; // checkout all ids\n  isLane?: boolean;\n};\n\ntype CheckoutTo = 'head' | 'reset' | string;\n\nexport class CheckoutMain {\n  constructor(private workspace: Workspace, private logger: Logger) {}\n\n  async checkout(checkoutProps: CheckoutProps): Promise<ApplyVersionResults> {\n    const consumer = this.workspace.consumer;\n    const { version, ids, promptMergeOptions } = checkoutProps;\n    await this.syncNewComponents(checkoutProps);\n    const bitIds = BitIds.fromArray(ids?.map((id) => id._legacy) || []);\n    await consumer.scope.import(bitIds, false);\n    const { components } = await consumer.loadComponents(bitIds);\n\n    const getAllComponentsStatus = async (): Promise<ComponentStatus[]> => {\n      const tmp = new Tmp(consumer.scope);\n      try {\n        const componentsStatusP = components.map((component) => this.getComponentStatus(component, checkoutProps));\n        const componentsStatus = await Promise.all(componentsStatusP);\n        await tmp.clear();\n        return componentsStatus;\n      } catch (err: any) {\n        await tmp.clear();\n        throw err;\n      }\n    };\n\n    const allComponentsStatus: ComponentStatus[] = await getAllComponentsStatus();\n    const componentWithConflict = allComponentsStatus.find(\n      (component) => component.mergeResults && component.mergeResults.hasConflicts\n    );\n    if (componentWithConflict) {\n      if (!promptMergeOptions && !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 (!checkoutProps.mergeStrategy) 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 checkoutPropsLegacy = { ...checkoutProps, ids: checkoutProps.ids?.map((id) => id._legacy) };\n    const componentsResults = await mapSeries(succeededComponents, ({ id, componentFromFS, mergeResults }) => {\n      return applyVersion(consumer, id, componentFromFS, mergeResults, checkoutPropsLegacy);\n    });\n\n    markFilesToBeRemovedIfNeeded(succeededComponents, componentsResults);\n\n    const componentsWithDependencies = componentsResults\n      .map((c) => c.component)\n      .filter((c) => c) as ComponentWithDependencies[];\n    const leftUnresolvedConflicts = componentWithConflict && checkoutProps.mergeStrategy === 'manual';\n    if (componentsWithDependencies.length) {\n      const manyComponentsWriter = new ManyComponentsWriter({\n        consumer,\n        componentsWithDependencies,\n        installNpmPackages: !checkoutProps.skipNpmInstall && !leftUnresolvedConflicts,\n        override: true,\n        verbose: checkoutProps.verbose,\n        resetConfig: checkoutProps.reset,\n      });\n      await manyComponentsWriter.writeAll();\n      await deleteFilesIfNeeded(componentsResults, consumer);\n    }\n\n    const appliedVersionComponents = componentsResults.map((c) => c.applyVersionResult);\n\n    return { components: appliedVersionComponents, version, failedComponents, leftUnresolvedConflicts };\n  }\n\n  async checkoutByCLIValues(\n    to: CheckoutTo,\n    componentPattern: string,\n    checkoutProps: CheckoutProps\n  ): Promise<ApplyVersionResults> {\n    this.logger.setStatusLine(BEFORE_CHECKOUT);\n    if (!this.workspace) throw new ConsumerNotFound();\n    const consumer = this.workspace.consumer;\n    await this.parseValues(to, componentPattern, checkoutProps);\n    const checkoutResults = await this.checkout(checkoutProps);\n    await consumer.onDestroy();\n    return checkoutResults;\n  }\n\n  private async syncNewComponents({ ids, head }: CheckoutProps) {\n    if (!head) return;\n    const notExported = ids?.filter((id) => !id._legacy.hasScope()).map((id) => id._legacy.changeScope(id.scope));\n    const scopeComponentsImporter = this.workspace.consumer.scope.scopeImporter;\n    try {\n      await scopeComponentsImporter.importManyDeltaWithoutDeps(BitIds.fromArray(notExported || []), true);\n    } catch (err) {\n      // don't stop the process. it's possible that the scope doesn't exist yet because these are new components\n      this.logger.error(`unable to sync new components due to an error`, err);\n    }\n  }\n\n  private async parseValues(to: CheckoutTo, componentPattern: string, checkoutProps: CheckoutProps) {\n    if (to === HEAD) checkoutProps.head = true;\n    else if (to === LATEST) checkoutProps.latest = true;\n    else if (to === 'reset') checkoutProps.reset = true;\n    else {\n      if (!BitId.isValidVersion(to)) throw new BitError(`the specified version \"${to}\" is not a valid version`);\n      checkoutProps.version = to;\n    }\n    if (checkoutProps.head && !componentPattern) {\n      if (checkoutProps.all) {\n        this.logger.console(`\"--all\" is deprecated for \"bit checkout ${HEAD}\", please omit it.`);\n      }\n      checkoutProps.all = true;\n    }\n    if (checkoutProps.latest && !componentPattern) {\n      if (checkoutProps.all) {\n        this.logger.console(`\"--all\" is deprecated for \"bit checkout ${LATEST}\", please omit it.`);\n      }\n      checkoutProps.all = true;\n    }\n    if (componentPattern && checkoutProps.all) {\n      throw new GeneralError('please specify either [component-pattern] or --all, not both');\n    }\n    if (!componentPattern && !checkoutProps.all) {\n      throw new GeneralError('please specify [component-pattern] or use --all flag');\n    }\n    const ids = componentPattern ? await this.workspace.idsByPattern(componentPattern) : await this.workspace.listIds();\n    checkoutProps.ids = ids.map((id) => (checkoutProps.head || checkoutProps.latest ? id.changeVersion(LATEST) : id));\n  }\n\n  private async getComponentStatus(\n    component: ConsumerComponent,\n    checkoutProps: CheckoutProps\n  ): Promise<ComponentStatus> {\n    const consumer = this.workspace.consumer;\n    const { version, head: headVersion, reset, latest: latestVersion } = checkoutProps;\n    const repo = consumer.scope.objects;\n    const componentModel = await consumer.scope.getModelComponentIfExist(component.id);\n    const componentStatus: ComponentStatus = { id: component.id };\n    const returnFailure = (msg: string, unchangedLegitimately = false) => {\n      componentStatus.failureMessage = msg;\n      componentStatus.unchangedLegitimately = unchangedLegitimately;\n      return componentStatus;\n    };\n    if (!componentModel) {\n      return returnFailure(`component ${component.id.toString()} is new, no version to checkout`, true);\n    }\n    const unmerged = repo.unmergedComponents.getEntry(component.name);\n    if (!reset && unmerged) {\n      return returnFailure(\n        `component ${component.id.toStringWithoutVersion()} is in during-merge state, please snap/tag it first (or use bit merge --resolve/--abort)`\n      );\n    }\n    const getNewVersion = async (): Promise<string> => {\n      if (reset) return component.id.version as string;\n\n      if (headVersion) return componentModel.headIncludeRemote(repo);\n      if (latestVersion) return componentModel.latestVersion();\n      // @ts-ignore if !reset the version is defined\n      return version;\n    };\n    const newVersion = await getNewVersion();\n    if (version && !headVersion) {\n      const hasVersion = await componentModel.hasVersion(version, repo);\n      if (!hasVersion)\n        return returnFailure(`component ${component.id.toStringWithoutVersion()} doesn't have version ${version}`);\n    }\n    const existingBitMapId = consumer.bitMap.getBitId(component.id, { ignoreVersion: true });\n    const currentlyUsedVersion = existingBitMapId.version;\n    if (!currentlyUsedVersion) {\n      return returnFailure(`component ${component.id.toStringWithoutVersion()} is new`);\n    }\n    if (version && currentlyUsedVersion === version) {\n      // it won't be relevant for 'reset' as it doesn't have a version\n      return returnFailure(`component ${component.id.toStringWithoutVersion()} is already at version ${version}`);\n    }\n    if (headVersion && currentlyUsedVersion === newVersion) {\n      return returnFailure(\n        `component ${component.id.toStringWithoutVersion()} is already at the latest version, which is ${newVersion}`,\n        true\n      );\n    }\n    const currentVersionObject: Version = await componentModel.loadVersion(currentlyUsedVersion, repo);\n    const isModified = await consumer.isComponentModified(currentVersionObject, component);\n    if (!isModified && reset) {\n      return returnFailure(`component ${component.id.toStringWithoutVersion()} is not modified`);\n    }\n    // this is tricky. imagine the user is 0.0.2+modification and wants to checkout to 0.0.1.\n    // the base is 0.0.1, as it's the common version for 0.0.1 and 0.0.2. however, if we let git merge-file use the 0.0.1\n    // as the base, then, it'll get the changes done since 0.0.1 to 0.0.1, which is nothing, and put them on top of\n    // 0.0.2+modification. in other words, it won't make any change.\n    // this scenario of checking out while there are modified files, is forbidden in Git. here, we want to simulate a similar\n    // experience of \"git stash\", then \"git checkout\", then \"git stash pop\". practically, we want the changes done on 0.0.2\n    // to be added to 0.0.1\n    // if there is no modification, it doesn't go the threeWayMerge anyway, so it doesn't matter what the base is.\n    const baseVersion = currentlyUsedVersion;\n    const baseComponent: Version = await componentModel.loadVersion(baseVersion, repo);\n    let mergeResults: MergeResultsThreeWay | null | undefined;\n    // if the component is not modified, no need to try merge the files, they will be written later on according to the\n    // checked out version. same thing when no version is specified, it'll be reset to the model-version later.\n    if (!reset && isModified) {\n      const otherComponent: Version = await componentModel.loadVersion(newVersion, repo);\n      mergeResults = await threeWayMerge({\n        consumer,\n        otherComponent,\n        otherLabel: newVersion,\n        currentComponent: component,\n        currentLabel: `${currentlyUsedVersion} modified`,\n        baseComponent,\n      });\n    }\n    const versionRef = componentModel.getRef(newVersion);\n    // @ts-ignore\n    const componentVersion = await consumer.scope.getObject(versionRef.hash);\n    const newId = component.id.changeVersion(newVersion);\n    // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n    return { componentFromFS: component, componentFromModel: componentVersion, id: newId, mergeResults };\n  }\n\n  static slots = [];\n  static dependencies = [CLIAspect, WorkspaceAspect, LoggerAspect];\n\n  static runtime = MainRuntime;\n\n  static async provider([cli, workspace, loggerMain]: [CLIMain, Workspace, LoggerMain]) {\n    const logger = loggerMain.createLogger(CheckoutAspect.id);\n    const checkoutMain = new CheckoutMain(workspace, logger);\n    cli.register(new CheckoutCmd(checkoutMain));\n    return checkoutMain;\n  }\n}\n\nCheckoutAspect.addRuntime(CheckoutMain);\n\nexport default CheckoutMain;\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;AACA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AACA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AAMA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AAOA;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;AAGA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AACA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AAIA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AACA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AAAmD;AAAA;AAkB5C,MAAMA,YAAY,CAAC;EACxBC,WAAW,CAASC,SAAoB,EAAUC,MAAc,EAAE;IAAA,KAA9CD,SAAoB,GAApBA,SAAoB;IAAA,KAAUC,MAAc,GAAdA,MAAc;EAAG;EAEnE,MAAMC,QAAQ,CAACC,aAA4B,EAAgC;IAAA;IACzE,MAAMC,QAAQ,GAAG,IAAI,CAACJ,SAAS,CAACI,QAAQ;IACxC,MAAM;MAAEC,OAAO;MAAEC,GAAG;MAAEC;IAAmB,CAAC,GAAGJ,aAAa;IAC1D,MAAM,IAAI,CAACK,iBAAiB,CAACL,aAAa,CAAC;IAC3C,MAAMM,MAAM,GAAGC,eAAM,CAACC,SAAS,CAAC,CAAAL,GAAG,aAAHA,GAAG,uBAAHA,GAAG,CAAEM,GAAG,CAAEC,EAAE,IAAKA,EAAE,CAACC,OAAO,CAAC,KAAI,EAAE,CAAC;IACnE,MAAMV,QAAQ,CAACW,KAAK,CAACC,MAAM,CAACP,MAAM,EAAE,KAAK,CAAC;IAC1C,MAAM;MAAEQ;IAAW,CAAC,GAAG,MAAMb,QAAQ,CAACc,cAAc,CAACT,MAAM,CAAC;IAE5D,MAAMU,sBAAsB,GAAG,YAAwC;MACrE,MAAMC,GAAG,GAAG,KAAIC,mBAAG,EAACjB,QAAQ,CAACW,KAAK,CAAC;MACnC,IAAI;QACF,MAAMO,iBAAiB,GAAGL,UAAU,CAACL,GAAG,CAAEW,SAAS,IAAK,IAAI,CAACC,kBAAkB,CAACD,SAAS,EAAEpB,aAAa,CAAC,CAAC;QAC1G,MAAMsB,gBAAgB,GAAG,MAAMC,OAAO,CAACC,GAAG,CAACL,iBAAiB,CAAC;QAC7D,MAAMF,GAAG,CAACQ,KAAK,EAAE;QACjB,OAAOH,gBAAgB;MACzB,CAAC,CAAC,OAAOI,GAAQ,EAAE;QACjB,MAAMT,GAAG,CAACQ,KAAK,EAAE;QACjB,MAAMC,GAAG;MACX;IACF,CAAC;IAED,MAAMC,mBAAsC,GAAG,MAAMX,sBAAsB,EAAE;IAC7E,MAAMY,qBAAqB,GAAGD,mBAAmB,CAACE,IAAI,CACnDT,SAAS,IAAKA,SAAS,CAACU,YAAY,IAAIV,SAAS,CAACU,YAAY,CAACC,YAAY,CAC7E;IACD,IAAIH,qBAAqB,EAAE;MACzB,IAAI,CAACxB,kBAAkB,IAAI,CAACJ,aAAa,CAACgC,aAAa,EAAE;QACvD,MAAM,KAAIC,uBAAY,EACnB,4CAA2CL,qBAAqB,CAAClB,EAAE,CAACwB,sBAAsB,EAAG,wHAAuH,CACtN;MACH;MACA,IAAI,CAAClC,aAAa,CAACgC,aAAa,EAAEhC,aAAa,CAACgC,aAAa,GAAG,MAAM,IAAAG,2CAA2B,GAAE;IACrG;IACA,MAAMC,gBAAoC,GAAGT,mBAAmB,CAC7DU,MAAM,CAAEC,eAAe,IAAKA,eAAe,CAACC,cAAc,CAAC,CAC3D9B,GAAG,CAAE6B,eAAe,KAAM;MACzB5B,EAAE,EAAE4B,eAAe,CAAC5B,EAAE;MACtB6B,cAAc,EAAED,eAAe,CAACC,cAAwB;MACxDC,qBAAqB,EAAEF,eAAe,CAACE;IACzC,CAAC,CAAC,CAAC;IAEL,MAAMC,mBAAmB,GAAGd,mBAAmB,CAACU,MAAM,CAAEC,eAAe,IAAK,CAACA,eAAe,CAACC,cAAc,CAAC;IAC5G;IACA;IACA,MAAMG,mBAAmB,mCAAQ1C,aAAa;MAAEG,GAAG,wBAAEH,aAAa,CAACG,GAAG,uDAAjB,mBAAmBM,GAAG,CAAEC,EAAE,IAAKA,EAAE,CAACC,OAAO;IAAC,EAAE;IACjG,MAAMgC,iBAAiB,GAAG,MAAM,IAAAC,qBAAS,EAACH,mBAAmB,EAAE,CAAC;MAAE/B,EAAE;MAAEmC,eAAe;MAAEf;IAAa,CAAC,KAAK;MACxG,OAAO,IAAAgB,+BAAY,EAAC7C,QAAQ,EAAES,EAAE,EAAEmC,eAAe,EAAEf,YAAY,EAAEY,mBAAmB,CAAC;IACvF,CAAC,CAAC;IAEF,IAAAK,+CAA4B,EAACN,mBAAmB,EAAEE,iBAAiB,CAAC;IAEpE,MAAMK,0BAA0B,GAAGL,iBAAiB,CACjDlC,GAAG,CAAEwC,CAAC,IAAKA,CAAC,CAAC7B,SAAS,CAAC,CACvBiB,MAAM,CAAEY,CAAC,IAAKA,CAAC,CAAgC;IAClD,MAAMC,uBAAuB,GAAGtB,qBAAqB,IAAI5B,aAAa,CAACgC,aAAa,KAAK,QAAQ;IACjG,IAAIgB,0BAA0B,CAACG,MAAM,EAAE;MACrC,MAAMC,oBAAoB,GAAG,KAAIC,+BAAoB,EAAC;QACpDpD,QAAQ;QACR+C,0BAA0B;QAC1BM,kBAAkB,EAAE,CAACtD,aAAa,CAACuD,cAAc,IAAI,CAACL,uBAAuB;QAC7EM,QAAQ,EAAE,IAAI;QACdC,OAAO,EAAEzD,aAAa,CAACyD,OAAO;QAC9BC,WAAW,EAAE1D,aAAa,CAAC2D;MAC7B,CAAC,CAAC;MACF,MAAMP,oBAAoB,CAACQ,QAAQ,EAAE;MACrC,MAAM,IAAAC,sCAAmB,EAAClB,iBAAiB,EAAE1C,QAAQ,CAAC;IACxD;IAEA,MAAM6D,wBAAwB,GAAGnB,iBAAiB,CAAClC,GAAG,CAAEwC,CAAC,IAAKA,CAAC,CAACc,kBAAkB,CAAC;IAEnF,OAAO;MAAEjD,UAAU,EAAEgD,wBAAwB;MAAE5D,OAAO;MAAEkC,gBAAgB;MAAEc;IAAwB,CAAC;EACrG;EAEA,MAAMc,mBAAmB,CACvBC,EAAc,EACdC,gBAAwB,EACxBlE,aAA4B,EACE;IAC9B,IAAI,CAACF,MAAM,CAACqE,aAAa,CAACC,iCAAe,CAAC;IAC1C,IAAI,CAAC,IAAI,CAACvE,SAAS,EAAE,MAAM,KAAIwE,8BAAgB,GAAE;IACjD,MAAMpE,QAAQ,GAAG,IAAI,CAACJ,SAAS,CAACI,QAAQ;IACxC,MAAM,IAAI,CAACqE,WAAW,CAACL,EAAE,EAAEC,gBAAgB,EAAElE,aAAa,CAAC;IAC3D,MAAMuE,eAAe,GAAG,MAAM,IAAI,CAACxE,QAAQ,CAACC,aAAa,CAAC;IAC1D,MAAMC,QAAQ,CAACuE,SAAS,EAAE;IAC1B,OAAOD,eAAe;EACxB;EAEA,MAAclE,iBAAiB,CAAC;IAAEF,GAAG;IAAEsE;EAAoB,CAAC,EAAE;IAC5D,IAAI,CAACA,IAAI,EAAE;IACX,MAAMC,WAAW,GAAGvE,GAAG,aAAHA,GAAG,uBAAHA,GAAG,CAAEkC,MAAM,CAAE3B,EAAE,IAAK,CAACA,EAAE,CAACC,OAAO,CAACgE,QAAQ,EAAE,CAAC,CAAClE,GAAG,CAAEC,EAAE,IAAKA,EAAE,CAACC,OAAO,CAACiE,WAAW,CAAClE,EAAE,CAACE,KAAK,CAAC,CAAC;IAC7G,MAAMiE,uBAAuB,GAAG,IAAI,CAAChF,SAAS,CAACI,QAAQ,CAACW,KAAK,CAACkE,aAAa;IAC3E,IAAI;MACF,MAAMD,uBAAuB,CAACE,0BAA0B,CAACxE,eAAM,CAACC,SAAS,CAACkE,WAAW,IAAI,EAAE,CAAC,EAAE,IAAI,CAAC;IACrG,CAAC,CAAC,OAAOhD,GAAG,EAAE;MACZ;MACA,IAAI,CAAC5B,MAAM,CAACkF,KAAK,CAAE,+CAA8C,EAAEtD,GAAG,CAAC;IACzE;EACF;EAEA,MAAc4C,WAAW,CAACL,EAAc,EAAEC,gBAAwB,EAAElE,aAA4B,EAAE;IAChG,IAAIiE,EAAE,KAAKgB,iBAAI,EAAEjF,aAAa,CAACyE,IAAI,GAAG,IAAI,CAAC,KACtC,IAAIR,EAAE,KAAKiB,mBAAM,EAAElF,aAAa,CAACmF,MAAM,GAAG,IAAI,CAAC,KAC/C,IAAIlB,EAAE,KAAK,OAAO,EAAEjE,aAAa,CAAC2D,KAAK,GAAG,IAAI,CAAC,KAC/C;MACH,IAAI,CAACyB,oBAAK,CAACC,cAAc,CAACpB,EAAE,CAAC,EAAE,MAAM,KAAIqB,oBAAQ,EAAE,0BAAyBrB,EAAG,0BAAyB,CAAC;MACzGjE,aAAa,CAACE,OAAO,GAAG+D,EAAE;IAC5B;IACA,IAAIjE,aAAa,CAACyE,IAAI,IAAI,CAACP,gBAAgB,EAAE;MAC3C,IAAIlE,aAAa,CAACwB,GAAG,EAAE;QACrB,IAAI,CAAC1B,MAAM,CAACyF,OAAO,CAAE,2CAA0CN,iBAAK,oBAAmB,CAAC;MAC1F;MACAjF,aAAa,CAACwB,GAAG,GAAG,IAAI;IAC1B;IACA,IAAIxB,aAAa,CAACmF,MAAM,IAAI,CAACjB,gBAAgB,EAAE;MAC7C,IAAIlE,aAAa,CAACwB,GAAG,EAAE;QACrB,IAAI,CAAC1B,MAAM,CAACyF,OAAO,CAAE,2CAA0CL,mBAAO,oBAAmB,CAAC;MAC5F;MACAlF,aAAa,CAACwB,GAAG,GAAG,IAAI;IAC1B;IACA,IAAI0C,gBAAgB,IAAIlE,aAAa,CAACwB,GAAG,EAAE;MACzC,MAAM,KAAIS,uBAAY,EAAC,8DAA8D,CAAC;IACxF;IACA,IAAI,CAACiC,gBAAgB,IAAI,CAAClE,aAAa,CAACwB,GAAG,EAAE;MAC3C,MAAM,KAAIS,uBAAY,EAAC,sDAAsD,CAAC;IAChF;IACA,MAAM9B,GAAG,GAAG+D,gBAAgB,GAAG,MAAM,IAAI,CAACrE,SAAS,CAAC2F,YAAY,CAACtB,gBAAgB,CAAC,GAAG,MAAM,IAAI,CAACrE,SAAS,CAAC4F,OAAO,EAAE;IACnHzF,aAAa,CAACG,GAAG,GAAGA,GAAG,CAACM,GAAG,CAAEC,EAAE,IAAMV,aAAa,CAACyE,IAAI,IAAIzE,aAAa,CAACmF,MAAM,GAAGzE,EAAE,CAACgF,aAAa,CAACR,mBAAM,CAAC,GAAGxE,EAAG,CAAC;EACnH;EAEA,MAAcW,kBAAkB,CAC9BD,SAA4B,EAC5BpB,aAA4B,EACF;IAC1B,MAAMC,QAAQ,GAAG,IAAI,CAACJ,SAAS,CAACI,QAAQ;IACxC,MAAM;MAAEC,OAAO;MAAEuE,IAAI,EAAEkB,WAAW;MAAEhC,KAAK;MAAEwB,MAAM,EAAES;IAAc,CAAC,GAAG5F,aAAa;IAClF,MAAM6F,IAAI,GAAG5F,QAAQ,CAACW,KAAK,CAACkF,OAAO;IACnC,MAAMC,cAAc,GAAG,MAAM9F,QAAQ,CAACW,KAAK,CAACoF,wBAAwB,CAAC5E,SAAS,CAACV,EAAE,CAAC;IAClF,MAAM4B,eAAgC,GAAG;MAAE5B,EAAE,EAAEU,SAAS,CAACV;IAAG,CAAC;IAC7D,MAAMuF,aAAa,GAAG,CAACC,GAAW,EAAE1D,qBAAqB,GAAG,KAAK,KAAK;MACpEF,eAAe,CAACC,cAAc,GAAG2D,GAAG;MACpC5D,eAAe,CAACE,qBAAqB,GAAGA,qBAAqB;MAC7D,OAAOF,eAAe;IACxB,CAAC;IACD,IAAI,CAACyD,cAAc,EAAE;MACnB,OAAOE,aAAa,CAAE,aAAY7E,SAAS,CAACV,EAAE,CAACyF,QAAQ,EAAG,iCAAgC,EAAE,IAAI,CAAC;IACnG;IACA,MAAMC,QAAQ,GAAGP,IAAI,CAACQ,kBAAkB,CAACC,QAAQ,CAAClF,SAAS,CAACmF,IAAI,CAAC;IACjE,IAAI,CAAC5C,KAAK,IAAIyC,QAAQ,EAAE;MACtB,OAAOH,aAAa,CACjB,aAAY7E,SAAS,CAACV,EAAE,CAACwB,sBAAsB,EAAG,0FAAyF,CAC7I;IACH;IACA,MAAMsE,aAAa,GAAG,YAA6B;MACjD,IAAI7C,KAAK,EAAE,OAAOvC,SAAS,CAACV,EAAE,CAACR,OAAO;MAEtC,IAAIyF,WAAW,EAAE,OAAOI,cAAc,CAACU,iBAAiB,CAACZ,IAAI,CAAC;MAC9D,IAAID,aAAa,EAAE,OAAOG,cAAc,CAACH,aAAa,EAAE;MACxD;MACA,OAAO1F,OAAO;IAChB,CAAC;IACD,MAAMwG,UAAU,GAAG,MAAMF,aAAa,EAAE;IACxC,IAAItG,OAAO,IAAI,CAACyF,WAAW,EAAE;MAC3B,MAAMgB,UAAU,GAAG,MAAMZ,cAAc,CAACY,UAAU,CAACzG,OAAO,EAAE2F,IAAI,CAAC;MACjE,IAAI,CAACc,UAAU,EACb,OAAOV,aAAa,CAAE,aAAY7E,SAAS,CAACV,EAAE,CAACwB,sBAAsB,EAAG,yBAAwBhC,OAAQ,EAAC,CAAC;IAC9G;IACA,MAAM0G,gBAAgB,GAAG3G,QAAQ,CAAC4G,MAAM,CAACC,QAAQ,CAAC1F,SAAS,CAACV,EAAE,EAAE;MAAEqG,aAAa,EAAE;IAAK,CAAC,CAAC;IACxF,MAAMC,oBAAoB,GAAGJ,gBAAgB,CAAC1G,OAAO;IACrD,IAAI,CAAC8G,oBAAoB,EAAE;MACzB,OAAOf,aAAa,CAAE,aAAY7E,SAAS,CAACV,EAAE,CAACwB,sBAAsB,EAAG,SAAQ,CAAC;IACnF;IACA,IAAIhC,OAAO,IAAI8G,oBAAoB,KAAK9G,OAAO,EAAE;MAC/C;MACA,OAAO+F,aAAa,CAAE,aAAY7E,SAAS,CAACV,EAAE,CAACwB,sBAAsB,EAAG,0BAAyBhC,OAAQ,EAAC,CAAC;IAC7G;IACA,IAAIyF,WAAW,IAAIqB,oBAAoB,KAAKN,UAAU,EAAE;MACtD,OAAOT,aAAa,CACjB,aAAY7E,SAAS,CAACV,EAAE,CAACwB,sBAAsB,EAAG,+CAA8CwE,UAAW,EAAC,EAC7G,IAAI,CACL;IACH;IACA,MAAMO,oBAA6B,GAAG,MAAMlB,cAAc,CAACmB,WAAW,CAACF,oBAAoB,EAAEnB,IAAI,CAAC;IAClG,MAAMsB,UAAU,GAAG,MAAMlH,QAAQ,CAACmH,mBAAmB,CAACH,oBAAoB,EAAE7F,SAAS,CAAC;IACtF,IAAI,CAAC+F,UAAU,IAAIxD,KAAK,EAAE;MACxB,OAAOsC,aAAa,CAAE,aAAY7E,SAAS,CAACV,EAAE,CAACwB,sBAAsB,EAAG,kBAAiB,CAAC;IAC5F;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA,MAAMmF,WAAW,GAAGL,oBAAoB;IACxC,MAAMM,aAAsB,GAAG,MAAMvB,cAAc,CAACmB,WAAW,CAACG,WAAW,EAAExB,IAAI,CAAC;IAClF,IAAI/D,YAAqD;IACzD;IACA;IACA,IAAI,CAAC6B,KAAK,IAAIwD,UAAU,EAAE;MACxB,MAAMI,cAAuB,GAAG,MAAMxB,cAAc,CAACmB,WAAW,CAACR,UAAU,EAAEb,IAAI,CAAC;MAClF/D,YAAY,GAAG,MAAM,IAAA0F,6BAAa,EAAC;QACjCvH,QAAQ;QACRsH,cAAc;QACdE,UAAU,EAAEf,UAAU;QACtBgB,gBAAgB,EAAEtG,SAAS;QAC3BuG,YAAY,EAAG,GAAEX,oBAAqB,WAAU;QAChDM;MACF,CAAC,CAAC;IACJ;IACA,MAAMM,UAAU,GAAG7B,cAAc,CAAC8B,MAAM,CAACnB,UAAU,CAAC;IACpD;IACA,MAAMoB,gBAAgB,GAAG,MAAM7H,QAAQ,CAACW,KAAK,CAACmH,SAAS,CAACH,UAAU,CAACI,IAAI,CAAC;IACxE,MAAMC,KAAK,GAAG7G,SAAS,CAACV,EAAE,CAACgF,aAAa,CAACgB,UAAU,CAAC;IACpD;IACA,OAAO;MAAE7D,eAAe,EAAEzB,SAAS;MAAE8G,kBAAkB,EAAEJ,gBAAgB;MAAEpH,EAAE,EAAEuH,KAAK;MAAEnG;IAAa,CAAC;EACtG;EAOA,aAAaqG,QAAQ,CAAC,CAACC,GAAG,EAAEvI,SAAS,EAAEwI,UAAU,CAAmC,EAAE;IACpF,MAAMvI,MAAM,GAAGuI,UAAU,CAACC,YAAY,CAACC,0BAAc,CAAC7H,EAAE,CAAC;IACzD,MAAM8H,YAAY,GAAG,IAAI7I,YAAY,CAACE,SAAS,EAAEC,MAAM,CAAC;IACxDsI,GAAG,CAACK,QAAQ,CAAC,KAAIC,0BAAW,EAACF,YAAY,CAAC,CAAC;IAC3C,OAAOA,YAAY;EACrB;AACF;AAAC;AAAA,gCAxOY7I,YAAY,WA6NR,EAAE;AAAA,gCA7NNA,YAAY,kBA8ND,CAACgJ,gBAAS,EAAEC,oBAAe,EAAEC,sBAAY,CAAC;AAAA,gCA9NrDlJ,YAAY,aAgONmJ,kBAAW;AAU9BP,0BAAc,CAACQ,UAAU,CAACpJ,YAAY,CAAC;AAAC,eAEzBA,YAAY;AAAA"}
+{"version":3,"names":["CheckoutMain","constructor","workspace","logger","checkout","checkoutProps","consumer","version","ids","promptMergeOptions","syncNewComponents","bitIds","BitIds","fromArray","map","id","_legacy","scope","import","components","loadComponents","allComponentStatusBeforeMerge","Promise","all","component","getComponentStatusBeforeMergeAttempt","compsNeedMerge","filter","c","propsForMerge","compsNotNeedMerge","toImport","compStatus","idsToImport","push","changeVersion","currentlyUsedVersion","flat","legacyScope","scopeImporter","importManyIfMissingWithoutDeps","getComponentsStatusOfMergeNeeded","tmp","Tmp","afterMergeAttempt","getMergeStatus","clear","err","compStatusMergeNeeded","allComponentsStatus","componentWithConflict","find","mergeResults","hasConflicts","mergeStrategy","GeneralError","toStringWithoutVersion","getMergeStrategyInteractive","failedComponents","componentStatus","failureMessage","unchangedLegitimately","succeededComponents","checkoutPropsLegacy","componentsResults","mapSeries","componentFromFS","applyVersion","markFilesToBeRemovedIfNeeded","componentsWithDependencies","leftUnresolvedConflicts","length","manyComponentsWriter","ManyComponentsWriter","installNpmPackages","skipNpmInstall","override","verbose","resetConfig","reset","writeAll","deleteFilesIfNeeded","appliedVersionComponents","applyVersionResult","checkoutByCLIValues","to","componentPattern","setStatusLine","BEFORE_CHECKOUT","ConsumerNotFound","parseValues","checkoutResults","onDestroy","head","notExported","hasScope","changeScope","scopeComponentsImporter","importManyDeltaWithoutDeps","fromHead","error","HEAD","LATEST","latest","BitId","isValidVersion","BitError","console","idsByPattern","listIds","headVersion","latestVersion","repo","objects","componentModel","getModelComponentIfExist","returnFailure","msg","toString","unmerged","unmergedComponents","getEntry","name","getNewVersion","headIncludeRemote","newVersion","hasVersion","existingBitMapId","bitMap","getBitId","ignoreVersion","currentVersionObject","loadVersion","isModified","isComponentModified","versionRef","getRef","Error","componentVersion","getObject","hash","newId","componentFromModel","baseVersion","baseComponent","otherComponent","threeWayMerge","otherLabel","currentComponent","currentLabel","provider","cli","loggerMain","createLogger","CheckoutAspect","checkoutMain","register","CheckoutCmd","CLIAspect","WorkspaceAspect","LoggerAspect","MainRuntime","addRuntime"],"sources":["checkout.main.runtime.ts"],"sourcesContent":["import { CLIAspect, CLIMain, MainRuntime } from '@teambit/cli';\nimport { Logger, LoggerAspect, LoggerMain } from '@teambit/logger';\nimport WorkspaceAspect, { Workspace } from '@teambit/workspace';\nimport { BitId } from '@teambit/legacy-bit-id';\nimport { BitError } from '@teambit/bit-error';\nimport { BEFORE_CHECKOUT } from '@teambit/legacy/dist/cli/loader/loader-messages';\nimport { HEAD, LATEST } from '@teambit/legacy/dist/constants';\nimport {\n  applyVersion,\n  markFilesToBeRemovedIfNeeded,\n  ComponentStatus,\n  deleteFilesIfNeeded,\n} from '@teambit/legacy/dist/consumer/versions-ops/checkout-version';\nimport {\n  ApplyVersionResults,\n  FailedComponents,\n  getMergeStrategyInteractive,\n  MergeStrategy,\n  threeWayMerge,\n} from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport GeneralError from '@teambit/legacy/dist/error/general-error';\nimport { ConsumerNotFound } from '@teambit/legacy/dist/consumer/exceptions';\nimport mapSeries from 'p-map-series';\nimport { BitIds } from '@teambit/legacy/dist/bit-id';\nimport { ComponentWithDependencies } from '@teambit/legacy/dist/scope';\nimport { Version, ModelComponent } from '@teambit/legacy/dist/scope/models';\nimport { Tmp } from '@teambit/legacy/dist/scope/repositories';\nimport ManyComponentsWriter from '@teambit/legacy/dist/consumer/component-ops/many-components-writer';\nimport ConsumerComponent from '@teambit/legacy/dist/consumer/component';\nimport { ComponentID } from '@teambit/component-id';\nimport { CheckoutCmd } from './checkout-cmd';\nimport { CheckoutAspect } from './checkout.aspect';\n\nexport type CheckoutProps = {\n  version?: string; // if reset is true, the version is undefined\n  ids?: ComponentID[];\n  head?: boolean;\n  latest?: boolean;\n  promptMergeOptions?: boolean;\n  mergeStrategy?: MergeStrategy | null;\n  verbose?: boolean;\n  skipNpmInstall?: boolean;\n  reset?: boolean; // remove local changes. if set, the version is undefined.\n  all?: boolean; // checkout all ids\n  isLane?: boolean;\n};\n\nexport type ComponentStatusBeforeMergeAttempt = {\n  componentFromFS?: ConsumerComponent;\n  componentFromModel?: Version;\n  id: BitId;\n  failureMessage?: string;\n  unchangedLegitimately?: boolean; // failed to checkout but for a legitimate reason, such as, up-to-date\n  propsForMerge?: {\n    currentlyUsedVersion: string;\n    componentModel: ModelComponent;\n  };\n};\n\ntype CheckoutTo = 'head' | 'reset' | string;\n\nexport class CheckoutMain {\n  constructor(private workspace: Workspace, private logger: Logger) {}\n\n  async checkout(checkoutProps: CheckoutProps): Promise<ApplyVersionResults> {\n    const consumer = this.workspace.consumer;\n    const { version, ids, promptMergeOptions } = checkoutProps;\n    await this.syncNewComponents(checkoutProps);\n    const bitIds = BitIds.fromArray(ids?.map((id) => id._legacy) || []);\n    await consumer.scope.import(bitIds, false);\n    const { components } = await consumer.loadComponents(bitIds);\n\n    const allComponentStatusBeforeMerge = await Promise.all(\n      components.map((component) => this.getComponentStatusBeforeMergeAttempt(component, checkoutProps))\n    );\n    const compsNeedMerge = allComponentStatusBeforeMerge.filter((c) => c.propsForMerge);\n    const compsNotNeedMerge = allComponentStatusBeforeMerge.filter((c) => !c.propsForMerge) as ComponentStatus[];\n\n    // in case the requested versions to checkout don't exist locally, import them.\n    const toImport = allComponentStatusBeforeMerge\n      .map((compStatus) => {\n        const idsToImport = [compStatus.id];\n        if (compStatus.propsForMerge) {\n          idsToImport.push(compStatus.id.changeVersion(compStatus.propsForMerge.currentlyUsedVersion));\n        }\n        return idsToImport;\n      })\n      .flat();\n    await this.workspace.scope.legacyScope.scopeImporter.importManyIfMissingWithoutDeps({\n      ids: BitIds.fromArray(toImport),\n    });\n\n    const getComponentsStatusOfMergeNeeded = async (): Promise<ComponentStatus[]> => {\n      const tmp = new Tmp(consumer.scope);\n      try {\n        const afterMergeAttempt = await Promise.all(compsNeedMerge.map((c) => this.getMergeStatus(c)));\n        await tmp.clear();\n        return afterMergeAttempt;\n      } catch (err: any) {\n        await tmp.clear();\n        throw err;\n      }\n    };\n\n    const compStatusMergeNeeded = await getComponentsStatusOfMergeNeeded();\n\n    const allComponentsStatus: ComponentStatus[] = [...compStatusMergeNeeded, ...compsNotNeedMerge];\n    const componentWithConflict = allComponentsStatus.find(\n      (component) => component.mergeResults && component.mergeResults.hasConflicts\n    );\n    if (componentWithConflict) {\n      if (!promptMergeOptions && !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 (!checkoutProps.mergeStrategy) 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 checkoutPropsLegacy = { ...checkoutProps, ids: checkoutProps.ids?.map((id) => id._legacy) };\n    const componentsResults = await mapSeries(succeededComponents, ({ id, componentFromFS, mergeResults }) => {\n      return applyVersion(consumer, id, componentFromFS, mergeResults, checkoutPropsLegacy);\n    });\n\n    markFilesToBeRemovedIfNeeded(succeededComponents, componentsResults);\n\n    const componentsWithDependencies = componentsResults\n      .map((c) => c.component)\n      .filter((c) => c) as ComponentWithDependencies[];\n    const leftUnresolvedConflicts = componentWithConflict && checkoutProps.mergeStrategy === 'manual';\n    if (componentsWithDependencies.length) {\n      const manyComponentsWriter = new ManyComponentsWriter({\n        consumer,\n        componentsWithDependencies,\n        installNpmPackages: !checkoutProps.skipNpmInstall && !leftUnresolvedConflicts,\n        override: true,\n        verbose: checkoutProps.verbose,\n        resetConfig: checkoutProps.reset,\n      });\n      await manyComponentsWriter.writeAll();\n      await deleteFilesIfNeeded(componentsResults, consumer);\n    }\n\n    const appliedVersionComponents = componentsResults.map((c) => c.applyVersionResult);\n\n    return { components: appliedVersionComponents, version, failedComponents, leftUnresolvedConflicts };\n  }\n\n  async checkoutByCLIValues(\n    to: CheckoutTo,\n    componentPattern: string,\n    checkoutProps: CheckoutProps\n  ): Promise<ApplyVersionResults> {\n    this.logger.setStatusLine(BEFORE_CHECKOUT);\n    if (!this.workspace) throw new ConsumerNotFound();\n    const consumer = this.workspace.consumer;\n    await this.parseValues(to, componentPattern, checkoutProps);\n    const checkoutResults = await this.checkout(checkoutProps);\n    await consumer.onDestroy();\n    return checkoutResults;\n  }\n\n  private async syncNewComponents({ ids, head }: CheckoutProps) {\n    if (!head) return;\n    const notExported = ids?.filter((id) => !id._legacy.hasScope()).map((id) => id._legacy.changeScope(id.scope));\n    const scopeComponentsImporter = this.workspace.consumer.scope.scopeImporter;\n    try {\n      await scopeComponentsImporter.importManyDeltaWithoutDeps({\n        ids: BitIds.fromArray(notExported || []),\n        fromHead: true,\n      });\n    } catch (err) {\n      // don't stop the process. it's possible that the scope doesn't exist yet because these are new components\n      this.logger.error(`unable to sync new components due to an error`, err);\n    }\n  }\n\n  private async parseValues(to: CheckoutTo, componentPattern: string, checkoutProps: CheckoutProps) {\n    if (to === HEAD) checkoutProps.head = true;\n    else if (to === LATEST) checkoutProps.latest = true;\n    else if (to === 'reset') checkoutProps.reset = true;\n    else {\n      if (!BitId.isValidVersion(to)) throw new BitError(`the specified version \"${to}\" is not a valid version`);\n      checkoutProps.version = to;\n    }\n    if (checkoutProps.head && !componentPattern) {\n      if (checkoutProps.all) {\n        this.logger.console(`\"--all\" is deprecated for \"bit checkout ${HEAD}\", please omit it.`);\n      }\n      checkoutProps.all = true;\n    }\n    if (checkoutProps.latest && !componentPattern) {\n      if (checkoutProps.all) {\n        this.logger.console(`\"--all\" is deprecated for \"bit checkout ${LATEST}\", please omit it.`);\n      }\n      checkoutProps.all = true;\n    }\n    if (componentPattern && checkoutProps.all) {\n      throw new GeneralError('please specify either [component-pattern] or --all, not both');\n    }\n    if (!componentPattern && !checkoutProps.all) {\n      throw new GeneralError('please specify [component-pattern] or use --all flag');\n    }\n    const ids = componentPattern ? await this.workspace.idsByPattern(componentPattern) : await this.workspace.listIds();\n    checkoutProps.ids = ids.map((id) => (checkoutProps.head || checkoutProps.latest ? id.changeVersion(LATEST) : id));\n  }\n\n  private async getComponentStatusBeforeMergeAttempt(\n    component: ConsumerComponent,\n    checkoutProps: CheckoutProps\n  ): Promise<ComponentStatusBeforeMergeAttempt> {\n    const consumer = this.workspace.consumer;\n    const { version, head: headVersion, reset, latest: latestVersion } = checkoutProps;\n    const repo = consumer.scope.objects;\n    const componentModel = await consumer.scope.getModelComponentIfExist(component.id);\n    const componentStatus: ComponentStatus = { id: component.id };\n    const returnFailure = (msg: string, unchangedLegitimately = false) => {\n      componentStatus.failureMessage = msg;\n      componentStatus.unchangedLegitimately = unchangedLegitimately;\n      return componentStatus;\n    };\n    if (!componentModel) {\n      return returnFailure(`component ${component.id.toString()} is new, no version to checkout`, true);\n    }\n    const unmerged = repo.unmergedComponents.getEntry(component.name);\n    if (!reset && unmerged) {\n      return returnFailure(\n        `component ${component.id.toStringWithoutVersion()} is in during-merge state, please snap/tag it first (or use bit merge --resolve/--abort)`\n      );\n    }\n    const getNewVersion = async (): Promise<string> => {\n      if (reset) return component.id.version as string;\n\n      if (headVersion) return componentModel.headIncludeRemote(repo);\n      if (latestVersion) return componentModel.latestVersion();\n      // @ts-ignore if !reset the version is defined\n      return version;\n    };\n    const newVersion = await getNewVersion();\n    if (version && !headVersion) {\n      const hasVersion = await componentModel.hasVersion(version, repo);\n      if (!hasVersion)\n        return returnFailure(`component ${component.id.toStringWithoutVersion()} doesn't have version ${version}`);\n    }\n    const existingBitMapId = consumer.bitMap.getBitId(component.id, { ignoreVersion: true });\n    const currentlyUsedVersion = existingBitMapId.version;\n    if (!currentlyUsedVersion) {\n      return returnFailure(`component ${component.id.toStringWithoutVersion()} is new`);\n    }\n    if (version && currentlyUsedVersion === version) {\n      // it won't be relevant for 'reset' as it doesn't have a version\n      return returnFailure(`component ${component.id.toStringWithoutVersion()} is already at version ${version}`, true);\n    }\n    if (headVersion && currentlyUsedVersion === newVersion) {\n      return returnFailure(\n        `component ${component.id.toStringWithoutVersion()} is already at the latest version, which is ${newVersion}`,\n        true\n      );\n    }\n    const currentVersionObject: Version = await componentModel.loadVersion(currentlyUsedVersion, repo);\n    const isModified = await consumer.isComponentModified(currentVersionObject, component);\n    if (!isModified && reset) {\n      return returnFailure(`component ${component.id.toStringWithoutVersion()} is not modified`, true);\n    }\n\n    const versionRef = componentModel.getRef(newVersion);\n    if (!versionRef) throw new Error(`unable to get ref ${newVersion} from ${componentModel.id()}`);\n    const componentVersion = (await consumer.scope.getObject(versionRef.hash)) as Version;\n    const newId = component.id.changeVersion(newVersion);\n\n    if (reset || !isModified) {\n      // if the component is not modified, no need to try merge the files, they will be written later on according to the\n      // checked out version. same thing when no version is specified, it'll be reset to the model-version later.\n      return { componentFromFS: component, componentFromModel: componentVersion, id: newId };\n    }\n\n    const propsForMerge = {\n      currentlyUsedVersion,\n      componentModel,\n    };\n\n    return { componentFromFS: component, componentFromModel: componentVersion, id: newId, propsForMerge };\n  }\n\n  private async getMergeStatus({\n    componentFromFS,\n    componentFromModel,\n    id,\n    propsForMerge,\n  }: ComponentStatusBeforeMergeAttempt): Promise<ComponentStatus> {\n    if (!propsForMerge) throw new Error(`propsForMerge is missing for ${id.toString()}`);\n    if (!componentFromFS) throw new Error(`componentFromFS is missing for ${id.toString()}`);\n    const consumer = this.workspace.consumer;\n    const repo = consumer.scope.objects;\n    const { currentlyUsedVersion, componentModel } = propsForMerge;\n\n    // this is tricky. imagine the user is 0.0.2+modification and wants to checkout to 0.0.1.\n    // the base is 0.0.1, as it's the common version for 0.0.1 and 0.0.2. however, if we let git merge-file use the 0.0.1\n    // as the base, then, it'll get the changes done since 0.0.1 to 0.0.1, which is nothing, and put them on top of\n    // 0.0.2+modification. in other words, it won't make any change.\n    // this scenario of checking out while there are modified files, is forbidden in Git. here, we want to simulate a similar\n    // experience of \"git stash\", then \"git checkout\", then \"git stash pop\". practically, we want the changes done on 0.0.2\n    // to be added to 0.0.1\n    // if there is no modification, it doesn't go the threeWayMerge anyway, so it doesn't matter what the base is.\n    const baseVersion = currentlyUsedVersion;\n    const newVersion = id.version as string;\n    const baseComponent: Version = await componentModel.loadVersion(baseVersion, repo);\n    const otherComponent: Version = await componentModel.loadVersion(newVersion, repo);\n    const mergeResults = await threeWayMerge({\n      consumer,\n      otherComponent,\n      otherLabel: newVersion,\n      currentComponent: componentFromFS,\n      currentLabel: `${currentlyUsedVersion} modified`,\n      baseComponent,\n    });\n\n    return { componentFromFS, componentFromModel, id, mergeResults };\n  }\n\n  static slots = [];\n  static dependencies = [CLIAspect, WorkspaceAspect, LoggerAspect];\n\n  static runtime = MainRuntime;\n\n  static async provider([cli, workspace, loggerMain]: [CLIMain, Workspace, LoggerMain]) {\n    const logger = loggerMain.createLogger(CheckoutAspect.id);\n    const checkoutMain = new CheckoutMain(workspace, logger);\n    cli.register(new CheckoutCmd(checkoutMain));\n    return checkoutMain;\n  }\n}\n\nCheckoutAspect.addRuntime(CheckoutMain);\n\nexport default CheckoutMain;\n"],"mappings":"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"}

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@teambit/checkout",
-  "version": "0.0.66",
+  "version": "0.0.67",
   "homepage": "https://bit.dev/teambit/component/checkout",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.component",
     "name": "checkout",
-    "version": "0.0.66"
+    "version": "0.0.67"
   },
   "dependencies": {
     "chalk": "2.4.2",
@@ -15,11 +15,11 @@
     "core-js": "^3.0.0",
     "@teambit/harmony": "0.3.3",
     "@teambit/bit-error": "0.0.402",
-    "@teambit/cli": "0.0.599",
+    "@teambit/cli": "0.0.600",
     "@teambit/component-id": "0.0.425",
     "@teambit/legacy-bit-id": "0.0.421",
-    "@teambit/logger": "0.0.692",
-    "@teambit/workspace": "0.0.897"
+    "@teambit/logger": "0.0.693",
+    "@teambit/workspace": "0.0.898"
   },
   "devDependencies": {
     "@types/mocha": "9.1.0",
@@ -30,7 +30,7 @@
     "@types/node": "12.20.4"
   },
   "peerDependencies": {
-    "@teambit/legacy": "1.0.382",
+    "@teambit/legacy": "1.0.383",
     "react-dom": "^16.8.0 || ^17.0.0",
     "react": "^16.8.0 || ^17.0.0"
   },