@teambit/checkout 0.0.222 → 0.0.224

package/dist/checkout-cmd.d.ts

@@ -15,16 +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, workspaceOnly, verbose, skipNpmInstall, skipDependencyInstallation, }: {
+    report([to, componentPattern]: [string, string], { interactiveMerge, ours, theirs, manual, all, workspaceOnly, verbose, skipDependencyInstallation, }: {
         interactiveMerge?: boolean;
         ours?: boolean;
         theirs?: boolean;
         manual?: boolean;
-        reset?: boolean;
         all?: boolean;
         workspaceOnly?: boolean;
         verbose?: boolean;
-        skipNpmInstall?: boolean;
         skipDependencyInstallation?: boolean;
     }): Promise<string>;
 }

package/dist/checkout-cmd.js

@@ -21,13 +21,6 @@ function _chalk() {
   };
   return data;
 }
-function _bitError() {
-  const data = require("@teambit/bit-error");
-  _bitError = function () {
-    return data;
-  };
-  return data;
-}
 function _merging() {
   const data = require("@teambit/merging");
   _merging = function () {
@@ -69,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'], ['e', 'workspace-only', 'when on a lane, avoid introducing new components from the remote lane that 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'], ['x', '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', 'workspace-only', 'when on a lane, avoid introducing new components from the remote lane that do not exist locally'], ['v', 'verbose', 'showing verbose output for inspection'], ['x', 'skip-dependency-installation', 'do not install packages of the imported components']]);
     (0, _defineProperty2().default)(this, "loader", true);
   }
   async report([to, componentPattern], {
@@ -77,21 +70,11 @@ class CheckoutCmd {
     ours = false,
     theirs = false,
     manual = false,
-    reset = false,
     all = false,
     workspaceOnly = false,
     verbose = false,
-    skipNpmInstall = 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`));
-      skipDependencyInstallation = true;
-    }
     const checkoutProps = {
       promptMergeOptions: interactiveMerge,
       mergeStrategy: (0, _mergeVersion().getMergeStrategy)(ours, theirs, manual),

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","workspaceOnly","verbose","skipNpmInstall","skipDependencyInstallation","BitError","console","log","chalk","yellow","checkoutProps","promptMergeOptions","mergeStrategy","getMergeStrategy","isLane","components","version","failedComponents","leftUnresolvedConflicts","newFromLane","newFromLaneAdded","installationError","compilationError","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","installationErrorOutput","compilationErrorOutput"],"sources":["checkout-cmd.ts"],"sourcesContent":["import chalk from 'chalk';\nimport { BitError } from '@teambit/bit-error';\nimport { Command, CommandOptions } from '@teambit/cli';\nimport {\n  ApplyVersionResults,\n  applyVersionReport,\n  conflictSummaryReport,\n  installationErrorOutput,\n  compilationErrorOutput,\n} from '@teambit/merging';\nimport { COMPONENT_PATTERN_HELP } from '@teambit/legacy/dist/constants';\nimport { getMergeStrategy } 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    [\n      'e',\n      'workspace-only',\n      'when on a lane, avoid introducing new components from the remote lane that do not exist locally',\n    ],\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    ['x', '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      workspaceOnly = 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      workspaceOnly?: 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      workspaceOnly,\n    };\n    const {\n      components,\n      version,\n      failedComponents,\n      leftUnresolvedConflicts,\n      newFromLane,\n      newFromLaneAdded,\n      installationError,\n      compilationError,\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. omit --workspace-only 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      installationErrorOutput(installationError) +\n      compilationErrorOutput(compilationError)\n    );\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","all","workspaceOnly","verbose","skipDependencyInstallation","checkoutProps","promptMergeOptions","mergeStrategy","getMergeStrategy","isLane","skipNpmInstall","components","version","failedComponents","leftUnresolvedConflicts","newFromLane","newFromLaneAdded","installationError","compilationError","checkoutByCLIValues","isHead","isReset","isLatest","realFailedComponents","filter","f","unchangedLegitimately","notCheckedOutComponents","getFailureOutput","length","title","body","map","failedComponent","chalk","bold","id","toString","red","failureMessage","join","underline","getNotCheckedOutOutput","green","getConflictSummary","suggestion","conflictSummaryReport","yellow","getSuccessfulOutput","component","componentName","toStringWithoutVersion","applyVersionReport","getVerOutput","versionOutput","showVersion","componentsStr","getNewOnLaneOutput","getSummary","checkedOut","notCheckedOutLegitimately","failedToCheckOut","newLines","checkedOutStr","unchangedLegitimatelyStr","failedToCheckOutStr","newOnLaneNum","newOnLaneAddedStr","newOnLaneStr","installationErrorOutput","compilationErrorOutput"],"sources":["checkout-cmd.ts"],"sourcesContent":["import chalk from 'chalk';\nimport { Command, CommandOptions } from '@teambit/cli';\nimport {\n  ApplyVersionResults,\n  applyVersionReport,\n  conflictSummaryReport,\n  installationErrorOutput,\n  compilationErrorOutput,\n} from '@teambit/merging';\nimport { COMPONENT_PATTERN_HELP } from '@teambit/legacy/dist/constants';\nimport { getMergeStrategy } 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    [\n      'e',\n      'workspace-only',\n      'when on a lane, avoid introducing new components from the remote lane that do not exist locally',\n    ],\n    ['v', 'verbose', 'showing verbose output for inspection'],\n    ['x', '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      all = false,\n      workspaceOnly = false,\n      verbose = false,\n      skipDependencyInstallation = false,\n    }: {\n      interactiveMerge?: boolean;\n      ours?: boolean;\n      theirs?: boolean;\n      manual?: boolean;\n      all?: boolean;\n      workspaceOnly?: boolean;\n      verbose?: boolean;\n      skipDependencyInstallation?: boolean;\n    }\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      workspaceOnly,\n    };\n    const {\n      components,\n      version,\n      failedComponents,\n      leftUnresolvedConflicts,\n      newFromLane,\n      newFromLaneAdded,\n      installationError,\n      compilationError,\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. omit --workspace-only 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      installationErrorOutput(installationError) +\n      compilationErrorOutput(compilationError)\n    );\n  }\n}\n"],"mappings":"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"}

package/dist/checkout-version.d.ts

@@ -0,0 +1,75 @@
+import { Consumer } from '@teambit/legacy/dist/consumer';
+import { BitId } from '@teambit/legacy-bit-id';
+import Version from '@teambit/legacy/dist/scope/models/version';
+import { SourceFile } from '@teambit/legacy/dist/consumer/component/sources';
+import { ApplyVersionResult, MergeStrategy } from '@teambit/legacy/dist/consumer/versions-ops/merge-version';
+import { MergeResultsThreeWay } from '@teambit/legacy/dist/consumer/versions-ops/merge-version/three-way-merge';
+import ConsumerComponent from '@teambit/legacy/dist/consumer/component';
+export declare type CheckoutProps = {
+    version?: string;
+    ids?: BitId[];
+    latestVersion?: boolean;
+    promptMergeOptions?: boolean;
+    mergeStrategy?: MergeStrategy | null;
+    verbose?: boolean;
+    skipNpmInstall?: boolean;
+    ignorePackageJson?: boolean;
+    writeConfig?: boolean;
+    reset?: boolean;
+    all?: boolean;
+    ignoreDist?: boolean;
+    isLane?: boolean;
+};
+export declare type ComponentStatus = {
+    componentFromFS?: ConsumerComponent;
+    componentFromModel?: Version;
+    id: BitId;
+    failureMessage?: string;
+    unchangedLegitimately?: boolean;
+    mergeResults?: MergeResultsThreeWay | null | undefined;
+};
+declare type ApplyVersionWithComps = {
+    applyVersionResult: ApplyVersionResult;
+    component?: ConsumerComponent;
+};
+/**
+ * 1) when the files are modified with conflicts and the strategy is "ours", leave the FS as is
+ * and update only bitmap id version. (not the componentMap object).
+ *
+ * 2) when the files are modified with conflicts and the strategy is "theirs", write the component
+ * according to id.version.
+ *
+ * 3) when files are modified with no conflict or files are modified with conflicts and the
+ * strategy is manual, load the component according to id.version and update component.files.
+ * applyModifiedVersion() docs explains what files are updated/added.
+ *
+ * 4) when --reset flag is used, write the component according to the bitmap version
+ *
+ * Side note:
+ * Deleted file => if files are in used version but not in the modified one, no need to delete it. (similar to git).
+ * Added file => if files are not in used version but in the modified one, they'll be under mergeResults.addFiles
+ */
+export declare function applyVersion(consumer: Consumer, id: BitId, componentFromFS: ConsumerComponent | null | undefined, // it can be null only when isLanes is true
+mergeResults: MergeResultsThreeWay | null | undefined, checkoutProps: CheckoutProps): Promise<ApplyVersionWithComps>;
+/**
+ * relevant only when
+ * 1) there is no conflict => add files from mergeResults: addFiles, overrideFiles and modifiedFiles.output.
+ * 2) there is conflict and mergeStrategy is manual => add files from mergeResults: addFiles, overrideFiles and modifiedFiles.conflict.
+ *
+ * this function only updates the files content, it doesn't write the files
+ */
+export declare function applyModifiedVersion(componentFiles: SourceFile[], mergeResults: MergeResultsThreeWay, mergeStrategy: MergeStrategy | null | undefined): {
+    filesStatus: Record<string, any>;
+    modifiedFiles: SourceFile[];
+};
+/**
+ * when files exist on the filesystem but not on the checked out versions, they need to be deleted.
+ * this function only mark them as such. later `deleteFilesIfNeeded()` will delete them
+ */
+export declare function markFilesToBeRemovedIfNeeded(succeededComponents: ComponentStatus[], componentsResults: ApplyVersionWithComps[]): void;
+/**
+ * it's needed in case the checked out version removed files that exist on the current version.
+ * without this function, these files would be left on the filesystem.
+ */
+export declare function deleteFilesIfNeeded(componentsResults: ApplyVersionWithComps[], consumer: Consumer): Promise<void>;
+export {};

package/dist/checkout-version.js

@@ -0,0 +1,267 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+require("core-js/modules/es.array.flat.js");
+require("core-js/modules/es.array.unscopables.flat.js");
+require("core-js/modules/es.promise.js");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.applyModifiedVersion = applyModifiedVersion;
+exports.applyVersion = applyVersion;
+exports.deleteFilesIfNeeded = deleteFilesIfNeeded;
+exports.markFilesToBeRemovedIfNeeded = markFilesToBeRemovedIfNeeded;
+function _defineProperty2() {
+  const data = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+  _defineProperty2 = function () {
+    return data;
+  };
+  return data;
+}
+function _lodash() {
+  const data = require("lodash");
+  _lodash = function () {
+    return data;
+  };
+  return data;
+}
+function path() {
+  const data = _interopRequireWildcard(require("path"));
+  path = function () {
+    return data;
+  };
+  return data;
+}
+function _generalError() {
+  const data = _interopRequireDefault(require("@teambit/legacy/dist/error/general-error"));
+  _generalError = function () {
+    return data;
+  };
+  return data;
+}
+function _path2() {
+  const data = require("@teambit/legacy/dist/utils/path");
+  _path2 = function () {
+    return data;
+  };
+  return data;
+}
+function _dataToPersist() {
+  const data = _interopRequireDefault(require("@teambit/legacy/dist/consumer/component/sources/data-to-persist"));
+  _dataToPersist = function () {
+    return data;
+  };
+  return data;
+}
+function _removePath() {
+  const data = _interopRequireDefault(require("@teambit/legacy/dist/consumer/component/sources/remove-path"));
+  _removePath = function () {
+    return data;
+  };
+  return data;
+}
+function _mergeVersion() {
+  const data = require("@teambit/legacy/dist/consumer/versions-ops/merge-version");
+  _mergeVersion = function () {
+    return data;
+  };
+  return data;
+}
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+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; }
+/**
+ * 1) when the files are modified with conflicts and the strategy is "ours", leave the FS as is
+ * and update only bitmap id version. (not the componentMap object).
+ *
+ * 2) when the files are modified with conflicts and the strategy is "theirs", write the component
+ * according to id.version.
+ *
+ * 3) when files are modified with no conflict or files are modified with conflicts and the
+ * strategy is manual, load the component according to id.version and update component.files.
+ * applyModifiedVersion() docs explains what files are updated/added.
+ *
+ * 4) when --reset flag is used, write the component according to the bitmap version
+ *
+ * Side note:
+ * Deleted file => if files are in used version but not in the modified one, no need to delete it. (similar to git).
+ * Added file => if files are not in used version but in the modified one, they'll be under mergeResults.addFiles
+ */
+async function applyVersion(consumer, id, componentFromFS,
+// it can be null only when isLanes is true
+mergeResults, checkoutProps) {
+  if (!checkoutProps.isLane && !componentFromFS) throw new Error(`applyVersion expect to get componentFromFS for ${id.toString()}`);
+  const {
+    mergeStrategy
+  } = checkoutProps;
+  let filesStatus = {};
+  if (mergeResults && mergeResults.hasConflicts && mergeStrategy === _mergeVersion().MergeOptions.ours) {
+    // even when isLane is true, the mergeResults is possible only when the component is on the filesystem
+    // otherwise it's impossible to have conflicts
+    if (!componentFromFS) throw new Error(`applyVersion expect to get componentFromFS for ${id.toString()}`);
+    componentFromFS.files.forEach(file => {
+      filesStatus[(0, _path2().pathNormalizeToLinux)(file.relative)] = _mergeVersion().FileStatus.unchanged;
+    });
+    consumer.bitMap.updateComponentId(id);
+    return {
+      applyVersionResult: {
+        id,
+        filesStatus
+      }
+    };
+  }
+  const component = await consumer.loadComponentFromModelImportIfNeeded(id);
+  const componentMap = componentFromFS && componentFromFS.componentMap;
+  if (componentFromFS && !componentMap) throw new (_generalError().default)('applyVersion: componentMap was not found');
+  const files = component.files;
+  files.forEach(file => {
+    filesStatus[(0, _path2().pathNormalizeToLinux)(file.relative)] = _mergeVersion().FileStatus.updated;
+  });
+  if (mergeResults) {
+    // update files according to the merge results
+    const {
+      filesStatus: modifiedStatus,
+      modifiedFiles
+    } = applyModifiedVersion(files, mergeResults, mergeStrategy);
+    filesStatus = _objectSpread(_objectSpread({}, filesStatus), modifiedStatus);
+    component.files = modifiedFiles;
+  }
+  return {
+    applyVersionResult: {
+      id,
+      filesStatus
+    },
+    component
+  };
+}
+
+/**
+ * relevant only when
+ * 1) there is no conflict => add files from mergeResults: addFiles, overrideFiles and modifiedFiles.output.
+ * 2) there is conflict and mergeStrategy is manual => add files from mergeResults: addFiles, overrideFiles and modifiedFiles.conflict.
+ *
+ * this function only updates the files content, it doesn't write the files
+ */
+function applyModifiedVersion(componentFiles, mergeResults, mergeStrategy) {
+  let modifiedFiles = componentFiles.map(file => file.clone());
+  const filesStatus = {};
+  if (mergeResults.hasConflicts && mergeStrategy !== _mergeVersion().MergeOptions.manual) {
+    return {
+      filesStatus,
+      modifiedFiles
+    };
+  }
+  mergeResults.modifiedFiles.forEach(file => {
+    const filePath = path().normalize(file.filePath);
+    const foundFile = modifiedFiles.find(componentFile => componentFile.relative === filePath);
+    if (!foundFile) throw new (_generalError().default)(`file ${filePath} not found`);
+    if (file.conflict) {
+      foundFile.contents = Buffer.from(file.conflict);
+      filesStatus[file.filePath] = _mergeVersion().FileStatus.manual;
+    } else if (typeof file.output === 'string') {
+      foundFile.contents = Buffer.from(file.output);
+      filesStatus[file.filePath] = _mergeVersion().FileStatus.merged;
+    } else if (file.isBinaryConflict) {
+      // leave the file as is and notify the user later about it.
+      foundFile.contents = file.fsFile.contents;
+      filesStatus[file.filePath] = _mergeVersion().FileStatus.binaryConflict;
+    } else {
+      throw new (_generalError().default)(`file ${filePath} does not have output nor conflict`);
+    }
+  });
+  mergeResults.addFiles.forEach(file => {
+    const filePath = path().normalize(file.filePath);
+    if (modifiedFiles.find(m => m.relative === filePath)) return;
+    modifiedFiles.push(file.fsFile);
+    filesStatus[file.filePath] = _mergeVersion().FileStatus.added;
+  });
+  mergeResults.deletedConflictFiles.forEach(file => {
+    if (!file.fsFile) return;
+    const filePath = path().normalize(file.filePath);
+    if (modifiedFiles.find(m => m.relative === filePath)) return;
+    modifiedFiles.push(file.fsFile);
+    filesStatus[file.filePath] = _mergeVersion().FileStatus.added;
+  });
+  mergeResults.removeFiles.forEach(file => {
+    const filePath = path().normalize(file.filePath);
+    filesStatus[file.filePath] = _mergeVersion().FileStatus.removed;
+    modifiedFiles = modifiedFiles.filter(f => f.relative !== filePath);
+  });
+  mergeResults.remainDeletedFiles.forEach(file => {
+    const filePath = path().normalize(file.filePath);
+    modifiedFiles = modifiedFiles.filter(f => f.relative !== filePath);
+    filesStatus[file.filePath] = _mergeVersion().FileStatus.remainDeleted;
+  });
+  mergeResults.deletedConflictFiles.forEach(file => {
+    filesStatus[file.filePath] = _mergeVersion().FileStatus.deletedConflict;
+  });
+  mergeResults.overrideFiles.forEach(file => {
+    const filePath = path().normalize(file.filePath);
+    const foundFile = modifiedFiles.find(componentFile => componentFile.relative === filePath);
+    if (!foundFile) throw new (_generalError().default)(`file ${filePath} not found`);
+    foundFile.contents = file.fsFile.contents;
+    filesStatus[file.filePath] = _mergeVersion().FileStatus.overridden;
+  });
+  mergeResults.updatedFiles.forEach(file => {
+    const filePath = path().normalize(file.filePath);
+    const foundFile = modifiedFiles.find(componentFile => componentFile.relative === filePath);
+    if (!foundFile) throw new (_generalError().default)(`file ${filePath} not found`);
+    foundFile.contents = file.content;
+    filesStatus[file.filePath] = _mergeVersion().FileStatus.updated;
+  });
+  return {
+    filesStatus,
+    modifiedFiles
+  };
+}
+
+/**
+ * when files exist on the filesystem but not on the checked out versions, they need to be deleted.
+ * this function only mark them as such. later `deleteFilesIfNeeded()` will delete them
+ */
+function markFilesToBeRemovedIfNeeded(succeededComponents, componentsResults) {
+  const succeededComponentsByBitId = succeededComponents.reduce((accum, next) => {
+    const bitId = next.id.toString();
+    if (!accum[bitId]) accum[bitId] = next;
+    return accum;
+  }, {});
+  componentsResults.forEach(componentResult => {
+    var _succeededComponent$c;
+    const existingFilePathsFromModel = componentResult.applyVersionResult.filesStatus;
+    const bitId = componentResult.applyVersionResult.id.toString();
+    const succeededComponent = succeededComponentsByBitId[bitId];
+    const filePathsFromFS = ((_succeededComponent$c = succeededComponent.componentFromFS) === null || _succeededComponent$c === void 0 ? void 0 : _succeededComponent$c.files) || [];
+    filePathsFromFS.forEach(file => {
+      const filename = (0, _path2().pathNormalizeToLinux)(file.relative);
+      if (!existingFilePathsFromModel[filename]) {
+        // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!
+        existingFilePathsFromModel[filename] = _mergeVersion().FileStatus.removed;
+      }
+    });
+  });
+}
+
+/**
+ * it's needed in case the checked out version removed files that exist on the current version.
+ * without this function, these files would be left on the filesystem.
+ */
+async function deleteFilesIfNeeded(componentsResults, consumer) {
+  const pathsToRemoveIncludeNull = componentsResults.map(compResult => {
+    return Object.keys(compResult.applyVersionResult.filesStatus).map(filePath => {
+      if (compResult.applyVersionResult.filesStatus[filePath] === _mergeVersion().FileStatus.removed) {
+        var _compResult$component, _compResult$component2;
+        if (!((_compResult$component = compResult.component) !== null && _compResult$component !== void 0 && _compResult$component.writtenPath)) return null;
+        return path().join((_compResult$component2 = compResult.component) === null || _compResult$component2 === void 0 ? void 0 : _compResult$component2.writtenPath, filePath);
+      }
+      return null;
+    });
+  });
+  const pathsToRemove = (0, _lodash().compact)(pathsToRemoveIncludeNull.flat());
+  const dataToPersist = new (_dataToPersist().default)();
+  dataToPersist.removeManyPaths(pathsToRemove.map(p => new (_removePath().default)(p, true)));
+  dataToPersist.addBasePath(consumer.getPath());
+  await dataToPersist.persistAllToFS();
+}
+
+//# sourceMappingURL=checkout-version.js.map

package/dist/checkout-version.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["applyVersion","consumer","id","componentFromFS","mergeResults","checkoutProps","isLane","Error","toString","mergeStrategy","filesStatus","hasConflicts","MergeOptions","ours","files","forEach","file","pathNormalizeToLinux","relative","FileStatus","unchanged","bitMap","updateComponentId","applyVersionResult","component","loadComponentFromModelImportIfNeeded","componentMap","GeneralError","updated","modifiedStatus","modifiedFiles","applyModifiedVersion","componentFiles","map","clone","manual","filePath","path","normalize","foundFile","find","componentFile","conflict","contents","Buffer","from","output","merged","isBinaryConflict","fsFile","binaryConflict","addFiles","m","push","added","deletedConflictFiles","removeFiles","removed","filter","f","remainDeletedFiles","remainDeleted","deletedConflict","overrideFiles","overridden","updatedFiles","content","markFilesToBeRemovedIfNeeded","succeededComponents","componentsResults","succeededComponentsByBitId","reduce","accum","next","bitId","componentResult","existingFilePathsFromModel","succeededComponent","filePathsFromFS","filename","deleteFilesIfNeeded","pathsToRemoveIncludeNull","compResult","Object","keys","writtenPath","join","pathsToRemove","compact","flat","dataToPersist","DataToPersist","removeManyPaths","p","RemovePath","addBasePath","getPath","persistAllToFS"],"sources":["checkout-version.ts"],"sourcesContent":["import { compact } from 'lodash';\nimport * as path from 'path';\nimport { Consumer } from '@teambit/legacy/dist/consumer';\nimport { BitId } from '@teambit/legacy-bit-id';\nimport GeneralError from '@teambit/legacy/dist/error/general-error';\nimport Version from '@teambit/legacy/dist/scope/models/version';\nimport { SourceFile } from '@teambit/legacy/dist/consumer/component/sources';\nimport { pathNormalizeToLinux, PathOsBased } from '@teambit/legacy/dist/utils/path';\nimport DataToPersist from '@teambit/legacy/dist/consumer/component/sources/data-to-persist';\nimport RemovePath from '@teambit/legacy/dist/consumer/component/sources/remove-path';\nimport {\n  ApplyVersionResult,\n  FileStatus,\n  MergeOptions,\n  MergeStrategy,\n} from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport { MergeResultsThreeWay } from '@teambit/legacy/dist/consumer/versions-ops/merge-version/three-way-merge';\nimport ConsumerComponent from '@teambit/legacy/dist/consumer/component';\n\nexport type CheckoutProps = {\n  version?: string; // if reset is true, the version is undefined\n  ids?: BitId[];\n  latestVersion?: boolean;\n  promptMergeOptions?: boolean;\n  mergeStrategy?: MergeStrategy | null;\n  verbose?: boolean;\n  skipNpmInstall?: boolean;\n  ignorePackageJson?: boolean;\n  writeConfig?: boolean;\n  reset?: boolean; // remove local changes. if set, the version is undefined.\n  all?: boolean; // checkout all ids\n  ignoreDist?: boolean;\n  isLane?: boolean;\n};\nexport type ComponentStatus = {\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  mergeResults?: MergeResultsThreeWay | null | undefined;\n};\n\ntype ApplyVersionWithComps = { applyVersionResult: ApplyVersionResult; component?: ConsumerComponent };\n\n/**\n * 1) when the files are modified with conflicts and the strategy is \"ours\", leave the FS as is\n * and update only bitmap id version. (not the componentMap object).\n *\n * 2) when the files are modified with conflicts and the strategy is \"theirs\", write the component\n * according to id.version.\n *\n * 3) when files are modified with no conflict or files are modified with conflicts and the\n * strategy is manual, load the component according to id.version and update component.files.\n * applyModifiedVersion() docs explains what files are updated/added.\n *\n * 4) when --reset flag is used, write the component according to the bitmap version\n *\n * Side note:\n * Deleted file => if files are in used version but not in the modified one, no need to delete it. (similar to git).\n * Added file => if files are not in used version but in the modified one, they'll be under mergeResults.addFiles\n */\nexport async function applyVersion(\n  consumer: Consumer,\n  id: BitId,\n  componentFromFS: ConsumerComponent | null | undefined, // it can be null only when isLanes is true\n  mergeResults: MergeResultsThreeWay | null | undefined,\n  checkoutProps: CheckoutProps\n): Promise<ApplyVersionWithComps> {\n  if (!checkoutProps.isLane && !componentFromFS)\n    throw new Error(`applyVersion expect to get componentFromFS for ${id.toString()}`);\n  const { mergeStrategy } = checkoutProps;\n  let filesStatus = {};\n  if (mergeResults && mergeResults.hasConflicts && mergeStrategy === MergeOptions.ours) {\n    // even when isLane is true, the mergeResults is possible only when the component is on the filesystem\n    // otherwise it's impossible to have conflicts\n    if (!componentFromFS) throw new Error(`applyVersion expect to get componentFromFS for ${id.toString()}`);\n    componentFromFS.files.forEach((file) => {\n      filesStatus[pathNormalizeToLinux(file.relative)] = FileStatus.unchanged;\n    });\n    consumer.bitMap.updateComponentId(id);\n    return { applyVersionResult: { id, filesStatus } };\n  }\n  const component = await consumer.loadComponentFromModelImportIfNeeded(id);\n  const componentMap = componentFromFS && componentFromFS.componentMap;\n  if (componentFromFS && !componentMap) throw new GeneralError('applyVersion: componentMap was not found');\n\n  const files = component.files;\n  files.forEach((file) => {\n    filesStatus[pathNormalizeToLinux(file.relative)] = FileStatus.updated;\n  });\n  if (mergeResults) {\n    // update files according to the merge results\n    const { filesStatus: modifiedStatus, modifiedFiles } = applyModifiedVersion(files, mergeResults, mergeStrategy);\n    filesStatus = { ...filesStatus, ...modifiedStatus };\n    component.files = modifiedFiles;\n  }\n\n  return {\n    applyVersionResult: { id, filesStatus },\n    component,\n  };\n}\n\n/**\n * relevant only when\n * 1) there is no conflict => add files from mergeResults: addFiles, overrideFiles and modifiedFiles.output.\n * 2) there is conflict and mergeStrategy is manual => add files from mergeResults: addFiles, overrideFiles and modifiedFiles.conflict.\n *\n * this function only updates the files content, it doesn't write the files\n */\nexport function applyModifiedVersion(\n  componentFiles: SourceFile[],\n  mergeResults: MergeResultsThreeWay,\n  mergeStrategy: MergeStrategy | null | undefined\n): { filesStatus: Record<string, any>; modifiedFiles: SourceFile[] } {\n  let modifiedFiles = componentFiles.map((file) => file.clone());\n  const filesStatus = {};\n  if (mergeResults.hasConflicts && mergeStrategy !== MergeOptions.manual) {\n    return { filesStatus, modifiedFiles };\n  }\n  mergeResults.modifiedFiles.forEach((file) => {\n    const filePath: PathOsBased = path.normalize(file.filePath);\n    const foundFile = modifiedFiles.find((componentFile) => componentFile.relative === filePath);\n    if (!foundFile) throw new GeneralError(`file ${filePath} not found`);\n    if (file.conflict) {\n      foundFile.contents = Buffer.from(file.conflict);\n      filesStatus[file.filePath] = FileStatus.manual;\n    } else if (typeof file.output === 'string') {\n      foundFile.contents = Buffer.from(file.output);\n      filesStatus[file.filePath] = FileStatus.merged;\n    } else if (file.isBinaryConflict) {\n      // leave the file as is and notify the user later about it.\n      foundFile.contents = file.fsFile.contents;\n      filesStatus[file.filePath] = FileStatus.binaryConflict;\n    } else {\n      throw new GeneralError(`file ${filePath} does not have output nor conflict`);\n    }\n  });\n\n  mergeResults.addFiles.forEach((file) => {\n    const filePath: PathOsBased = path.normalize(file.filePath);\n    if (modifiedFiles.find((m) => m.relative === filePath)) return;\n    modifiedFiles.push(file.fsFile);\n    filesStatus[file.filePath] = FileStatus.added;\n  });\n  mergeResults.deletedConflictFiles.forEach((file) => {\n    if (!file.fsFile) return;\n    const filePath: PathOsBased = path.normalize(file.filePath);\n    if (modifiedFiles.find((m) => m.relative === filePath)) return;\n    modifiedFiles.push(file.fsFile);\n    filesStatus[file.filePath] = FileStatus.added;\n  });\n  mergeResults.removeFiles.forEach((file) => {\n    const filePath: PathOsBased = path.normalize(file.filePath);\n    filesStatus[file.filePath] = FileStatus.removed;\n    modifiedFiles = modifiedFiles.filter((f) => f.relative !== filePath);\n  });\n  mergeResults.remainDeletedFiles.forEach((file) => {\n    const filePath: PathOsBased = path.normalize(file.filePath);\n    modifiedFiles = modifiedFiles.filter((f) => f.relative !== filePath);\n    filesStatus[file.filePath] = FileStatus.remainDeleted;\n  });\n  mergeResults.deletedConflictFiles.forEach((file) => {\n    filesStatus[file.filePath] = FileStatus.deletedConflict;\n  });\n\n  mergeResults.overrideFiles.forEach((file) => {\n    const filePath: PathOsBased = path.normalize(file.filePath);\n    const foundFile = modifiedFiles.find((componentFile) => componentFile.relative === filePath);\n    if (!foundFile) throw new GeneralError(`file ${filePath} not found`);\n    foundFile.contents = file.fsFile.contents;\n    filesStatus[file.filePath] = FileStatus.overridden;\n  });\n  mergeResults.updatedFiles.forEach((file) => {\n    const filePath: PathOsBased = path.normalize(file.filePath);\n    const foundFile = modifiedFiles.find((componentFile) => componentFile.relative === filePath);\n    if (!foundFile) throw new GeneralError(`file ${filePath} not found`);\n    foundFile.contents = file.content;\n    filesStatus[file.filePath] = FileStatus.updated;\n  });\n\n  return { filesStatus, modifiedFiles };\n}\n\n/**\n * when files exist on the filesystem but not on the checked out versions, they need to be deleted.\n * this function only mark them as such. later `deleteFilesIfNeeded()` will delete them\n */\nexport function markFilesToBeRemovedIfNeeded(\n  succeededComponents: ComponentStatus[],\n  componentsResults: ApplyVersionWithComps[]\n) {\n  const succeededComponentsByBitId: { [K in string]: ComponentStatus } = succeededComponents.reduce((accum, next) => {\n    const bitId = next.id.toString();\n    if (!accum[bitId]) accum[bitId] = next;\n    return accum;\n  }, {});\n\n  componentsResults.forEach((componentResult) => {\n    const existingFilePathsFromModel = componentResult.applyVersionResult.filesStatus;\n    const bitId = componentResult.applyVersionResult.id.toString();\n    const succeededComponent = succeededComponentsByBitId[bitId];\n    const filePathsFromFS = succeededComponent.componentFromFS?.files || [];\n\n    filePathsFromFS.forEach((file) => {\n      const filename = pathNormalizeToLinux(file.relative);\n      if (!existingFilePathsFromModel[filename]) {\n        // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n        existingFilePathsFromModel[filename] = FileStatus.removed;\n      }\n    });\n  });\n}\n\n/**\n * it's needed in case the checked out version removed files that exist on the current version.\n * without this function, these files would be left on the filesystem.\n */\nexport async function deleteFilesIfNeeded(\n  componentsResults: ApplyVersionWithComps[],\n  consumer: Consumer\n): Promise<void> {\n  const pathsToRemoveIncludeNull = componentsResults.map((compResult) => {\n    return Object.keys(compResult.applyVersionResult.filesStatus).map((filePath) => {\n      if (compResult.applyVersionResult.filesStatus[filePath] === FileStatus.removed) {\n        if (!compResult.component?.writtenPath) return null;\n        return path.join(compResult.component?.writtenPath, filePath);\n      }\n      return null;\n    });\n  });\n  const pathsToRemove = compact(pathsToRemoveIncludeNull.flat());\n  const dataToPersist = new DataToPersist();\n  dataToPersist.removeManyPaths(pathsToRemove.map((p) => new RemovePath(p, true)));\n  dataToPersist.addBasePath(consumer.getPath());\n  await dataToPersist.persistAllToFS();\n}\n"],"mappings":"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"}

package/dist/checkout.main.runtime.js

@@ -86,13 +86,6 @@ function _componentWriter() {
   };
   return data;
 }
-function _checkoutVersion() {
-  const data = require("@teambit/legacy/dist/consumer/versions-ops/checkout-version");
-  _checkoutVersion = function () {
-    return data;
-  };
-  return data;
-}
 function _mergeVersion() {
   const data = require("@teambit/legacy/dist/consumer/versions-ops/merge-version");
   _mergeVersion = function () {
@@ -142,6 +135,13 @@ function _checkout() {
   };
   return data;
 }
+function _checkoutVersion() {
+  const data = require("./checkout-version");
+  _checkoutVersion = function () {
+    return data;
+  };
+  return data;
+}
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 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; }
@@ -387,6 +387,13 @@ class CheckoutMain {
     if (headVersion && currentlyUsedVersion === newVersion) {
       return returnFailure(`component ${component.id.toStringWithoutVersion()} is already at the latest version, which is ${newVersion}`, true);
     }
+    if (!reset) {
+      const divergeDataForMergePending = await componentModel.getDivergeDataForMergePending(repo);
+      const isMergePending = divergeDataForMergePending.isDiverged();
+      if (isMergePending) {
+        return returnFailure(`component is merge-pending and cannot be checked out, run "bit status" for more info`);
+      }
+    }
     const currentVersionObject = await componentModel.loadVersion(currentlyUsedVersion, repo);
     const isModified = await consumer.isComponentModified(currentVersionObject, component);
     if (!isModified && reset) {

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

@@ -1 +1 @@
-{"version":3,"names":["CheckoutMain","constructor","workspace","logger","componentWriter","importer","checkout","checkoutProps","consumer","version","ids","promptMergeOptions","syncNewComponents","importCurrentObjects","bitIds","BitIds","fromArray","map","id","_legacy","components","loadComponents","allComponentStatusBeforeMerge","Promise","all","component","getComponentStatusBeforeMergeAttempt","compsNeedMerge","filter","c","propsForMerge","compsNotNeedMerge","toImport","compStatus","idsToImport","push","changeVersion","currentlyUsedVersion","flat","scope","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","componentsLegacy","compact","newFromLane","newFromLaneAdded","head","getNewComponentsFromLane","workspaceOnly","compsNewFromLane","loadComponentFromModelImportIfNeeded","leftUnresolvedConflicts","componentWriterResults","length","manyComponentsWriterOpts","skipDependencyInstallation","skipNpmInstall","verbose","resetConfig","reset","writeMany","deleteFilesIfNeeded","appliedVersionComponents","applyVersionResult","n","toString","installationError","compilationError","checkoutByCLIValues","to","componentPattern","setStatusLine","BEFORE_CHECKOUT","OutsideWorkspaceError","makeLaneComponentsAvailableOnMain","parseValues","checkoutResults","onDestroy","notExported","hasScope","changeScope","scopeComponentsImporter","importManyDeltaWithoutDeps","fromHead","error","unavailableOnMain","getUnavailableOnMainComponents","bitMap","makeComponentsAvailableOnMain","HEAD","LATEST","latest","BitId","isValidVersion","BitError","console","idsOnWorkspace","idsByPattern","listIds","currentLane","getCurrentLaneObject","currentLaneIds","toBitIds","hasWithoutVersion","lane","laneBitIds","newIds","bitId","isEqualWithoutVersion","newComponentIds","resolveMultipleComponentIds","nonRemovedNewIds","isRemoved","isComponentRemoved","headVersion","latestVersion","repo","objects","componentModel","getModelComponentIfExist","returnFailure","msg","unmerged","unmergedComponents","getEntry","name","getNewVersion","headIncludeRemote","newVersion","hasVersion","existingBitMapId","getBitId","ignoreVersion","currentVersionObject","loadVersion","isModified","isComponentModified","versionRef","getRef","Error","componentVersion","getObject","hash","newId","componentFromModel","baseVersion","baseComponent","otherComponent","threeWayMerge","otherLabel","currentComponent","currentLabel","provider","cli","loggerMain","compWriter","createLogger","CheckoutAspect","checkoutMain","register","CheckoutCmd","CLIAspect","WorkspaceAspect","LoggerAspect","ComponentWriterAspect","ImporterAspect","MainRuntime","addRuntime"],"sources":["checkout.main.runtime.ts"],"sourcesContent":["import { CLIAspect, CLIMain, MainRuntime } from '@teambit/cli';\nimport { Logger, LoggerAspect, LoggerMain } from '@teambit/logger';\nimport WorkspaceAspect, { OutsideWorkspaceError, 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 { ApplyVersionResults } from '@teambit/merging';\nimport ImporterAspect, { ImporterMain } from '@teambit/importer';\nimport { HEAD, LATEST } from '@teambit/legacy/dist/constants';\nimport { ComponentWriterAspect, ComponentWriterMain } from '@teambit/component-writer';\nimport {\n  applyVersion,\n  markFilesToBeRemovedIfNeeded,\n  ComponentStatus,\n  deleteFilesIfNeeded,\n} from '@teambit/legacy/dist/consumer/versions-ops/checkout-version';\nimport {\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 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 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  workspaceOnly?: 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(\n    private workspace: Workspace,\n    private logger: Logger,\n    private componentWriter: ComponentWriterMain,\n    private importer: ImporterMain\n  ) {}\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    await this.importer.importCurrentObjects(); // important. among others, it fetches the remote lane object and its new components.\n    const bitIds = BitIds.fromArray(ids?.map((id) => id._legacy) || []);\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 componentsLegacy = 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.workspaceOnly) {\n        const compsNewFromLane = await Promise.all(\n          newFromLane.map((id) => consumer.loadComponentFromModelImportIfNeeded(id._legacy))\n        );\n        componentsLegacy.push(...compsNewFromLane);\n        newFromLaneAdded = true;\n      }\n    }\n\n    const leftUnresolvedConflicts = componentWithConflict && checkoutProps.mergeStrategy === 'manual';\n    let componentWriterResults;\n    if (componentsLegacy.length) {\n      const manyComponentsWriterOpts = {\n        components: componentsLegacy,\n        skipDependencyInstallation: checkoutProps.skipNpmInstall || leftUnresolvedConflicts,\n        verbose: checkoutProps.verbose,\n        resetConfig: checkoutProps.reset,\n      };\n      componentWriterResults = await this.componentWriter.writeMany(manyComponentsWriterOpts);\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      installationError: componentWriterResults?.installationError,\n      compilationError: componentWriterResults?.compilationError,\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 OutsideWorkspaceError();\n    const consumer = this.workspace.consumer;\n    if (to === 'head') await this.makeLaneComponentsAvailableOnMain();\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, if these components are really new, ignore the error`, err);\n    }\n  }\n\n  private async makeLaneComponentsAvailableOnMain() {\n    const unavailableOnMain = await this.workspace.getUnavailableOnMainComponents();\n    if (!unavailableOnMain.length) return;\n    this.workspace.bitMap.makeComponentsAvailableOnMain(unavailableOnMain);\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.workspaceOnly && !checkoutProps.head) {\n      throw new BitError(`--workspace-only flag can only be used with \"head\" (bit checkout head --workspace-only)`);\n    }\n    const idsOnWorkspace = componentPattern\n      ? await this.workspace.idsByPattern(componentPattern)\n      : await this.workspace.listIds();\n    const currentLane = await this.workspace.consumer.getCurrentLaneObject();\n    const currentLaneIds = currentLane?.toBitIds();\n    const ids = currentLaneIds\n      ? idsOnWorkspace.filter((id) => currentLaneIds.hasWithoutVersion(id._legacy))\n      : idsOnWorkspace;\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    // current lane object is up to date due to the previous `importCurrentObjects()` call\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    const nonRemovedNewIds: ComponentID[] = [];\n    await Promise.all(\n      newComponentIds.map(async (id) => {\n        const isRemoved = await this.workspace.scope.isComponentRemoved(id);\n        if (!isRemoved) nonRemovedNewIds.push(id);\n      })\n    );\n    return nonRemovedNewIds;\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, ComponentWriterAspect, ImporterAspect];\n\n  static runtime = MainRuntime;\n\n  static async provider([cli, workspace, loggerMain, compWriter, importer]: [\n    CLIMain,\n    Workspace,\n    LoggerMain,\n    ComponentWriterMain,\n    ImporterMain\n  ]) {\n    const logger = loggerMain.createLogger(CheckoutAspect.id);\n    const checkoutMain = new CheckoutMain(workspace, logger, compWriter, importer);\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","componentWriter","importer","checkout","checkoutProps","consumer","version","ids","promptMergeOptions","syncNewComponents","importCurrentObjects","bitIds","BitIds","fromArray","map","id","_legacy","components","loadComponents","allComponentStatusBeforeMerge","Promise","all","component","getComponentStatusBeforeMergeAttempt","compsNeedMerge","filter","c","propsForMerge","compsNotNeedMerge","toImport","compStatus","idsToImport","push","changeVersion","currentlyUsedVersion","flat","scope","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","componentsLegacy","compact","newFromLane","newFromLaneAdded","head","getNewComponentsFromLane","workspaceOnly","compsNewFromLane","loadComponentFromModelImportIfNeeded","leftUnresolvedConflicts","componentWriterResults","length","manyComponentsWriterOpts","skipDependencyInstallation","skipNpmInstall","verbose","resetConfig","reset","writeMany","deleteFilesIfNeeded","appliedVersionComponents","applyVersionResult","n","toString","installationError","compilationError","checkoutByCLIValues","to","componentPattern","setStatusLine","BEFORE_CHECKOUT","OutsideWorkspaceError","makeLaneComponentsAvailableOnMain","parseValues","checkoutResults","onDestroy","notExported","hasScope","changeScope","scopeComponentsImporter","importManyDeltaWithoutDeps","fromHead","error","unavailableOnMain","getUnavailableOnMainComponents","bitMap","makeComponentsAvailableOnMain","HEAD","LATEST","latest","BitId","isValidVersion","BitError","console","idsOnWorkspace","idsByPattern","listIds","currentLane","getCurrentLaneObject","currentLaneIds","toBitIds","hasWithoutVersion","lane","laneBitIds","newIds","bitId","isEqualWithoutVersion","newComponentIds","resolveMultipleComponentIds","nonRemovedNewIds","isRemoved","isComponentRemoved","headVersion","latestVersion","repo","objects","componentModel","getModelComponentIfExist","returnFailure","msg","unmerged","unmergedComponents","getEntry","name","getNewVersion","headIncludeRemote","newVersion","hasVersion","existingBitMapId","getBitId","ignoreVersion","divergeDataForMergePending","getDivergeDataForMergePending","isMergePending","isDiverged","currentVersionObject","loadVersion","isModified","isComponentModified","versionRef","getRef","Error","componentVersion","getObject","hash","newId","componentFromModel","baseVersion","baseComponent","otherComponent","threeWayMerge","otherLabel","currentComponent","currentLabel","provider","cli","loggerMain","compWriter","createLogger","CheckoutAspect","checkoutMain","register","CheckoutCmd","CLIAspect","WorkspaceAspect","LoggerAspect","ComponentWriterAspect","ImporterAspect","MainRuntime","addRuntime"],"sources":["checkout.main.runtime.ts"],"sourcesContent":["import { CLIAspect, CLIMain, MainRuntime } from '@teambit/cli';\nimport { Logger, LoggerAspect, LoggerMain } from '@teambit/logger';\nimport WorkspaceAspect, { OutsideWorkspaceError, 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 { ApplyVersionResults } from '@teambit/merging';\nimport ImporterAspect, { ImporterMain } from '@teambit/importer';\nimport { HEAD, LATEST } from '@teambit/legacy/dist/constants';\nimport { ComponentWriterAspect, ComponentWriterMain } from '@teambit/component-writer';\nimport {\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 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 ConsumerComponent from '@teambit/legacy/dist/consumer/component';\nimport { ComponentID } from '@teambit/component-id';\nimport { CheckoutCmd } from './checkout-cmd';\nimport { CheckoutAspect } from './checkout.aspect';\nimport { applyVersion, markFilesToBeRemovedIfNeeded, ComponentStatus, deleteFilesIfNeeded } from './checkout-version';\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  workspaceOnly?: 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(\n    private workspace: Workspace,\n    private logger: Logger,\n    private componentWriter: ComponentWriterMain,\n    private importer: ImporterMain\n  ) {}\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    await this.importer.importCurrentObjects(); // important. among others, it fetches the remote lane object and its new components.\n    const bitIds = BitIds.fromArray(ids?.map((id) => id._legacy) || []);\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 componentsLegacy = 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.workspaceOnly) {\n        const compsNewFromLane = await Promise.all(\n          newFromLane.map((id) => consumer.loadComponentFromModelImportIfNeeded(id._legacy))\n        );\n        componentsLegacy.push(...compsNewFromLane);\n        newFromLaneAdded = true;\n      }\n    }\n\n    const leftUnresolvedConflicts = componentWithConflict && checkoutProps.mergeStrategy === 'manual';\n    let componentWriterResults;\n    if (componentsLegacy.length) {\n      const manyComponentsWriterOpts = {\n        components: componentsLegacy,\n        skipDependencyInstallation: checkoutProps.skipNpmInstall || leftUnresolvedConflicts,\n        verbose: checkoutProps.verbose,\n        resetConfig: checkoutProps.reset,\n      };\n      componentWriterResults = await this.componentWriter.writeMany(manyComponentsWriterOpts);\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      installationError: componentWriterResults?.installationError,\n      compilationError: componentWriterResults?.compilationError,\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 OutsideWorkspaceError();\n    const consumer = this.workspace.consumer;\n    if (to === 'head') await this.makeLaneComponentsAvailableOnMain();\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, if these components are really new, ignore the error`, err);\n    }\n  }\n\n  private async makeLaneComponentsAvailableOnMain() {\n    const unavailableOnMain = await this.workspace.getUnavailableOnMainComponents();\n    if (!unavailableOnMain.length) return;\n    this.workspace.bitMap.makeComponentsAvailableOnMain(unavailableOnMain);\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.workspaceOnly && !checkoutProps.head) {\n      throw new BitError(`--workspace-only flag can only be used with \"head\" (bit checkout head --workspace-only)`);\n    }\n    const idsOnWorkspace = componentPattern\n      ? await this.workspace.idsByPattern(componentPattern)\n      : await this.workspace.listIds();\n    const currentLane = await this.workspace.consumer.getCurrentLaneObject();\n    const currentLaneIds = currentLane?.toBitIds();\n    const ids = currentLaneIds\n      ? idsOnWorkspace.filter((id) => currentLaneIds.hasWithoutVersion(id._legacy))\n      : idsOnWorkspace;\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    // current lane object is up to date due to the previous `importCurrentObjects()` call\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    const nonRemovedNewIds: ComponentID[] = [];\n    await Promise.all(\n      newComponentIds.map(async (id) => {\n        const isRemoved = await this.workspace.scope.isComponentRemoved(id);\n        if (!isRemoved) nonRemovedNewIds.push(id);\n      })\n    );\n    return nonRemovedNewIds;\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    if (!reset) {\n      const divergeDataForMergePending = await componentModel.getDivergeDataForMergePending(repo);\n      const isMergePending = divergeDataForMergePending.isDiverged();\n      if (isMergePending) {\n        return returnFailure(`component is merge-pending and cannot be checked out, run \"bit status\" for more info`);\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, ComponentWriterAspect, ImporterAspect];\n\n  static runtime = MainRuntime;\n\n  static async provider([cli, workspace, loggerMain, compWriter, importer]: [\n    CLIMain,\n    Workspace,\n    LoggerMain,\n    ComponentWriterMain,\n    ImporterMain\n  ]) {\n    const logger = loggerMain.createLogger(CheckoutAspect.id);\n    const checkoutMain = new CheckoutMain(workspace, logger, compWriter, importer);\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/dist/index.d.ts

@@ -2,3 +2,4 @@ import { CheckoutAspect } from './checkout.aspect';
 export type { CheckoutMain } from './checkout.main.runtime';
 export default CheckoutAspect;
 export { CheckoutAspect };
+export { CheckoutProps, ComponentStatus, applyModifiedVersion, applyVersion, deleteFilesIfNeeded, markFilesToBeRemovedIfNeeded, } from './checkout-version';

package/dist/index.js

@@ -9,7 +9,43 @@ Object.defineProperty(exports, "CheckoutAspect", {
     return _checkout().CheckoutAspect;
   }
 });
