@teambit/checkout 0.0.66 → 0.0.68

package/dist/checkout-cmd.d.ts

@@ -15,13 +15,14 @@ export declare class CheckoutCmd implements Command {
     options: CommandOptions;
     loader: boolean;
     constructor(checkout: CheckoutMain);
-    report([to, componentPattern]: [string, string], { interactiveMerge, ours, theirs, manual, reset, all, verbose, skipNpmInstall, skipDependencyInstallation, }: {
+    report([to, componentPattern]: [string, string], { interactiveMerge, ours, theirs, manual, reset, all, entireLane, verbose, skipNpmInstall, skipDependencyInstallation, }: {
         interactiveMerge?: boolean;
         ours?: boolean;
         theirs?: boolean;
         manual?: boolean;
         reset?: boolean;
         all?: boolean;
+        entireLane?: boolean;
         verbose?: boolean;
         skipNpmInstall?: boolean;
         skipDependencyInstallation?: boolean;

package/dist/checkout-cmd.js

@@ -62,7 +62,7 @@ class CheckoutCmd {
   \`bit checkout latest [component-pattern]\` => checkout to the latest satisfying semver tag, omit [component-pattern] to checkout latest for all
   \`bit checkout reset [component-pattern]\` => remove local modifications from the specified ids (or all components when --all is used)`);
     (0, _defineProperty2().default)(this, "alias", 'U');
-    (0, _defineProperty2().default)(this, "options", [['i', 'interactive-merge', 'when a component is modified and the merge process found conflicts, display options to resolve them'], ['o', 'ours', 'in case of a conflict, override the used version with the current modification'], ['t', 'theirs', 'in case of a conflict, override the current modification with the specified version'], ['m', 'manual', 'in case of a conflict, leave the files with a conflict state to resolve them manually later'], ['r', 'reset', 'revert changes that were not snapped/tagged'], ['a', 'all', 'all components'], ['v', 'verbose', 'showing verbose output for inspection'], ['', 'reset', 'DEPRECATED. run "bit checkout reset" instead'], ['', 'skip-npm-install', 'DEPRECATED. use "--skip-dependency-installation" instead'], ['', 'skip-dependency-installation', 'do not install packages of the imported components']]);
+    (0, _defineProperty2().default)(this, "options", [['i', 'interactive-merge', 'when a component is modified and the merge process found conflicts, display options to resolve them'], ['o', 'ours', 'in case of a conflict, override the used version with the current modification'], ['t', 'theirs', 'in case of a conflict, override the current modification with the specified version'], ['m', 'manual', 'in case of a conflict, leave the files with a conflict state to resolve them manually later'], ['r', 'reset', 'revert changes that were not snapped/tagged'], ['a', 'all', 'all components'], ['e', 'entire-lane', 'write also new components that were introduced on the remote lane and do not exist locally'], ['v', 'verbose', 'showing verbose output for inspection'], ['', 'reset', 'DEPRECATED. run "bit checkout reset" instead'], ['', 'skip-npm-install', 'DEPRECATED. use "--skip-dependency-installation" instead'], ['', 'skip-dependency-installation', 'do not install packages of the imported components']]);
     (0, _defineProperty2().default)(this, "loader", true);
   }
   async report([to, componentPattern], {
@@ -72,6 +72,7 @@ class CheckoutCmd {
     manual = false,
     reset = false,
     all = false,
+    entireLane = false,
     verbose = false,
     skipNpmInstall = false,
     skipDependencyInstallation = false
@@ -90,35 +91,38 @@ class CheckoutCmd {
       all,
       verbose,
       isLane: false,
-      skipNpmInstall: skipDependencyInstallation
+      skipNpmInstall: skipDependencyInstallation,
+      entireLane
     };
     const {
       components,
       version,
       failedComponents,
-      leftUnresolvedConflicts
+      leftUnresolvedConflicts,
+      newFromLane,
+      newFromLaneAdded
     } = await this.checkout.checkoutByCLIValues(to, componentPattern || '', checkoutProps);
     const isHead = to === 'head';
     const isReset = to === 'reset';
     const isLatest = to === 'latest';
+    // components that failed for no legitimate reason. e.g. merge-conflict.
+    const realFailedComponents = (failedComponents || []).filter(f => !f.unchangedLegitimately);
+    // components that weren't checked out for legitimate reasons, e.g. up-to-date.
+    const notCheckedOutComponents = (failedComponents || []).filter(f => f.unchangedLegitimately);
     const getFailureOutput = () => {
-      // components that failed for no legitimate reason. e.g. merge-conflict.
-      const realFailedComponents = failedComponents === null || failedComponents === void 0 ? void 0 : failedComponents.filter(f => !f.unchangedLegitimately);
-      if (!realFailedComponents || !realFailedComponents.length) return '';
-      const title = 'the checkout has been canceled on the following component(s)';
+      if (!realFailedComponents.length) return '';
+      const title = 'the checkout has been failed on the following component(s)';
       const body = realFailedComponents.map(failedComponent => `${_chalk().default.bold(failedComponent.id.toString())} - ${_chalk().default.red(failedComponent.failureMessage)}`).join('\n');
-      return `${title}\n${body}\n\n`;
+      return `${_chalk().default.underline(title)}\n${body}\n\n`;
     };
-    const getNeutralOutput = () => {
-      // components that weren't checked out for legitimate reasons, e.g. up-to-date.
-      const neutralComponents = (failedComponents || []).filter(f => f.unchangedLegitimately);
-      if (!neutralComponents.length) return '';
+    const getNotCheckedOutOutput = () => {
+      if (!notCheckedOutComponents.length) return '';
       if (!verbose && all) {
-        return _chalk().default.green(`checkout was not needed for ${_chalk().default.bold(neutralComponents.length.toString())} components (use --verbose to get more details)\n`);
+        return _chalk().default.green(`checkout was not needed for ${_chalk().default.bold(notCheckedOutComponents.length.toString())} components (use --verbose to get more details)\n`);
       }
       const title = 'the checkout was not needed on the following component(s)';
-      const body = neutralComponents.map(failedComponent => `${_chalk().default.bold(failedComponent.id.toString())} - ${failedComponent.failureMessage}`).join('\n');
-      return `${title}\n${body}\n\n`;
+      const body = notCheckedOutComponents.map(failedComponent => `${failedComponent.id.toString()} - ${failedComponent.failureMessage}`).join('\n');
+      return `${_chalk().default.underline(title)}\n${body}\n\n`;
     };
     const getConflictSummary = () => {
       if (!components || !components.length || !leftUnresolvedConflicts) return '';
@@ -136,12 +140,12 @@ once ready, snap/tag the components to persist the changes`;
         const title = `successfully switched ${_chalk().default.bold(componentName)} to version ${_chalk().default.bold(
         // @ts-ignore version is defined when !isReset
         isHead || isLatest ? component.id.version : version)}\n`;
-        return `${title} ${(0, _mergeVersion().applyVersionReport)(components, false)}`;
+        return `${_chalk().default.underline(title)} ${(0, _mergeVersion().applyVersionReport)(components, false)}`;
       }
       if (isReset) {
         const title = 'successfully reset the following components\n\n';
         const body = components.map(component => _chalk().default.bold(component.id.toString())).join('\n');
-        return title + body;
+        return _chalk().default.underline(title) + body;
       }
       const getVerOutput = () => {
         if (isHead) return 'their head version';
@@ -153,9 +157,29 @@ once ready, snap/tag the components to persist the changes`;
       const title = `successfully switched the following components to ${versionOutput}\n\n`;
       const showVersion = isHead || isReset;
       const componentsStr = (0, _mergeVersion().applyVersionReport)(components, true, showVersion);
-      return title + componentsStr;
+      return _chalk().default.underline(title) + componentsStr;
     };
-    return getFailureOutput() + getNeutralOutput() + getSuccessfulOutput() + getConflictSummary();
+    const getNewOnLaneOutput = () => {
+      if (!(newFromLane !== null && newFromLane !== void 0 && newFromLane.length)) return '';
+      const title = newFromLaneAdded ? `successfully added the following components from the lane` : `the following components introduced on the lane and were not added. use --entire-lane flag to add them`;
+      const body = newFromLane.join('\n');
+      return `\n\n${_chalk().default.underline(title)}\n${body}`;
+    };
+    const getSummary = () => {
+      const checkedOut = (components === null || components === void 0 ? void 0 : components.length) || 0;
+      const notCheckedOutLegitimately = notCheckedOutComponents.length;
+      const failedToCheckOut = realFailedComponents.length;
+      const newLines = '\n\n';
+      const title = _chalk().default.bold.underline('Checkout Summary');
+      const checkedOutStr = `\nTotal CheckedOut: ${_chalk().default.bold(checkedOut.toString())}`;
+      const unchangedLegitimatelyStr = `\nTotal Unchanged: ${_chalk().default.bold(notCheckedOutLegitimately.toString())}`;
+      const failedToCheckOutStr = `\nTotal Failed: ${_chalk().default.bold(failedToCheckOut.toString())}`;
+      const newOnLaneNum = (newFromLane === null || newFromLane === void 0 ? void 0 : newFromLane.length) || 0;
+      const newOnLaneAddedStr = newFromLaneAdded ? ' (added)' : ' (not added)';
+      const newOnLaneStr = newOnLaneNum ? `\nNew on lane${newOnLaneAddedStr}: ${_chalk().default.bold(newOnLaneNum.toString())}` : '';
+      return newLines + title + checkedOutStr + unchangedLegitimatelyStr + failedToCheckOutStr + newOnLaneStr;
+    };
+    return getFailureOutput() + getNotCheckedOutOutput() + getSuccessfulOutput() + getNewOnLaneOutput() + getConflictSummary() + getSummary();
   }
 }
 exports.CheckoutCmd = CheckoutCmd;

package/dist/checkout-cmd.js.map

@@ -1 +1 @@
-{"version":3,"names":["CheckoutCmd","constructor","checkout","name","description","COMPONENT_PATTERN_HELP","report","to","componentPattern","interactiveMerge","ours","theirs","manual","reset","all","verbose","skipNpmInstall","skipDependencyInstallation","BitError","console","log","chalk","yellow","checkoutProps","promptMergeOptions","mergeStrategy","getMergeStrategy","isLane","components","version","failedComponents","leftUnresolvedConflicts","checkoutByCLIValues","isHead","isReset","isLatest","getFailureOutput","realFailedComponents","filter","f","unchangedLegitimately","length","title","body","map","failedComponent","bold","id","toString","red","failureMessage","join","getNeutralOutput","neutralComponents","green","getConflictSummary","suggestion","underline","conflictSummaryReport","getSuccessfulOutput","component","componentName","toStringWithoutVersion","applyVersionReport","getVerOutput","versionOutput","showVersion","componentsStr"],"sources":["checkout-cmd.ts"],"sourcesContent":["import chalk from 'chalk';\nimport { BitError } from '@teambit/bit-error';\nimport { Command, CommandOptions } from '@teambit/cli';\nimport { COMPONENT_PATTERN_HELP } from '@teambit/legacy/dist/constants';\nimport {\n  ApplyVersionResults,\n  getMergeStrategy,\n  applyVersionReport,\n  conflictSummaryReport,\n} from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport { CheckoutMain, CheckoutProps } from './checkout.main.runtime';\n\nexport class CheckoutCmd implements Command {\n  name = 'checkout <to> [component-pattern]';\n  arguments = [\n    {\n      name: 'to',\n      description:\n        \"permitted values: [head, latest, reset, specific-version]. 'head' - last snap/tag. 'latest' - semver latest tag. 'reset' - removes local changes\",\n    },\n    {\n      name: 'component-pattern',\n      description: COMPONENT_PATTERN_HELP,\n    },\n  ];\n  description = 'switch between component versions or remove local changes';\n  helpUrl = 'docs/components/merging-changes#checkout-snaps-to-the-working-directory';\n  group = 'development';\n  extendedDescription = `\n  \\`bit checkout <version> [component-pattern]\\` => checkout the specified ids (or all components when --all is used) to the specified version\n  \\`bit checkout head [component-pattern]\\` => checkout to the last snap/tag, omit [component-pattern] to checkout head for all\n  \\`bit checkout latest [component-pattern]\\` => checkout to the latest satisfying semver tag, omit [component-pattern] to checkout latest for all\n  \\`bit checkout reset [component-pattern]\\` => remove local modifications from the specified ids (or all components when --all is used)`;\n  alias = 'U';\n  options = [\n    [\n      'i',\n      'interactive-merge',\n      'when a component is modified and the merge process found conflicts, display options to resolve them',\n    ],\n    ['o', 'ours', 'in case of a conflict, override the used version with the current modification'],\n    ['t', 'theirs', 'in case of a conflict, override the current modification with the specified version'],\n    ['m', 'manual', 'in case of a conflict, leave the files with a conflict state to resolve them manually later'],\n    ['r', 'reset', 'revert changes that were not snapped/tagged'],\n    ['a', 'all', 'all components'],\n    ['v', 'verbose', 'showing verbose output for inspection'],\n    ['', 'reset', 'DEPRECATED. run \"bit checkout reset\" instead'],\n    ['', 'skip-npm-install', 'DEPRECATED. use \"--skip-dependency-installation\" instead'],\n    ['', 'skip-dependency-installation', 'do not install packages of the imported components'],\n  ] as CommandOptions;\n  loader = true;\n\n  constructor(private checkout: CheckoutMain) {}\n\n  async report(\n    [to, componentPattern]: [string, string],\n    {\n      interactiveMerge = false,\n      ours = false,\n      theirs = false,\n      manual = false,\n      reset = false,\n      all = false,\n      verbose = false,\n      skipNpmInstall = false,\n      skipDependencyInstallation = false,\n    }: {\n      interactiveMerge?: boolean;\n      ours?: boolean;\n      theirs?: boolean;\n      manual?: boolean;\n      reset?: boolean;\n      all?: boolean;\n      verbose?: boolean;\n      skipNpmInstall?: boolean;\n      skipDependencyInstallation?: boolean;\n    }\n  ) {\n    if (reset) {\n      throw new BitError(`--reset flag has been removed. please run \"bit checkout reset\" instead`);\n    }\n    if (skipNpmInstall) {\n      // eslint-disable-next-line no-console\n      console.log(\n        chalk.yellow(`\"--skip-npm-install\" has been deprecated, please use \"--skip-dependency-installation\" instead`)\n      );\n      skipDependencyInstallation = true;\n    }\n    const checkoutProps: CheckoutProps = {\n      promptMergeOptions: interactiveMerge,\n      mergeStrategy: getMergeStrategy(ours, theirs, manual),\n      all,\n      verbose,\n      isLane: false,\n      skipNpmInstall: skipDependencyInstallation,\n    };\n    const { components, version, failedComponents, leftUnresolvedConflicts }: ApplyVersionResults =\n      await this.checkout.checkoutByCLIValues(to, componentPattern || '', checkoutProps);\n    const isHead = to === 'head';\n    const isReset = to === 'reset';\n    const isLatest = to === 'latest';\n    const getFailureOutput = () => {\n      // components that failed for no legitimate reason. e.g. merge-conflict.\n      const realFailedComponents = failedComponents?.filter((f) => !f.unchangedLegitimately);\n      if (!realFailedComponents || !realFailedComponents.length) return '';\n      const title = 'the checkout has been canceled on the following component(s)';\n      const body = realFailedComponents\n        .map(\n          (failedComponent) =>\n            `${chalk.bold(failedComponent.id.toString())} - ${chalk.red(failedComponent.failureMessage)}`\n        )\n        .join('\\n');\n      return `${title}\\n${body}\\n\\n`;\n    };\n    const getNeutralOutput = () => {\n      // components that weren't checked out for legitimate reasons, e.g. up-to-date.\n      const neutralComponents = (failedComponents || []).filter((f) => f.unchangedLegitimately);\n      if (!neutralComponents.length) return '';\n      if (!verbose && all) {\n        return chalk.green(\n          `checkout was not needed for ${chalk.bold(\n            neutralComponents.length.toString()\n          )} components (use --verbose to get more details)\\n`\n        );\n      }\n\n      const title = 'the checkout was not needed on the following component(s)';\n      const body = neutralComponents\n        .map((failedComponent) => `${chalk.bold(failedComponent.id.toString())} - ${failedComponent.failureMessage}`)\n        .join('\\n');\n      return `${title}\\n${body}\\n\\n`;\n    };\n    const getConflictSummary = () => {\n      if (!components || !components.length || !leftUnresolvedConflicts) return '';\n      const title = `\\n\\nfiles with conflicts summary\\n`;\n      const suggestion = `\\n\\nfix the conflicts above manually and then run \"bit install\" and \"bit compile\".\nonce ready, snap/tag the components to persist the changes`;\n      return chalk.underline(title) + conflictSummaryReport(components) + chalk.yellow(suggestion);\n    };\n\n    const getSuccessfulOutput = () => {\n      if (!components || !components.length) return '';\n      if (components.length === 1) {\n        const component = components[0];\n        const componentName = isReset ? component.id.toString() : component.id.toStringWithoutVersion();\n        if (isReset) return `successfully reset ${chalk.bold(componentName)}\\n`;\n        const title = `successfully switched ${chalk.bold(componentName)} to version ${chalk.bold(\n          // @ts-ignore version is defined when !isReset\n          isHead || isLatest ? component.id.version : version\n        )}\\n`;\n        return `${title} ${applyVersionReport(components, false)}`;\n      }\n      if (isReset) {\n        const title = 'successfully reset the following components\\n\\n';\n        const body = components.map((component) => chalk.bold(component.id.toString())).join('\\n');\n        return title + body;\n      }\n\n      const getVerOutput = () => {\n        if (isHead) return 'their head version';\n        if (isLatest) return 'their latest version';\n        // @ts-ignore version is defined when !isReset\n        return `version ${chalk.bold(version)}`;\n      };\n      const versionOutput = getVerOutput();\n      const title = `successfully switched the following components to ${versionOutput}\\n\\n`;\n      const showVersion = isHead || isReset;\n      const componentsStr = applyVersionReport(components, true, showVersion);\n      return title + componentsStr;\n    };\n\n    return getFailureOutput() + getNeutralOutput() + getSuccessfulOutput() + getConflictSummary();\n  }\n}\n"],"mappings":"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"}
+{"version":3,"names":["CheckoutCmd","constructor","checkout","name","description","COMPONENT_PATTERN_HELP","report","to","componentPattern","interactiveMerge","ours","theirs","manual","reset","all","entireLane","verbose","skipNpmInstall","skipDependencyInstallation","BitError","console","log","chalk","yellow","checkoutProps","promptMergeOptions","mergeStrategy","getMergeStrategy","isLane","components","version","failedComponents","leftUnresolvedConflicts","newFromLane","newFromLaneAdded","checkoutByCLIValues","isHead","isReset","isLatest","realFailedComponents","filter","f","unchangedLegitimately","notCheckedOutComponents","getFailureOutput","length","title","body","map","failedComponent","bold","id","toString","red","failureMessage","join","underline","getNotCheckedOutOutput","green","getConflictSummary","suggestion","conflictSummaryReport","getSuccessfulOutput","component","componentName","toStringWithoutVersion","applyVersionReport","getVerOutput","versionOutput","showVersion","componentsStr","getNewOnLaneOutput","getSummary","checkedOut","notCheckedOutLegitimately","failedToCheckOut","newLines","checkedOutStr","unchangedLegitimatelyStr","failedToCheckOutStr","newOnLaneNum","newOnLaneAddedStr","newOnLaneStr"],"sources":["checkout-cmd.ts"],"sourcesContent":["import chalk from 'chalk';\nimport { BitError } from '@teambit/bit-error';\nimport { Command, CommandOptions } from '@teambit/cli';\nimport { COMPONENT_PATTERN_HELP } from '@teambit/legacy/dist/constants';\nimport {\n  ApplyVersionResults,\n  getMergeStrategy,\n  applyVersionReport,\n  conflictSummaryReport,\n} from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport { CheckoutMain, CheckoutProps } from './checkout.main.runtime';\n\nexport class CheckoutCmd implements Command {\n  name = 'checkout <to> [component-pattern]';\n  arguments = [\n    {\n      name: 'to',\n      description:\n        \"permitted values: [head, latest, reset, specific-version]. 'head' - last snap/tag. 'latest' - semver latest tag. 'reset' - removes local changes\",\n    },\n    {\n      name: 'component-pattern',\n      description: COMPONENT_PATTERN_HELP,\n    },\n  ];\n  description = 'switch between component versions or remove local changes';\n  helpUrl = 'docs/components/merging-changes#checkout-snaps-to-the-working-directory';\n  group = 'development';\n  extendedDescription = `\n  \\`bit checkout <version> [component-pattern]\\` => checkout the specified ids (or all components when --all is used) to the specified version\n  \\`bit checkout head [component-pattern]\\` => checkout to the last snap/tag, omit [component-pattern] to checkout head for all\n  \\`bit checkout latest [component-pattern]\\` => checkout to the latest satisfying semver tag, omit [component-pattern] to checkout latest for all\n  \\`bit checkout reset [component-pattern]\\` => remove local modifications from the specified ids (or all components when --all is used)`;\n  alias = 'U';\n  options = [\n    [\n      'i',\n      'interactive-merge',\n      'when a component is modified and the merge process found conflicts, display options to resolve them',\n    ],\n    ['o', 'ours', 'in case of a conflict, override the used version with the current modification'],\n    ['t', 'theirs', 'in case of a conflict, override the current modification with the specified version'],\n    ['m', 'manual', 'in case of a conflict, leave the files with a conflict state to resolve them manually later'],\n    ['r', 'reset', 'revert changes that were not snapped/tagged'],\n    ['a', 'all', 'all components'],\n    ['e', 'entire-lane', 'write also new components that were introduced on the remote lane and do not exist locally'],\n    ['v', 'verbose', 'showing verbose output for inspection'],\n    ['', 'reset', 'DEPRECATED. run \"bit checkout reset\" instead'],\n    ['', 'skip-npm-install', 'DEPRECATED. use \"--skip-dependency-installation\" instead'],\n    ['', 'skip-dependency-installation', 'do not install packages of the imported components'],\n  ] as CommandOptions;\n  loader = true;\n\n  constructor(private checkout: CheckoutMain) {}\n\n  async report(\n    [to, componentPattern]: [string, string],\n    {\n      interactiveMerge = false,\n      ours = false,\n      theirs = false,\n      manual = false,\n      reset = false,\n      all = false,\n      entireLane = false,\n      verbose = false,\n      skipNpmInstall = false,\n      skipDependencyInstallation = false,\n    }: {\n      interactiveMerge?: boolean;\n      ours?: boolean;\n      theirs?: boolean;\n      manual?: boolean;\n      reset?: boolean;\n      all?: boolean;\n      entireLane?: boolean;\n      verbose?: boolean;\n      skipNpmInstall?: boolean;\n      skipDependencyInstallation?: boolean;\n    }\n  ) {\n    if (reset) {\n      throw new BitError(`--reset flag has been removed. please run \"bit checkout reset\" instead`);\n    }\n    if (skipNpmInstall) {\n      // eslint-disable-next-line no-console\n      console.log(\n        chalk.yellow(`\"--skip-npm-install\" has been deprecated, please use \"--skip-dependency-installation\" instead`)\n      );\n      skipDependencyInstallation = true;\n    }\n    const checkoutProps: CheckoutProps = {\n      promptMergeOptions: interactiveMerge,\n      mergeStrategy: getMergeStrategy(ours, theirs, manual),\n      all,\n      verbose,\n      isLane: false,\n      skipNpmInstall: skipDependencyInstallation,\n      entireLane,\n    };\n    const {\n      components,\n      version,\n      failedComponents,\n      leftUnresolvedConflicts,\n      newFromLane,\n      newFromLaneAdded,\n    }: ApplyVersionResults = await this.checkout.checkoutByCLIValues(to, componentPattern || '', checkoutProps);\n    const isHead = to === 'head';\n    const isReset = to === 'reset';\n    const isLatest = to === 'latest';\n    // components that failed for no legitimate reason. e.g. merge-conflict.\n    const realFailedComponents = (failedComponents || []).filter((f) => !f.unchangedLegitimately);\n    // components that weren't checked out for legitimate reasons, e.g. up-to-date.\n    const notCheckedOutComponents = (failedComponents || []).filter((f) => f.unchangedLegitimately);\n\n    const getFailureOutput = () => {\n      if (!realFailedComponents.length) return '';\n      const title = 'the checkout has been failed on the following component(s)';\n      const body = realFailedComponents\n        .map(\n          (failedComponent) =>\n            `${chalk.bold(failedComponent.id.toString())} - ${chalk.red(failedComponent.failureMessage)}`\n        )\n        .join('\\n');\n      return `${chalk.underline(title)}\\n${body}\\n\\n`;\n    };\n    const getNotCheckedOutOutput = () => {\n      if (!notCheckedOutComponents.length) return '';\n      if (!verbose && all) {\n        return chalk.green(\n          `checkout was not needed for ${chalk.bold(\n            notCheckedOutComponents.length.toString()\n          )} components (use --verbose to get more details)\\n`\n        );\n      }\n      const title = 'the checkout was not needed on the following component(s)';\n      const body = notCheckedOutComponents\n        .map((failedComponent) => `${failedComponent.id.toString()} - ${failedComponent.failureMessage}`)\n        .join('\\n');\n      return `${chalk.underline(title)}\\n${body}\\n\\n`;\n    };\n    const getConflictSummary = () => {\n      if (!components || !components.length || !leftUnresolvedConflicts) return '';\n      const title = `\\n\\nfiles with conflicts summary\\n`;\n      const suggestion = `\\n\\nfix the conflicts above manually and then run \"bit install\" and \"bit compile\".\nonce ready, snap/tag the components to persist the changes`;\n      return chalk.underline(title) + conflictSummaryReport(components) + chalk.yellow(suggestion);\n    };\n    const getSuccessfulOutput = () => {\n      if (!components || !components.length) return '';\n      if (components.length === 1) {\n        const component = components[0];\n        const componentName = isReset ? component.id.toString() : component.id.toStringWithoutVersion();\n        if (isReset) return `successfully reset ${chalk.bold(componentName)}\\n`;\n        const title = `successfully switched ${chalk.bold(componentName)} to version ${chalk.bold(\n          // @ts-ignore version is defined when !isReset\n          isHead || isLatest ? component.id.version : version\n        )}\\n`;\n        return `${chalk.underline(title)} ${applyVersionReport(components, false)}`;\n      }\n      if (isReset) {\n        const title = 'successfully reset the following components\\n\\n';\n        const body = components.map((component) => chalk.bold(component.id.toString())).join('\\n');\n        return chalk.underline(title) + body;\n      }\n      const getVerOutput = () => {\n        if (isHead) return 'their head version';\n        if (isLatest) return 'their latest version';\n        // @ts-ignore version is defined when !isReset\n        return `version ${chalk.bold(version)}`;\n      };\n      const versionOutput = getVerOutput();\n      const title = `successfully switched the following components to ${versionOutput}\\n\\n`;\n      const showVersion = isHead || isReset;\n      const componentsStr = applyVersionReport(components, true, showVersion);\n      return chalk.underline(title) + componentsStr;\n    };\n    const getNewOnLaneOutput = () => {\n      if (!newFromLane?.length) return '';\n      const title = newFromLaneAdded\n        ? `successfully added the following components from the lane`\n        : `the following components introduced on the lane and were not added. use --entire-lane flag to add them`;\n      const body = newFromLane.join('\\n');\n      return `\\n\\n${chalk.underline(title)}\\n${body}`;\n    };\n    const getSummary = () => {\n      const checkedOut = components?.length || 0;\n      const notCheckedOutLegitimately = notCheckedOutComponents.length;\n      const failedToCheckOut = realFailedComponents.length;\n      const newLines = '\\n\\n';\n      const title = chalk.bold.underline('Checkout Summary');\n      const checkedOutStr = `\\nTotal CheckedOut: ${chalk.bold(checkedOut.toString())}`;\n      const unchangedLegitimatelyStr = `\\nTotal Unchanged: ${chalk.bold(notCheckedOutLegitimately.toString())}`;\n      const failedToCheckOutStr = `\\nTotal Failed: ${chalk.bold(failedToCheckOut.toString())}`;\n      const newOnLaneNum = newFromLane?.length || 0;\n      const newOnLaneAddedStr = newFromLaneAdded ? ' (added)' : ' (not added)';\n      const newOnLaneStr = newOnLaneNum\n        ? `\\nNew on lane${newOnLaneAddedStr}: ${chalk.bold(newOnLaneNum.toString())}`\n        : '';\n\n      return newLines + title + checkedOutStr + unchangedLegitimatelyStr + failedToCheckOutStr + newOnLaneStr;\n    };\n\n    return (\n      getFailureOutput() +\n      getNotCheckedOutOutput() +\n      getSuccessfulOutput() +\n      getNewOnLaneOutput() +\n      getConflictSummary() +\n      getSummary()\n    );\n  }\n}\n"],"mappings":"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"}

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;
@@ -15,6 +18,18 @@ export declare type CheckoutProps = {
     reset?: boolean;
     all?: boolean;
     isLane?: boolean;
+    entireLane?: 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 {
@@ -25,7 +40,9 @@ export declare class CheckoutMain {
     checkoutByCLIValues(to: CheckoutTo, componentPattern: string, checkoutProps: CheckoutProps): Promise<ApplyVersionResults>;
     private syncNewComponents;
     private parseValues;
-    private getComponentStatus;
+    private getNewComponentsFromLane;
+    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
@@ -49,6 +51,13 @@ function _bitError() {
   };
   return data;
 }
+function _lodash() {
+  const data = require("lodash");
+  _lodash = function () {
+    return data;
+  };
+  return data;
+}
 function _loaderMessages() {
   const data = require("@teambit/legacy/dist/cli/loader/loader-messages");
   _loaderMessages = function () {
@@ -141,7 +150,7 @@ class CheckoutMain {
     this.logger = logger;
   }
   async checkout(checkoutProps) {
-    var _checkoutProps$ids;
+    var _checkoutProps$ids, _newFromLane;
     const consumer = this.workspace.consumer;
     const {
       version,
@@ -154,19 +163,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) {
@@ -193,7 +217,17 @@ class CheckoutMain {
       return (0, _checkoutVersion().applyVersion)(consumer, id, componentFromFS, mergeResults, checkoutPropsLegacy);
     });
     (0, _checkoutVersion().markFilesToBeRemovedIfNeeded)(succeededComponents, componentsResults);
-    const componentsWithDependencies = componentsResults.map(c => c.component).filter(c => c);
+    const componentsWithDependencies = (0, _lodash().compact)(componentsResults.map(c => c.component));
+    let newFromLane;
+    let newFromLaneAdded = false;
+    if (checkoutProps.head) {
+      newFromLane = await this.getNewComponentsFromLane(checkoutProps.ids || []);
+      if (checkoutProps.entireLane) {
+        const compsNewFromLane = await Promise.all(newFromLane.map(id => consumer.loadComponentWithDependenciesFromModel(id._legacy)));
+        componentsWithDependencies.push(...compsNewFromLane);
+        newFromLaneAdded = true;
+      }
+    }
     const leftUnresolvedConflicts = componentWithConflict && checkoutProps.mergeStrategy === 'manual';
     if (componentsWithDependencies.length) {
       const manyComponentsWriter = new (_manyComponentsWriter().default)({
@@ -212,7 +246,9 @@ class CheckoutMain {
       components: appliedVersionComponents,
       version,
       failedComponents,
-      leftUnresolvedConflicts
+      leftUnresolvedConflicts,
+      newFromLane: (_newFromLane = newFromLane) === null || _newFromLane === void 0 ? void 0 : _newFromLane.map(n => n.toString()),
+      newFromLaneAdded
     };
   }
   async checkoutByCLIValues(to, componentPattern, checkoutProps) {
@@ -232,7 +268,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);
@@ -261,10 +300,23 @@ class CheckoutMain {
     if (!componentPattern && !checkoutProps.all) {
       throw new (_generalError().default)('please specify [component-pattern] or use --all flag');
     }
+    if (checkoutProps.entireLane && !checkoutProps.head) {
+      throw new (_bitError().BitError)(`--entire-lane flag can only be used with "head" (bit checkout head --entire-lane)`);
+    }
     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 getNewComponentsFromLane(ids) {
+    const lane = await this.workspace.consumer.getCurrentLaneObject();
+    if (!lane) {
+      return [];
+    }
+    const laneBitIds = lane.toBitIds();
+    const newIds = laneBitIds.filter(bitId => !ids.find(id => id._legacy.isEqualWithoutVersion(bitId)));
+    const newComponentIds = await this.workspace.resolveMultipleComponentIds(newIds);
+    return newComponentIds;
+  }
+  async getComponentStatusBeforeMergeAttempt(component, checkoutProps) {
     const consumer = this.workspace.consumer;
     const {
       version,
@@ -310,7 +362,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 +370,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 +420,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":"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"}
+{"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","compact","newFromLane","newFromLaneAdded","head","getNewComponentsFromLane","entireLane","compsNewFromLane","loadComponentWithDependenciesFromModel","leftUnresolvedConflicts","length","manyComponentsWriter","ManyComponentsWriter","installNpmPackages","skipNpmInstall","override","verbose","resetConfig","reset","writeAll","deleteFilesIfNeeded","appliedVersionComponents","applyVersionResult","n","toString","checkoutByCLIValues","to","componentPattern","setStatusLine","BEFORE_CHECKOUT","ConsumerNotFound","parseValues","checkoutResults","onDestroy","notExported","hasScope","changeScope","scopeComponentsImporter","importManyDeltaWithoutDeps","fromHead","error","HEAD","LATEST","latest","BitId","isValidVersion","BitError","console","idsByPattern","listIds","lane","getCurrentLaneObject","laneBitIds","toBitIds","newIds","bitId","isEqualWithoutVersion","newComponentIds","resolveMultipleComponentIds","headVersion","latestVersion","repo","objects","componentModel","getModelComponentIfExist","returnFailure","msg","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 { compact } from 'lodash';\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 { 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  entireLane?: 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 = compact(componentsResults.map((c) => c.component));\n\n    let newFromLane: ComponentID[] | undefined;\n    let newFromLaneAdded = false;\n    if (checkoutProps.head) {\n      newFromLane = await this.getNewComponentsFromLane(checkoutProps.ids || []);\n      if (checkoutProps.entireLane) {\n        const compsNewFromLane = await Promise.all(\n          newFromLane.map((id) => consumer.loadComponentWithDependenciesFromModel(id._legacy))\n        );\n        componentsWithDependencies.push(...compsNewFromLane);\n        newFromLaneAdded = true;\n      }\n    }\n\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 {\n      components: appliedVersionComponents,\n      version,\n      failedComponents,\n      leftUnresolvedConflicts,\n      newFromLane: newFromLane?.map((n) => n.toString()),\n      newFromLaneAdded,\n    };\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    if (checkoutProps.entireLane && !checkoutProps.head) {\n      throw new BitError(`--entire-lane flag can only be used with \"head\" (bit checkout head --entire-lane)`);\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 getNewComponentsFromLane(ids: ComponentID[]): Promise<ComponentID[]> {\n    const lane = await this.workspace.consumer.getCurrentLaneObject();\n    if (!lane) {\n      return [];\n    }\n    const laneBitIds = lane.toBitIds();\n    const newIds = laneBitIds.filter((bitId) => !ids.find((id) => id._legacy.isEqualWithoutVersion(bitId)));\n    const newComponentIds = await this.workspace.resolveMultipleComponentIds(newIds);\n    return newComponentIds;\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,27 +1,29 @@
 {
   "name": "@teambit/checkout",
-  "version": "0.0.66",
+  "version": "0.0.68",
   "homepage": "https://bit.dev/teambit/component/checkout",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.component",
     "name": "checkout",
-    "version": "0.0.66"
+    "version": "0.0.68"
   },
   "dependencies": {
     "chalk": "2.4.2",
+    "lodash": "4.17.21",
     "p-map-series": "2.1.0",
     "@babel/runtime": "7.20.0",
     "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.601",
     "@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.694",
+    "@teambit/workspace": "0.0.899"
   },
   "devDependencies": {
+    "@types/lodash": "4.14.165",
     "@types/mocha": "9.1.0",
     "@types/testing-library__jest-dom": "5.9.5",
     "@types/jest": "^26.0.0",
@@ -30,7 +32,7 @@
     "@types/node": "12.20.4"
   },
   "peerDependencies": {
-    "@teambit/legacy": "1.0.382",
+    "@teambit/legacy": "1.0.385",
     "react-dom": "^16.8.0 || ^17.0.0",
     "react": "^16.8.0 || ^17.0.0"
   },