@teambit/checkout 1.0.676 → 1.0.678

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,5 +1,5 @@
1
1
  import type { Command, CommandOptions } from '@teambit/cli';
2
- import type { ApplyVersionResults, MergeStrategy } from '@teambit/merging';
2
+ import type { ApplyVersionResults, MergeStrategy } from '@teambit/component.modules.merge-helper';
3
3
  import type { CheckoutMain, CheckoutProps } from './checkout.main.runtime';
4
4
  export declare class CheckoutCmd implements Command {
5
5
  private checkout;
@@ -19,9 +19,9 @@ function _lodash() {
19
19
  };
20
20
  return data;
21
21
  }
22
- function _merging() {
23
- const data = require("@teambit/merging");
24
- _merging = function () {
22
+ function _componentModules() {
23
+ const data = require("@teambit/component.modules.merge-helper");
24
+ _componentModules = function () {
25
25
  return data;
26
26
  };
27
27
  return data;
@@ -175,7 +175,7 @@ function checkoutOutput(checkoutResults, checkoutProps, alternativeTitle) {
175
175
  const title = `files with conflicts summary\n`;
176
176
  const suggestion = `\n\nfix the conflicts above manually and then run "bit install".
177
177
  once ready, snap/tag the components to persist the changes`;
178
- const conflictSummary = (0, _merging().conflictSummaryReport)(components);
178
+ const conflictSummary = (0, _componentModules().conflictSummaryReport)(components);
179
179
  return _chalk().default.underline(title) + conflictSummary.conflictStr + _chalk().default.yellow(suggestion);
180
180
  };
181
181
  const getSuccessfulOutput = () => {
@@ -189,7 +189,7 @@ once ready, snap/tag the components to persist the changes`;
189
189
  const title = alternativeTitle || `successfully ${switchedOrReverted} ${_chalk().default.bold(componentName)} to version ${_chalk().default.bold(
190
190
  // @ts-ignore version is defined when !reset
191
191
  head || latest ? component.id.version : version)}`;
192
- return _chalk().default.bold(title) + newLine + (0, _merging().applyVersionReport)(components, false);
192
+ return _chalk().default.bold(title) + newLine + (0, _componentModules().applyVersionReport)(components, false);
193
193
  }
194
194
  if (reset) {
195
195
  const title = 'successfully reset the following components\n\n';
@@ -206,7 +206,7 @@ once ready, snap/tag the components to persist the changes`;
206
206
  const versionOutput = getVerOutput();
207
207
  const title = alternativeTitle || `successfully ${switchedOrReverted} ${components.length} components to ${versionOutput}`;
208
208
  const showVersion = head || reset;
209
- return _chalk().default.bold(title) + newLine + (0, _merging().applyVersionReport)(components, true, showVersion);
209
+ return _chalk().default.bold(title) + newLine + (0, _componentModules().applyVersionReport)(components, true, showVersion);
210
210
  };
211
211
  const getNewOnLaneOutput = () => {
212
212
  if (!newFromLane?.length) return '';
@@ -225,7 +225,7 @@ once ready, snap/tag the components to persist the changes`;
225
225
  const newOnLaneStr = newOnLaneNum ? `\nNew on lane${newOnLaneAddedStr}: ${_chalk().default.bold(newOnLaneNum.toString())}` : '';
226
226
  return title + checkedOutStr + unchangedLegitimatelyStr + newOnLaneStr;
227
227
  };
228
- return (0, _lodash().compact)([getWsConfigUpdateLogs(), getNotCheckedOutOutput(), getSuccessfulOutput(), (0, _merging().getRemovedOutput)(removedComponents), (0, _merging().getAddedOutput)(addedComponents), getNewOnLaneOutput(), (0, _merging().getWorkspaceConfigUpdateOutput)(workspaceConfigUpdateResult), getConflictSummary(), getSummary(), (0, _merging().installationErrorOutput)(installationError), (0, _merging().compilationErrorOutput)(compilationError)]).join('\n\n');
228
+ return (0, _lodash().compact)([getWsConfigUpdateLogs(), getNotCheckedOutOutput(), getSuccessfulOutput(), (0, _componentModules().getRemovedOutput)(removedComponents), (0, _componentModules().getAddedOutput)(addedComponents), getNewOnLaneOutput(), (0, _componentModules().getWorkspaceConfigUpdateOutput)(workspaceConfigUpdateResult), getConflictSummary(), getSummary(), (0, _componentModules().installationErrorOutput)(installationError), (0, _componentModules().compilationErrorOutput)(compilationError)]).join('\n\n');
229
229
  }
230
230
 
231
231
  //# sourceMappingURL=checkout-cmd.js.map
@@ -1 +1 @@
1
- {"version":3,"names":["_chalk","data","_interopRequireDefault","require","_lodash","_merging","_legacy","_componentId","_bitError","e","__esModule","default","_defineProperty","r","t","_toPropertyKey","Object","defineProperty","value","enumerable","configurable","writable","i","_toPrimitive","Symbol","toPrimitive","call","TypeError","String","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","startsWith","ancestor","parseInt","split","isNaN","ComponentID","isValidVersion","version","checkoutResults","checkoutByCLIValues","checkoutOutput","exports","alternativeTitle","components","failedComponents","removedComponents","addedComponents","leftUnresolvedConflicts","workspaceConfigUpdateResult","newFromLane","newFromLaneAdded","installationError","compilationError","realFailedComponents","filter","f","unchangedLegitimately","length","Error","notCheckedOutComponents","getNotCheckedOutOutput","chalk","green","bold","toString","title","body","map","failedComponent","id","unchangedMessage","join","underline","getWsConfigUpdateLogs","logs","logsStr","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","getWorkspaceConfigUpdateOutput","installationErrorOutput","compilationErrorOutput"],"sources":["checkout-cmd.ts"],"sourcesContent":["import chalk from 'chalk';\nimport type { Command, CommandOptions } from '@teambit/cli';\nimport { compact } from 'lodash';\nimport type { ApplyVersionResults, MergeStrategy } from '@teambit/merging';\nimport {\n applyVersionReport,\n conflictSummaryReport,\n installationErrorOutput,\n compilationErrorOutput,\n getRemovedOutput,\n getAddedOutput,\n getWorkspaceConfigUpdateOutput,\n} from '@teambit/merging';\nimport { COMPONENT_PATTERN_HELP, HEAD, LATEST } from '@teambit/legacy.constants';\nimport { ComponentID } from '@teambit/component-id';\nimport { BitError } from '@teambit/bit-error';\nimport type { 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~x}]. '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 = 'version-control';\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 head~x [component-pattern]\\` => go backward x generations from the head and checkout to that version\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). also, if a component dir is deleted from the filesystem, it'll be restored\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 'r',\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 to = String(to); // it can be a number in case short-hash is used\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 if (to.startsWith(`${HEAD}~`)) {\n const ancestor = parseInt(to.split('~')[1]);\n if (Number.isNaN(ancestor))\n throw new BitError(`the character after \"${HEAD}~\" must be a number, got ${ancestor}`);\n checkoutProps.ancestor = ancestor;\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 workspaceConfigUpdateResult,\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 getWsConfigUpdateLogs = () => {\n const logs = workspaceConfigUpdateResult?.logs;\n if (!logs || !logs.length) return '';\n const logsStr = logs.join('\\n');\n return `${chalk.underline('verbose logs of workspace config update')}\\n${logsStr}`;\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 getWsConfigUpdateLogs(),\n getNotCheckedOutOutput(),\n getSuccessfulOutput(),\n getRemovedOutput(removedComponents),\n getAddedOutput(addedComponents),\n getNewOnLaneOutput(),\n getWorkspaceConfigUpdateOutput(workspaceConfigUpdateResult),\n getConflictSummary(),\n getSummary(),\n installationErrorOutput(installationError),\n compilationErrorOutput(compilationError),\n ]).join('\\n\\n');\n}\n"],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"names":["_chalk","data","_interopRequireDefault","require","_lodash","_componentModules","_legacy","_componentId","_bitError","e","__esModule","default","_defineProperty","r","t","_toPropertyKey","Object","defineProperty","value","enumerable","configurable","writable","i","_toPrimitive","Symbol","toPrimitive","call","TypeError","String","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","startsWith","ancestor","parseInt","split","isNaN","ComponentID","isValidVersion","version","checkoutResults","checkoutByCLIValues","checkoutOutput","exports","alternativeTitle","components","failedComponents","removedComponents","addedComponents","leftUnresolvedConflicts","workspaceConfigUpdateResult","newFromLane","newFromLaneAdded","installationError","compilationError","realFailedComponents","filter","f","unchangedLegitimately","length","Error","notCheckedOutComponents","getNotCheckedOutOutput","chalk","green","bold","toString","title","body","map","failedComponent","id","unchangedMessage","join","underline","getWsConfigUpdateLogs","logs","logsStr","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","getWorkspaceConfigUpdateOutput","installationErrorOutput","compilationErrorOutput"],"sources":["checkout-cmd.ts"],"sourcesContent":["import chalk from 'chalk';\nimport type { Command, CommandOptions } from '@teambit/cli';\nimport { compact } from 'lodash';\nimport type { ApplyVersionResults, MergeStrategy } from '@teambit/component.modules.merge-helper';\nimport {\n applyVersionReport,\n conflictSummaryReport,\n installationErrorOutput,\n compilationErrorOutput,\n getRemovedOutput,\n getAddedOutput,\n getWorkspaceConfigUpdateOutput,\n} from '@teambit/component.modules.merge-helper';\nimport { COMPONENT_PATTERN_HELP, HEAD, LATEST } from '@teambit/legacy.constants';\nimport { ComponentID } from '@teambit/component-id';\nimport { BitError } from '@teambit/bit-error';\nimport type { 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~x}]. '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 = 'version-control';\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 head~x [component-pattern]\\` => go backward x generations from the head and checkout to that version\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). also, if a component dir is deleted from the filesystem, it'll be restored\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 'r',\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 to = String(to); // it can be a number in case short-hash is used\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 if (to.startsWith(`${HEAD}~`)) {\n const ancestor = parseInt(to.split('~')[1]);\n if (Number.isNaN(ancestor))\n throw new BitError(`the character after \"${HEAD}~\" must be a number, got ${ancestor}`);\n checkoutProps.ancestor = ancestor;\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 workspaceConfigUpdateResult,\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 getWsConfigUpdateLogs = () => {\n const logs = workspaceConfigUpdateResult?.logs;\n if (!logs || !logs.length) return '';\n const logsStr = logs.join('\\n');\n return `${chalk.underline('verbose logs of workspace config update')}\\n${logsStr}`;\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 getWsConfigUpdateLogs(),\n getNotCheckedOutOutput(),\n getSuccessfulOutput(),\n getRemovedOutput(removedComponents),\n getAddedOutput(addedComponents),\n getNewOnLaneOutput(),\n getWorkspaceConfigUpdateOutput(workspaceConfigUpdateResult),\n getConflictSummary(),\n getSummary(),\n installationErrorOutput(installationError),\n compilationErrorOutput(compilationError),\n ]).join('\\n\\n');\n}\n"],"mappings":"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","ignoreList":[]}
@@ -3,7 +3,7 @@ import type { ComponentID } from '@teambit/component-id';
3
3
  import type { Version } from '@teambit/objects';
4
4
  import type { SourceFile } from '@teambit/component.sources';
5
5
  import type { ConsumerComponent } from '@teambit/legacy.consumer-component';
6
- import type { ApplyVersionResult, FilesStatus, MergeStrategy, MergeResultsThreeWay } from '@teambit/merging';
6
+ import type { ApplyVersionResult, FilesStatus, MergeResultsThreeWay } from '@teambit/component.modules.merge-helper';
7
7
  import type { CheckoutProps } from './checkout.main.runtime';
8
8
  export type ComponentStatusBase = {
9
9
  currentComponent?: ConsumerComponent;
@@ -52,15 +52,4 @@ export declare function updateFileStatus(files: SourceFile[], filesStatus: Files
52
52
  * has a case change. e.g. from uppercase to lowercase. (see merge-lane.e2e 'renaming files from uppercase to lowercase').
53
53
  */
54
54
  export declare function removeFilesIfNeeded(filesStatus: FilesStatus, consumer: Consumer, componentFromFS?: ConsumerComponent): Promise<void>;
55
- /**
56
- * relevant only when
57
- * 1) there is no conflict => add files from mergeResults: addFiles, overrideFiles and modifiedFiles.output.
58
- * 2) there is conflict and mergeStrategy is manual => add files from mergeResults: addFiles, overrideFiles and modifiedFiles.conflict.
59
- *
60
- * this function only updates the files content, it doesn't write the files
61
- */
62
- export declare function applyModifiedVersion(componentFiles: SourceFile[], mergeResults: MergeResultsThreeWay, mergeStrategy: MergeStrategy | null | undefined): {
63
- filesStatus: Record<string, any>;
64
- modifiedFiles: SourceFile[];
65
- };
66
55
  export declare function throwForFailures(allComponentsStatus: ComponentStatusBase[]): void;
@@ -3,18 +3,10 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
- exports.applyModifiedVersion = applyModifiedVersion;
7
6
  exports.applyVersion = applyVersion;
8
7
  exports.removeFilesIfNeeded = removeFilesIfNeeded;
9
8
  exports.throwForFailures = throwForFailures;
10
9
  exports.updateFileStatus = updateFileStatus;
11
- function path() {
12
- const data = _interopRequireWildcard(require("path"));
13
- path = function () {
14
- return data;
15
- };
16
- return data;
17
- }
18
10
  function _component() {
19
11
  const data = require("@teambit/component.sources");
20
12
  _component = function () {
@@ -43,15 +35,14 @@ function _chalk() {
43
35
  };
44
36
  return data;
45
37
  }
46
- function _merging() {
47
- const data = require("@teambit/merging");
48
- _merging = function () {
38
+ function _componentModules() {
39
+ const data = require("@teambit/component.modules.merge-helper");
40
+ _componentModules = function () {
49
41
  return data;
50
42
  };
51
43
  return data;
52
44
  }
53
45
  function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
54
- function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
55
46
  function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
56
47
  function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
57
48
  function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
@@ -87,12 +78,12 @@ mergeResults, checkoutProps) {
87
78
  forceOurs
88
79
  } = checkoutProps;
89
80
  let filesStatus = {};
90
- if (mergeResults?.hasConflicts && mergeStrategy === _merging().MergeOptions.ours || forceOurs) {
81
+ if (mergeResults?.hasConflicts && mergeStrategy === _componentModules().MergeOptions.ours || forceOurs) {
91
82
  // even when isLane is true, the mergeResults is possible only when the component is on the filesystem
92
83
  // otherwise it's impossible to have conflicts
93
84
  if (!componentFromFS) throw new Error(`applyVersion expect to get componentFromFS for ${id.toString()}`);
94
85
  componentFromFS.files.forEach(file => {
95
- filesStatus[(0, _legacy().pathNormalizeToLinux)(file.relative)] = _merging().FileStatus.unchanged;
86
+ filesStatus[(0, _legacy().pathNormalizeToLinux)(file.relative)] = _componentModules().FileStatus.unchanged;
96
87
  });
97
88
  consumer.bitMap.updateComponentId(id);
98
89
  return {
@@ -113,7 +104,7 @@ mergeResults, checkoutProps) {
113
104
  const {
114
105
  filesStatus: modifiedStatus,
115
106
  modifiedFiles
116
- } = applyModifiedVersion(files, mergeResults, mergeStrategy);
107
+ } = (0, _componentModules().applyModifiedVersion)(files, mergeResults, mergeStrategy);
117
108
  filesStatus = _objectSpread(_objectSpread({}, filesStatus), modifiedStatus);
118
109
  component.files = modifiedFiles;
119
110
  }
@@ -135,7 +126,7 @@ function updateFileStatus(files, filesStatus, componentFromFS) {
135
126
  // @ts-ignore should be fixed after upgrading @types/node from '12.20.4' to > 20
136
127
  const areFilesEqual = fileFromFs && Buffer.compare(fileFromFs.contents, file.contents) === 0;
137
128
  // @ts-ignore
138
- filesStatus[(0, _legacy().pathNormalizeToLinux)(file.relative)] = areFilesEqual ? _merging().FileStatus.unchanged : _merging().FileStatus.updated;
129
+ filesStatus[(0, _legacy().pathNormalizeToLinux)(file.relative)] = areFilesEqual ? _componentModules().FileStatus.unchanged : _componentModules().FileStatus.updated;
139
130
  });
140
131
  }
141
132
 
@@ -159,94 +150,14 @@ async function removeFilesIfNeeded(filesStatus, consumer, componentFromFS) {
159
150
  const filename = (0, _legacy().pathNormalizeToLinux)(file.relative);
160
151
  if (!filesStatus[filename]) {
161
152
  // @ts-ignore todo: typescript has a good point here. it should be the string "removed", not chalk.green(removed).
162
- filesStatus[filename] = _merging().FileStatus.removed;
153
+ filesStatus[filename] = _componentModules().FileStatus.removed;
163
154
  }
164
- if (filesStatus[filename] === _merging().FileStatus.removed) {
155
+ if (filesStatus[filename] === _componentModules().FileStatus.removed) {
165
156
  dataToPersist.removePath(new (_component().RemovePath)(file.path));
166
157
  }
167
158
  });
168
159
  await dataToPersist.persistAllToFS();
169
160
  }
170
-
171
- /**
172
- * relevant only when
173
- * 1) there is no conflict => add files from mergeResults: addFiles, overrideFiles and modifiedFiles.output.
174
- * 2) there is conflict and mergeStrategy is manual => add files from mergeResults: addFiles, overrideFiles and modifiedFiles.conflict.
175
- *
176
- * this function only updates the files content, it doesn't write the files
177
- */
178
- function applyModifiedVersion(componentFiles, mergeResults, mergeStrategy) {
179
- let modifiedFiles = componentFiles.map(file => file.clone());
180
- const filesStatus = {};
181
- if (mergeResults.hasConflicts && mergeStrategy !== _merging().MergeOptions.manual) {
182
- return {
183
- filesStatus,
184
- modifiedFiles
185
- };
186
- }
187
- mergeResults.modifiedFiles.forEach(file => {
188
- const filePath = path().normalize(file.filePath);
189
- const foundFile = modifiedFiles.find(componentFile => componentFile.relative === filePath);
190
- if (!foundFile) throw new (_bitError().BitError)(`file ${filePath} not found`);
191
- if (file.conflict) {
192
- foundFile.contents = Buffer.from(file.conflict);
193
- filesStatus[file.filePath] = _merging().FileStatus.manual;
194
- } else if (typeof file.output === 'string') {
195
- foundFile.contents = Buffer.from(file.output);
196
- filesStatus[file.filePath] = _merging().FileStatus.merged;
197
- } else if (file.isBinaryConflict) {
198
- // leave the file as is and notify the user later about it.
199
- foundFile.contents = file.fsFile.contents;
200
- filesStatus[file.filePath] = _merging().FileStatus.binaryConflict;
201
- } else {
202
- throw new (_bitError().BitError)(`file ${filePath} does not have output nor conflict`);
203
- }
204
- });
205
- mergeResults.addFiles.forEach(file => {
206
- const filePath = path().normalize(file.filePath);
207
- if (modifiedFiles.find(m => m.relative === filePath)) return;
208
- modifiedFiles.push(file.fsFile);
209
- filesStatus[file.filePath] = _merging().FileStatus.added;
210
- });
211
- mergeResults.deletedConflictFiles.forEach(file => {
212
- if (!file.fsFile) return;
213
- const filePath = path().normalize(file.filePath);
214
- if (modifiedFiles.find(m => m.relative === filePath)) return;
215
- modifiedFiles.push(file.fsFile);
216
- filesStatus[file.filePath] = _merging().FileStatus.added;
217
- });
218
- mergeResults.removeFiles.forEach(file => {
219
- const filePath = path().normalize(file.filePath);
220
- filesStatus[file.filePath] = _merging().FileStatus.removed;
221
- modifiedFiles = modifiedFiles.filter(f => f.relative !== filePath);
222
- });
223
- mergeResults.remainDeletedFiles.forEach(file => {
224
- const filePath = path().normalize(file.filePath);
225
- modifiedFiles = modifiedFiles.filter(f => f.relative !== filePath);
226
- filesStatus[file.filePath] = _merging().FileStatus.remainDeleted;
227
- });
228
- mergeResults.deletedConflictFiles.forEach(file => {
229
- filesStatus[file.filePath] = _merging().FileStatus.deletedConflict;
230
- });
231
- mergeResults.overrideFiles.forEach(file => {
232
- const filePath = path().normalize(file.filePath);
233
- const foundFile = modifiedFiles.find(componentFile => componentFile.relative === filePath);
234
- if (!foundFile) throw new (_bitError().BitError)(`file ${filePath} not found`);
235
- foundFile.contents = file.fsFile.contents;
236
- filesStatus[file.filePath] = _merging().FileStatus.overridden;
237
- });
238
- mergeResults.updatedFiles.forEach(file => {
239
- const filePath = path().normalize(file.filePath);
240
- const foundFile = modifiedFiles.find(componentFile => componentFile.relative === filePath);
241
- if (!foundFile) throw new (_bitError().BitError)(`file ${filePath} not found`);
242
- foundFile.contents = file.content;
243
- filesStatus[file.filePath] = _merging().FileStatus.updated;
244
- });
245
- return {
246
- filesStatus,
247
- modifiedFiles
248
- };
249
- }
250
161
  function throwForFailures(allComponentsStatus) {
251
162
  const failedComponents = allComponentsStatus.filter(c => c.unchangedMessage && !c.unchangedLegitimately);
252
163
  if (failedComponents.length) {
@@ -1 +1 @@
1
- {"version":3,"names":["path","data","_interopRequireWildcard","require","_component","_legacy","_bitError","_chalk","_interopRequireDefault","_merging","e","__esModule","default","t","WeakMap","r","n","o","i","f","__proto__","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","ownKeys","keys","getOwnPropertySymbols","filter","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","_toPropertyKey","value","configurable","writable","_toPrimitive","Symbol","toPrimitive","TypeError","String","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","BitError","updateFileStatus","undefined","removeFilesIfNeeded","modifiedStatus","modifiedFiles","applyModifiedVersion","fileFromFs","find","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"],"sources":["checkout-version.ts"],"sourcesContent":["import * as path from 'path';\nimport type { Consumer } from '@teambit/legacy.consumer';\nimport type { ComponentID } from '@teambit/component-id';\nimport type { Version } from '@teambit/objects';\nimport type { SourceFile } from '@teambit/component.sources';\nimport { RemovePath, DataToPersist } from '@teambit/component.sources';\nimport type { PathOsBased } from '@teambit/legacy.utils';\nimport { pathNormalizeToLinux } from '@teambit/legacy.utils';\nimport type { ConsumerComponent } from '@teambit/legacy.consumer-component';\nimport { BitError } from '@teambit/bit-error';\nimport chalk from 'chalk';\nimport type { ApplyVersionResult, FilesStatus, MergeStrategy, MergeResultsThreeWay } from '@teambit/merging';\nimport { FileStatus, MergeOptions } from '@teambit/merging';\nimport type { 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 BitError('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 // @ts-ignore should be fixed after upgrading @types/node from '12.20.4' to > 20\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 }\n if (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 BitError(`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 BitError(`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 BitError(`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 BitError(`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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","ignoreList":[]}
1
+ {"version":3,"names":["_component","data","require","_legacy","_bitError","_chalk","_interopRequireDefault","_componentModules","e","__esModule","default","ownKeys","r","t","Object","keys","getOwnPropertySymbols","o","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","defineProperty","_toPropertyKey","value","configurable","writable","i","_toPrimitive","Symbol","toPrimitive","call","TypeError","String","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","BitError","updateFileStatus","undefined","removeFilesIfNeeded","modifiedStatus","modifiedFiles","applyModifiedVersion","fileFromFs","find","f","areFilesEqual","Buffer","compare","contents","updated","isExistOnFs","getComponentIdIfExist","ignoreVersion","filePathsFromFS","dataToPersist","DataToPersist","filename","removed","removePath","RemovePath","path","persistAllToFS","throwForFailures","allComponentsStatus","failedComponents","c","unchangedMessage","unchangedLegitimately","failureMsgs","map","failedComponent","chalk","bold","red","join"],"sources":["checkout-version.ts"],"sourcesContent":["import type { Consumer } from '@teambit/legacy.consumer';\nimport type { ComponentID } from '@teambit/component-id';\nimport type { Version } from '@teambit/objects';\nimport type { SourceFile } from '@teambit/component.sources';\nimport { RemovePath, DataToPersist } from '@teambit/component.sources';\nimport { pathNormalizeToLinux } from '@teambit/legacy.utils';\nimport type { ConsumerComponent } from '@teambit/legacy.consumer-component';\nimport { BitError } from '@teambit/bit-error';\nimport chalk from 'chalk';\nimport type { ApplyVersionResult, FilesStatus, MergeResultsThreeWay } from '@teambit/component.modules.merge-helper';\nimport { applyModifiedVersion, FileStatus, MergeOptions } from '@teambit/component.modules.merge-helper';\nimport type { 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 BitError('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 // @ts-ignore should be fixed after upgrading @types/node from '12.20.4' to > 20\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 }\n if (filesStatus[filename] === FileStatus.removed) {\n dataToPersist.removePath(new RemovePath(file.path));\n }\n });\n await dataToPersist.persistAllToFS();\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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","ignoreList":[]}
@@ -2,7 +2,7 @@ import type { CLIMain } from '@teambit/cli';
2
2
  import type { Logger, LoggerMain } from '@teambit/logger';
3
3
  import type { Workspace } from '@teambit/workspace';
4
4
  import type { RemoveMain } from '@teambit/remove';
5
- import type { ApplyVersionResults, MergeStrategy } from '@teambit/merging';
5
+ import type { ApplyVersionResults, MergeStrategy } from '@teambit/component.modules.merge-helper';
6
6
  import type { ImporterMain } from '@teambit/importer';
7
7
  import type { ComponentWriterMain } from '@teambit/component-writer';
8
8
  import { ComponentID } from '@teambit/component-id';
@@ -46,9 +46,9 @@ function _remove() {
46
46
  };
47
47
  return data;
48
48
  }
49
- function _merging() {
50
- const data = require("@teambit/merging");
51
- _merging = function () {
49
+ function _componentModules() {
50
+ const data = require("@teambit/component.modules.merge-helper");
51
+ _componentModules = function () {
52
52
  return data;
53
53
  };
54
54
  return data;
@@ -199,7 +199,7 @@ class CheckoutMain {
199
199
  if (!promptMergeOptions && !checkoutProps.mergeStrategy) {
200
200
  throw new (_bitError().BitError)(`automatic merge has failed for component ${componentWithConflict.id.toStringWithoutVersion()}.\nplease use "--auto-merge-resolve" with 'manual', 'ours' or 'theirs' to resolve the conflict/s`);
201
201
  }
202
- if (!checkoutProps.mergeStrategy) checkoutProps.mergeStrategy = await (0, _merging().getMergeStrategyInteractive)();
202
+ if (!checkoutProps.mergeStrategy) checkoutProps.mergeStrategy = await (0, _componentModules().getMergeStrategyInteractive)();
203
203
  }
204
204
  (0, _checkoutVersion().throwForFailures)(allComponentsStatus);
205
205
  const failedComponents = allComponentsStatus.filter(componentStatus => componentStatus.unchangedMessage).filter(componentStatus => !componentStatus.shouldBeRemoved).map(componentStatus => ({
@@ -640,7 +640,7 @@ class CheckoutMain {
640
640
  baseVersion = parent.toString();
641
641
  baseComponent = await componentModel.loadVersion(baseVersion, repo);
642
642
  }
643
- const mergeResults = await (0, _merging().threeWayMerge)({
643
+ const mergeResults = await (0, _componentModules().threeWayMerge)({
644
644
  scope: consumer.scope,
645
645
  otherComponent,
646
646
  otherLabel: loadStash ? 'stash' : newVersion,
@@ -1 +1 @@
1
- {"version":3,"names":["_cli","data","require","_logger","_workspace","_bitError","_lodash","_remove","_merging","_importer","_legacy","_componentWriter","_pMapSeries","_interopRequireDefault","_componentId","_objects","_legacy2","_legacy3","_checkoutCmd","_checkout","_checkoutVersion","_revertCmd","e","__esModule","default","ownKeys","r","t","Object","keys","getOwnPropertySymbols","o","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","defineProperty","_toPropertyKey","value","configurable","writable","i","_toPrimitive","Symbol","toPrimitive","call","TypeError","String","Number","CheckoutMain","constructor","workspace","logger","componentWriter","importer","remove","checkout","checkoutProps","ensureCheckoutConfiguration","inInstallContext","version","ids","promptMergeOptions","syncNewComponents","addedComponents","restoreMissingComponents","newComponents","addNewComponents","bitIds","ComponentIdList","fromArray","map","id","allComponentStatusBeforeMerge","mapSeries","getComponentStatusBeforeMergeAttempt","compsNeedMerge","c","propsForMerge","compsNotNeedMerge","toImport","compStatus","idsToImport","changeVersion","currentlyUsedVersion","flat","scope","legacyScope","scopeImporter","importWithoutDeps","cache","lane","consumer","getComponentsStatusOfMergeNeeded","tmp","Tmp","afterMergeAttempt","Promise","all","getMergeStatus","clear","err","compStatusMergeNeeded","allComponentsStatus","componentWithConflict","find","component","mergeResults","hasConflicts","mergeStrategy","BitError","toStringWithoutVersion","getMergeStrategyInteractive","throwForFailures","failedComponents","componentStatus","unchangedMessage","shouldBeRemoved","unchangedLegitimately","succeededComponents","checkoutPropsLegacy","componentsResults","currentComponent","applyVersion","componentsLegacy","compact","newFromLane","newFromLaneAdded","head","getNewComponentsFromLane","workspaceOnly","compsNewFromLane","loadComponentFromModelImportIfNeeded","leftUnresolvedConflicts","componentWriterResults","manyComponentsWriterOpts","components","skipDependencyInstallation","skipNpmInstall","verbose","resetConfig","reset","skipUpdatingBitMap","skipUpdatingBitmap","revert","shouldUpdateWorkspaceConfig","reasonForBitmapChange","writeMany","appliedVersionComponents","applyVersionResult","componentIdsToRemove","undefined","removeLocallyByIds","force","reasonForRemoval","removedComponents","n","toString","workspaceConfigUpdateResult","installationError","compilationError","missing","bitMapEntry","bitMap","getBitmapEntry","ignoreVersion","noFilesError","ComponentNotFoundInPath","comps","getMany","state","_consumer","stashedBitmapEntries","newBitmapEntries","entry","defaultScope","newComps","bitmapEntry","existingId","getBitmapEntryIfExist","modelComponent","ModelComponent","fromBitId","repo","objects","consumerComp","toConsumerComponent","newCompId","ComponentID","fromObject","name","fullName","writeToPath","rootDir","addComponent","componentId","files","f","basename","relativePath","relative","test","mainFile","config","triggerOnComponentAdd","compile","write","checkoutByCLIValues","componentPattern","setStatusLine","OutsideWorkspaceError","importCurrentObjects","makeLaneComponentsAvailableOnMain","parseValues","checkoutResults","onDestroy","notExported","isExported","changeScope","scopeComponentsImporter","toVersionLatest","reason","includeUnexported","error","unavailableOnMain","getUnavailableOnMainComponents","makeComponentsAvailableOnMain","includeLocallyDeleted","latest","idsOnWorkspace","listIdsIncludeRemoved","listIds","currentLane","getCurrentLaneObject","currentLaneIds","toComponentIds","hasWithoutVersion","LATEST","console","HEAD","getIds","idsByPattern","includeDeleted","laneBitIds","newComponentIds","bitId","isEqualWithoutVersion","nonRemovedNewIds","isRemoved","isComponentRemoved","headVersion","ancestor","main","latestVersion","versionPerId","forceOurs","forceTheirs","loadStash","existingBitMapId","getComponentIdIfExist","getComponent","results","loadComponents","allowAddingComponentsFromScope","componentModel","getModelComponentIfExist","returnFailure","msg","unmerged","unmergedComponents","getEntry","getNewVersion","headIncludeRemote","previousParent","getRefOfAncestor","getTagOfRefIfExists","latestVersionIfExist","newVersion","hasVersion","divergeDataForMergePending","getDivergeDataForMergePending","isMergePending","isDiverged","isModified","currentVersionObject","loadVersion","isComponentModified","versionRef","getRef","Error","componentVersion","getObject","hash","newId","componentFromModel","componentFromFS","baseVersion","baseComponent","otherComponent","parents","parent","threeWayMerge","otherLabel","currentLabel","provider","cli","loggerMain","compWriter","createLogger","CheckoutAspect","checkoutMain","register","CheckoutCmd","RevertCmd","exports","CLIAspect","WorkspaceAspect","LoggerAspect","ComponentWriterAspect","ImporterAspect","RemoveAspect","MainRuntime","addRuntime","_default"],"sources":["checkout.main.runtime.ts"],"sourcesContent":["import type { CLIMain } from '@teambit/cli';\nimport { CLIAspect, MainRuntime } from '@teambit/cli';\nimport type { Logger, LoggerMain } from '@teambit/logger';\nimport { LoggerAspect } from '@teambit/logger';\nimport type { Workspace } from '@teambit/workspace';\nimport { WorkspaceAspect, OutsideWorkspaceError } from '@teambit/workspace';\nimport { BitError } from '@teambit/bit-error';\nimport { compact } from 'lodash';\nimport type { RemoveMain } from '@teambit/remove';\nimport { RemoveAspect } from '@teambit/remove';\nimport type { ApplyVersionResults, FailedComponents, MergeStrategy } from '@teambit/merging';\nimport { threeWayMerge, getMergeStrategyInteractive } from '@teambit/merging';\nimport type { ImporterMain } from '@teambit/importer';\nimport { ImporterAspect } from '@teambit/importer';\nimport { HEAD, LATEST } from '@teambit/legacy.constants';\nimport type { ComponentWriterMain } from '@teambit/component-writer';\nimport { ComponentWriterAspect } from '@teambit/component-writer';\nimport mapSeries from 'p-map-series';\nimport { ComponentIdList, ComponentID } from '@teambit/component-id';\nimport type { Version, Lane } from '@teambit/objects';\nimport { ModelComponent } from '@teambit/objects';\nimport { Tmp } from '@teambit/legacy.scope';\nimport { ComponentNotFoundInPath } from '@teambit/legacy.consumer-component';\nimport { CheckoutCmd } from './checkout-cmd';\nimport { CheckoutAspect } from './checkout.aspect';\nimport type { ComponentStatus, ComponentStatusBase } from './checkout-version';\nimport { applyVersion, throwForFailures } from './checkout-version';\nimport { RevertCmd } from './revert-cmd';\nimport type { ComponentMap } from '@teambit/legacy.bit-map';\n\nexport type CheckoutProps = {\n version?: string; // if reset/head/latest is true, the version is undefined\n ids?: ComponentID[];\n head?: boolean;\n ancestor?: number; // how many generations to go backward\n latest?: boolean;\n main?: boolean; // relevant for \"revert\" only\n promptMergeOptions?: boolean;\n mergeStrategy?: MergeStrategy; // strategy to use in case of conflicts\n forceOurs?: boolean; // regardless of conflicts, use ours\n forceTheirs?: boolean; // regardless of conflicts, use theirs\n verbose?: boolean;\n skipNpmInstall?: boolean;\n reset?: boolean; // remove local changes. if set, the version is undefined.\n revert?: boolean; // change the files according to the given version, but don't change the bitmap version and don't try to merge\n all?: boolean; // checkout all ids\n isLane?: boolean;\n lane?: Lane; // currently needed for \"bit switch\" to tell the \"fetch\" where to fetch from\n workspaceOnly?: boolean;\n versionPerId?: ComponentID[]; // if given, the ComponentID.version is the version to checkout to.\n skipUpdatingBitmap?: boolean; // needed for stash\n loadStash?: boolean;\n stashedBitmapEntries?: Array<Partial<ComponentMap>>;\n restoreMissingComponents?: boolean; // in case .bitmap has a component and it's missing from the workspace, restore it (from model)\n allowAddingComponentsFromScope?: boolean; // in case the id doesn't exist in .bitmap, add it from the scope (relevant for switch)\n includeLocallyDeleted?: boolean; // include components that were deleted locally. currently enabled for \"bit checkout reset\" only.\n};\n\nexport type ComponentStatusBeforeMergeAttempt = ComponentStatusBase & {\n propsForMerge?: {\n currentlyUsedVersion: string;\n componentModel: ModelComponent;\n };\n};\n\nexport class CheckoutMain {\n constructor(\n private workspace: Workspace,\n private logger: Logger,\n private componentWriter: ComponentWriterMain,\n private importer: ImporterMain,\n private remove: RemoveMain\n ) {}\n\n async checkout(checkoutProps: CheckoutProps): Promise<ApplyVersionResults> {\n await this.ensureCheckoutConfiguration(checkoutProps);\n this.workspace.inInstallContext = true;\n const { version, ids, promptMergeOptions } = checkoutProps;\n await this.syncNewComponents(checkoutProps);\n const addedComponents = await this.restoreMissingComponents(checkoutProps);\n const newComponents = await this.addNewComponents(checkoutProps);\n const bitIds = ComponentIdList.fromArray(ids?.map((id) => id) || []);\n // don't use Promise.all, it loads the components and this operation must be in sequence.\n const allComponentStatusBeforeMerge = await mapSeries(bitIds, (id) =>\n this.getComponentStatusBeforeMergeAttempt(id, 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\n await this.workspace.scope.legacyScope.scopeImporter.importWithoutDeps(ComponentIdList.fromArray(toImport), {\n cache: true,\n lane: checkoutProps.lane,\n });\n const consumer = this.workspace.consumer;\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, checkoutProps)));\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 BitError(\n `automatic merge has failed for component ${componentWithConflict.id.toStringWithoutVersion()}.\\nplease use \"--auto-merge-resolve\" with 'manual', 'ours' or 'theirs' to resolve the conflict/s`\n );\n }\n if (!checkoutProps.mergeStrategy) checkoutProps.mergeStrategy = await getMergeStrategyInteractive();\n }\n\n throwForFailures(allComponentsStatus);\n\n const failedComponents: FailedComponents[] = allComponentsStatus\n .filter((componentStatus) => componentStatus.unchangedMessage)\n .filter((componentStatus) => !componentStatus.shouldBeRemoved)\n .map((componentStatus) => ({\n id: componentStatus.id,\n unchangedMessage: componentStatus.unchangedMessage as string,\n unchangedLegitimately: componentStatus.unchangedLegitimately,\n }));\n\n const succeededComponents = allComponentsStatus.filter((componentStatus) => !componentStatus.unchangedMessage);\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) };\n const componentsResults = await mapSeries(succeededComponents, ({ id, currentComponent, mergeResults }) => {\n return applyVersion(consumer, id, currentComponent, mergeResults, checkoutPropsLegacy);\n });\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))\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 skipUpdatingBitMap: checkoutProps.skipUpdatingBitmap || checkoutProps.revert,\n shouldUpdateWorkspaceConfig: true,\n reasonForBitmapChange: 'checkout',\n mergeStrategy: checkoutProps.mergeStrategy,\n };\n componentWriterResults = await this.componentWriter.writeMany(manyComponentsWriterOpts);\n }\n\n const appliedVersionComponents = componentsResults.map((c) => c.applyVersionResult);\n\n const componentIdsToRemove = allComponentsStatus\n .filter((componentStatus) => componentStatus.shouldBeRemoved)\n .map((c) => c.id.changeVersion(undefined));\n\n if (componentIdsToRemove.length) {\n await this.remove.removeLocallyByIds(componentIdsToRemove, { force: true, reasonForRemoval: 'checkout' });\n }\n\n return {\n components: appliedVersionComponents,\n removedComponents: componentIdsToRemove,\n addedComponents,\n newComponents,\n version,\n failedComponents,\n leftUnresolvedConflicts,\n newFromLane: newFromLane?.map((n) => n.toString()),\n newFromLaneAdded,\n workspaceConfigUpdateResult: componentWriterResults?.workspaceConfigUpdateResult,\n installationError: componentWriterResults?.installationError,\n compilationError: componentWriterResults?.compilationError,\n };\n }\n\n /**\n * if .bitmap entry exists but the rootDir is missing from the filesystem, find the component in the scope and restore it.\n * returns the restored component ids.\n */\n async restoreMissingComponents(checkoutProps: CheckoutProps): Promise<ComponentID[] | undefined> {\n if (checkoutProps.reset) {\n checkoutProps.restoreMissingComponents = true;\n }\n if (!checkoutProps.restoreMissingComponents) return undefined;\n const ids = checkoutProps.ids || [];\n const missing: ComponentID[] = [];\n await Promise.all(\n ids.map(async (id) => {\n const bitMapEntry = this.workspace.bitMap.getBitmapEntry(id, { ignoreVersion: true });\n if (bitMapEntry.noFilesError && bitMapEntry.noFilesError instanceof ComponentNotFoundInPath) {\n delete bitMapEntry.noFilesError;\n missing.push(id);\n }\n })\n );\n if (!missing.length) return undefined;\n const comps = await this.workspace.scope.getMany(missing);\n await this.componentWriter.writeMany({\n components: comps.map((c) => c.state._consumer),\n skipDependencyInstallation: true,\n skipUpdatingBitMap: true,\n });\n\n return missing;\n }\n\n async addNewComponents(checkoutProps: CheckoutProps): Promise<undefined | ComponentID[]> {\n const stashedBitmapEntries = checkoutProps.stashedBitmapEntries;\n if (!stashedBitmapEntries) return;\n const newBitmapEntries = stashedBitmapEntries.filter((entry) => entry.defaultScope);\n if (!newBitmapEntries.length) return;\n const newComps = await mapSeries(newBitmapEntries, async (bitmapEntry) => {\n const id = bitmapEntry.id!;\n const existingId = this.workspace.bitMap.getBitmapEntryIfExist(id, { ignoreVersion: true });\n if (existingId) return;\n const modelComponent = ModelComponent.fromBitId(id);\n const repo = this.workspace.scope.legacyScope.objects;\n const consumerComp = await modelComponent.toConsumerComponent(id.version, id.scope, repo);\n const newCompId = ComponentID.fromObject({ name: id.fullName }, bitmapEntry.defaultScope!);\n await this.componentWriter.writeMany({\n components: [consumerComp],\n skipDependencyInstallation: true,\n writeToPath: bitmapEntry.rootDir,\n skipUpdatingBitMap: true,\n });\n\n this.workspace.consumer.bitMap.addComponent({\n componentId: newCompId,\n files: consumerComp.files.map((f) => ({\n name: f.basename,\n relativePath: f.relative,\n test: f.test,\n })),\n mainFile: bitmapEntry.mainFile!,\n config: bitmapEntry.config,\n defaultScope: bitmapEntry.defaultScope,\n });\n await this.workspace.triggerOnComponentAdd(newCompId, { compile: true });\n return newCompId;\n });\n await this.workspace.bitMap.write();\n return compact(newComps);\n }\n\n async checkoutByCLIValues(componentPattern: string, checkoutProps: CheckoutProps): Promise<ApplyVersionResults> {\n const { revert, head } = checkoutProps;\n this.logger.setStatusLine(revert ? 'reverting components...' : 'switching component version...');\n if (!this.workspace) throw new OutsideWorkspaceError();\n const consumer = this.workspace.consumer;\n await this.importer.importCurrentObjects(); // important. among others, it fetches the remote lane object and its new components.\n if (head) await this.makeLaneComponentsAvailableOnMain();\n await this.parseValues(componentPattern, checkoutProps);\n const checkoutResults = await this.checkout(checkoutProps);\n await consumer.onDestroy(`checkout (${componentPattern})`);\n return checkoutResults;\n }\n\n private async syncNewComponents({ ids, head }: CheckoutProps) {\n if (!head) return;\n const notExported = ids?.filter((id) => !this.workspace.isExported(id)).map((id) => id.changeScope(id.scope));\n const scopeComponentsImporter = this.workspace.consumer.scope.scopeImporter;\n try {\n await scopeComponentsImporter.importWithoutDeps(ComponentIdList.fromArray(notExported || []).toVersionLatest(), {\n cache: false,\n reason: 'for making sure the new components are really new and are not out-of-sync',\n includeUnexported: 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 ensureCheckoutConfiguration(checkoutProps: CheckoutProps) {\n if (checkoutProps.reset || checkoutProps.head) {\n checkoutProps.includeLocallyDeleted = true;\n }\n if (checkoutProps.ids?.length) {\n return;\n }\n if (checkoutProps.head || checkoutProps.latest) {\n checkoutProps.all = true;\n }\n if (!checkoutProps.all) {\n return; // no ids and no all.\n }\n const idsOnWorkspace = checkoutProps.includeLocallyDeleted\n ? this.workspace.listIdsIncludeRemoved()\n : this.workspace.listIds();\n\n const currentLane = await this.workspace.consumer.getCurrentLaneObject();\n const currentLaneIds = currentLane?.toComponentIds();\n\n // When on a lane and doing head checkout, only checkout lane components\n const ids =\n currentLaneIds && checkoutProps.head\n ? idsOnWorkspace.filter((id) => currentLaneIds.hasWithoutVersion(id))\n : idsOnWorkspace;\n\n checkoutProps.ids = ids.map((id) => (checkoutProps.head || checkoutProps.latest ? id.changeVersion(LATEST) : id));\n }\n\n private async parseValues(componentPattern: string, checkoutProps: CheckoutProps) {\n // CLI-specific validations and deprecation warnings\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 BitError('please specify either [component-pattern] or --all, not both');\n }\n if (!componentPattern && !checkoutProps.all) {\n throw new BitError('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 if (checkoutProps.reset || checkoutProps.head) {\n checkoutProps.includeLocallyDeleted = true;\n }\n\n const getIds = async () => {\n if (componentPattern) {\n return this.workspace.idsByPattern(componentPattern, true, {\n includeDeleted: checkoutProps.includeLocallyDeleted,\n });\n }\n return checkoutProps.includeLocallyDeleted ? this.workspace.listIdsIncludeRemoved() : this.workspace.listIds();\n };\n\n const idsOnWorkspace = await getIds();\n\n const currentLane = await this.workspace.consumer.getCurrentLaneObject();\n const currentLaneIds = currentLane?.toComponentIds();\n // when no ids were given and the user is on a lane, return lane-ids only.\n // it's relevant for cases like \"bit checkout head\" when on a lane to not checkout main components. (see https://github.com/teambit/bit/pull/6853)\n const ids =\n currentLaneIds && !componentPattern && checkoutProps.head\n ? idsOnWorkspace.filter((id) => currentLaneIds.hasWithoutVersion(id))\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.toComponentIds();\n const newComponentIds = laneBitIds.filter((bitId) => !ids.find((id) => id.isEqualWithoutVersion(bitId)));\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 // eslint-disable-next-line complexity\n private async getComponentStatusBeforeMergeAttempt(\n id: ComponentID,\n checkoutProps: CheckoutProps\n ): Promise<ComponentStatusBeforeMergeAttempt> {\n const consumer = this.workspace.consumer;\n const {\n version,\n head: headVersion,\n ancestor,\n reset,\n revert,\n main,\n latest: latestVersion,\n versionPerId,\n forceOurs,\n forceTheirs,\n loadStash,\n } = checkoutProps;\n const repo = consumer.scope.objects;\n\n let existingBitMapId = consumer.bitMap.getComponentIdIfExist(id, { ignoreVersion: true });\n const getComponent = async () => {\n try {\n const results = await consumer.loadComponents(ComponentIdList.fromArray([id]));\n if (results.components[0]) return results.components[0];\n if (checkoutProps.includeLocallyDeleted && results.removedComponents[0]) {\n return results.removedComponents[0];\n }\n } catch (err) {\n if (checkoutProps.allowAddingComponentsFromScope && !existingBitMapId) return undefined;\n throw err;\n }\n return undefined;\n };\n const component = await getComponent();\n if (component) {\n // the component might fix an out-of-sync issue and as a result, the id has changed\n id = component.id;\n existingBitMapId = consumer.bitMap.getComponentIdIfExist(id, { ignoreVersion: true });\n }\n\n const componentModel = await consumer.scope.getModelComponentIfExist(id);\n const componentStatus: ComponentStatusBeforeMergeAttempt = { id };\n const returnFailure = (msg: string, unchangedLegitimately = false) => {\n componentStatus.unchangedMessage = msg;\n componentStatus.unchangedLegitimately = unchangedLegitimately;\n return componentStatus;\n };\n if (!componentModel) {\n return returnFailure(`component ${id.toString()} is new, no version to checkout`, true);\n }\n if (main && !componentModel.head) {\n return returnFailure(`component ${id.toString()} is not available on main`);\n }\n const unmerged = repo.unmergedComponents.getEntry(id);\n if (!reset && unmerged) {\n return returnFailure(\n `component ${id.toStringWithoutVersion()} is in during-merge state, please snap/tag it first (or use bit merge --resolve/--abort)`\n );\n }\n\n const getNewVersion = async (): Promise<string> => {\n // eslint-disable-next-line @typescript-eslint/no-non-null-assertion\n if (reset) return component!.id.version as string;\n if (headVersion) return componentModel.headIncludeRemote(repo);\n if (ancestor) {\n const previousParent = await componentModel.getRefOfAncestor(repo, ancestor);\n return componentModel.getTagOfRefIfExists(previousParent)?.toString() || previousParent.toString();\n }\n // we verified previously that head exists in case of \"main\"\n if (main) return componentModel.head?.toString() as string;\n if (latestVersion) {\n const latest = componentModel.latestVersionIfExist();\n return latest || componentModel.headIncludeRemote(repo);\n }\n if (versionPerId) {\n return versionPerId.find((bitId) => bitId.isEqualWithoutVersion(id))?.version as string;\n }\n\n // if all above are false, the version is defined\n return version as string;\n };\n const newVersion = await getNewVersion();\n if (version && !headVersion) {\n const hasVersion = await componentModel.hasVersion(version, repo);\n if (!hasVersion) return returnFailure(`component ${id.toStringWithoutVersion()} doesn't have version ${version}`);\n }\n const currentlyUsedVersion = existingBitMapId?.version;\n if (existingBitMapId && !currentlyUsedVersion) {\n return returnFailure(`component ${id.toStringWithoutVersion()} is new`);\n }\n\n if ((version && currentlyUsedVersion === version) || (versionPerId && currentlyUsedVersion === newVersion)) {\n // it won't be relevant for 'reset' as it doesn't have a version/versionPerId\n return returnFailure(\n `component ${id.toStringWithoutVersion()} is already at version ${version || newVersion}`,\n true\n );\n }\n if ((headVersion || latestVersion) && currentlyUsedVersion === newVersion) {\n return returnFailure(\n `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 let isModified = false;\n if (currentlyUsedVersion) {\n const currentVersionObject: Version = await componentModel.loadVersion(currentlyUsedVersion, repo);\n // eslint-disable-next-line @typescript-eslint/no-non-null-assertion\n isModified = await consumer.isComponentModified(currentVersionObject, component!);\n const isRemoved = component && component.isRemoved();\n if (!isModified && !isRemoved && reset) {\n return returnFailure(`component ${id.toStringWithoutVersion()} is not modified`, true);\n }\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 | undefined;\n if (componentVersion?.isRemoved()) {\n if (existingBitMapId) componentStatus.shouldBeRemoved = true;\n return returnFailure(`component has been removed`, true);\n }\n\n const newId = id.changeVersion(newVersion);\n\n if (reset || (!isModified && !loadStash) || revert || !currentlyUsedVersion || forceTheirs || forceOurs) {\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 // in case of \"loadStash\", we want to merge the stashed modifications regardless whether it's modified currently.\n\n // if !currentlyUsedVersion it only exists in the model, so just write it. (happening during bit-switch/bit-lane-import)\n return { currentComponent: component, componentFromModel: componentVersion, id: newId };\n }\n\n const propsForMerge = {\n currentlyUsedVersion,\n componentModel,\n };\n\n return { currentComponent: component, componentFromModel: componentVersion, id: newId, propsForMerge };\n }\n\n private async getMergeStatus(\n { currentComponent: componentFromFS, componentFromModel, id, propsForMerge }: ComponentStatusBeforeMergeAttempt,\n checkoutProps: CheckoutProps\n ): 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 let baseVersion = currentlyUsedVersion;\n const newVersion = id.version as string;\n let baseComponent: Version = await componentModel.loadVersion(baseVersion, repo);\n const otherComponent: Version = await componentModel.loadVersion(newVersion, repo);\n const { loadStash } = checkoutProps;\n if (loadStash && otherComponent.parents.length) {\n // for stash, we want the stashed modifications to be added on top of the current version.\n // for this to happen, the \"base\" must be the parent of the stashed version.\n const parent = otherComponent.parents[0];\n baseVersion = parent.toString();\n baseComponent = await componentModel.loadVersion(baseVersion, repo);\n }\n\n const mergeResults = await threeWayMerge({\n scope: consumer.scope,\n otherComponent,\n otherLabel: loadStash ? 'stash' : newVersion,\n currentComponent: componentFromFS,\n currentLabel: `${currentlyUsedVersion} modified`,\n baseComponent,\n });\n\n return { currentComponent: componentFromFS, componentFromModel, id, mergeResults };\n }\n\n static slots = [];\n static dependencies = [CLIAspect, WorkspaceAspect, LoggerAspect, ComponentWriterAspect, ImporterAspect, RemoveAspect];\n\n static runtime = MainRuntime;\n\n static async provider([cli, workspace, loggerMain, compWriter, importer, remove]: [\n CLIMain,\n Workspace,\n LoggerMain,\n ComponentWriterMain,\n ImporterMain,\n RemoveMain,\n ]) {\n const logger = loggerMain.createLogger(CheckoutAspect.id);\n const checkoutMain = new CheckoutMain(workspace, logger, compWriter, importer, remove);\n cli.register(new CheckoutCmd(checkoutMain), new RevertCmd(checkoutMain));\n return checkoutMain;\n }\n}\n\nCheckoutAspect.addRuntime(CheckoutMain);\n\nexport default CheckoutMain;\n"],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"names":["_cli","data","require","_logger","_workspace","_bitError","_lodash","_remove","_componentModules","_importer","_legacy","_componentWriter","_pMapSeries","_interopRequireDefault","_componentId","_objects","_legacy2","_legacy3","_checkoutCmd","_checkout","_checkoutVersion","_revertCmd","e","__esModule","default","ownKeys","r","t","Object","keys","getOwnPropertySymbols","o","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","defineProperty","_toPropertyKey","value","configurable","writable","i","_toPrimitive","Symbol","toPrimitive","call","TypeError","String","Number","CheckoutMain","constructor","workspace","logger","componentWriter","importer","remove","checkout","checkoutProps","ensureCheckoutConfiguration","inInstallContext","version","ids","promptMergeOptions","syncNewComponents","addedComponents","restoreMissingComponents","newComponents","addNewComponents","bitIds","ComponentIdList","fromArray","map","id","allComponentStatusBeforeMerge","mapSeries","getComponentStatusBeforeMergeAttempt","compsNeedMerge","c","propsForMerge","compsNotNeedMerge","toImport","compStatus","idsToImport","changeVersion","currentlyUsedVersion","flat","scope","legacyScope","scopeImporter","importWithoutDeps","cache","lane","consumer","getComponentsStatusOfMergeNeeded","tmp","Tmp","afterMergeAttempt","Promise","all","getMergeStatus","clear","err","compStatusMergeNeeded","allComponentsStatus","componentWithConflict","find","component","mergeResults","hasConflicts","mergeStrategy","BitError","toStringWithoutVersion","getMergeStrategyInteractive","throwForFailures","failedComponents","componentStatus","unchangedMessage","shouldBeRemoved","unchangedLegitimately","succeededComponents","checkoutPropsLegacy","componentsResults","currentComponent","applyVersion","componentsLegacy","compact","newFromLane","newFromLaneAdded","head","getNewComponentsFromLane","workspaceOnly","compsNewFromLane","loadComponentFromModelImportIfNeeded","leftUnresolvedConflicts","componentWriterResults","manyComponentsWriterOpts","components","skipDependencyInstallation","skipNpmInstall","verbose","resetConfig","reset","skipUpdatingBitMap","skipUpdatingBitmap","revert","shouldUpdateWorkspaceConfig","reasonForBitmapChange","writeMany","appliedVersionComponents","applyVersionResult","componentIdsToRemove","undefined","removeLocallyByIds","force","reasonForRemoval","removedComponents","n","toString","workspaceConfigUpdateResult","installationError","compilationError","missing","bitMapEntry","bitMap","getBitmapEntry","ignoreVersion","noFilesError","ComponentNotFoundInPath","comps","getMany","state","_consumer","stashedBitmapEntries","newBitmapEntries","entry","defaultScope","newComps","bitmapEntry","existingId","getBitmapEntryIfExist","modelComponent","ModelComponent","fromBitId","repo","objects","consumerComp","toConsumerComponent","newCompId","ComponentID","fromObject","name","fullName","writeToPath","rootDir","addComponent","componentId","files","f","basename","relativePath","relative","test","mainFile","config","triggerOnComponentAdd","compile","write","checkoutByCLIValues","componentPattern","setStatusLine","OutsideWorkspaceError","importCurrentObjects","makeLaneComponentsAvailableOnMain","parseValues","checkoutResults","onDestroy","notExported","isExported","changeScope","scopeComponentsImporter","toVersionLatest","reason","includeUnexported","error","unavailableOnMain","getUnavailableOnMainComponents","makeComponentsAvailableOnMain","includeLocallyDeleted","latest","idsOnWorkspace","listIdsIncludeRemoved","listIds","currentLane","getCurrentLaneObject","currentLaneIds","toComponentIds","hasWithoutVersion","LATEST","console","HEAD","getIds","idsByPattern","includeDeleted","laneBitIds","newComponentIds","bitId","isEqualWithoutVersion","nonRemovedNewIds","isRemoved","isComponentRemoved","headVersion","ancestor","main","latestVersion","versionPerId","forceOurs","forceTheirs","loadStash","existingBitMapId","getComponentIdIfExist","getComponent","results","loadComponents","allowAddingComponentsFromScope","componentModel","getModelComponentIfExist","returnFailure","msg","unmerged","unmergedComponents","getEntry","getNewVersion","headIncludeRemote","previousParent","getRefOfAncestor","getTagOfRefIfExists","latestVersionIfExist","newVersion","hasVersion","divergeDataForMergePending","getDivergeDataForMergePending","isMergePending","isDiverged","isModified","currentVersionObject","loadVersion","isComponentModified","versionRef","getRef","Error","componentVersion","getObject","hash","newId","componentFromModel","componentFromFS","baseVersion","baseComponent","otherComponent","parents","parent","threeWayMerge","otherLabel","currentLabel","provider","cli","loggerMain","compWriter","createLogger","CheckoutAspect","checkoutMain","register","CheckoutCmd","RevertCmd","exports","CLIAspect","WorkspaceAspect","LoggerAspect","ComponentWriterAspect","ImporterAspect","RemoveAspect","MainRuntime","addRuntime","_default"],"sources":["checkout.main.runtime.ts"],"sourcesContent":["import type { CLIMain } from '@teambit/cli';\nimport { CLIAspect, MainRuntime } from '@teambit/cli';\nimport type { Logger, LoggerMain } from '@teambit/logger';\nimport { LoggerAspect } from '@teambit/logger';\nimport type { Workspace } from '@teambit/workspace';\nimport { WorkspaceAspect, OutsideWorkspaceError } from '@teambit/workspace';\nimport { BitError } from '@teambit/bit-error';\nimport { compact } from 'lodash';\nimport type { RemoveMain } from '@teambit/remove';\nimport { RemoveAspect } from '@teambit/remove';\nimport type { ApplyVersionResults, FailedComponents, MergeStrategy } from '@teambit/component.modules.merge-helper';\nimport { threeWayMerge, getMergeStrategyInteractive } from '@teambit/component.modules.merge-helper';\nimport type { ImporterMain } from '@teambit/importer';\nimport { ImporterAspect } from '@teambit/importer';\nimport { HEAD, LATEST } from '@teambit/legacy.constants';\nimport type { ComponentWriterMain } from '@teambit/component-writer';\nimport { ComponentWriterAspect } from '@teambit/component-writer';\nimport mapSeries from 'p-map-series';\nimport { ComponentIdList, ComponentID } from '@teambit/component-id';\nimport type { Version, Lane } from '@teambit/objects';\nimport { ModelComponent } from '@teambit/objects';\nimport { Tmp } from '@teambit/legacy.scope';\nimport { ComponentNotFoundInPath } from '@teambit/legacy.consumer-component';\nimport { CheckoutCmd } from './checkout-cmd';\nimport { CheckoutAspect } from './checkout.aspect';\nimport type { ComponentStatus, ComponentStatusBase } from './checkout-version';\nimport { applyVersion, throwForFailures } from './checkout-version';\nimport { RevertCmd } from './revert-cmd';\nimport type { ComponentMap } from '@teambit/legacy.bit-map';\n\nexport type CheckoutProps = {\n version?: string; // if reset/head/latest is true, the version is undefined\n ids?: ComponentID[];\n head?: boolean;\n ancestor?: number; // how many generations to go backward\n latest?: boolean;\n main?: boolean; // relevant for \"revert\" only\n promptMergeOptions?: boolean;\n mergeStrategy?: MergeStrategy; // strategy to use in case of conflicts\n forceOurs?: boolean; // regardless of conflicts, use ours\n forceTheirs?: boolean; // regardless of conflicts, use theirs\n verbose?: boolean;\n skipNpmInstall?: boolean;\n reset?: boolean; // remove local changes. if set, the version is undefined.\n revert?: boolean; // change the files according to the given version, but don't change the bitmap version and don't try to merge\n all?: boolean; // checkout all ids\n isLane?: boolean;\n lane?: Lane; // currently needed for \"bit switch\" to tell the \"fetch\" where to fetch from\n workspaceOnly?: boolean;\n versionPerId?: ComponentID[]; // if given, the ComponentID.version is the version to checkout to.\n skipUpdatingBitmap?: boolean; // needed for stash\n loadStash?: boolean;\n stashedBitmapEntries?: Array<Partial<ComponentMap>>;\n restoreMissingComponents?: boolean; // in case .bitmap has a component and it's missing from the workspace, restore it (from model)\n allowAddingComponentsFromScope?: boolean; // in case the id doesn't exist in .bitmap, add it from the scope (relevant for switch)\n includeLocallyDeleted?: boolean; // include components that were deleted locally. currently enabled for \"bit checkout reset\" only.\n};\n\nexport type ComponentStatusBeforeMergeAttempt = ComponentStatusBase & {\n propsForMerge?: {\n currentlyUsedVersion: string;\n componentModel: ModelComponent;\n };\n};\n\nexport class CheckoutMain {\n constructor(\n private workspace: Workspace,\n private logger: Logger,\n private componentWriter: ComponentWriterMain,\n private importer: ImporterMain,\n private remove: RemoveMain\n ) {}\n\n async checkout(checkoutProps: CheckoutProps): Promise<ApplyVersionResults> {\n await this.ensureCheckoutConfiguration(checkoutProps);\n this.workspace.inInstallContext = true;\n const { version, ids, promptMergeOptions } = checkoutProps;\n await this.syncNewComponents(checkoutProps);\n const addedComponents = await this.restoreMissingComponents(checkoutProps);\n const newComponents = await this.addNewComponents(checkoutProps);\n const bitIds = ComponentIdList.fromArray(ids?.map((id) => id) || []);\n // don't use Promise.all, it loads the components and this operation must be in sequence.\n const allComponentStatusBeforeMerge = await mapSeries(bitIds, (id) =>\n this.getComponentStatusBeforeMergeAttempt(id, 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\n await this.workspace.scope.legacyScope.scopeImporter.importWithoutDeps(ComponentIdList.fromArray(toImport), {\n cache: true,\n lane: checkoutProps.lane,\n });\n const consumer = this.workspace.consumer;\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, checkoutProps)));\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 BitError(\n `automatic merge has failed for component ${componentWithConflict.id.toStringWithoutVersion()}.\\nplease use \"--auto-merge-resolve\" with 'manual', 'ours' or 'theirs' to resolve the conflict/s`\n );\n }\n if (!checkoutProps.mergeStrategy) checkoutProps.mergeStrategy = await getMergeStrategyInteractive();\n }\n\n throwForFailures(allComponentsStatus);\n\n const failedComponents: FailedComponents[] = allComponentsStatus\n .filter((componentStatus) => componentStatus.unchangedMessage)\n .filter((componentStatus) => !componentStatus.shouldBeRemoved)\n .map((componentStatus) => ({\n id: componentStatus.id,\n unchangedMessage: componentStatus.unchangedMessage as string,\n unchangedLegitimately: componentStatus.unchangedLegitimately,\n }));\n\n const succeededComponents = allComponentsStatus.filter((componentStatus) => !componentStatus.unchangedMessage);\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) };\n const componentsResults = await mapSeries(succeededComponents, ({ id, currentComponent, mergeResults }) => {\n return applyVersion(consumer, id, currentComponent, mergeResults, checkoutPropsLegacy);\n });\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))\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 skipUpdatingBitMap: checkoutProps.skipUpdatingBitmap || checkoutProps.revert,\n shouldUpdateWorkspaceConfig: true,\n reasonForBitmapChange: 'checkout',\n mergeStrategy: checkoutProps.mergeStrategy,\n };\n componentWriterResults = await this.componentWriter.writeMany(manyComponentsWriterOpts);\n }\n\n const appliedVersionComponents = componentsResults.map((c) => c.applyVersionResult);\n\n const componentIdsToRemove = allComponentsStatus\n .filter((componentStatus) => componentStatus.shouldBeRemoved)\n .map((c) => c.id.changeVersion(undefined));\n\n if (componentIdsToRemove.length) {\n await this.remove.removeLocallyByIds(componentIdsToRemove, { force: true, reasonForRemoval: 'checkout' });\n }\n\n return {\n components: appliedVersionComponents,\n removedComponents: componentIdsToRemove,\n addedComponents,\n newComponents,\n version,\n failedComponents,\n leftUnresolvedConflicts,\n newFromLane: newFromLane?.map((n) => n.toString()),\n newFromLaneAdded,\n workspaceConfigUpdateResult: componentWriterResults?.workspaceConfigUpdateResult,\n installationError: componentWriterResults?.installationError,\n compilationError: componentWriterResults?.compilationError,\n };\n }\n\n /**\n * if .bitmap entry exists but the rootDir is missing from the filesystem, find the component in the scope and restore it.\n * returns the restored component ids.\n */\n async restoreMissingComponents(checkoutProps: CheckoutProps): Promise<ComponentID[] | undefined> {\n if (checkoutProps.reset) {\n checkoutProps.restoreMissingComponents = true;\n }\n if (!checkoutProps.restoreMissingComponents) return undefined;\n const ids = checkoutProps.ids || [];\n const missing: ComponentID[] = [];\n await Promise.all(\n ids.map(async (id) => {\n const bitMapEntry = this.workspace.bitMap.getBitmapEntry(id, { ignoreVersion: true });\n if (bitMapEntry.noFilesError && bitMapEntry.noFilesError instanceof ComponentNotFoundInPath) {\n delete bitMapEntry.noFilesError;\n missing.push(id);\n }\n })\n );\n if (!missing.length) return undefined;\n const comps = await this.workspace.scope.getMany(missing);\n await this.componentWriter.writeMany({\n components: comps.map((c) => c.state._consumer),\n skipDependencyInstallation: true,\n skipUpdatingBitMap: true,\n });\n\n return missing;\n }\n\n async addNewComponents(checkoutProps: CheckoutProps): Promise<undefined | ComponentID[]> {\n const stashedBitmapEntries = checkoutProps.stashedBitmapEntries;\n if (!stashedBitmapEntries) return;\n const newBitmapEntries = stashedBitmapEntries.filter((entry) => entry.defaultScope);\n if (!newBitmapEntries.length) return;\n const newComps = await mapSeries(newBitmapEntries, async (bitmapEntry) => {\n const id = bitmapEntry.id!;\n const existingId = this.workspace.bitMap.getBitmapEntryIfExist(id, { ignoreVersion: true });\n if (existingId) return;\n const modelComponent = ModelComponent.fromBitId(id);\n const repo = this.workspace.scope.legacyScope.objects;\n const consumerComp = await modelComponent.toConsumerComponent(id.version, id.scope, repo);\n const newCompId = ComponentID.fromObject({ name: id.fullName }, bitmapEntry.defaultScope!);\n await this.componentWriter.writeMany({\n components: [consumerComp],\n skipDependencyInstallation: true,\n writeToPath: bitmapEntry.rootDir,\n skipUpdatingBitMap: true,\n });\n\n this.workspace.consumer.bitMap.addComponent({\n componentId: newCompId,\n files: consumerComp.files.map((f) => ({\n name: f.basename,\n relativePath: f.relative,\n test: f.test,\n })),\n mainFile: bitmapEntry.mainFile!,\n config: bitmapEntry.config,\n defaultScope: bitmapEntry.defaultScope,\n });\n await this.workspace.triggerOnComponentAdd(newCompId, { compile: true });\n return newCompId;\n });\n await this.workspace.bitMap.write();\n return compact(newComps);\n }\n\n async checkoutByCLIValues(componentPattern: string, checkoutProps: CheckoutProps): Promise<ApplyVersionResults> {\n const { revert, head } = checkoutProps;\n this.logger.setStatusLine(revert ? 'reverting components...' : 'switching component version...');\n if (!this.workspace) throw new OutsideWorkspaceError();\n const consumer = this.workspace.consumer;\n await this.importer.importCurrentObjects(); // important. among others, it fetches the remote lane object and its new components.\n if (head) await this.makeLaneComponentsAvailableOnMain();\n await this.parseValues(componentPattern, checkoutProps);\n const checkoutResults = await this.checkout(checkoutProps);\n await consumer.onDestroy(`checkout (${componentPattern})`);\n return checkoutResults;\n }\n\n private async syncNewComponents({ ids, head }: CheckoutProps) {\n if (!head) return;\n const notExported = ids?.filter((id) => !this.workspace.isExported(id)).map((id) => id.changeScope(id.scope));\n const scopeComponentsImporter = this.workspace.consumer.scope.scopeImporter;\n try {\n await scopeComponentsImporter.importWithoutDeps(ComponentIdList.fromArray(notExported || []).toVersionLatest(), {\n cache: false,\n reason: 'for making sure the new components are really new and are not out-of-sync',\n includeUnexported: 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 ensureCheckoutConfiguration(checkoutProps: CheckoutProps) {\n if (checkoutProps.reset || checkoutProps.head) {\n checkoutProps.includeLocallyDeleted = true;\n }\n if (checkoutProps.ids?.length) {\n return;\n }\n if (checkoutProps.head || checkoutProps.latest) {\n checkoutProps.all = true;\n }\n if (!checkoutProps.all) {\n return; // no ids and no all.\n }\n const idsOnWorkspace = checkoutProps.includeLocallyDeleted\n ? this.workspace.listIdsIncludeRemoved()\n : this.workspace.listIds();\n\n const currentLane = await this.workspace.consumer.getCurrentLaneObject();\n const currentLaneIds = currentLane?.toComponentIds();\n\n // When on a lane and doing head checkout, only checkout lane components\n const ids =\n currentLaneIds && checkoutProps.head\n ? idsOnWorkspace.filter((id) => currentLaneIds.hasWithoutVersion(id))\n : idsOnWorkspace;\n\n checkoutProps.ids = ids.map((id) => (checkoutProps.head || checkoutProps.latest ? id.changeVersion(LATEST) : id));\n }\n\n private async parseValues(componentPattern: string, checkoutProps: CheckoutProps) {\n // CLI-specific validations and deprecation warnings\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 BitError('please specify either [component-pattern] or --all, not both');\n }\n if (!componentPattern && !checkoutProps.all) {\n throw new BitError('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 if (checkoutProps.reset || checkoutProps.head) {\n checkoutProps.includeLocallyDeleted = true;\n }\n\n const getIds = async () => {\n if (componentPattern) {\n return this.workspace.idsByPattern(componentPattern, true, {\n includeDeleted: checkoutProps.includeLocallyDeleted,\n });\n }\n return checkoutProps.includeLocallyDeleted ? this.workspace.listIdsIncludeRemoved() : this.workspace.listIds();\n };\n\n const idsOnWorkspace = await getIds();\n\n const currentLane = await this.workspace.consumer.getCurrentLaneObject();\n const currentLaneIds = currentLane?.toComponentIds();\n // when no ids were given and the user is on a lane, return lane-ids only.\n // it's relevant for cases like \"bit checkout head\" when on a lane to not checkout main components. (see https://github.com/teambit/bit/pull/6853)\n const ids =\n currentLaneIds && !componentPattern && checkoutProps.head\n ? idsOnWorkspace.filter((id) => currentLaneIds.hasWithoutVersion(id))\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.toComponentIds();\n const newComponentIds = laneBitIds.filter((bitId) => !ids.find((id) => id.isEqualWithoutVersion(bitId)));\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 // eslint-disable-next-line complexity\n private async getComponentStatusBeforeMergeAttempt(\n id: ComponentID,\n checkoutProps: CheckoutProps\n ): Promise<ComponentStatusBeforeMergeAttempt> {\n const consumer = this.workspace.consumer;\n const {\n version,\n head: headVersion,\n ancestor,\n reset,\n revert,\n main,\n latest: latestVersion,\n versionPerId,\n forceOurs,\n forceTheirs,\n loadStash,\n } = checkoutProps;\n const repo = consumer.scope.objects;\n\n let existingBitMapId = consumer.bitMap.getComponentIdIfExist(id, { ignoreVersion: true });\n const getComponent = async () => {\n try {\n const results = await consumer.loadComponents(ComponentIdList.fromArray([id]));\n if (results.components[0]) return results.components[0];\n if (checkoutProps.includeLocallyDeleted && results.removedComponents[0]) {\n return results.removedComponents[0];\n }\n } catch (err) {\n if (checkoutProps.allowAddingComponentsFromScope && !existingBitMapId) return undefined;\n throw err;\n }\n return undefined;\n };\n const component = await getComponent();\n if (component) {\n // the component might fix an out-of-sync issue and as a result, the id has changed\n id = component.id;\n existingBitMapId = consumer.bitMap.getComponentIdIfExist(id, { ignoreVersion: true });\n }\n\n const componentModel = await consumer.scope.getModelComponentIfExist(id);\n const componentStatus: ComponentStatusBeforeMergeAttempt = { id };\n const returnFailure = (msg: string, unchangedLegitimately = false) => {\n componentStatus.unchangedMessage = msg;\n componentStatus.unchangedLegitimately = unchangedLegitimately;\n return componentStatus;\n };\n if (!componentModel) {\n return returnFailure(`component ${id.toString()} is new, no version to checkout`, true);\n }\n if (main && !componentModel.head) {\n return returnFailure(`component ${id.toString()} is not available on main`);\n }\n const unmerged = repo.unmergedComponents.getEntry(id);\n if (!reset && unmerged) {\n return returnFailure(\n `component ${id.toStringWithoutVersion()} is in during-merge state, please snap/tag it first (or use bit merge --resolve/--abort)`\n );\n }\n\n const getNewVersion = async (): Promise<string> => {\n // eslint-disable-next-line @typescript-eslint/no-non-null-assertion\n if (reset) return component!.id.version as string;\n if (headVersion) return componentModel.headIncludeRemote(repo);\n if (ancestor) {\n const previousParent = await componentModel.getRefOfAncestor(repo, ancestor);\n return componentModel.getTagOfRefIfExists(previousParent)?.toString() || previousParent.toString();\n }\n // we verified previously that head exists in case of \"main\"\n if (main) return componentModel.head?.toString() as string;\n if (latestVersion) {\n const latest = componentModel.latestVersionIfExist();\n return latest || componentModel.headIncludeRemote(repo);\n }\n if (versionPerId) {\n return versionPerId.find((bitId) => bitId.isEqualWithoutVersion(id))?.version as string;\n }\n\n // if all above are false, the version is defined\n return version as string;\n };\n const newVersion = await getNewVersion();\n if (version && !headVersion) {\n const hasVersion = await componentModel.hasVersion(version, repo);\n if (!hasVersion) return returnFailure(`component ${id.toStringWithoutVersion()} doesn't have version ${version}`);\n }\n const currentlyUsedVersion = existingBitMapId?.version;\n if (existingBitMapId && !currentlyUsedVersion) {\n return returnFailure(`component ${id.toStringWithoutVersion()} is new`);\n }\n\n if ((version && currentlyUsedVersion === version) || (versionPerId && currentlyUsedVersion === newVersion)) {\n // it won't be relevant for 'reset' as it doesn't have a version/versionPerId\n return returnFailure(\n `component ${id.toStringWithoutVersion()} is already at version ${version || newVersion}`,\n true\n );\n }\n if ((headVersion || latestVersion) && currentlyUsedVersion === newVersion) {\n return returnFailure(\n `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 let isModified = false;\n if (currentlyUsedVersion) {\n const currentVersionObject: Version = await componentModel.loadVersion(currentlyUsedVersion, repo);\n // eslint-disable-next-line @typescript-eslint/no-non-null-assertion\n isModified = await consumer.isComponentModified(currentVersionObject, component!);\n const isRemoved = component && component.isRemoved();\n if (!isModified && !isRemoved && reset) {\n return returnFailure(`component ${id.toStringWithoutVersion()} is not modified`, true);\n }\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 | undefined;\n if (componentVersion?.isRemoved()) {\n if (existingBitMapId) componentStatus.shouldBeRemoved = true;\n return returnFailure(`component has been removed`, true);\n }\n\n const newId = id.changeVersion(newVersion);\n\n if (reset || (!isModified && !loadStash) || revert || !currentlyUsedVersion || forceTheirs || forceOurs) {\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 // in case of \"loadStash\", we want to merge the stashed modifications regardless whether it's modified currently.\n\n // if !currentlyUsedVersion it only exists in the model, so just write it. (happening during bit-switch/bit-lane-import)\n return { currentComponent: component, componentFromModel: componentVersion, id: newId };\n }\n\n const propsForMerge = {\n currentlyUsedVersion,\n componentModel,\n };\n\n return { currentComponent: component, componentFromModel: componentVersion, id: newId, propsForMerge };\n }\n\n private async getMergeStatus(\n { currentComponent: componentFromFS, componentFromModel, id, propsForMerge }: ComponentStatusBeforeMergeAttempt,\n checkoutProps: CheckoutProps\n ): 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 let baseVersion = currentlyUsedVersion;\n const newVersion = id.version as string;\n let baseComponent: Version = await componentModel.loadVersion(baseVersion, repo);\n const otherComponent: Version = await componentModel.loadVersion(newVersion, repo);\n const { loadStash } = checkoutProps;\n if (loadStash && otherComponent.parents.length) {\n // for stash, we want the stashed modifications to be added on top of the current version.\n // for this to happen, the \"base\" must be the parent of the stashed version.\n const parent = otherComponent.parents[0];\n baseVersion = parent.toString();\n baseComponent = await componentModel.loadVersion(baseVersion, repo);\n }\n\n const mergeResults = await threeWayMerge({\n scope: consumer.scope,\n otherComponent,\n otherLabel: loadStash ? 'stash' : newVersion,\n currentComponent: componentFromFS,\n currentLabel: `${currentlyUsedVersion} modified`,\n baseComponent,\n });\n\n return { currentComponent: componentFromFS, componentFromModel, id, mergeResults };\n }\n\n static slots = [];\n static dependencies = [CLIAspect, WorkspaceAspect, LoggerAspect, ComponentWriterAspect, ImporterAspect, RemoveAspect];\n\n static runtime = MainRuntime;\n\n static async provider([cli, workspace, loggerMain, compWriter, importer, remove]: [\n CLIMain,\n Workspace,\n LoggerMain,\n ComponentWriterMain,\n ImporterMain,\n RemoveMain,\n ]) {\n const logger = loggerMain.createLogger(CheckoutAspect.id);\n const checkoutMain = new CheckoutMain(workspace, logger, compWriter, importer, remove);\n cli.register(new CheckoutCmd(checkoutMain), new RevertCmd(checkoutMain));\n return checkoutMain;\n }\n}\n\nCheckoutAspect.addRuntime(CheckoutMain);\n\nexport default CheckoutMain;\n"],"mappings":"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","ignoreList":[]}
package/dist/index.d.ts CHANGED
@@ -2,6 +2,6 @@ import { CheckoutAspect } from './checkout.aspect';
2
2
  export type { CheckoutMain, CheckoutProps } from './checkout.main.runtime';
3
3
  export default CheckoutAspect;
4
4
  export { CheckoutAspect };
5
- export { applyModifiedVersion, applyVersion, removeFilesIfNeeded, updateFileStatus, throwForFailures, } from './checkout-version';
5
+ export { applyVersion, removeFilesIfNeeded, updateFileStatus, throwForFailures } from './checkout-version';
6
6
  export type { ComponentStatus, ComponentStatusBase, ApplyVersionWithComps } from './checkout-version';
7
7
  export { checkoutOutput } from './checkout-cmd';
package/dist/index.js CHANGED
@@ -9,12 +9,6 @@ Object.defineProperty(exports, "CheckoutAspect", {
9
9
  return _checkout().CheckoutAspect;
10
10
  }
11
11
  });
12
- Object.defineProperty(exports, "applyModifiedVersion", {
13
- enumerable: true,
14
- get: function () {
15
- return _checkoutVersion().applyModifiedVersion;
16
- }
17
- });
18
12
  Object.defineProperty(exports, "applyVersion", {
19
13
  enumerable: true,
20
14
  get: function () {
@@ -67,6 +61,9 @@ function _checkoutCmd() {
67
61
  };
68
62
  return data;
69
63
  }
70
- var _default = exports.default = _checkout().CheckoutAspect;
64
+ var _default = exports.default = _checkout().CheckoutAspect; // backward compatibility
65
+ // export {
66
+ // applyModifiedVersion
67
+ // } from '@teambit/component.modules.merge-helper';
71
68
 
72
69
  //# sourceMappingURL=index.js.map
package/dist/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"names":["_checkout","data","require","_checkoutVersion","_checkoutCmd","_default","exports","default","CheckoutAspect"],"sources":["index.ts"],"sourcesContent":["import { CheckoutAspect } from './checkout.aspect';\n\nexport type { CheckoutMain, CheckoutProps } from './checkout.main.runtime';\nexport default CheckoutAspect;\nexport { CheckoutAspect };\n\nexport {\n applyModifiedVersion,\n applyVersion,\n removeFilesIfNeeded,\n updateFileStatus,\n throwForFailures,\n} from './checkout-version';\n\nexport type { ComponentStatus, ComponentStatusBase, ApplyVersionWithComps } from './checkout-version';\nexport { checkoutOutput } from './checkout-cmd';\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,SAAAA,UAAA;EAAA,MAAAC,IAAA,GAAAC,OAAA;EAAAF,SAAA,YAAAA,CAAA;IAAA,OAAAC,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAMA,SAAAE,iBAAA;EAAA,MAAAF,IAAA,GAAAC,OAAA;EAAAC,gBAAA,YAAAA,CAAA;IAAA,OAAAF,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AASA,SAAAG,aAAA;EAAA,MAAAH,IAAA,GAAAC,OAAA;EAAAE,YAAA,YAAAA,CAAA;IAAA,OAAAH,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAAgD,IAAAI,QAAA,GAAAC,OAAA,CAAAC,OAAA,GAZjCC,0BAAc","ignoreList":[]}
1
+ {"version":3,"names":["_checkout","data","require","_checkoutVersion","_checkoutCmd","_default","exports","default","CheckoutAspect"],"sources":["index.ts"],"sourcesContent":["import { CheckoutAspect } from './checkout.aspect';\n\nexport type { CheckoutMain, CheckoutProps } from './checkout.main.runtime';\nexport default CheckoutAspect;\nexport { CheckoutAspect };\n\nexport { applyVersion, removeFilesIfNeeded, updateFileStatus, throwForFailures } from './checkout-version';\n\n// backward compatibility\n// export {\n// applyModifiedVersion\n// } from '@teambit/component.modules.merge-helper';\n\nexport type { ComponentStatus, ComponentStatusBase, ApplyVersionWithComps } from './checkout-version';\nexport { checkoutOutput } from './checkout-cmd';\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,SAAAA,UAAA;EAAA,MAAAC,IAAA,GAAAC,OAAA;EAAAF,SAAA,YAAAA,CAAA;IAAA,OAAAC,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAMA,SAAAE,iBAAA;EAAA,MAAAF,IAAA,GAAAC,OAAA;EAAAC,gBAAA,YAAAA,CAAA;IAAA,OAAAF,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAQA,SAAAG,aAAA;EAAA,MAAAH,IAAA,GAAAC,OAAA;EAAAE,YAAA,YAAAA,CAAA;IAAA,OAAAH,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAAgD,IAAAI,QAAA,GAAAC,OAAA,CAAAC,OAAA,GAXjCC,0BAAc,EAK7B;AACA;AACA;AACA","ignoreList":[]}
package/package.json CHANGED
@@ -1,47 +1,47 @@
1
1
  {
2
2
  "name": "@teambit/checkout",
3
- "version": "1.0.676",
3
+ "version": "1.0.678",
4
4
  "homepage": "https://bit.cloud/teambit/component/checkout",
5
5
  "main": "dist/index.js",
6
6
  "componentId": {
7
7
  "scope": "teambit.component",
8
8
  "name": "checkout",
9
- "version": "1.0.676"
9
+ "version": "1.0.678"
10
10
  },
11
11
  "dependencies": {
12
12
  "chalk": "4.1.2",
13
13
  "lodash": "4.17.21",
14
14
  "p-map-series": "2.1.0",
15
15
  "@teambit/bit-error": "0.0.404",
16
- "@teambit/cli": "0.0.1250",
16
+ "@teambit/cli": "0.0.1251",
17
17
  "@teambit/component-id": "1.2.4",
18
18
  "@teambit/legacy.constants": "0.0.14",
19
- "@teambit/component.sources": "0.0.112",
20
- "@teambit/legacy.consumer-component": "0.0.61",
21
- "@teambit/legacy.consumer": "0.0.60",
19
+ "@teambit/component.sources": "0.0.113",
20
+ "@teambit/legacy.consumer-component": "0.0.62",
21
+ "@teambit/legacy.consumer": "0.0.61",
22
22
  "@teambit/legacy.utils": "0.0.23",
23
23
  "@teambit/harmony": "0.4.7",
24
- "@teambit/legacy.bit-map": "0.0.117",
25
- "@teambit/legacy.scope": "0.0.60",
26
- "@teambit/logger": "0.0.1343",
27
- "@teambit/merging": "1.0.676",
28
- "@teambit/objects": "0.0.183",
29
- "@teambit/component-writer": "1.0.676",
30
- "@teambit/importer": "1.0.676",
31
- "@teambit/remove": "1.0.676",
32
- "@teambit/workspace": "1.0.676"
24
+ "@teambit/legacy.bit-map": "0.0.118",
25
+ "@teambit/legacy.scope": "0.0.61",
26
+ "@teambit/logger": "0.0.1344",
27
+ "@teambit/component.modules.merge-helper": "0.0.1",
28
+ "@teambit/objects": "0.0.185",
29
+ "@teambit/component-writer": "1.0.678",
30
+ "@teambit/importer": "1.0.678",
31
+ "@teambit/remove": "1.0.678",
32
+ "@teambit/workspace": "1.0.678"
33
33
  },
34
34
  "devDependencies": {
35
35
  "@types/lodash": "4.14.165",
36
36
  "@types/fs-extra": "9.0.7",
37
37
  "fs-extra": "10.0.0",
38
38
  "@types/mocha": "9.1.0",
39
- "@teambit/component.testing.mock-components": "0.0.324",
40
- "@teambit/harmony.testing.load-aspect": "0.0.319",
41
- "@teambit/workspace.testing.mock-workspace": "0.0.103",
39
+ "@teambit/component.testing.mock-components": "0.0.325",
40
+ "@teambit/harmony.testing.load-aspect": "0.0.320",
42
41
  "@teambit/harmony.envs.core-aspect-env": "0.0.72",
43
- "@teambit/lister": "1.0.676",
44
- "@teambit/snapping": "1.0.676"
42
+ "@teambit/lister": "1.0.678",
43
+ "@teambit/snapping": "1.0.678",
44
+ "@teambit/workspace.testing.mock-workspace": "0.0.105"
45
45
  },
46
46
  "peerDependencies": {
47
47
  "chai": "5.2.1",