@teambit/checkout 0.0.12 → 0.0.15

package/dist/checkout-cmd.d.ts

@@ -3,6 +3,10 @@ import { CheckoutMain } from './checkout.main.runtime';
 export declare class CheckoutCmd implements Command {
     private checkout;
     name: string;
+    arguments: {
+        name: string;
+        description: string;
+    }[];
     description: string;
     group: string;
     extendedDescription: string;
@@ -10,7 +14,7 @@ export declare class CheckoutCmd implements Command {
     options: CommandOptions;
     loader: boolean;
     constructor(checkout: CheckoutMain);
-    report([values]: [string[]], { interactiveMerge, ours, theirs, manual, reset, all, verbose, skipNpmInstall, skipDependencyInstallation, ignorePackageJson, conf, ignoreDist, }: {
+    report([to, componentPattern]: [string, string], { interactiveMerge, ours, theirs, manual, reset, all, verbose, skipNpmInstall, skipDependencyInstallation, }: {
         interactiveMerge?: boolean;
         ours?: boolean;
         theirs?: boolean;
@@ -20,8 +24,5 @@ export declare class CheckoutCmd implements Command {
         verbose?: boolean;
         skipNpmInstall?: boolean;
         skipDependencyInstallation?: boolean;
-        ignorePackageJson?: boolean;
-        conf?: string;
-        ignoreDist?: boolean;
     }): Promise<string>;
 }

package/dist/checkout-cmd.js

@@ -31,6 +31,16 @@ function _chalk() {
   return data;
 }
 
+function _bitError() {
+  const data = require("@teambit/bit-error");
+
+  _bitError = function () {
+    return data;
+  };
+
+  return data;
+}
+
 function _constants() {
   const data = require("@teambit/legacy/dist/constants");
 
@@ -54,21 +64,26 @@ function _mergeVersion() {
 class CheckoutCmd {
   constructor(checkout) {
     this.checkout = checkout;
-    (0, _defineProperty2().default)(this, "name", 'checkout [values...]');
+    (0, _defineProperty2().default)(this, "name", 'checkout <to> [component-pattern]');
+    (0, _defineProperty2().default)(this, "arguments", [{
+      name: 'to',
+      description: "permitted values: [head, reset, specific-version]. 'head' - last snap/tag. 'reset' - removes local changes"
+    }, {
+      name: 'component-pattern',
+      description: _constants().COMPONENT_PATTERN_HELP
+    }]);
     (0, _defineProperty2().default)(this, "description", 'switch between component versions or remove local changes');
     (0, _defineProperty2().default)(this, "group", 'development');
     (0, _defineProperty2().default)(this, "extendedDescription", `
-  \`bit checkout <version> [ids...]\` => checkout the specified ids (or all components when --all is used) to the specified version
-  \`bit checkout head\` => checkout all components to their latest versions
-  \`bit checkout head [ids...]\` => checkout the specified ids to their latest versions
-  \`bit checkout [ids...] --reset\` => remove local modifications from the specified ids (or all components when --all is used)
-  ${(0, _constants().WILDCARD_HELP)('checkout 0.0.1')}`);
+  \`bit checkout <version> [component-pattern]\` => checkout the specified ids (or all components when --all is used) to the specified version
+  \`bit checkout head [component-pattern]\` => checkout to the last snap/tag, omit [component-pattern] to checkout head 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'], ['', 'skip-npm-install', 'DEPRECATED. use "--skip-dependency-installation" instead'], ['', 'skip-dependency-installation', 'do not install packages of the imported components'], ['', 'ignore-package-json', 'do not generate package.json for the imported component(s). (it automatically enables skip-npm-install and save-dependencies-as-components flags)'], ['', 'conf [path]', 'write the configuration file (bit.json) and the envs configuration files (use --conf without path to write to the default dir)'], ['', 'ignore-dist', 'do not write dist files (when exist)']]);
+    (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, "loader", true);
   }
 
-  async report([values = []], {
+  async report([to, componentPattern], {
     interactiveMerge = false,
     ours = false,
     theirs = false,
@@ -77,11 +92,12 @@ class CheckoutCmd {
     all = false,
     verbose = false,
     skipNpmInstall = false,
-    skipDependencyInstallation = false,
-    ignorePackageJson = false,
-    conf,
-    ignoreDist = false
+    skipDependencyInstallation = false
   }) {
+    if (reset) {
+      throw new (_bitError().BitError)(`--reset flag has been removed. please run "bit checkout reset" instead`);
+    }
+
     if (skipNpmInstall) {
       // eslint-disable-next-line no-console
       console.log(_chalk().default.yellow(`"--skip-npm-install" has been deprecated, please use "--skip-dependency-installation" instead`));
@@ -91,23 +107,19 @@ class CheckoutCmd {
     const checkoutProps = {
       promptMergeOptions: interactiveMerge,
       mergeStrategy: (0, _mergeVersion().getMergeStrategy)(ours, theirs, manual),
-      reset,
       all,
       verbose,
       isLane: false,
-      skipNpmInstall: skipDependencyInstallation,
-      ignoreDist,
-      ignorePackageJson,
-      writeConfig: !!conf
+      skipNpmInstall: skipDependencyInstallation
     };
     const {
       components,
       version,
       failedComponents,
       leftUnresolvedConflicts
-    } = await this.checkout.checkout(values, checkoutProps);
-    const isLatest = Boolean(version && version === _constants().LATEST);
-    const isReset = !version;
+    } = await this.checkout.checkoutByCLIValues(to, componentPattern || '', checkoutProps);
+    const isLatest = to === 'head';
+    const isReset = to === 'reset';
 
     const getFailureOutput = () => {
       // components that failed for no legitimate reason. e.g. merge-conflict.

package/dist/checkout-cmd.js.map

@@ -1 +1 @@
-{"version":3,"names":["CheckoutCmd","constructor","checkout","WILDCARD_HELP","report","values","interactiveMerge","ours","theirs","manual","reset","all","verbose","skipNpmInstall","skipDependencyInstallation","ignorePackageJson","conf","ignoreDist","console","log","chalk","yellow","checkoutProps","promptMergeOptions","mergeStrategy","getMergeStrategy","isLane","writeConfig","components","version","failedComponents","leftUnresolvedConflicts","isLatest","Boolean","LATEST","isReset","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","versionOutput","showVersion","componentsStr"],"sources":["checkout-cmd.ts"],"sourcesContent":["import chalk from 'chalk';\nimport { Command, CommandOptions } from '@teambit/cli';\nimport { LATEST, WILDCARD_HELP } from '@teambit/legacy/dist/constants';\nimport { CheckoutProps } from '@teambit/legacy/dist/consumer/versions-ops/checkout-version';\nimport {\n  ApplyVersionResults,\n  getMergeStrategy,\n  applyVersionReport,\n  conflictSummaryReport,\n} from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport { CheckoutMain } from './checkout.main.runtime';\n\nexport class CheckoutCmd implements Command {\n  name = 'checkout [values...]';\n  description = 'switch between component versions or remove local changes';\n  group = 'development';\n  extendedDescription = `\n  \\`bit checkout <version> [ids...]\\` => checkout the specified ids (or all components when --all is used) to the specified version\n  \\`bit checkout head\\` => checkout all components to their latest versions\n  \\`bit checkout head [ids...]\\` => checkout the specified ids to their latest versions\n  \\`bit checkout [ids...] --reset\\` => remove local modifications from the specified ids (or all components when --all is used)\n  ${WILDCARD_HELP('checkout 0.0.1')}`;\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    ['', 'skip-npm-install', 'DEPRECATED. use \"--skip-dependency-installation\" instead'],\n    ['', 'skip-dependency-installation', 'do not install packages of the imported components'],\n    [\n      '',\n      'ignore-package-json',\n      'do not generate package.json for the imported component(s). (it automatically enables skip-npm-install and save-dependencies-as-components flags)',\n    ],\n    [\n      '',\n      'conf [path]',\n      'write the configuration file (bit.json) and the envs configuration files (use --conf without path to write to the default dir)',\n    ],\n    ['', 'ignore-dist', 'do not write dist files (when exist)'],\n  ] as CommandOptions;\n  loader = true;\n\n  constructor(private checkout: CheckoutMain) {}\n\n  async report(\n    [values = []]: [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      ignorePackageJson = false,\n      conf,\n      ignoreDist = 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      ignorePackageJson?: boolean;\n      conf?: string;\n      ignoreDist?: boolean;\n    }\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      reset,\n      all,\n      verbose,\n      isLane: false,\n      skipNpmInstall: skipDependencyInstallation,\n      ignoreDist,\n      ignorePackageJson,\n      writeConfig: !!conf,\n    };\n    const { components, version, failedComponents, leftUnresolvedConflicts }: ApplyVersionResults =\n      await this.checkout.checkout(values, checkoutProps);\n    const isLatest = Boolean(version && version === LATEST);\n    const isReset = !version;\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          // $FlowFixMe version is defined when !isReset\n          // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n          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      // $FlowFixMe version is defined when !isReset\n      // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n      const versionOutput = isLatest ? 'their latest version' : `version ${chalk.bold(version)}`;\n      const title = `successfully switched the following components to ${versionOutput}\\n\\n`;\n      const showVersion = isLatest || 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","verbose","skipNpmInstall","skipDependencyInstallation","BitError","console","log","chalk","yellow","checkoutProps","promptMergeOptions","mergeStrategy","getMergeStrategy","isLane","components","version","failedComponents","leftUnresolvedConflicts","checkoutByCLIValues","isLatest","isReset","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","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, reset, specific-version]. 'head' - last snap/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  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 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 isLatest = to === 'head';\n    const isReset = to === 'reset';\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          // $FlowFixMe version is defined when !isReset\n          // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n          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      // $FlowFixMe version is defined when !isReset\n      // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n      const versionOutput = isLatest ? 'their latest version' : `version ${chalk.bold(version)}`;\n      const title = `successfully switched the following components to ${versionOutput}\\n\\n`;\n      const showVersion = isLatest || isReset;\n      const componentsStr = applyVersionReport(components, true, showVersion);\n      return title + componentsStr;\n    };\n\n    return getFailureOutput() + getNeutralOutput() + getSuccessfulOutput() + getConflictSummary();\n  }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AAAA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AAEA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AAQO,MAAMA,WAAN,CAAqC;EAsC1CC,WAAW,CAASC,QAAT,EAAiC;IAAA,KAAxBA,QAAwB,GAAxBA,QAAwB;IAAA,8CArCrC,mCAqCqC;IAAA,mDApChC,CACV;MACEC,IAAI,EAAE,IADR;MAEEC,WAAW,EACT;IAHJ,CADU,EAMV;MACED,IAAI,EAAE,mBADR;MAEEC,WAAW,EAAEC;IAFf,CANU,CAoCgC;IAAA,qDAzB9B,2DAyB8B;IAAA,+CAxBpC,aAwBoC;IAAA,6DAvBrB;AACzB;AACA;AACA,yIAoB8C;IAAA,+CAnBpC,GAmBoC;IAAA,iDAlBlC,CACR,CACE,GADF,EAEE,mBAFF,EAGE,qGAHF,CADQ,EAMR,CAAC,GAAD,EAAM,MAAN,EAAc,gFAAd,CANQ,EAOR,CAAC,GAAD,EAAM,QAAN,EAAgB,qFAAhB,CAPQ,EAQR,CAAC,GAAD,EAAM,QAAN,EAAgB,6FAAhB,CARQ,EASR,CAAC,GAAD,EAAM,OAAN,EAAe,6CAAf,CATQ,EAUR,CAAC,GAAD,EAAM,KAAN,EAAa,gBAAb,CAVQ,EAWR,CAAC,GAAD,EAAM,SAAN,EAAiB,uCAAjB,CAXQ,EAYR,CAAC,EAAD,EAAK,OAAL,EAAc,8CAAd,CAZQ,EAaR,CAAC,EAAD,EAAK,kBAAL,EAAyB,0DAAzB,CAbQ,EAcR,CAAC,EAAD,EAAK,8BAAL,EAAqC,oDAArC,CAdQ,CAkBkC;IAAA,gDAFnC,IAEmC;EAAE;;EAElC,MAANC,MAAM,CACV,CAACC,EAAD,EAAKC,gBAAL,CADU,EAEV;IACEC,gBAAgB,GAAG,KADrB;IAEEC,IAAI,GAAG,KAFT;IAGEC,MAAM,GAAG,KAHX;IAIEC,MAAM,GAAG,KAJX;IAKEC,KAAK,GAAG,KALV;IAMEC,GAAG,GAAG,KANR;IAOEC,OAAO,GAAG,KAPZ;IAQEC,cAAc,GAAG,KARnB;IASEC,0BAA0B,GAAG;EAT/B,CAFU,EAuBV;IACA,IAAIJ,KAAJ,EAAW;MACT,MAAM,KAAIK,oBAAJ,EAAc,wEAAd,CAAN;IACD;;IACD,IAAIF,cAAJ,EAAoB;MAClB;MACAG,OAAO,CAACC,GAAR,CACEC,gBAAA,CAAMC,MAAN,CAAc,+FAAd,CADF;MAGAL,0BAA0B,GAAG,IAA7B;IACD;;IACD,MAAMM,aAA4B,GAAG;MACnCC,kBAAkB,EAAEf,gBADe;MAEnCgB,aAAa,EAAE,IAAAC,gCAAA,EAAiBhB,IAAjB,EAAuBC,MAAvB,EAA+BC,MAA/B,CAFoB;MAGnCE,GAHmC;MAInCC,OAJmC;MAKnCY,MAAM,EAAE,KAL2B;MAMnCX,cAAc,EAAEC;IANmB,CAArC;IAQA,MAAM;MAAEW,UAAF;MAAcC,OAAd;MAAuBC,gBAAvB;MAAyCC;IAAzC,IACJ,MAAM,KAAK7B,QAAL,CAAc8B,mBAAd,CAAkCzB,EAAlC,EAAsCC,gBAAgB,IAAI,EAA1D,EAA8De,aAA9D,CADR;IAEA,MAAMU,QAAQ,GAAG1B,EAAE,KAAK,MAAxB;IACA,MAAM2B,OAAO,GAAG3B,EAAE,KAAK,OAAvB;;IACA,MAAM4B,gBAAgB,GAAG,MAAM;MAC7B;MACA,MAAMC,oBAAoB,GAAGN,gBAAH,aAAGA,gBAAH,uBAAGA,gBAAgB,CAAEO,MAAlB,CAA0BC,CAAD,IAAO,CAACA,CAAC,CAACC,qBAAnC,CAA7B;MACA,IAAI,CAACH,oBAAD,IAAyB,CAACA,oBAAoB,CAACI,MAAnD,EAA2D,OAAO,EAAP;MAC3D,MAAMC,KAAK,GAAG,8DAAd;MACA,MAAMC,IAAI,GAAGN,oBAAoB,CAC9BO,GADU,CAERC,eAAD,IACG,GAAEvB,gBAAA,CAAMwB,IAAN,CAAWD,eAAe,CAACE,EAAhB,CAAmBC,QAAnB,EAAX,CAA0C,MAAK1B,gBAAA,CAAM2B,GAAN,CAAUJ,eAAe,CAACK,cAA1B,CAA0C,EAHrF,EAKVC,IALU,CAKL,IALK,CAAb;MAMA,OAAQ,GAAET,KAAM,KAAIC,IAAK,MAAzB;IACD,CAZD;;IAaA,MAAMS,gBAAgB,GAAG,MAAM;MAC7B;MACA,MAAMC,iBAAiB,GAAG,CAACtB,gBAAgB,IAAI,EAArB,EAAyBO,MAAzB,CAAiCC,CAAD,IAAOA,CAAC,CAACC,qBAAzC,CAA1B;MACA,IAAI,CAACa,iBAAiB,CAACZ,MAAvB,EAA+B,OAAO,EAAP;;MAC/B,IAAI,CAACzB,OAAD,IAAYD,GAAhB,EAAqB;QACnB,OAAOO,gBAAA,CAAMgC,KAAN,CACJ,+BAA8BhC,gBAAA,CAAMwB,IAAN,CAC7BO,iBAAiB,CAACZ,MAAlB,CAAyBO,QAAzB,EAD6B,CAE7B,mDAHG,CAAP;MAKD;;MAED,MAAMN,KAAK,GAAG,2DAAd;MACA,MAAMC,IAAI,GAAGU,iBAAiB,CAC3BT,GADU,CACLC,eAAD,IAAsB,GAAEvB,gBAAA,CAAMwB,IAAN,CAAWD,eAAe,CAACE,EAAhB,CAAmBC,QAAnB,EAAX,CAA0C,MAAKH,eAAe,CAACK,cAAe,EADhG,EAEVC,IAFU,CAEL,IAFK,CAAb;MAGA,OAAQ,GAAET,KAAM,KAAIC,IAAK,MAAzB;IACD,CAjBD;;IAkBA,MAAMY,kBAAkB,GAAG,MAAM;MAC/B,IAAI,CAAC1B,UAAD,IAAe,CAACA,UAAU,CAACY,MAA3B,IAAqC,CAACT,uBAA1C,EAAmE,OAAO,EAAP;MACnE,MAAMU,KAAK,GAAI,oCAAf;MACA,MAAMc,UAAU,GAAI;AAC1B,2DADM;MAEA,OAAOlC,gBAAA,CAAMmC,SAAN,CAAgBf,KAAhB,IAAyB,IAAAgB,qCAAA,EAAsB7B,UAAtB,CAAzB,GAA6DP,gBAAA,CAAMC,MAAN,CAAaiC,UAAb,CAApE;IACD,CAND;;IAQA,MAAMG,mBAAmB,GAAG,MAAM;MAChC,IAAI,CAAC9B,UAAD,IAAe,CAACA,UAAU,CAACY,MAA/B,EAAuC,OAAO,EAAP;;MACvC,IAAIZ,UAAU,CAACY,MAAX,KAAsB,CAA1B,EAA6B;QAC3B,MAAMmB,SAAS,GAAG/B,UAAU,CAAC,CAAD,CAA5B;QACA,MAAMgC,aAAa,GAAG1B,OAAO,GAAGyB,SAAS,CAACb,EAAV,CAAaC,QAAb,EAAH,GAA6BY,SAAS,CAACb,EAAV,CAAae,sBAAb,EAA1D;QACA,IAAI3B,OAAJ,EAAa,OAAQ,sBAAqBb,gBAAA,CAAMwB,IAAN,CAAWe,aAAX,CAA0B,IAAvD;QACb,MAAMnB,KAAK,GAAI,yBAAwBpB,gBAAA,CAAMwB,IAAN,CAAWe,aAAX,CAA0B,eAAcvC,gBAAA,CAAMwB,IAAN,EAC7E;QACA;QACAZ,QAAQ,GAAG0B,SAAS,CAACb,EAAV,CAAajB,OAAhB,GAA0BA,OAH2C,CAI7E,IAJF;QAKA,OAAQ,GAAEY,KAAM,IAAG,IAAAqB,kCAAA,EAAmBlC,UAAnB,EAA+B,KAA/B,CAAsC,EAAzD;MACD;;MACD,IAAIM,OAAJ,EAAa;QACX,MAAMO,KAAK,GAAG,iDAAd;QACA,MAAMC,IAAI,GAAGd,UAAU,CAACe,GAAX,CAAgBgB,SAAD,IAAetC,gBAAA,CAAMwB,IAAN,CAAWc,SAAS,CAACb,EAAV,CAAaC,QAAb,EAAX,CAA9B,EAAmEG,IAAnE,CAAwE,IAAxE,CAAb;QACA,OAAOT,KAAK,GAAGC,IAAf;MACD,CAjB+B,CAkBhC;MACA;;;MACA,MAAMqB,aAAa,GAAG9B,QAAQ,GAAG,sBAAH,GAA6B,WAAUZ,gBAAA,CAAMwB,IAAN,CAAWhB,OAAX,CAAoB,EAAzF;MACA,MAAMY,KAAK,GAAI,qDAAoDsB,aAAc,MAAjF;MACA,MAAMC,WAAW,GAAG/B,QAAQ,IAAIC,OAAhC;MACA,MAAM+B,aAAa,GAAG,IAAAH,kCAAA,EAAmBlC,UAAnB,EAA+B,IAA/B,EAAqCoC,WAArC,CAAtB;MACA,OAAOvB,KAAK,GAAGwB,aAAf;IACD,CAzBD;;IA2BA,OAAO9B,gBAAgB,KAAKgB,gBAAgB,EAArC,GAA0CO,mBAAmB,EAA7D,GAAkEJ,kBAAkB,EAA3F;EACD;;AAzJyC"}

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

@@ -1,20 +1,30 @@
 import { CLIMain } from '@teambit/cli';
 import { Logger, LoggerMain } from '@teambit/logger';
 import { Workspace } from '@teambit/workspace';
-import { CheckoutProps } from '@teambit/legacy/dist/consumer/versions-ops/checkout-version';
-import { ApplyVersionResults } from '@teambit/legacy/dist/consumer/versions-ops/merge-version';
+import { ApplyVersionResults, MergeStrategy } from '@teambit/legacy/dist/consumer/versions-ops/merge-version';
+import { ComponentID } from '@teambit/component-id';
+export declare type CheckoutProps = {
+    version?: string;
+    ids?: ComponentID[];
+    head?: boolean;
+    promptMergeOptions?: boolean;
+    mergeStrategy?: MergeStrategy | null;
+    verbose?: boolean;
+    skipNpmInstall?: boolean;
+    reset?: boolean;
+    all?: boolean;
+    isLane?: boolean;
+};
+declare type CheckoutTo = 'head' | 'reset' | string;
 export declare class CheckoutMain {
     private workspace;
     private logger;
     constructor(workspace: Workspace, logger: Logger);
-    checkout(values: string[], checkoutProps: CheckoutProps): Promise<ApplyVersionResults>;
+    checkout(checkoutProps: CheckoutProps): Promise<ApplyVersionResults>;
+    checkoutByCLIValues(to: CheckoutTo, componentPattern: string, checkoutProps: CheckoutProps): Promise<ApplyVersionResults>;
+    private syncNewComponents;
     private parseValues;
-    /**
-     * when user didn't enter any id and used '--all' flag, populate all ids.
-     */
-    private populateAllIds;
-    private getIdsMatchedByWildcard;
-    private getCandidateIds;
+    private getComponentStatus;
     static slots: never[];
     static dependencies: import("@teambit/harmony").Aspect[];
     static runtime: import("@teambit/harmony").RuntimeDefinition;

package/dist/checkout.main.runtime.js

@@ -51,20 +51,20 @@ function _workspace() {
   return data;
 }
 
-function _ramda() {
-  const data = _interopRequireDefault(require("ramda"));
+function _legacyBitId() {
+  const data = require("@teambit/legacy-bit-id");
 
-  _ramda = function () {
+  _legacyBitId = function () {
     return data;
   };
 
   return data;
 }
 
-function _bitId() {
-  const data = require("@teambit/legacy/dist/bit-id");
+function _bitError() {
+  const data = require("@teambit/bit-error");
 
-  _bitId = function () {
+  _bitError = function () {
     return data;
   };
 
@@ -91,20 +91,20 @@ function _constants() {
   return data;
 }
 
-function _componentsList() {
-  const data = _interopRequireDefault(require("@teambit/legacy/dist/consumer/component/components-list"));
+function _checkoutVersion() {
+  const data = require("@teambit/legacy/dist/consumer/versions-ops/checkout-version");
 
-  _componentsList = function () {
+  _checkoutVersion = function () {
     return data;
   };
 
   return data;
 }
 
-function _checkoutVersion() {
-  const data = _interopRequireDefault(require("@teambit/legacy/dist/consumer/versions-ops/checkout-version"));
+function _mergeVersion() {
+  const data = require("@teambit/legacy/dist/consumer/versions-ops/merge-version");
 
-  _checkoutVersion = function () {
+  _mergeVersion = function () {
     return data;
   };
 
@@ -121,30 +121,60 @@ function _generalError() {
   return data;
 }
 
-function _hasWildcard() {
-  const data = _interopRequireDefault(require("@teambit/legacy/dist/utils/string/has-wildcard"));
+function _exceptions() {
+  const data = require("@teambit/legacy/dist/consumer/exceptions");
 
-  _hasWildcard = function () {
+  _exceptions = function () {
     return data;
   };
 
   return data;
 }
 
-function _exceptions() {
-  const data = require("@teambit/legacy/dist/consumer/exceptions");
+function _pMapSeries() {
+  const data = _interopRequireDefault(require("p-map-series"));
 
-  _exceptions = function () {
+  _pMapSeries = function () {
     return data;
   };
 
   return data;
 }
 
-function _noIdMatchWildcard() {
-  const data = _interopRequireDefault(require("@teambit/legacy/dist/api/consumer/lib/exceptions/no-id-match-wildcard"));
+function _bitId() {
+  const data = require("@teambit/legacy/dist/bit-id");
 
-  _noIdMatchWildcard = function () {
+  _bitId = function () {
+    return data;
+  };
+
+  return data;
+}
+
+function _repositories() {
+  const data = require("@teambit/legacy/dist/scope/repositories");
+
+  _repositories = function () {
+    return data;
+  };
+
+  return data;
+}
+
+function _manyComponentsWriter() {
+  const data = _interopRequireDefault(require("@teambit/legacy/dist/consumer/component-ops/many-components-writer"));
+
+  _manyComponentsWriter = function () {
+    return data;
+  };
+
+  return data;
+}
+
+function _scopeComponentsImporter() {
+  const data = _interopRequireDefault(require("@teambit/legacy/dist/scope/component-ops/scope-components-importer"));
+
+  _scopeComponentsImporter = function () {
     return data;
   };
 
@@ -171,37 +201,137 @@ function _checkout() {
   return data;
 }
 
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2().default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
 class CheckoutMain {
   constructor(workspace, logger) {
     this.workspace = workspace;
     this.logger = logger;
   }
 
-  async checkout(values, checkoutProps) {
+  async checkout(checkoutProps) {
+    var _checkoutProps$ids;
+
+    const consumer = this.workspace.consumer;
+    const {
+      version,
+      ids,
+      promptMergeOptions
+    } = checkoutProps;
+    await this.syncNewComponents(checkoutProps);
+
+    const bitIds = _bitId().BitIds.fromArray((ids === null || ids === void 0 ? void 0 : ids.map(id => id._legacy)) || []);
+
+    await consumer.scope.import(bitIds, false);
+    const {
+      components
+    } = await consumer.loadComponents(bitIds);
+
+    const getAllComponentsStatus = async () => {
+      const tmp = new (_repositories().Tmp)(consumer.scope);
+
+      try {
+        const componentsStatusP = components.map(component => this.getComponentStatus(component, checkoutProps));
+        const componentsStatus = await Promise.all(componentsStatusP);
+        await tmp.clear();
+        return componentsStatus;
+      } catch (err) {
+        await tmp.clear();
+        throw err;
+      }
+    };
+
+    const allComponentsStatus = await getAllComponentsStatus();
+    const componentWithConflict = allComponentsStatus.find(component => component.mergeResults && component.mergeResults.hasConflicts);
+
+    if (componentWithConflict) {
+      if (!promptMergeOptions && !checkoutProps.mergeStrategy) {
+        throw new (_generalError().default)(`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`);
+      }
+
+      if (!checkoutProps.mergeStrategy) checkoutProps.mergeStrategy = await (0, _mergeVersion().getMergeStrategyInteractive)();
+    }
+
+    const failedComponents = allComponentsStatus.filter(componentStatus => componentStatus.failureMessage).map(componentStatus => ({
+      id: componentStatus.id,
+      failureMessage: componentStatus.failureMessage,
+      unchangedLegitimately: componentStatus.unchangedLegitimately
+    }));
+    const succeededComponents = allComponentsStatus.filter(componentStatus => !componentStatus.failureMessage); // do not use Promise.all for applyVersion. otherwise, it'll write all components in parallel,
+    // which can be an issue when some components are also dependencies of others
+
+    const checkoutPropsLegacy = _objectSpread(_objectSpread({}, checkoutProps), {}, {
+      ids: (_checkoutProps$ids = checkoutProps.ids) === null || _checkoutProps$ids === void 0 ? void 0 : _checkoutProps$ids.map(id => id._legacy)
+    });
+
+    const componentsResults = await (0, _pMapSeries().default)(succeededComponents, ({
+      id,
+      componentFromFS,
+      mergeResults
+    }) => {
+      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 leftUnresolvedConflicts = componentWithConflict && checkoutProps.mergeStrategy === 'manual';
+
+    if (componentsWithDependencies.length) {
+      const manyComponentsWriter = new (_manyComponentsWriter().default)({
+        consumer,
+        componentsWithDependencies,
+        installNpmPackages: !checkoutProps.skipNpmInstall && !leftUnresolvedConflicts,
+        override: true,
+        verbose: checkoutProps.verbose,
+        resetConfig: checkoutProps.reset
+      });
+      await manyComponentsWriter.writeAll();
+      await (0, _checkoutVersion().deleteFilesIfNeeded)(componentsResults, consumer);
+    }
+
+    const appliedVersionComponents = componentsResults.map(c => c.applyVersionResult);
+    return {
+      components: appliedVersionComponents,
+      version,
+      failedComponents,
+      leftUnresolvedConflicts
+    };
+  }
+
+  async checkoutByCLIValues(to, componentPattern, checkoutProps) {
     this.logger.setStatusLine(_loaderMessages().BEFORE_CHECKOUT);
     if (!this.workspace) throw new (_exceptions().ConsumerNotFound)();
     const consumer = this.workspace.consumer;
-    await this.parseValues(values, checkoutProps);
-    const checkoutResults = await (0, _checkoutVersion().default)(consumer, checkoutProps);
+    await this.parseValues(to, componentPattern, checkoutProps);
+    const checkoutResults = await this.checkout(checkoutProps);
     await consumer.onDestroy();
     return checkoutResults;
   }
 
-  async parseValues(values, checkoutProps) {
-    const consumer = this.workspace.consumer;
-
-    const firstValue = _ramda().default.head(values);
-
-    checkoutProps.version = firstValue && (_bitId().BitId.isValidVersion(firstValue) || firstValue === _constants().LATEST || firstValue === _constants().HEAD) ? firstValue : undefined;
-    const ids = checkoutProps.version ? _ramda().default.tail(values) : values; // if first value is a version, the rest are ids
-
-    checkoutProps.latestVersion = Boolean(checkoutProps.version && (checkoutProps.version === _constants().LATEST || checkoutProps.version === _constants().HEAD));
+  async syncNewComponents({
+    ids,
+    head
+  }) {
+    if (!head) return;
+    const notExported = ids === null || ids === void 0 ? void 0 : ids.filter(id => !id._legacy.hasScope()).map(id => id._legacy.changeScope(id.scope));
+    const scopeComponentsImporter = new (_scopeComponentsImporter().default)(this.workspace.consumer.scope);
+
+    try {
+      await scopeComponentsImporter.importManyDeltaWithoutDeps(_bitId().BitIds.fromArray(notExported || []), 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);
+    }
+  }
 
-    if (checkoutProps.latestVersion && checkoutProps.version === _constants().LATEST) {
-      this.logger.console(`"latest" is deprecated. please use "${_constants().HEAD}" instead`);
+  async parseValues(to, componentPattern, checkoutProps) {
+    if (to === _constants().HEAD) checkoutProps.head = true;else if (to === _constants().LATEST) throw new (_bitError().BitError)(`"latest" was deprecated a while ago, please use "head" instead`);else if (to === 'reset') checkoutProps.reset = true;else {
+      if (!_legacyBitId().BitId.isValidVersion(to)) throw new (_bitError().BitError)(`the specified version "${to}" is not a valid version`);
+      checkoutProps.version = to;
     }
 
-    if (checkoutProps.latestVersion && !ids.length) {
+    if (checkoutProps.head && !componentPattern) {
       if (checkoutProps.all) {
         this.logger.console(`"--all" is deprecated for "bit checkout ${_constants().HEAD}", please omit it.`);
       }
@@ -209,57 +339,122 @@ class CheckoutMain {
       checkoutProps.all = true;
     }
 
-    if (!firstValue && !checkoutProps.reset && !checkoutProps.all) {
-      throw new (_generalError().default)('please enter [values...] or use --reset --all flags');
+    if (componentPattern && checkoutProps.all) {
+      throw new (_generalError().default)('please specify either [component-pattern] or --all, not both');
     }
 
-    if (checkoutProps.reset && checkoutProps.version) {
-      throw new (_generalError().default)(`the first argument "${checkoutProps.version}" seems to be a version. however, --reset flag doesn't support a version`);
+    if (!componentPattern && !checkoutProps.all) {
+      throw new (_generalError().default)('please specify [component-pattern] or use --all flag');
     }
 
-    if (ids.length && checkoutProps.all) {
-      throw new (_generalError().default)('please specify either [ids...] or --all, not both');
+    const ids = componentPattern ? await this.workspace.idsByPattern(componentPattern) : await this.workspace.listIds();
+    checkoutProps.ids = ids.map(id => checkoutProps.head ? id.changeVersion(_constants().LATEST) : id);
+  }
+
+  async getComponentStatus(component, checkoutProps) {
+    const consumer = this.workspace.consumer;
+    const {
+      version,
+      head: latestVersion,
+      reset
+    } = checkoutProps;
+    const repo = consumer.scope.objects;
+    const componentModel = await consumer.scope.getModelComponentIfExist(component.id);
+    const componentStatus = {
+      id: component.id
+    };
+
+    const returnFailure = (msg, unchangedLegitimately = false) => {
+      componentStatus.failureMessage = msg;
+      componentStatus.unchangedLegitimately = unchangedLegitimately;
+      return componentStatus;
+    };
+
+    if (!componentModel) {
+      return returnFailure(`component ${component.id.toString()} is new, no version to checkout`, true);
     }
 
-    if (!checkoutProps.reset && !checkoutProps.version) {
-      if (ids.length) throw new (_generalError().default)(`the specified version "${ids[0]}" is not a valid version`);else throw new (_generalError().default)('please specify a version');
+    const unmerged = repo.unmergedComponents.getEntry(component.name);
+
+    if (!reset && unmerged) {
+      return returnFailure(`component ${component.id.toStringWithoutVersion()} is in during-merge state, please snap/tag it first (or use bit merge --resolve/--abort)`);
     }
 
-    if (!ids.length) {
-      this.populateAllIds(consumer, checkoutProps);
-    } else {
-      const idsHasWildcard = (0, _hasWildcard().default)(ids);
-      checkoutProps.ids = idsHasWildcard ? this.getIdsMatchedByWildcard(consumer, checkoutProps, ids) : ids.map(id => consumer.getParsedId(id));
+    const getNewVersion = async () => {
+      // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!
+      if (reset) return component.id.version; // @ts-ignore if !reset the version is defined
+
+      return latestVersion ? componentModel.latestIncludeRemote(repo) : version;
+    };
+
+    const newVersion = await getNewVersion();
+
+    if (version && !latestVersion) {
+      const hasVersion = await componentModel.hasVersion(version, repo);
+      if (!hasVersion) return returnFailure(`component ${component.id.toStringWithoutVersion()} doesn't have version ${version}`);
     }
-  }
-  /**
-   * when user didn't enter any id and used '--all' flag, populate all ids.
-   */
 
+    const existingBitMapId = consumer.bitMap.getBitId(component.id, {
+      ignoreVersion: true
+    });
+    const currentlyUsedVersion = existingBitMapId.version;
 
-  populateAllIds(consumer, checkoutProps) {
-    if (!checkoutProps.all) {
-      throw new (_generalError().default)('please specify [ids...] or use --all flag');
+    if (!currentlyUsedVersion) {
+      return returnFailure(`component ${component.id.toStringWithoutVersion()} is new`);
     }
 
-    checkoutProps.ids = this.getCandidateIds(consumer, checkoutProps);
-  }
+    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}`);
+    }
 
-  getIdsMatchedByWildcard(consumer, checkoutProps, ids) {
-    const candidateIds = this.getCandidateIds(consumer, checkoutProps);
+    if (latestVersion && currentlyUsedVersion === newVersion) {
+      return returnFailure(`component ${component.id.toStringWithoutVersion()} is already at the latest version, which is ${newVersion}`, true);
+    }
 
-    const matchedIds = _componentsList().default.filterComponentsByWildcard(candidateIds, ids);
+    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`);
+    } // 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
+    // 0.0.2+modification. in other words, it won't make any change.
+    // this scenario of checking out while there are modified files, is forbidden in Git. here, we want to simulate a similar
+    // experience of "git stash", then "git checkout", then "git stash pop". practically, we want the changes done on 0.0.2
+    // 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 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
+      });
+    }
 
-    if (!matchedIds.length) throw new (_noIdMatchWildcard().default)(ids);
-    return matchedIds;
-  }
+    const versionRef = componentModel.getRef(newVersion); // @ts-ignore
 
-  getCandidateIds(consumer, checkoutProps) {
-    const idsFromBitMap = consumer.bitMap.getAllBitIds();
-    return idsFromBitMap.map(bitId => {
-      const version = checkoutProps.latestVersion ? _constants().LATEST : bitId.version;
-      return bitId.changeVersion(version);
-    });
+    const componentVersion = await consumer.scope.getObject(versionRef.hash);
+    const newId = component.id.changeVersion(newVersion); // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!
+
+    return {
+      componentFromFS: component,
+      componentFromModel: componentVersion,
+      id: newId,
+      mergeResults
+    };
   }
 
   static async provider([cli, workspace, loggerMain]) {

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

@@ -1 +1 @@
-{"version":3,"names":["CheckoutMain","constructor","workspace","logger","checkout","values","checkoutProps","setStatusLine","BEFORE_CHECKOUT","ConsumerNotFound","consumer","parseValues","checkoutResults","checkoutVersion","onDestroy","firstValue","R","head","version","BitId","isValidVersion","LATEST","HEAD","undefined","ids","tail","latestVersion","Boolean","console","length","all","reset","GeneralError","populateAllIds","idsHasWildcard","hasWildcard","getIdsMatchedByWildcard","map","id","getParsedId","getCandidateIds","candidateIds","matchedIds","ComponentsList","filterComponentsByWildcard","NoIdMatchWildcard","idsFromBitMap","bitMap","getAllBitIds","bitId","changeVersion","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 R from 'ramda';\nimport { BitId } from '@teambit/legacy/dist/bit-id';\nimport { BEFORE_CHECKOUT } from '@teambit/legacy/dist/cli/loader/loader-messages';\nimport { HEAD, LATEST } from '@teambit/legacy/dist/constants';\nimport { Consumer } from '@teambit/legacy/dist/consumer';\nimport ComponentsList from '@teambit/legacy/dist/consumer/component/components-list';\nimport checkoutVersion, { CheckoutProps } from '@teambit/legacy/dist/consumer/versions-ops/checkout-version';\nimport { ApplyVersionResults } from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport GeneralError from '@teambit/legacy/dist/error/general-error';\nimport hasWildcard from '@teambit/legacy/dist/utils/string/has-wildcard';\nimport { ConsumerNotFound } from '@teambit/legacy/dist/consumer/exceptions';\nimport NoIdMatchWildcard from '@teambit/legacy/dist/api/consumer/lib/exceptions/no-id-match-wildcard';\nimport { CheckoutCmd } from './checkout-cmd';\nimport { CheckoutAspect } from './checkout.aspect';\n\nexport class CheckoutMain {\n  constructor(private workspace: Workspace, private logger: Logger) {}\n  async checkout(values: string[], checkoutProps: CheckoutProps): 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(values, checkoutProps);\n    const checkoutResults = await checkoutVersion(consumer, checkoutProps);\n    await consumer.onDestroy();\n    return checkoutResults;\n  }\n\n  private async parseValues(values: string[], checkoutProps: CheckoutProps) {\n    const consumer = this.workspace.consumer;\n    const firstValue = R.head(values);\n    checkoutProps.version =\n      firstValue && (BitId.isValidVersion(firstValue) || firstValue === LATEST || firstValue === HEAD)\n        ? firstValue\n        : undefined;\n    const ids = checkoutProps.version ? R.tail(values) : values; // if first value is a version, the rest are ids\n    checkoutProps.latestVersion = Boolean(\n      checkoutProps.version && (checkoutProps.version === LATEST || checkoutProps.version === HEAD)\n    );\n    if (checkoutProps.latestVersion && checkoutProps.version === LATEST) {\n      this.logger.console(`\"latest\" is deprecated. please use \"${HEAD}\" instead`);\n    }\n    if (checkoutProps.latestVersion && !ids.length) {\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 (!firstValue && !checkoutProps.reset && !checkoutProps.all) {\n      throw new GeneralError('please enter [values...] or use --reset --all flags');\n    }\n    if (checkoutProps.reset && checkoutProps.version) {\n      throw new GeneralError(\n        `the first argument \"${checkoutProps.version}\" seems to be a version. however, --reset flag doesn't support a version`\n      );\n    }\n    if (ids.length && checkoutProps.all) {\n      throw new GeneralError('please specify either [ids...] or --all, not both');\n    }\n    if (!checkoutProps.reset && !checkoutProps.version) {\n      if (ids.length) throw new GeneralError(`the specified version \"${ids[0]}\" is not a valid version`);\n      else throw new GeneralError('please specify a version');\n    }\n    if (!ids.length) {\n      this.populateAllIds(consumer, checkoutProps);\n    } else {\n      const idsHasWildcard = hasWildcard(ids);\n      checkoutProps.ids = idsHasWildcard\n        ? this.getIdsMatchedByWildcard(consumer, checkoutProps, ids)\n        : ids.map((id) => consumer.getParsedId(id));\n    }\n  }\n\n  /**\n   * when user didn't enter any id and used '--all' flag, populate all ids.\n   */\n  private populateAllIds(consumer: Consumer, checkoutProps: CheckoutProps) {\n    if (!checkoutProps.all) {\n      throw new GeneralError('please specify [ids...] or use --all flag');\n    }\n    checkoutProps.ids = this.getCandidateIds(consumer, checkoutProps);\n  }\n\n  private getIdsMatchedByWildcard(consumer: Consumer, checkoutProps: CheckoutProps, ids: string[]): BitId[] {\n    const candidateIds = this.getCandidateIds(consumer, checkoutProps);\n    const matchedIds = ComponentsList.filterComponentsByWildcard(candidateIds, ids);\n    if (!matchedIds.length) throw new NoIdMatchWildcard(ids);\n    return matchedIds;\n  }\n\n  private getCandidateIds(consumer: Consumer, checkoutProps: CheckoutProps): BitId[] {\n    const idsFromBitMap = consumer.bitMap.getAllBitIds();\n    return idsFromBitMap.map((bitId) => {\n      const version = checkoutProps.latestVersion ? LATEST : bitId.version;\n      return bitId.changeVersion(version);\n    });\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;;AAEA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AAEA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AAEO,MAAMA,YAAN,CAAmB;EACxBC,WAAW,CAASC,SAAT,EAAuCC,MAAvC,EAAuD;IAAA,KAA9CD,SAA8C,GAA9CA,SAA8C;IAAA,KAAhBC,MAAgB,GAAhBA,MAAgB;EAAE;;EACtD,MAARC,QAAQ,CAACC,MAAD,EAAmBC,aAAnB,EAA+E;IAC3F,KAAKH,MAAL,CAAYI,aAAZ,CAA0BC,iCAA1B;IACA,IAAI,CAAC,KAAKN,SAAV,EAAqB,MAAM,KAAIO,8BAAJ,GAAN;IACrB,MAAMC,QAAQ,GAAG,KAAKR,SAAL,CAAeQ,QAAhC;IACA,MAAM,KAAKC,WAAL,CAAiBN,MAAjB,EAAyBC,aAAzB,CAAN;IACA,MAAMM,eAAe,GAAG,MAAM,IAAAC,0BAAA,EAAgBH,QAAhB,EAA0BJ,aAA1B,CAA9B;IACA,MAAMI,QAAQ,CAACI,SAAT,EAAN;IACA,OAAOF,eAAP;EACD;;EAEwB,MAAXD,WAAW,CAACN,MAAD,EAAmBC,aAAnB,EAAiD;IACxE,MAAMI,QAAQ,GAAG,KAAKR,SAAL,CAAeQ,QAAhC;;IACA,MAAMK,UAAU,GAAGC,gBAAA,CAAEC,IAAF,CAAOZ,MAAP,CAAnB;;IACAC,aAAa,CAACY,OAAd,GACEH,UAAU,KAAKI,cAAA,CAAMC,cAAN,CAAqBL,UAArB,KAAoCA,UAAU,KAAKM,mBAAnD,IAA6DN,UAAU,KAAKO,iBAAjF,CAAV,GACIP,UADJ,GAEIQ,SAHN;IAIA,MAAMC,GAAG,GAAGlB,aAAa,CAACY,OAAd,GAAwBF,gBAAA,CAAES,IAAF,CAAOpB,MAAP,CAAxB,GAAyCA,MAArD,CAPwE,CAOX;;IAC7DC,aAAa,CAACoB,aAAd,GAA8BC,OAAO,CACnCrB,aAAa,CAACY,OAAd,KAA0BZ,aAAa,CAACY,OAAd,KAA0BG,mBAA1B,IAAoCf,aAAa,CAACY,OAAd,KAA0BI,iBAAxF,CADmC,CAArC;;IAGA,IAAIhB,aAAa,CAACoB,aAAd,IAA+BpB,aAAa,CAACY,OAAd,KAA0BG,mBAA7D,EAAqE;MACnE,KAAKlB,MAAL,CAAYyB,OAAZ,CAAqB,uCAAsCN,iBAAK,WAAhE;IACD;;IACD,IAAIhB,aAAa,CAACoB,aAAd,IAA+B,CAACF,GAAG,CAACK,MAAxC,EAAgD;MAC9C,IAAIvB,aAAa,CAACwB,GAAlB,EAAuB;QACrB,KAAK3B,MAAL,CAAYyB,OAAZ,CAAqB,2CAA0CN,iBAAK,oBAApE;MACD;;MACDhB,aAAa,CAACwB,GAAd,GAAoB,IAApB;IACD;;IACD,IAAI,CAACf,UAAD,IAAe,CAACT,aAAa,CAACyB,KAA9B,IAAuC,CAACzB,aAAa,CAACwB,GAA1D,EAA+D;MAC7D,MAAM,KAAIE,uBAAJ,EAAiB,qDAAjB,CAAN;IACD;;IACD,IAAI1B,aAAa,CAACyB,KAAd,IAAuBzB,aAAa,CAACY,OAAzC,EAAkD;MAChD,MAAM,KAAIc,uBAAJ,EACH,uBAAsB1B,aAAa,CAACY,OAAQ,0EADzC,CAAN;IAGD;;IACD,IAAIM,GAAG,CAACK,MAAJ,IAAcvB,aAAa,CAACwB,GAAhC,EAAqC;MACnC,MAAM,KAAIE,uBAAJ,EAAiB,mDAAjB,CAAN;IACD;;IACD,IAAI,CAAC1B,aAAa,CAACyB,KAAf,IAAwB,CAACzB,aAAa,CAACY,OAA3C,EAAoD;MAClD,IAAIM,GAAG,CAACK,MAAR,EAAgB,MAAM,KAAIG,uBAAJ,EAAkB,0BAAyBR,GAAG,CAAC,CAAD,CAAI,0BAAlD,CAAN,CAAhB,KACK,MAAM,KAAIQ,uBAAJ,EAAiB,0BAAjB,CAAN;IACN;;IACD,IAAI,CAACR,GAAG,CAACK,MAAT,EAAiB;MACf,KAAKI,cAAL,CAAoBvB,QAApB,EAA8BJ,aAA9B;IACD,CAFD,MAEO;MACL,MAAM4B,cAAc,GAAG,IAAAC,sBAAA,EAAYX,GAAZ,CAAvB;MACAlB,aAAa,CAACkB,GAAd,GAAoBU,cAAc,GAC9B,KAAKE,uBAAL,CAA6B1B,QAA7B,EAAuCJ,aAAvC,EAAsDkB,GAAtD,CAD8B,GAE9BA,GAAG,CAACa,GAAJ,CAASC,EAAD,IAAQ5B,QAAQ,CAAC6B,WAAT,CAAqBD,EAArB,CAAhB,CAFJ;IAGD;EACF;EAED;AACF;AACA;;;EACUL,cAAc,CAACvB,QAAD,EAAqBJ,aAArB,EAAmD;IACvE,IAAI,CAACA,aAAa,CAACwB,GAAnB,EAAwB;MACtB,MAAM,KAAIE,uBAAJ,EAAiB,2CAAjB,CAAN;IACD;;IACD1B,aAAa,CAACkB,GAAd,GAAoB,KAAKgB,eAAL,CAAqB9B,QAArB,EAA+BJ,aAA/B,CAApB;EACD;;EAEO8B,uBAAuB,CAAC1B,QAAD,EAAqBJ,aAArB,EAAmDkB,GAAnD,EAA2E;IACxG,MAAMiB,YAAY,GAAG,KAAKD,eAAL,CAAqB9B,QAArB,EAA+BJ,aAA/B,CAArB;;IACA,MAAMoC,UAAU,GAAGC,yBAAA,CAAeC,0BAAf,CAA0CH,YAA1C,EAAwDjB,GAAxD,CAAnB;;IACA,IAAI,CAACkB,UAAU,CAACb,MAAhB,EAAwB,MAAM,KAAIgB,4BAAJ,EAAsBrB,GAAtB,CAAN;IACxB,OAAOkB,UAAP;EACD;;EAEOF,eAAe,CAAC9B,QAAD,EAAqBJ,aAArB,EAA4D;IACjF,MAAMwC,aAAa,GAAGpC,QAAQ,CAACqC,MAAT,CAAgBC,YAAhB,EAAtB;IACA,OAAOF,aAAa,CAACT,GAAd,CAAmBY,KAAD,IAAW;MAClC,MAAM/B,OAAO,GAAGZ,aAAa,CAACoB,aAAd,GAA8BL,mBAA9B,GAAuC4B,KAAK,CAAC/B,OAA7D;MACA,OAAO+B,KAAK,CAACC,aAAN,CAAoBhC,OAApB,CAAP;IACD,CAHM,CAAP;EAID;;EAOoB,aAARiC,QAAQ,CAAC,CAACC,GAAD,EAAMlD,SAAN,EAAiBmD,UAAjB,CAAD,EAAiE;IACpF,MAAMlD,MAAM,GAAGkD,UAAU,CAACC,YAAX,CAAwBC,0BAAA,CAAejB,EAAvC,CAAf;IACA,MAAMkB,YAAY,GAAG,IAAIxD,YAAJ,CAAiBE,SAAjB,EAA4BC,MAA5B,CAArB;IACAiD,GAAG,CAACK,QAAJ,CAAa,KAAIC,0BAAJ,EAAgBF,YAAhB,CAAb;IACA,OAAOA,YAAP;EACD;;AA5FuB;;;gCAAbxD,Y,WAkFI,E;gCAlFJA,Y,kBAmFW,CAAC2D,gBAAD,EAAYC,oBAAZ,EAA6BC,sBAA7B,C;gCAnFX7D,Y,aAqFM8D,kB;;AAUnBP,0BAAA,CAAeQ,UAAf,CAA0B/D,YAA1B;;eAEeA,Y"}
+{"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","ScopeComponentsImporter","importManyDeltaWithoutDeps","error","HEAD","LATEST","BitError","BitId","isValidVersion","console","idsByPattern","listIds","changeVersion","latestVersion","repo","objects","componentModel","getModelComponentIfExist","returnFailure","msg","toString","unmerged","unmergedComponents","getEntry","name","getNewVersion","latestIncludeRemote","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 ScopeComponentsImporter from '@teambit/legacy/dist/scope/component-ops/scope-components-importer';\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  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 = new ScopeComponentsImporter(this.workspace.consumer.scope);\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) throw new BitError(`\"latest\" was deprecated a while ago, please use \"head\" instead`);\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 (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 ? 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: latestVersion, reset } = 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      // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n      if (reset) return component.id.version;\n      // @ts-ignore if !reset the version is defined\n      return latestVersion ? componentModel.latestIncludeRemote(repo) : version;\n    };\n    const newVersion = await getNewVersion();\n    if (version && !latestVersion) {\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 (latestVersion && 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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"}

package/package.json

@@ -1,22 +1,25 @@
 {
   "name": "@teambit/checkout",
-  "version": "0.0.12",
+  "version": "0.0.15",
   "homepage": "https://bit.dev/teambit/component/checkout",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.component",
     "name": "checkout",
-    "version": "0.0.12"
+    "version": "0.0.15"
   },
   "dependencies": {
     "chalk": "2.4.2",
-    "ramda": "0.27.1",
+    "p-map-series": "2.1.0",
     "@babel/runtime": "7.12.18",
     "core-js": "^3.0.0",
+    "@teambit/bit-error": "0.0.400",
+    "@teambit/cli": "0.0.564",
     "@teambit/harmony": "0.3.3",
-    "@teambit/cli": "0.0.562",
-    "@teambit/logger": "0.0.655",
-    "@teambit/workspace": "0.0.843"
+    "@teambit/component-id": "0.0.417",
+    "@teambit/legacy-bit-id": "0.0.414",
+    "@teambit/logger": "0.0.657",
+    "@teambit/workspace": "0.0.846"
   },
   "devDependencies": {
     "@types/mocha": "9.1.0",
@@ -27,7 +30,7 @@
     "@types/node": "12.20.4"
   },
   "peerDependencies": {
-    "@teambit/legacy": "1.0.343",
+    "@teambit/legacy": "1.0.345",
     "react-dom": "^16.8.0 || ^17.0.0",
     "react": "^16.8.0 || ^17.0.0"
   },