+Object.defineProperty(exports, "CheckoutProps", {
+  enumerable: true,
+  get: function () {
+    return _checkoutVersion().CheckoutProps;
+  }
+});
+Object.defineProperty(exports, "ComponentStatus", {
+  enumerable: true,
+  get: function () {
+    return _checkoutVersion().ComponentStatus;
+  }
+});
+Object.defineProperty(exports, "applyModifiedVersion", {
+  enumerable: true,
+  get: function () {
+    return _checkoutVersion().applyModifiedVersion;
+  }
+});
+Object.defineProperty(exports, "applyVersion", {
+  enumerable: true,
+  get: function () {
+    return _checkoutVersion().applyVersion;
+  }
+});
 exports.default = void 0;
+Object.defineProperty(exports, "deleteFilesIfNeeded", {
+  enumerable: true,
+  get: function () {
+    return _checkoutVersion().deleteFilesIfNeeded;
+  }
+});
+Object.defineProperty(exports, "markFilesToBeRemovedIfNeeded", {
+  enumerable: true,
+  get: function () {
+    return _checkoutVersion().markFilesToBeRemovedIfNeeded;
+  }
+});
 function _checkout() {
   const data = require("./checkout.aspect");
   _checkout = function () {
@@ -17,6 +53,13 @@ function _checkout() {
   };
   return data;
 }
+function _checkoutVersion() {
+  const data = require("./checkout-version");
+  _checkoutVersion = function () {
+    return data;
+  };
+  return data;
+}
 var _default = _checkout().CheckoutAspect;
 exports.default = _default;
 

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["CheckoutAspect"],"sources":["index.ts"],"sourcesContent":["import { CheckoutAspect } from './checkout.aspect';\n\nexport type { CheckoutMain } from './checkout.main.runtime';\nexport default CheckoutAspect;\nexport { CheckoutAspect };\n"],"mappings":";;;;;;;;;;;;AAAA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AAAmD,eAGpCA,0BAAc;AAAA"}
+{"version":3,"names":["CheckoutAspect"],"sources":["index.ts"],"sourcesContent":["import { CheckoutAspect } from './checkout.aspect';\n\nexport type { CheckoutMain } from './checkout.main.runtime';\nexport default CheckoutAspect;\nexport { CheckoutAspect };\n\nexport {\n  CheckoutProps,\n  ComponentStatus,\n  applyModifiedVersion,\n  applyVersion,\n  deleteFilesIfNeeded,\n  markFilesToBeRemovedIfNeeded,\n} from './checkout-version';\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AAMA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AAO4B,eAVbA,0BAAc;AAAA"}

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@teambit/checkout",
-  "version": "0.0.222",
+  "version": "0.0.224",
   "homepage": "https://bit.cloud/teambit/component/checkout",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.component",
     "name": "checkout",
-    "version": "0.0.222"
+    "version": "0.0.224"
   },
   "dependencies": {
     "chalk": "2.4.2",
@@ -14,16 +14,16 @@
     "p-map-series": "2.1.0",
     "core-js": "^3.0.0",
     "@babel/runtime": "7.20.0",
+    "@teambit/legacy-bit-id": "0.0.423",
     "@teambit/harmony": "0.4.6",
     "@teambit/component-id": "0.0.427",
-    "@teambit/legacy-bit-id": "0.0.423",
+    "@teambit/cli": "0.0.711",
+    "@teambit/merging": "0.0.370",
     "@teambit/bit-error": "0.0.402",
-    "@teambit/cli": "0.0.709",
-    "@teambit/merging": "0.0.368",
-    "@teambit/component-writer": "0.0.89",
-    "@teambit/importer": "0.0.482",
-    "@teambit/logger": "0.0.802",
-    "@teambit/workspace": "0.0.1053"
+    "@teambit/component-writer": "0.0.91",
+    "@teambit/importer": "0.0.484",
+    "@teambit/logger": "0.0.804",
+    "@teambit/workspace": "0.0.1055"
   },
   "devDependencies": {
     "@types/lodash": "4.14.165",
@@ -35,7 +35,7 @@
     "@types/testing-library__jest-dom": "5.9.5"
   },
   "peerDependencies": {
-    "@teambit/legacy": "1.0.489",
+    "@teambit/legacy": "1.0.491",
     "react": "^16.8.0 || ^17.0.0",
     "react-dom": "^16.8.0 || ^17.0.0"
   },