@teambit/checkout 1.0.138 → 1.0.140

package/dist/checkout-cmd.d.ts

@@ -17,11 +17,12 @@ export declare class CheckoutCmd implements Command {
     options: CommandOptions;
     loader: boolean;
     constructor(checkout: CheckoutMain);
-    report([to, componentPattern]: [string, string], { interactiveMerge, forceOurs, forceTheirs, autoMergeResolve, all, workspaceOnly, verbose, skipDependencyInstallation, revert, }: {
+    report([to, componentPattern]: [string, string], { interactiveMerge, forceOurs, forceTheirs, autoMergeResolve, manual, all, workspaceOnly, verbose, skipDependencyInstallation, revert, }: {
         interactiveMerge?: boolean;
         forceOurs?: boolean;
         forceTheirs?: boolean;
         autoMergeResolve?: MergeStrategy;
+        manual?: boolean;
         all?: boolean;
         workspaceOnly?: boolean;
         verbose?: boolean;

package/dist/checkout-cmd.js

@@ -12,6 +12,13 @@ function _chalk() {
   };
   return data;
 }
+function _lodash() {
+  const data = require("lodash");
+  _lodash = function () {
+    return data;
+  };
+  return data;
+}
 function _merging() {
   const data = require("@teambit/merging");
   _merging = function () {
@@ -65,7 +72,7 @@ class CheckoutCmd {
 \`bit checkout reset [component-pattern]\` => remove local modifications from the specified ids (or all components when --all is used)
 when on a lane, "checkout head" only checks out components on this lane. to update main components, run "bit lane merge main"`);
     _defineProperty(this, "alias", 'U');
-    _defineProperty(this, "options", [['i', 'interactive-merge', 'when a component is modified and the merge process found conflicts, display options to resolve them'], ['', 'auto-merge-resolve <merge-strategy>', 'in case of merge conflict, resolve according to the provided strategy: [ours, theirs, manual]'], ['a', 'all', 'all components'], ['e', 'workspace-only', "only relevant for 'bit checkout head' when on a lane. don't import components from the remote lane that are not already in the workspace"], ['v', 'verbose', 'showing verbose output for inspection'], ['x', 'skip-dependency-installation', 'do not auto-install dependencies of the imported components'], ['', 'force-ours', 'regardless of conflicts, ignore theirs changes and keep our local files intact'], ['', 'force-theirs', 'regardless of conflicts, ignore our local changes and use theirs files']]);
+    _defineProperty(this, "options", [['i', 'interactive-merge', 'when a component is modified and the merge process found conflicts, display options to resolve them'], ['', 'auto-merge-resolve <merge-strategy>', 'in case of merge conflict, resolve according to the provided strategy: [ours, theirs, manual]'], ['', 'manual', 'same as "--auto-merge-resolve manual". in case of merge conflict, write the files with the conflict markers'], ['a', 'all', 'all components'], ['e', 'workspace-only', "only relevant for 'bit checkout head' when on a lane. don't import components from the remote lane that are not already in the workspace"], ['v', 'verbose', 'showing verbose output for inspection'], ['x', 'skip-dependency-installation', 'do not auto-install dependencies of the imported components'], ['', 'force-ours', 'do not merge, preserve local files as is'], ['', 'force-theirs', 'do not merge, just overwrite with incoming files']]);
     _defineProperty(this, "loader", true);
   }
   async report([to, componentPattern], {
@@ -73,6 +80,7 @@ when on a lane, "checkout head" only checks out components on this lane. to upda
     forceOurs,
     forceTheirs,
     autoMergeResolve,
+    manual,
     all = false,
     workspaceOnly = false,
     verbose = false,
@@ -85,6 +93,7 @@ when on a lane, "checkout head" only checks out components on this lane. to upda
     if (autoMergeResolve && autoMergeResolve !== 'ours' && autoMergeResolve !== 'theirs' && autoMergeResolve !== 'manual') {
       throw new (_bitError().BitError)('--auto-merge-resolve must be one of the following: [ours, theirs, manual]');
     }
+    if (manual) autoMergeResolve = 'manual';
     if (workspaceOnly && to !== _constants().HEAD) {
       throw new (_bitError().BitError)('--workspace-only is only relevant when running "bit checkout head" on a lane');
     }
@@ -146,11 +155,11 @@ function checkoutOutput(checkoutResults, checkoutProps, alternativeTitle) {
     }
     const title = 'checkout was not required for the following component(s)';
     const body = notCheckedOutComponents.map(failedComponent => `${failedComponent.id.toString()} - ${failedComponent.unchangedMessage}`).join('\n');
-    return `${_chalk().default.underline(title)}\n${body}\n\n`;
+    return `${_chalk().default.underline(title)}\n${body}`;
   };
   const getConflictSummary = () => {
     if (!components || !components.length || !leftUnresolvedConflicts) return '';
-    const title = `\n\nfiles with conflicts summary\n`;
+    const title = `files with conflicts summary\n`;
     const suggestion = `\n\nfix the conflicts above manually and then run "bit install".
 once ready, snap/tag the components to persist the changes`;
     const conflictSummary = (0, _merging().conflictSummaryReport)(components);
@@ -190,21 +199,20 @@ once ready, snap/tag the components to persist the changes`;
     if (!newFromLane?.length) return '';
     const title = newFromLaneAdded ? `successfully added the following components from the lane` : `the following components exist on the lane but were not added to the workspace. omit --workspace-only flag to add them`;
     const body = newFromLane.join('\n');
-    return `\n\n${_chalk().default.underline(title)}\n${body}`;
+    return `${_chalk().default.underline(title)}\n${body}`;
   };
   const getSummary = () => {
     const checkedOut = components?.length || 0;
     const notCheckedOutLegitimately = notCheckedOutComponents.length;
-    const newLines = '\n\n';
     const title = _chalk().default.bold.underline('Summary');
     const checkedOutStr = `\nTotal Changed: ${_chalk().default.bold(checkedOut.toString())}`;
     const unchangedLegitimatelyStr = `\nTotal Unchanged: ${_chalk().default.bold(notCheckedOutLegitimately.toString())}`;
     const newOnLaneNum = newFromLane?.length || 0;
     const newOnLaneAddedStr = newFromLaneAdded ? ' (added)' : ' (not added)';
     const newOnLaneStr = newOnLaneNum ? `\nNew on lane${newOnLaneAddedStr}: ${_chalk().default.bold(newOnLaneNum.toString())}` : '';
-    return newLines + title + checkedOutStr + unchangedLegitimatelyStr + newOnLaneStr;
+    return title + checkedOutStr + unchangedLegitimatelyStr + newOnLaneStr;
   };
-  return getNotCheckedOutOutput() + getSuccessfulOutput() + (0, _merging().getRemovedOutput)(removedComponents) + (0, _merging().getAddedOutput)(addedComponents) + getNewOnLaneOutput() + getConflictSummary() + getSummary() + (0, _merging().installationErrorOutput)(installationError) + (0, _merging().compilationErrorOutput)(compilationError);
+  return (0, _lodash().compact)([getNotCheckedOutOutput(), getSuccessfulOutput(), (0, _merging().getRemovedOutput)(removedComponents), (0, _merging().getAddedOutput)(addedComponents), getNewOnLaneOutput(), getConflictSummary(), getSummary(), (0, _merging().installationErrorOutput)(installationError), (0, _merging().compilationErrorOutput)(compilationError)]).join('\n\n');
 }
 
 //# sourceMappingURL=checkout-cmd.js.map

package/dist/checkout-cmd.js.map

@@ -1 +1 @@
-{"version":3,"names":["_chalk","data","_interopRequireDefault","require","_merging","_constants","_componentId","_bitError","obj","__esModule","default","_defineProperty","key","value","_toPropertyKey","Object","defineProperty","enumerable","configurable","writable","t","i","_toPrimitive","String","r","e","Symbol","toPrimitive","call","TypeError","Number","CheckoutCmd","constructor","checkout","name","description","COMPONENT_PATTERN_HELP","report","to","componentPattern","interactiveMerge","forceOurs","forceTheirs","autoMergeResolve","all","workspaceOnly","verbose","skipDependencyInstallation","revert","BitError","HEAD","checkoutProps","promptMergeOptions","mergeStrategy","isLane","skipNpmInstall","head","LATEST","latest","reset","main","ComponentID","isValidVersion","version","checkoutResults","checkoutByCLIValues","checkoutOutput","exports","alternativeTitle","components","failedComponents","removedComponents","addedComponents","leftUnresolvedConflicts","newFromLane","newFromLaneAdded","installationError","compilationError","realFailedComponents","filter","f","unchangedLegitimately","length","Error","notCheckedOutComponents","getNotCheckedOutOutput","chalk","green","bold","toString","title","body","map","failedComponent","id","unchangedMessage","join","underline","getConflictSummary","suggestion","conflictSummary","conflictSummaryReport","conflictStr","yellow","getSuccessfulOutput","newLine","switchedOrReverted","component","componentName","toStringWithoutVersion","applyVersionReport","getVerOutput","versionOutput","showVersion","getNewOnLaneOutput","getSummary","checkedOut","notCheckedOutLegitimately","newLines","checkedOutStr","unchangedLegitimatelyStr","newOnLaneNum","newOnLaneAddedStr","newOnLaneStr","getRemovedOutput","getAddedOutput","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  getRemovedOutput,\n  getAddedOutput,\n} from '@teambit/merging';\nimport { COMPONENT_PATTERN_HELP, HEAD, LATEST } from '@teambit/legacy/dist/constants';\nimport { MergeStrategy } from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport { ComponentID } from '@teambit/component-id';\nimport { BitError } from '@teambit/bit-error';\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 = 'reference/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 (use --latest if you only want semver tags), 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)\nwhen on a lane, \"checkout head\" only checks out components on this lane. to update main components, run \"bit lane merge main\"`;\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    [\n      '',\n      'auto-merge-resolve <merge-strategy>',\n      'in case of merge conflict, resolve according to the provided strategy: [ours, theirs, manual]',\n    ],\n    ['a', 'all', 'all components'],\n    [\n      'e',\n      'workspace-only',\n      \"only relevant for 'bit checkout head' when on a lane. don't import components from the remote lane that are not already in the workspace\",\n    ],\n    ['v', 'verbose', 'showing verbose output for inspection'],\n    ['x', 'skip-dependency-installation', 'do not auto-install dependencies of the imported components'],\n    ['', 'force-ours', 'regardless of conflicts, ignore theirs changes and keep our local files intact'],\n    ['', 'force-theirs', 'regardless of conflicts, ignore our local changes and use theirs files'],\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      forceOurs,\n      forceTheirs,\n      autoMergeResolve,\n      all = false,\n      workspaceOnly = false,\n      verbose = false,\n      skipDependencyInstallation = false,\n      revert = false,\n    }: {\n      interactiveMerge?: boolean;\n      forceOurs?: boolean;\n      forceTheirs?: boolean;\n      autoMergeResolve?: MergeStrategy;\n      all?: boolean;\n      workspaceOnly?: boolean;\n      verbose?: boolean;\n      skipDependencyInstallation?: boolean;\n      revert?: boolean;\n    }\n  ) {\n    if (forceOurs && forceTheirs) {\n      throw new BitError('please use either --force-ours or --force-theirs, not both');\n    }\n    if (\n      autoMergeResolve &&\n      autoMergeResolve !== 'ours' &&\n      autoMergeResolve !== 'theirs' &&\n      autoMergeResolve !== 'manual'\n    ) {\n      throw new BitError('--auto-merge-resolve must be one of the following: [ours, theirs, manual]');\n    }\n    if (workspaceOnly && to !== HEAD) {\n      throw new BitError('--workspace-only is only relevant when running \"bit checkout head\" on a lane');\n    }\n    const checkoutProps: CheckoutProps = {\n      promptMergeOptions: interactiveMerge,\n      mergeStrategy: autoMergeResolve,\n      all,\n      verbose,\n      isLane: false,\n      skipNpmInstall: skipDependencyInstallation,\n      workspaceOnly,\n      revert,\n      forceOurs,\n      forceTheirs,\n    };\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 if (to === 'main') checkoutProps.main = true;\n    else {\n      if (!ComponentID.isValidVersion(to)) throw new BitError(`the specified version \"${to}\" is not a valid version`);\n      checkoutProps.version = to;\n    }\n\n    const checkoutResults = await this.checkout.checkoutByCLIValues(componentPattern || '', checkoutProps);\n    return checkoutOutput(checkoutResults, checkoutProps);\n  }\n}\n\nexport function checkoutOutput(\n  checkoutResults: ApplyVersionResults,\n  checkoutProps: CheckoutProps,\n  alternativeTitle?: string\n) {\n  const {\n    components,\n    version,\n    failedComponents,\n    removedComponents,\n    addedComponents,\n    leftUnresolvedConflicts,\n    newFromLane,\n    newFromLaneAdded,\n    installationError,\n    compilationError,\n  }: ApplyVersionResults = checkoutResults;\n\n  const { head, reset, latest, main, revert, verbose, all } = checkoutProps;\n\n  // components that failed for no legitimate reason. e.g. merge-conflict.\n  const realFailedComponents = (failedComponents || []).filter((f) => !f.unchangedLegitimately);\n  if (realFailedComponents.length) {\n    throw new Error('checkout should throw in case of errors');\n  }\n  // components that weren't checked out for legitimate reasons, e.g. up-to-date.\n  const notCheckedOutComponents = failedComponents || [];\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 = 'checkout was not required for the following component(s)';\n    const body = notCheckedOutComponents\n      .map((failedComponent) => `${failedComponent.id.toString()} - ${failedComponent.unchangedMessage}`)\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\".\nonce ready, snap/tag the components to persist the changes`;\n    const conflictSummary = conflictSummaryReport(components);\n    return chalk.underline(title) + conflictSummary.conflictStr + chalk.yellow(suggestion);\n  };\n  const getSuccessfulOutput = () => {\n    if (!components || !components.length) return '';\n    const newLine = '\\n';\n    const switchedOrReverted = revert ? 'reverted' : 'switched';\n    if (components.length === 1) {\n      const component = components[0];\n      const componentName = reset ? component.id.toString() : component.id.toStringWithoutVersion();\n      if (reset) return `successfully reset ${chalk.bold(componentName)}\\n`;\n      const title =\n        alternativeTitle ||\n        `successfully ${switchedOrReverted} ${chalk.bold(componentName)} to version ${chalk.bold(\n          // @ts-ignore version is defined when !reset\n          head || latest ? component.id.version : version\n        )}`;\n      return chalk.bold(title) + newLine + applyVersionReport(components, false);\n    }\n    if (reset) {\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 (head) return 'their head version';\n      if (latest) return 'their latest version';\n      if (main) return 'their main version';\n      // @ts-ignore version is defined when !reset\n      return `version ${chalk.bold(version)}`;\n    };\n    const versionOutput = getVerOutput();\n    const title =\n      alternativeTitle || `successfully ${switchedOrReverted} ${components.length} components to ${versionOutput}`;\n    const showVersion = head || reset;\n    return chalk.bold(title) + newLine + applyVersionReport(components, true, showVersion);\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 exist on the lane but were not added to the workspace. 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 newLines = '\\n\\n';\n    const title = chalk.bold.underline('Summary');\n    const checkedOutStr = `\\nTotal Changed: ${chalk.bold(checkedOut.toString())}`;\n    const unchangedLegitimatelyStr = `\\nTotal Unchanged: ${chalk.bold(notCheckedOutLegitimately.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 + newOnLaneStr;\n  };\n\n  return (\n    getNotCheckedOutOutput() +\n    getSuccessfulOutput() +\n    getRemovedOutput(removedComponents) +\n    getAddedOutput(addedComponents) +\n    getNewOnLaneOutput() +\n    getConflictSummary() +\n    getSummary() +\n    installationErrorOutput(installationError) +\n    compilationErrorOutput(compilationError)\n  );\n}\n"],"mappings":"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"}
+{"version":3,"names":["_chalk","data","_interopRequireDefault","require","_lodash","_merging","_constants","_componentId","_bitError","obj","__esModule","default","_defineProperty","key","value","_toPropertyKey","Object","defineProperty","enumerable","configurable","writable","t","i","_toPrimitive","String","r","e","Symbol","toPrimitive","call","TypeError","Number","CheckoutCmd","constructor","checkout","name","description","COMPONENT_PATTERN_HELP","report","to","componentPattern","interactiveMerge","forceOurs","forceTheirs","autoMergeResolve","manual","all","workspaceOnly","verbose","skipDependencyInstallation","revert","BitError","HEAD","checkoutProps","promptMergeOptions","mergeStrategy","isLane","skipNpmInstall","head","LATEST","latest","reset","main","ComponentID","isValidVersion","version","checkoutResults","checkoutByCLIValues","checkoutOutput","exports","alternativeTitle","components","failedComponents","removedComponents","addedComponents","leftUnresolvedConflicts","newFromLane","newFromLaneAdded","installationError","compilationError","realFailedComponents","filter","f","unchangedLegitimately","length","Error","notCheckedOutComponents","getNotCheckedOutOutput","chalk","green","bold","toString","title","body","map","failedComponent","id","unchangedMessage","join","underline","getConflictSummary","suggestion","conflictSummary","conflictSummaryReport","conflictStr","yellow","getSuccessfulOutput","newLine","switchedOrReverted","component","componentName","toStringWithoutVersion","applyVersionReport","getVerOutput","versionOutput","showVersion","getNewOnLaneOutput","getSummary","checkedOut","notCheckedOutLegitimately","checkedOutStr","unchangedLegitimatelyStr","newOnLaneNum","newOnLaneAddedStr","newOnLaneStr","compact","getRemovedOutput","getAddedOutput","installationErrorOutput","compilationErrorOutput"],"sources":["checkout-cmd.ts"],"sourcesContent":["import chalk from 'chalk';\nimport { Command, CommandOptions } from '@teambit/cli';\nimport { compact } from 'lodash';\nimport {\n  ApplyVersionResults,\n  applyVersionReport,\n  conflictSummaryReport,\n  installationErrorOutput,\n  compilationErrorOutput,\n  getRemovedOutput,\n  getAddedOutput,\n} from '@teambit/merging';\nimport { COMPONENT_PATTERN_HELP, HEAD, LATEST } from '@teambit/legacy/dist/constants';\nimport { MergeStrategy } from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport { ComponentID } from '@teambit/component-id';\nimport { BitError } from '@teambit/bit-error';\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 = 'reference/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 (use --latest if you only want semver tags), 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)\nwhen on a lane, \"checkout head\" only checks out components on this lane. to update main components, run \"bit lane merge main\"`;\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    [\n      '',\n      'auto-merge-resolve <merge-strategy>',\n      'in case of merge conflict, resolve according to the provided strategy: [ours, theirs, manual]',\n    ],\n    [\n      '',\n      'manual',\n      'same as \"--auto-merge-resolve manual\". in case of merge conflict, write the files with the conflict markers',\n    ],\n    ['a', 'all', 'all components'],\n    [\n      'e',\n      'workspace-only',\n      \"only relevant for 'bit checkout head' when on a lane. don't import components from the remote lane that are not already in the workspace\",\n    ],\n    ['v', 'verbose', 'showing verbose output for inspection'],\n    ['x', 'skip-dependency-installation', 'do not auto-install dependencies of the imported components'],\n    ['', 'force-ours', 'do not merge, preserve local files as is'],\n    ['', 'force-theirs', 'do not merge, just overwrite with incoming files'],\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      forceOurs,\n      forceTheirs,\n      autoMergeResolve,\n      manual,\n      all = false,\n      workspaceOnly = false,\n      verbose = false,\n      skipDependencyInstallation = false,\n      revert = false,\n    }: {\n      interactiveMerge?: boolean;\n      forceOurs?: boolean;\n      forceTheirs?: boolean;\n      autoMergeResolve?: MergeStrategy;\n      manual?: boolean;\n      all?: boolean;\n      workspaceOnly?: boolean;\n      verbose?: boolean;\n      skipDependencyInstallation?: boolean;\n      revert?: boolean;\n    }\n  ) {\n    if (forceOurs && forceTheirs) {\n      throw new BitError('please use either --force-ours or --force-theirs, not both');\n    }\n    if (\n      autoMergeResolve &&\n      autoMergeResolve !== 'ours' &&\n      autoMergeResolve !== 'theirs' &&\n      autoMergeResolve !== 'manual'\n    ) {\n      throw new BitError('--auto-merge-resolve must be one of the following: [ours, theirs, manual]');\n    }\n    if (manual) autoMergeResolve = 'manual';\n    if (workspaceOnly && to !== HEAD) {\n      throw new BitError('--workspace-only is only relevant when running \"bit checkout head\" on a lane');\n    }\n    const checkoutProps: CheckoutProps = {\n      promptMergeOptions: interactiveMerge,\n      mergeStrategy: autoMergeResolve,\n      all,\n      verbose,\n      isLane: false,\n      skipNpmInstall: skipDependencyInstallation,\n      workspaceOnly,\n      revert,\n      forceOurs,\n      forceTheirs,\n    };\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 if (to === 'main') checkoutProps.main = true;\n    else {\n      if (!ComponentID.isValidVersion(to)) throw new BitError(`the specified version \"${to}\" is not a valid version`);\n      checkoutProps.version = to;\n    }\n\n    const checkoutResults = await this.checkout.checkoutByCLIValues(componentPattern || '', checkoutProps);\n    return checkoutOutput(checkoutResults, checkoutProps);\n  }\n}\n\nexport function checkoutOutput(\n  checkoutResults: ApplyVersionResults,\n  checkoutProps: CheckoutProps,\n  alternativeTitle?: string\n) {\n  const {\n    components,\n    version,\n    failedComponents,\n    removedComponents,\n    addedComponents,\n    leftUnresolvedConflicts,\n    newFromLane,\n    newFromLaneAdded,\n    installationError,\n    compilationError,\n  }: ApplyVersionResults = checkoutResults;\n\n  const { head, reset, latest, main, revert, verbose, all } = checkoutProps;\n\n  // components that failed for no legitimate reason. e.g. merge-conflict.\n  const realFailedComponents = (failedComponents || []).filter((f) => !f.unchangedLegitimately);\n  if (realFailedComponents.length) {\n    throw new Error('checkout should throw in case of errors');\n  }\n  // components that weren't checked out for legitimate reasons, e.g. up-to-date.\n  const notCheckedOutComponents = failedComponents || [];\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 = 'checkout was not required for the following component(s)';\n    const body = notCheckedOutComponents\n      .map((failedComponent) => `${failedComponent.id.toString()} - ${failedComponent.unchangedMessage}`)\n      .join('\\n');\n    return `${chalk.underline(title)}\\n${body}`;\n  };\n  const getConflictSummary = () => {\n    if (!components || !components.length || !leftUnresolvedConflicts) return '';\n    const title = `files with conflicts summary\\n`;\n    const suggestion = `\\n\\nfix the conflicts above manually and then run \"bit install\".\nonce ready, snap/tag the components to persist the changes`;\n    const conflictSummary = conflictSummaryReport(components);\n    return chalk.underline(title) + conflictSummary.conflictStr + chalk.yellow(suggestion);\n  };\n  const getSuccessfulOutput = () => {\n    if (!components || !components.length) return '';\n    const newLine = '\\n';\n    const switchedOrReverted = revert ? 'reverted' : 'switched';\n    if (components.length === 1) {\n      const component = components[0];\n      const componentName = reset ? component.id.toString() : component.id.toStringWithoutVersion();\n      if (reset) return `successfully reset ${chalk.bold(componentName)}\\n`;\n      const title =\n        alternativeTitle ||\n        `successfully ${switchedOrReverted} ${chalk.bold(componentName)} to version ${chalk.bold(\n          // @ts-ignore version is defined when !reset\n          head || latest ? component.id.version : version\n        )}`;\n      return chalk.bold(title) + newLine + applyVersionReport(components, false);\n    }\n    if (reset) {\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 (head) return 'their head version';\n      if (latest) return 'their latest version';\n      if (main) return 'their main version';\n      // @ts-ignore version is defined when !reset\n      return `version ${chalk.bold(version)}`;\n    };\n    const versionOutput = getVerOutput();\n    const title =\n      alternativeTitle || `successfully ${switchedOrReverted} ${components.length} components to ${versionOutput}`;\n    const showVersion = head || reset;\n    return chalk.bold(title) + newLine + applyVersionReport(components, true, showVersion);\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 exist on the lane but were not added to the workspace. omit --workspace-only flag to add them`;\n    const body = newFromLane.join('\\n');\n    return `${chalk.underline(title)}\\n${body}`;\n  };\n  const getSummary = () => {\n    const checkedOut = components?.length || 0;\n    const notCheckedOutLegitimately = notCheckedOutComponents.length;\n    const title = chalk.bold.underline('Summary');\n    const checkedOutStr = `\\nTotal Changed: ${chalk.bold(checkedOut.toString())}`;\n    const unchangedLegitimatelyStr = `\\nTotal Unchanged: ${chalk.bold(notCheckedOutLegitimately.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 title + checkedOutStr + unchangedLegitimatelyStr + newOnLaneStr;\n  };\n\n  return compact([\n    getNotCheckedOutOutput(),\n    getSuccessfulOutput(),\n    getRemovedOutput(removedComponents),\n    getAddedOutput(addedComponents),\n    getNewOnLaneOutput(),\n    getConflictSummary(),\n    getSummary(),\n    installationErrorOutput(installationError),\n    compilationErrorOutput(compilationError),\n  ]).join('\\n\\n');\n}\n"],"mappings":"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"}

package/dist/checkout-version.d.ts

@@ -53,7 +53,7 @@ export declare function updateFileStatus(files: SourceFile[], filesStatus: Files
  * this needs to be done *before* the component is written to the filesystem, otherwise, it won't work when a file
  * has a case change. e.g. from uppercase to lowercase. (see merge-lane.e2e 'renaming files from uppercase to lowercase').
  */
-export declare function removeFilesIfNeeded(filesStatus: FilesStatus, componentFromFS?: ConsumerComponent): Promise<void>;
+export declare function removeFilesIfNeeded(filesStatus: FilesStatus, consumer: Consumer, componentFromFS?: ConsumerComponent): Promise<void>;
 /**
  * relevant only when
  * 1) there is no conflict => add files from mergeResults: addFiles, overrideFiles and modifiedFiles.output.

package/dist/checkout-version.js

@@ -122,7 +122,7 @@ mergeResults, checkoutProps) {
   if (componentFromFS && !componentMap) throw new (_generalError().default)('applyVersion: componentMap was not found');
   const files = component.files;
   updateFileStatus(files, filesStatus, componentFromFS || undefined);
-  await removeFilesIfNeeded(filesStatus, componentFromFS || undefined);
+  await removeFilesIfNeeded(filesStatus, consumer, componentFromFS || undefined);
   if (mergeResults) {
     // update files according to the merge results
     const {
@@ -159,8 +159,14 @@ function updateFileStatus(files, filesStatus, componentFromFS) {
  * this needs to be done *before* the component is written to the filesystem, otherwise, it won't work when a file
  * has a case change. e.g. from uppercase to lowercase. (see merge-lane.e2e 'renaming files from uppercase to lowercase').
  */
-async function removeFilesIfNeeded(filesStatus, componentFromFS) {
+async function removeFilesIfNeeded(filesStatus, consumer, componentFromFS) {
   if (!componentFromFS) return;
+  // @todo: if the component is not in the FS, it should be passed as undefined here.
+  // in the case this is coming from merge-lane, it's sometimes populated from the scope.
+  const isExistOnFs = consumer.bitMap.getComponentIdIfExist(componentFromFS.id, {
+    ignoreVersion: true
+  });
+  if (!isExistOnFs) return;
   const filePathsFromFS = componentFromFS.files || [];
   const dataToPersist = new (_dataToPersist().default)();
   filePathsFromFS.forEach(file => {

package/dist/checkout-version.js.map

@@ -1 +1 @@
-{"version":3,"names":["path","data","_interopRequireWildcard","require","_generalError","_interopRequireDefault","_path2","_dataToPersist","_removePath","_mergeVersion","_bitError","_chalk","obj","__esModule","default","_getRequireWildcardCache","e","WeakMap","r","t","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","ownKeys","keys","getOwnPropertySymbols","o","filter","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","key","value","_toPropertyKey","configurable","writable","_toPrimitive","String","Symbol","toPrimitive","TypeError","Number","applyVersion","consumer","id","componentFromFS","mergeResults","checkoutProps","isLane","Error","toString","mergeStrategy","forceOurs","filesStatus","hasConflicts","MergeOptions","ours","files","file","pathNormalizeToLinux","relative","FileStatus","unchanged","bitMap","updateComponentId","applyVersionResult","component","loadComponentFromModelImportIfNeeded","componentMap","GeneralError","updateFileStatus","undefined","removeFilesIfNeeded","modifiedStatus","modifiedFiles","applyModifiedVersion","fileFromFs","find","f","areFilesEqual","Buffer","compare","contents","updated","filePathsFromFS","dataToPersist","DataToPersist","filename","removed","removePath","RemovePath","persistAllToFS","componentFiles","map","clone","manual","filePath","normalize","foundFile","componentFile","conflict","from","output","merged","isBinaryConflict","fsFile","binaryConflict","addFiles","m","added","deletedConflictFiles","removeFiles","remainDeletedFiles","remainDeleted","deletedConflict","overrideFiles","overridden","updatedFiles","content","throwForFailures","allComponentsStatus","failedComponents","c","unchangedMessage","unchangedLegitimately","failureMsgs","failedComponent","chalk","bold","red","join","BitError"],"sources":["checkout-version.ts"],"sourcesContent":["import * as path from 'path';\nimport { Consumer } from '@teambit/legacy/dist/consumer';\nimport { ComponentID } from '@teambit/component-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 { FileStatus, MergeOptions, MergeStrategy } 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';\nimport { BitError } from '@teambit/bit-error';\nimport chalk from 'chalk';\nimport { ApplyVersionResult, FilesStatus } from '@teambit/merging';\nimport { CheckoutProps } from './checkout.main.runtime';\n\nexport type ComponentStatusBase = {\n  currentComponent?: ConsumerComponent;\n  componentFromModel?: Version;\n  id: ComponentID;\n  shouldBeRemoved?: boolean; // in case the component is soft-removed, it should be removed from the workspace\n  unchangedMessage?: string; // this gets populated either upon skip or failure.\n  unchangedLegitimately?: boolean; // true for skipped legitimately (e.g. already up to date). false for failure.\n};\n\nexport type ComponentStatus = ComponentStatusBase & {\n  mergeResults?: MergeResultsThreeWay | null | undefined;\n};\n\nexport type ApplyVersionWithComps = {\n  applyVersionResult: ApplyVersionResult;\n  component?: ConsumerComponent;\n  // in case the component needs to be written to the filesystem, this is the component to write.\n  legacyCompToWrite?: ConsumerComponent;\n};\n\n/**\n * This function optionally returns \"component\" object. If it returns, it means it needs to be written to the filesystem.\n * Otherwise, it means the component is already up to date and no need to write it.\n *\n * If no need to change anything (ours), then don't return the component object.\n * Otherwise, either return the component object as is (if no conflicts or \"theirs\"), or change the files in this\n * component object. Later, this component object is written to the filesystem.\n *\n * 1) when the files are modified with conflicts and the strategy is \"ours\", or forceOurs was used, leave the FS as is.\n *\n * 2) when the files are modified with conflicts and the strategy is \"theirs\", or forceTheirs was used, write the\n * component according to \"component\" object\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 * 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: ComponentID,\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, forceOurs } = checkoutProps;\n  let filesStatus = {};\n  if ((mergeResults?.hasConflicts && mergeStrategy === MergeOptions.ours) || forceOurs) {\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  updateFileStatus(files, filesStatus, componentFromFS || undefined);\n\n  await removeFilesIfNeeded(filesStatus, componentFromFS || undefined);\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  // in case of forceTheirs, the mergeResults is undefined, the \"component\" object is according to \"theirs\", so it'll work\n  // expected. (later, it writes the component object).\n\n  return {\n    applyVersionResult: { id, filesStatus },\n    component,\n  };\n}\n\nexport function updateFileStatus(files: SourceFile[], filesStatus: FilesStatus, componentFromFS?: ConsumerComponent) {\n  files.forEach((file) => {\n    const fileFromFs = componentFromFS?.files.find((f) => f.relative === file.relative);\n    const areFilesEqual = fileFromFs && Buffer.compare(fileFromFs.contents, file.contents) === 0;\n    // @ts-ignore\n    filesStatus[pathNormalizeToLinux(file.relative)] = areFilesEqual ? FileStatus.unchanged : FileStatus.updated;\n  });\n}\n\n/**\n * when files exist on the filesystem but not on the checked out versions, they need to be deleted.\n * without this function, these files would be left on the filesystem. (we don't delete the comp-dir before writing).\n * this needs to be done *before* the component is written to the filesystem, otherwise, it won't work when a file\n * has a case change. e.g. from uppercase to lowercase. (see merge-lane.e2e 'renaming files from uppercase to lowercase').\n */\nexport async function removeFilesIfNeeded(filesStatus: FilesStatus, componentFromFS?: ConsumerComponent) {\n  if (!componentFromFS) return;\n  const filePathsFromFS = componentFromFS.files || [];\n  const dataToPersist = new DataToPersist();\n  filePathsFromFS.forEach((file) => {\n    const filename = pathNormalizeToLinux(file.relative);\n    if (!filesStatus[filename]) {\n      // @ts-ignore todo: typescript has a good point here. it should be the string \"removed\", not chalk.green(removed).\n      filesStatus[filename] = FileStatus.removed;\n      dataToPersist.removePath(new RemovePath(file.path));\n    }\n  });\n  await dataToPersist.persistAllToFS();\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\nexport function throwForFailures(allComponentsStatus: ComponentStatusBase[]) {\n  const failedComponents = allComponentsStatus.filter((c) => c.unchangedMessage && !c.unchangedLegitimately);\n  if (failedComponents.length) {\n    const failureMsgs = failedComponents\n      .map(\n        (failedComponent) =>\n          `${chalk.bold(failedComponent.id.toString())} - ${chalk.red(failedComponent.unchangedMessage as string)}`\n      )\n      .join('\\n');\n    throw new BitError(`unable to proceed due to the following failures:\\n${failureMsgs}`);\n  }\n}\n"],"mappings":"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"}
+{"version":3,"names":["path","data","_interopRequireWildcard","require","_generalError","_interopRequireDefault","_path2","_dataToPersist","_removePath","_mergeVersion","_bitError","_chalk","obj","__esModule","default","_getRequireWildcardCache","e","WeakMap","r","t","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","ownKeys","keys","getOwnPropertySymbols","o","filter","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","key","value","_toPropertyKey","configurable","writable","_toPrimitive","String","Symbol","toPrimitive","TypeError","Number","applyVersion","consumer","id","componentFromFS","mergeResults","checkoutProps","isLane","Error","toString","mergeStrategy","forceOurs","filesStatus","hasConflicts","MergeOptions","ours","files","file","pathNormalizeToLinux","relative","FileStatus","unchanged","bitMap","updateComponentId","applyVersionResult","component","loadComponentFromModelImportIfNeeded","componentMap","GeneralError","updateFileStatus","undefined","removeFilesIfNeeded","modifiedStatus","modifiedFiles","applyModifiedVersion","fileFromFs","find","f","areFilesEqual","Buffer","compare","contents","updated","isExistOnFs","getComponentIdIfExist","ignoreVersion","filePathsFromFS","dataToPersist","DataToPersist","filename","removed","removePath","RemovePath","persistAllToFS","componentFiles","map","clone","manual","filePath","normalize","foundFile","componentFile","conflict","from","output","merged","isBinaryConflict","fsFile","binaryConflict","addFiles","m","added","deletedConflictFiles","removeFiles","remainDeletedFiles","remainDeleted","deletedConflict","overrideFiles","overridden","updatedFiles","content","throwForFailures","allComponentsStatus","failedComponents","c","unchangedMessage","unchangedLegitimately","failureMsgs","failedComponent","chalk","bold","red","join","BitError"],"sources":["checkout-version.ts"],"sourcesContent":["import * as path from 'path';\nimport { Consumer } from '@teambit/legacy/dist/consumer';\nimport { ComponentID } from '@teambit/component-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 { FileStatus, MergeOptions, MergeStrategy } 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';\nimport { BitError } from '@teambit/bit-error';\nimport chalk from 'chalk';\nimport { ApplyVersionResult, FilesStatus } from '@teambit/merging';\nimport { CheckoutProps } from './checkout.main.runtime';\n\nexport type ComponentStatusBase = {\n  currentComponent?: ConsumerComponent;\n  componentFromModel?: Version;\n  id: ComponentID;\n  shouldBeRemoved?: boolean; // in case the component is soft-removed, it should be removed from the workspace\n  unchangedMessage?: string; // this gets populated either upon skip or failure.\n  unchangedLegitimately?: boolean; // true for skipped legitimately (e.g. already up to date). false for failure.\n};\n\nexport type ComponentStatus = ComponentStatusBase & {\n  mergeResults?: MergeResultsThreeWay | null | undefined;\n};\n\nexport type ApplyVersionWithComps = {\n  applyVersionResult: ApplyVersionResult;\n  component?: ConsumerComponent;\n  // in case the component needs to be written to the filesystem, this is the component to write.\n  legacyCompToWrite?: ConsumerComponent;\n};\n\n/**\n * This function optionally returns \"component\" object. If it returns, it means it needs to be written to the filesystem.\n * Otherwise, it means the component is already up to date and no need to write it.\n *\n * If no need to change anything (ours), then don't return the component object.\n * Otherwise, either return the component object as is (if no conflicts or \"theirs\"), or change the files in this\n * component object. Later, this component object is written to the filesystem.\n *\n * 1) when the files are modified with conflicts and the strategy is \"ours\", or forceOurs was used, leave the FS as is.\n *\n * 2) when the files are modified with conflicts and the strategy is \"theirs\", or forceTheirs was used, write the\n * component according to \"component\" object\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 * 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: ComponentID,\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, forceOurs } = checkoutProps;\n  let filesStatus = {};\n  if ((mergeResults?.hasConflicts && mergeStrategy === MergeOptions.ours) || forceOurs) {\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  updateFileStatus(files, filesStatus, componentFromFS || undefined);\n\n  await removeFilesIfNeeded(filesStatus, consumer, componentFromFS || undefined);\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  // in case of forceTheirs, the mergeResults is undefined, the \"component\" object is according to \"theirs\", so it'll work\n  // expected. (later, it writes the component object).\n\n  return {\n    applyVersionResult: { id, filesStatus },\n    component,\n  };\n}\n\nexport function updateFileStatus(files: SourceFile[], filesStatus: FilesStatus, componentFromFS?: ConsumerComponent) {\n  files.forEach((file) => {\n    const fileFromFs = componentFromFS?.files.find((f) => f.relative === file.relative);\n    const areFilesEqual = fileFromFs && Buffer.compare(fileFromFs.contents, file.contents) === 0;\n    // @ts-ignore\n    filesStatus[pathNormalizeToLinux(file.relative)] = areFilesEqual ? FileStatus.unchanged : FileStatus.updated;\n  });\n}\n\n/**\n * when files exist on the filesystem but not on the checked out versions, they need to be deleted.\n * without this function, these files would be left on the filesystem. (we don't delete the comp-dir before writing).\n * this needs to be done *before* the component is written to the filesystem, otherwise, it won't work when a file\n * has a case change. e.g. from uppercase to lowercase. (see merge-lane.e2e 'renaming files from uppercase to lowercase').\n */\nexport async function removeFilesIfNeeded(\n  filesStatus: FilesStatus,\n  consumer: Consumer,\n  componentFromFS?: ConsumerComponent\n) {\n  if (!componentFromFS) return;\n  // @todo: if the component is not in the FS, it should be passed as undefined here.\n  // in the case this is coming from merge-lane, it's sometimes populated from the scope.\n  const isExistOnFs = consumer.bitMap.getComponentIdIfExist(componentFromFS.id, { ignoreVersion: true });\n  if (!isExistOnFs) return;\n  const filePathsFromFS = componentFromFS.files || [];\n  const dataToPersist = new DataToPersist();\n  filePathsFromFS.forEach((file) => {\n    const filename = pathNormalizeToLinux(file.relative);\n    if (!filesStatus[filename]) {\n      // @ts-ignore todo: typescript has a good point here. it should be the string \"removed\", not chalk.green(removed).\n      filesStatus[filename] = FileStatus.removed;\n      dataToPersist.removePath(new RemovePath(file.path));\n    }\n  });\n  await dataToPersist.persistAllToFS();\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\nexport function throwForFailures(allComponentsStatus: ComponentStatusBase[]) {\n  const failedComponents = allComponentsStatus.filter((c) => c.unchangedMessage && !c.unchangedLegitimately);\n  if (failedComponents.length) {\n    const failureMsgs = failedComponents\n      .map(\n        (failedComponent) =>\n          `${chalk.bold(failedComponent.id.toString())} - ${chalk.red(failedComponent.unchangedMessage as string)}`\n      )\n      .join('\\n');\n    throw new BitError(`unable to proceed due to the following failures:\\n${failureMsgs}`);\n  }\n}\n"],"mappings":"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"}

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@teambit/checkout",
-  "version": "1.0.138",
+  "version": "1.0.140",
   "homepage": "https://bit.cloud/teambit/component/checkout",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.component",
     "name": "checkout",
-    "version": "1.0.138"
+    "version": "1.0.140"
   },
   "dependencies": {
     "chalk": "2.4.2",
@@ -16,12 +16,12 @@
     "@teambit/component-id": "1.2.0",
     "@teambit/harmony": "0.4.6",
     "@teambit/cli": "0.0.848",
-    "@teambit/merging": "1.0.138",
-    "@teambit/component-writer": "1.0.138",
-    "@teambit/importer": "1.0.138",
+    "@teambit/merging": "1.0.140",
+    "@teambit/component-writer": "1.0.140",
+    "@teambit/importer": "1.0.140",
     "@teambit/logger": "0.0.941",
-    "@teambit/remove": "1.0.138",
-    "@teambit/workspace": "1.0.138"
+    "@teambit/remove": "1.0.140",
+    "@teambit/workspace": "1.0.140"
   },
   "devDependencies": {
     "@types/lodash": "4.14.165",