@teambit/checkout 1.0.65 → 1.0.66

package/dist/checkout-version.d.ts

@@ -34,6 +34,7 @@ export declare type ComponentStatus = ComponentStatusBase & {
 export declare type ApplyVersionWithComps = {
     applyVersionResult: ApplyVersionResult;
     component?: ConsumerComponent;
+    legacyCompToWrite?: ConsumerComponent;
 };
 /**
  * 1) when the files are modified with conflicts and the strategy is "ours", leave the FS as is

package/dist/checkout-version.js.map

@@ -1 +1 @@
-{"version":3,"names":["path","data","_interopRequireWildcard","require","_generalError","_interopRequireDefault","_path2","_dataToPersist","_removePath","_mergeVersion","_bitError","_chalk","obj","__esModule","default","_getRequireWildcardCache","e","WeakMap","r","t","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","ownKeys","keys","getOwnPropertySymbols","o","filter","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","key","value","_toPropertyKey","configurable","writable","arg","_toPrimitive","String","input","hint","prim","Symbol","toPrimitive","undefined","res","TypeError","Number","applyVersion","consumer","id","componentFromFS","mergeResults","checkoutProps","isLane","Error","toString","mergeStrategy","filesStatus","hasConflicts","MergeOptions","ours","files","file","pathNormalizeToLinux","relative","FileStatus","unchanged","bitMap","updateComponentId","applyVersionResult","component","loadComponentFromModelImportIfNeeded","componentMap","GeneralError","updateFileStatus","removeFilesIfNeeded","modifiedStatus","modifiedFiles","applyModifiedVersion","fileFromFs","find","f","areFilesEqual","Buffer","compare","contents","updated","filePathsFromFS","dataToPersist","DataToPersist","filename","removed","removePath","RemovePath","persistAllToFS","componentFiles","map","clone","manual","filePath","normalize","foundFile","componentFile","conflict","from","output","merged","isBinaryConflict","fsFile","binaryConflict","addFiles","m","added","deletedConflictFiles","removeFiles","remainDeletedFiles","remainDeleted","deletedConflict","overrideFiles","overridden","updatedFiles","content","throwForFailures","allComponentsStatus","failedComponents","c","unchangedMessage","unchangedLegitimately","failureMsgs","failedComponent","chalk","bold","red","join","BitError"],"sources":["checkout-version.ts"],"sourcesContent":["import * as path from 'path';\nimport { Consumer } from '@teambit/legacy/dist/consumer';\nimport { ComponentID } from '@teambit/component-id';\nimport GeneralError from '@teambit/legacy/dist/error/general-error';\nimport Version from '@teambit/legacy/dist/scope/models/version';\nimport { SourceFile } from '@teambit/legacy/dist/consumer/component/sources';\nimport { pathNormalizeToLinux, PathOsBased } from '@teambit/legacy/dist/utils/path';\nimport DataToPersist from '@teambit/legacy/dist/consumer/component/sources/data-to-persist';\nimport RemovePath from '@teambit/legacy/dist/consumer/component/sources/remove-path';\nimport {\n  ApplyVersionResult,\n  FilesStatus,\n  FileStatus,\n  MergeOptions,\n  MergeStrategy,\n} from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport { MergeResultsThreeWay } from '@teambit/legacy/dist/consumer/versions-ops/merge-version/three-way-merge';\nimport ConsumerComponent from '@teambit/legacy/dist/consumer/component';\nimport { BitError } from '@teambit/bit-error';\nimport chalk from 'chalk';\n\nexport type CheckoutProps = {\n  version?: string; // if reset is true, the version is undefined\n  ids?: ComponentID[];\n  latestVersion?: boolean;\n  promptMergeOptions?: boolean;\n  mergeStrategy?: MergeStrategy | null;\n  verbose?: boolean;\n  skipNpmInstall?: boolean;\n  ignorePackageJson?: boolean;\n  writeConfig?: boolean;\n  reset?: boolean; // remove local changes. if set, the version is undefined.\n  all?: boolean; // checkout all ids\n  ignoreDist?: boolean;\n  isLane?: boolean;\n};\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 = { applyVersionResult: ApplyVersionResult; component?: ConsumerComponent };\n\n/**\n * 1) when the files are modified with conflicts and the strategy is \"ours\", leave the FS as is\n * and update only bitmap id version. (not the componentMap object).\n *\n * 2) when the files are modified with conflicts and the strategy is \"theirs\", write the component\n * according to id.version.\n *\n * 3) when files are modified with no conflict or files are modified with conflicts and the\n * strategy is manual, load the component according to id.version and update component.files.\n * applyModifiedVersion() docs explains what files are updated/added.\n *\n * 4) when --reset flag is used, write the component according to the bitmap version\n *\n * Side note:\n * Deleted file => if files are in used version but not in the modified one, no need to delete it. (similar to git).\n * Added file => if files are not in used version but in the modified one, they'll be under mergeResults.addFiles\n */\nexport async function applyVersion(\n  consumer: Consumer,\n  id: 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 } = checkoutProps;\n  let filesStatus = {};\n  if (mergeResults && mergeResults.hasConflicts && mergeStrategy === MergeOptions.ours) {\n    // even when isLane is true, the mergeResults is possible only when the component is on the filesystem\n    // otherwise it's impossible to have conflicts\n    if (!componentFromFS) throw new Error(`applyVersion expect to get componentFromFS for ${id.toString()}`);\n    componentFromFS.files.forEach((file) => {\n      filesStatus[pathNormalizeToLinux(file.relative)] = FileStatus.unchanged;\n    });\n    consumer.bitMap.updateComponentId(id);\n    return { applyVersionResult: { id, filesStatus } };\n  }\n  const component = await consumer.loadComponentFromModelImportIfNeeded(id);\n  const componentMap = componentFromFS && componentFromFS.componentMap;\n  if (componentFromFS && !componentMap) throw new GeneralError('applyVersion: componentMap was not found');\n\n  const files = component.files;\n  updateFileStatus(files, filesStatus, componentFromFS || undefined);\n\n  await removeFilesIfNeeded(filesStatus, componentFromFS || undefined);\n\n  if (mergeResults) {\n    // update files according to the merge results\n    const { filesStatus: modifiedStatus, modifiedFiles } = applyModifiedVersion(files, mergeResults, mergeStrategy);\n    filesStatus = { ...filesStatus, ...modifiedStatus };\n    component.files = modifiedFiles;\n  }\n\n  return {\n    applyVersionResult: { id, filesStatus },\n    component,\n  };\n}\n\nexport function updateFileStatus(files: SourceFile[], filesStatus: FilesStatus, componentFromFS?: ConsumerComponent) {\n  files.forEach((file) => {\n    const fileFromFs = componentFromFS?.files.find((f) => f.relative === file.relative);\n    const areFilesEqual = fileFromFs && Buffer.compare(fileFromFs.contents, file.contents) === 0;\n    // @ts-ignore\n    filesStatus[pathNormalizeToLinux(file.relative)] = areFilesEqual ? FileStatus.unchanged : FileStatus.updated;\n  });\n}\n\n/**\n * when files exist on the filesystem but not on the checked out versions, they need to be deleted.\n * without this function, these files would be left on the filesystem. (we don't delete the comp-dir before writing).\n * this needs to be done *before* the component is written to the filesystem, otherwise, it won't work when a file\n * has a case change. e.g. from uppercase to lowercase. (see merge-lane.e2e 'renaming files from uppercase to lowercase').\n */\nexport async function removeFilesIfNeeded(filesStatus: FilesStatus, componentFromFS?: ConsumerComponent) {\n  if (!componentFromFS) return;\n  const filePathsFromFS = componentFromFS.files || [];\n  const dataToPersist = new DataToPersist();\n  filePathsFromFS.forEach((file) => {\n    const filename = pathNormalizeToLinux(file.relative);\n    if (!filesStatus[filename]) {\n      // @ts-ignore todo: typescript has a good point here. it should be the string \"removed\", not chalk.green(removed).\n      filesStatus[filename] = FileStatus.removed;\n      dataToPersist.removePath(new RemovePath(file.path));\n    }\n  });\n  await dataToPersist.persistAllToFS();\n}\n\n/**\n * relevant only when\n * 1) there is no conflict => add files from mergeResults: addFiles, overrideFiles and modifiedFiles.output.\n * 2) there is conflict and mergeStrategy is manual => add files from mergeResults: addFiles, overrideFiles and modifiedFiles.conflict.\n *\n * this function only updates the files content, it doesn't write the files\n */\nexport function applyModifiedVersion(\n  componentFiles: SourceFile[],\n  mergeResults: MergeResultsThreeWay,\n  mergeStrategy: MergeStrategy | null | undefined\n): { filesStatus: Record<string, any>; modifiedFiles: SourceFile[] } {\n  let modifiedFiles = componentFiles.map((file) => file.clone());\n  const filesStatus = {};\n  if (mergeResults.hasConflicts && mergeStrategy !== MergeOptions.manual) {\n    return { filesStatus, modifiedFiles };\n  }\n  mergeResults.modifiedFiles.forEach((file) => {\n    const filePath: PathOsBased = path.normalize(file.filePath);\n    const foundFile = modifiedFiles.find((componentFile) => componentFile.relative === filePath);\n    if (!foundFile) throw new GeneralError(`file ${filePath} not found`);\n    if (file.conflict) {\n      foundFile.contents = Buffer.from(file.conflict);\n      filesStatus[file.filePath] = FileStatus.manual;\n    } else if (typeof file.output === 'string') {\n      foundFile.contents = Buffer.from(file.output);\n      filesStatus[file.filePath] = FileStatus.merged;\n    } else if (file.isBinaryConflict) {\n      // leave the file as is and notify the user later about it.\n      foundFile.contents = file.fsFile.contents;\n      filesStatus[file.filePath] = FileStatus.binaryConflict;\n    } else {\n      throw new GeneralError(`file ${filePath} does not have output nor conflict`);\n    }\n  });\n\n  mergeResults.addFiles.forEach((file) => {\n    const filePath: PathOsBased = path.normalize(file.filePath);\n    if (modifiedFiles.find((m) => m.relative === filePath)) return;\n    modifiedFiles.push(file.fsFile);\n    filesStatus[file.filePath] = FileStatus.added;\n  });\n  mergeResults.deletedConflictFiles.forEach((file) => {\n    if (!file.fsFile) return;\n    const filePath: PathOsBased = path.normalize(file.filePath);\n    if (modifiedFiles.find((m) => m.relative === filePath)) return;\n    modifiedFiles.push(file.fsFile);\n    filesStatus[file.filePath] = FileStatus.added;\n  });\n  mergeResults.removeFiles.forEach((file) => {\n    const filePath: PathOsBased = path.normalize(file.filePath);\n    filesStatus[file.filePath] = FileStatus.removed;\n    modifiedFiles = modifiedFiles.filter((f) => f.relative !== filePath);\n  });\n  mergeResults.remainDeletedFiles.forEach((file) => {\n    const filePath: PathOsBased = path.normalize(file.filePath);\n    modifiedFiles = modifiedFiles.filter((f) => f.relative !== filePath);\n    filesStatus[file.filePath] = FileStatus.remainDeleted;\n  });\n  mergeResults.deletedConflictFiles.forEach((file) => {\n    filesStatus[file.filePath] = FileStatus.deletedConflict;\n  });\n\n  mergeResults.overrideFiles.forEach((file) => {\n    const filePath: PathOsBased = path.normalize(file.filePath);\n    const foundFile = modifiedFiles.find((componentFile) => componentFile.relative === filePath);\n    if (!foundFile) throw new GeneralError(`file ${filePath} not found`);\n    foundFile.contents = file.fsFile.contents;\n    filesStatus[file.filePath] = FileStatus.overridden;\n  });\n  mergeResults.updatedFiles.forEach((file) => {\n    const filePath: PathOsBased = path.normalize(file.filePath);\n    const foundFile = modifiedFiles.find((componentFile) => componentFile.relative === filePath);\n    if (!foundFile) throw new GeneralError(`file ${filePath} not found`);\n    foundFile.contents = file.content;\n    filesStatus[file.filePath] = FileStatus.updated;\n  });\n\n  return { filesStatus, modifiedFiles };\n}\n\nexport function throwForFailures(allComponentsStatus: ComponentStatusBase[]) {\n  const failedComponents = allComponentsStatus.filter((c) => c.unchangedMessage && !c.unchangedLegitimately);\n  if (failedComponents.length) {\n    const failureMsgs = failedComponents\n      .map(\n        (failedComponent) =>\n          `${chalk.bold(failedComponent.id.toString())} - ${chalk.red(failedComponent.unchangedMessage as string)}`\n      )\n      .join('\\n');\n    throw new BitError(`unable to proceed due to the following failures:\\n${failureMsgs}`);\n  }\n}\n"],"mappings":"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"}
+{"version":3,"names":["path","data","_interopRequireWildcard","require","_generalError","_interopRequireDefault","_path2","_dataToPersist","_removePath","_mergeVersion","_bitError","_chalk","obj","__esModule","default","_getRequireWildcardCache","e","WeakMap","r","t","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","ownKeys","keys","getOwnPropertySymbols","o","filter","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","key","value","_toPropertyKey","configurable","writable","arg","_toPrimitive","String","input","hint","prim","Symbol","toPrimitive","undefined","res","TypeError","Number","applyVersion","consumer","id","componentFromFS","mergeResults","checkoutProps","isLane","Error","toString","mergeStrategy","filesStatus","hasConflicts","MergeOptions","ours","files","file","pathNormalizeToLinux","relative","FileStatus","unchanged","bitMap","updateComponentId","applyVersionResult","component","loadComponentFromModelImportIfNeeded","componentMap","GeneralError","updateFileStatus","removeFilesIfNeeded","modifiedStatus","modifiedFiles","applyModifiedVersion","fileFromFs","find","f","areFilesEqual","Buffer","compare","contents","updated","filePathsFromFS","dataToPersist","DataToPersist","filename","removed","removePath","RemovePath","persistAllToFS","componentFiles","map","clone","manual","filePath","normalize","foundFile","componentFile","conflict","from","output","merged","isBinaryConflict","fsFile","binaryConflict","addFiles","m","added","deletedConflictFiles","removeFiles","remainDeletedFiles","remainDeleted","deletedConflict","overrideFiles","overridden","updatedFiles","content","throwForFailures","allComponentsStatus","failedComponents","c","unchangedMessage","unchangedLegitimately","failureMsgs","failedComponent","chalk","bold","red","join","BitError"],"sources":["checkout-version.ts"],"sourcesContent":["import * as path from 'path';\nimport { Consumer } from '@teambit/legacy/dist/consumer';\nimport { ComponentID } from '@teambit/component-id';\nimport GeneralError from '@teambit/legacy/dist/error/general-error';\nimport Version from '@teambit/legacy/dist/scope/models/version';\nimport { SourceFile } from '@teambit/legacy/dist/consumer/component/sources';\nimport { pathNormalizeToLinux, PathOsBased } from '@teambit/legacy/dist/utils/path';\nimport DataToPersist from '@teambit/legacy/dist/consumer/component/sources/data-to-persist';\nimport RemovePath from '@teambit/legacy/dist/consumer/component/sources/remove-path';\nimport {\n  ApplyVersionResult,\n  FilesStatus,\n  FileStatus,\n  MergeOptions,\n  MergeStrategy,\n} from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport { MergeResultsThreeWay } from '@teambit/legacy/dist/consumer/versions-ops/merge-version/three-way-merge';\nimport ConsumerComponent from '@teambit/legacy/dist/consumer/component';\nimport { BitError } from '@teambit/bit-error';\nimport chalk from 'chalk';\n\nexport type CheckoutProps = {\n  version?: string; // if reset is true, the version is undefined\n  ids?: ComponentID[];\n  latestVersion?: boolean;\n  promptMergeOptions?: boolean;\n  mergeStrategy?: MergeStrategy | null;\n  verbose?: boolean;\n  skipNpmInstall?: boolean;\n  ignorePackageJson?: boolean;\n  writeConfig?: boolean;\n  reset?: boolean; // remove local changes. if set, the version is undefined.\n  all?: boolean; // checkout all ids\n  ignoreDist?: boolean;\n  isLane?: boolean;\n};\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 * 1) when the files are modified with conflicts and the strategy is \"ours\", leave the FS as is\n * and update only bitmap id version. (not the componentMap object).\n *\n * 2) when the files are modified with conflicts and the strategy is \"theirs\", write the component\n * according to id.version.\n *\n * 3) when files are modified with no conflict or files are modified with conflicts and the\n * strategy is manual, load the component according to id.version and update component.files.\n * applyModifiedVersion() docs explains what files are updated/added.\n *\n * 4) when --reset flag is used, write the component according to the bitmap version\n *\n * Side note:\n * Deleted file => if files are in used version but not in the modified one, no need to delete it. (similar to git).\n * Added file => if files are not in used version but in the modified one, they'll be under mergeResults.addFiles\n */\nexport async function applyVersion(\n  consumer: Consumer,\n  id: 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 } = checkoutProps;\n  let filesStatus = {};\n  if (mergeResults && mergeResults.hasConflicts && mergeStrategy === MergeOptions.ours) {\n    // even when isLane is true, the mergeResults is possible only when the component is on the filesystem\n    // otherwise it's impossible to have conflicts\n    if (!componentFromFS) throw new Error(`applyVersion expect to get componentFromFS for ${id.toString()}`);\n    componentFromFS.files.forEach((file) => {\n      filesStatus[pathNormalizeToLinux(file.relative)] = FileStatus.unchanged;\n    });\n    consumer.bitMap.updateComponentId(id);\n    return { applyVersionResult: { id, filesStatus } };\n  }\n  const component = await consumer.loadComponentFromModelImportIfNeeded(id);\n  const componentMap = componentFromFS && componentFromFS.componentMap;\n  if (componentFromFS && !componentMap) throw new GeneralError('applyVersion: componentMap was not found');\n\n  const files = component.files;\n  updateFileStatus(files, filesStatus, componentFromFS || undefined);\n\n  await removeFilesIfNeeded(filesStatus, componentFromFS || undefined);\n\n  if (mergeResults) {\n    // update files according to the merge results\n    const { filesStatus: modifiedStatus, modifiedFiles } = applyModifiedVersion(files, mergeResults, mergeStrategy);\n    filesStatus = { ...filesStatus, ...modifiedStatus };\n    component.files = modifiedFiles;\n  }\n\n  return {\n    applyVersionResult: { id, filesStatus },\n    component,\n  };\n}\n\nexport function updateFileStatus(files: SourceFile[], filesStatus: FilesStatus, componentFromFS?: ConsumerComponent) {\n  files.forEach((file) => {\n    const fileFromFs = componentFromFS?.files.find((f) => f.relative === file.relative);\n    const areFilesEqual = fileFromFs && Buffer.compare(fileFromFs.contents, file.contents) === 0;\n    // @ts-ignore\n    filesStatus[pathNormalizeToLinux(file.relative)] = areFilesEqual ? FileStatus.unchanged : FileStatus.updated;\n  });\n}\n\n/**\n * when files exist on the filesystem but not on the checked out versions, they need to be deleted.\n * without this function, these files would be left on the filesystem. (we don't delete the comp-dir before writing).\n * this needs to be done *before* the component is written to the filesystem, otherwise, it won't work when a file\n * has a case change. e.g. from uppercase to lowercase. (see merge-lane.e2e 'renaming files from uppercase to lowercase').\n */\nexport async function removeFilesIfNeeded(filesStatus: FilesStatus, componentFromFS?: ConsumerComponent) {\n  if (!componentFromFS) return;\n  const filePathsFromFS = componentFromFS.files || [];\n  const dataToPersist = new DataToPersist();\n  filePathsFromFS.forEach((file) => {\n    const filename = pathNormalizeToLinux(file.relative);\n    if (!filesStatus[filename]) {\n      // @ts-ignore todo: typescript has a good point here. it should be the string \"removed\", not chalk.green(removed).\n      filesStatus[filename] = FileStatus.removed;\n      dataToPersist.removePath(new RemovePath(file.path));\n    }\n  });\n  await dataToPersist.persistAllToFS();\n}\n\n/**\n * relevant only when\n * 1) there is no conflict => add files from mergeResults: addFiles, overrideFiles and modifiedFiles.output.\n * 2) there is conflict and mergeStrategy is manual => add files from mergeResults: addFiles, overrideFiles and modifiedFiles.conflict.\n *\n * this function only updates the files content, it doesn't write the files\n */\nexport function applyModifiedVersion(\n  componentFiles: SourceFile[],\n  mergeResults: MergeResultsThreeWay,\n  mergeStrategy: MergeStrategy | null | undefined\n): { filesStatus: Record<string, any>; modifiedFiles: SourceFile[] } {\n  let modifiedFiles = componentFiles.map((file) => file.clone());\n  const filesStatus = {};\n  if (mergeResults.hasConflicts && mergeStrategy !== MergeOptions.manual) {\n    return { filesStatus, modifiedFiles };\n  }\n  mergeResults.modifiedFiles.forEach((file) => {\n    const filePath: PathOsBased = path.normalize(file.filePath);\n    const foundFile = modifiedFiles.find((componentFile) => componentFile.relative === filePath);\n    if (!foundFile) throw new GeneralError(`file ${filePath} not found`);\n    if (file.conflict) {\n      foundFile.contents = Buffer.from(file.conflict);\n      filesStatus[file.filePath] = FileStatus.manual;\n    } else if (typeof file.output === 'string') {\n      foundFile.contents = Buffer.from(file.output);\n      filesStatus[file.filePath] = FileStatus.merged;\n    } else if (file.isBinaryConflict) {\n      // leave the file as is and notify the user later about it.\n      foundFile.contents = file.fsFile.contents;\n      filesStatus[file.filePath] = FileStatus.binaryConflict;\n    } else {\n      throw new GeneralError(`file ${filePath} does not have output nor conflict`);\n    }\n  });\n\n  mergeResults.addFiles.forEach((file) => {\n    const filePath: PathOsBased = path.normalize(file.filePath);\n    if (modifiedFiles.find((m) => m.relative === filePath)) return;\n    modifiedFiles.push(file.fsFile);\n    filesStatus[file.filePath] = FileStatus.added;\n  });\n  mergeResults.deletedConflictFiles.forEach((file) => {\n    if (!file.fsFile) return;\n    const filePath: PathOsBased = path.normalize(file.filePath);\n    if (modifiedFiles.find((m) => m.relative === filePath)) return;\n    modifiedFiles.push(file.fsFile);\n    filesStatus[file.filePath] = FileStatus.added;\n  });\n  mergeResults.removeFiles.forEach((file) => {\n    const filePath: PathOsBased = path.normalize(file.filePath);\n    filesStatus[file.filePath] = FileStatus.removed;\n    modifiedFiles = modifiedFiles.filter((f) => f.relative !== filePath);\n  });\n  mergeResults.remainDeletedFiles.forEach((file) => {\n    const filePath: PathOsBased = path.normalize(file.filePath);\n    modifiedFiles = modifiedFiles.filter((f) => f.relative !== filePath);\n    filesStatus[file.filePath] = FileStatus.remainDeleted;\n  });\n  mergeResults.deletedConflictFiles.forEach((file) => {\n    filesStatus[file.filePath] = FileStatus.deletedConflict;\n  });\n\n  mergeResults.overrideFiles.forEach((file) => {\n    const filePath: PathOsBased = path.normalize(file.filePath);\n    const foundFile = modifiedFiles.find((componentFile) => componentFile.relative === filePath);\n    if (!foundFile) throw new GeneralError(`file ${filePath} not found`);\n    foundFile.contents = file.fsFile.contents;\n    filesStatus[file.filePath] = FileStatus.overridden;\n  });\n  mergeResults.updatedFiles.forEach((file) => {\n    const filePath: PathOsBased = path.normalize(file.filePath);\n    const foundFile = modifiedFiles.find((componentFile) => componentFile.relative === filePath);\n    if (!foundFile) throw new GeneralError(`file ${filePath} not found`);\n    foundFile.contents = file.content;\n    filesStatus[file.filePath] = FileStatus.updated;\n  });\n\n  return { filesStatus, modifiedFiles };\n}\n\nexport function throwForFailures(allComponentsStatus: ComponentStatusBase[]) {\n  const failedComponents = allComponentsStatus.filter((c) => c.unchangedMessage && !c.unchangedLegitimately);\n  if (failedComponents.length) {\n    const failureMsgs = failedComponents\n      .map(\n        (failedComponent) =>\n          `${chalk.bold(failedComponent.id.toString())} - ${chalk.red(failedComponent.unchangedMessage as string)}`\n      )\n      .join('\\n');\n    throw new BitError(`unable to proceed due to the following failures:\\n${failureMsgs}`);\n  }\n}\n"],"mappings":";;;;;;;;;;AAAA,SAAAA,KAAA;EAAA,MAAAC,IAAA,GAAAC,uBAAA,CAAAC,OAAA;EAAAH,IAAA,YAAAA,CAAA;IAAA,OAAAC,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAGA,SAAAG,cAAA;EAAA,MAAAH,IAAA,GAAAI,sBAAA,CAAAF,OAAA;EAAAC,aAAA,YAAAA,CAAA;IAAA,OAAAH,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAGA,SAAAK,OAAA;EAAA,MAAAL,IAAA,GAAAE,OAAA;EAAAG,MAAA,YAAAA,CAAA;IAAA,OAAAL,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAM,eAAA;EAAA,MAAAN,IAAA,GAAAI,sBAAA,CAAAF,OAAA;EAAAI,cAAA,YAAAA,CAAA;IAAA,OAAAN,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAO,YAAA;EAAA,MAAAP,IAAA,GAAAI,sBAAA,CAAAF,OAAA;EAAAK,WAAA,YAAAA,CAAA;IAAA,OAAAP,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAQ,cAAA;EAAA,MAAAR,IAAA,GAAAE,OAAA;EAAAM,aAAA,YAAAA,CAAA;IAAA,OAAAR,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AASA,SAAAS,UAAA;EAAA,MAAAT,IAAA,GAAAE,OAAA;EAAAO,SAAA,YAAAA,CAAA;IAAA,OAAAT,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAU,OAAA;EAAA,MAAAV,IAAA,GAAAI,sBAAA,CAAAF,OAAA;EAAAQ,MAAA,YAAAA,CAAA;IAAA,OAAAV,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAA0B,SAAAI,uBAAAO,GAAA,WAAAA,GAAA,IAAAA,GAAA,CAAAC,UAAA,GAAAD,GAAA,KAAAE,OAAA,EAAAF,GAAA;AAAA,SAAAG,yBAAAC,CAAA,6BAAAC,OAAA,mBAAAC,CAAA,OAAAD,OAAA,IAAAE,CAAA,OAAAF,OAAA,YAAAF,wBAAA,YAAAA,CAAAC,CAAA,WAAAA,CAAA,GAAAG,CAAA,GAAAD,CAAA,KAAAF,CAAA;AAAA,SAAAd,wBAAAc,CAAA,EAAAE,CAAA,SAAAA,CAAA,IAAAF,CAAA,IAAAA,CAAA,CAAAH,UAAA,SAAAG,CAAA,eAAAA,CAAA,uBAAAA,CAAA,yBAAAA,CAAA,WAAAF,OAAA,EAAAE,CAAA,QAAAG,CAAA,GAAAJ,wBAAA,CAAAG,CAAA,OAAAC,CAAA,IAAAA,CAAA,CAAAC,GAAA,CAAAJ,CAAA,UAAAG,CAAA,CAAAE,GAAA,CAAAL,CAAA,OAAAM,CAAA,KAAAC,SAAA,UAAAC,CAAA,GAAAC,MAAA,CAAAC,cAAA,IAAAD,MAAA,CAAAE,wBAAA,WAAAC,CAAA,IAAAZ,CAAA,oBAAAY,CAAA,IAAAH,MAAA,CAAAI,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAf,CAAA,EAAAY,CAAA,SAAAI,CAAA,GAAAR,CAAA,GAAAC,MAAA,CAAAE,wBAAA,CAAAX,CAAA,EAAAY,CAAA,UAAAI,CAAA,KAAAA,CAAA,CAAAX,GAAA,IAAAW,CAAA,CAAAC,GAAA,IAAAR,MAAA,CAAAC,cAAA,CAAAJ,CAAA,EAAAM,CAAA,EAAAI,CAAA,IAAAV,CAAA,CAAAM,CAAA,IAAAZ,CAAA,CAAAY,CAAA,YAAAN,CAAA,CAAAR,OAAA,GAAAE,CAAA,EAAAG,CAAA,IAAAA,CAAA,CAAAc,GAAA,CAAAjB,CAAA,EAAAM,CAAA,GAAAA,CAAA;AAAA,SAAAY,QAAAlB,CAAA,EAAAE,CAAA,QAAAC,CAAA,GAAAM,MAAA,CAAAU,IAAA,CAAAnB,CAAA,OAAAS,MAAA,CAAAW,qBAAA,QAAAC,CAAA,GAAAZ,MAAA,CAAAW,qBAAA,CAAApB,CAAA,GAAAE,CAAA,KAAAmB,CAAA,GAAAA,CAAA,CAAAC,MAAA,WAAApB,CAAA,WAAAO,MAAA,CAAAE,wBAAA,CAAAX,CAAA,EAAAE,CAAA,EAAAqB,UAAA,OAAApB,CAAA,CAAAqB,IAAA,CAAAC,KAAA,CAAAtB,CAAA,EAAAkB,CAAA,YAAAlB,CAAA;AAAA,SAAAuB,cAAA1B,CAAA,aAAAE,CAAA,MAAAA,CAAA,GAAAyB,SAAA,CAAAC,MAAA,EAAA1B,CAAA,UAAAC,CAAA,WAAAwB,SAAA,CAAAzB,CAAA,IAAAyB,SAAA,CAAAzB,CAAA,QAAAA,CAAA,OAAAgB,OAAA,CAAAT,MAAA,CAAAN,CAAA,OAAA0B,OAAA,WAAA3B,CAAA,IAAA4B,eAAA,CAAA9B,CAAA,EAAAE,CAAA,EAAAC,CAAA,CAAAD,CAAA,SAAAO,MAAA,CAAAsB,yBAAA,GAAAtB,MAAA,CAAAuB,gBAAA,CAAAhC,CAAA,EAAAS,MAAA,CAAAsB,yBAAA,CAAA5B,CAAA,KAAAe,OAAA,CAAAT,MAAA,CAAAN,CAAA,GAAA0B,OAAA,WAAA3B,CAAA,IAAAO,MAAA,CAAAC,cAAA,CAAAV,CAAA,EAAAE,CAAA,EAAAO,MAAA,CAAAE,wBAAA,CAAAR,CAAA,EAAAD,CAAA,iBAAAF,CAAA;AAAA,SAAA8B,gBAAAlC,GAAA,EAAAqC,GAAA,EAAAC,KAAA,IAAAD,GAAA,GAAAE,cAAA,CAAAF,GAAA,OAAAA,GAAA,IAAArC,GAAA,IAAAa,MAAA,CAAAC,cAAA,CAAAd,GAAA,EAAAqC,GAAA,IAAAC,KAAA,EAAAA,KAAA,EAAAX,UAAA,QAAAa,YAAA,QAAAC,QAAA,oBAAAzC,GAAA,CAAAqC,GAAA,IAAAC,KAAA,WAAAtC,GAAA;AAAA,SAAAuC,eAAAG,GAAA,QAAAL,GAAA,GAAAM,YAAA,CAAAD,GAAA,2BAAAL,GAAA,gBAAAA,GAAA,GAAAO,MAAA,CAAAP,GAAA;AAAA,SAAAM,aAAAE,KAAA,EAAAC,IAAA,eAAAD,KAAA,iBAAAA,KAAA,kBAAAA,KAAA,MAAAE,IAAA,GAAAF,KAAA,CAAAG,MAAA,CAAAC,WAAA,OAAAF,IAAA,KAAAG,SAAA,QAAAC,GAAA,GAAAJ,IAAA,CAAA5B,IAAA,CAAA0B,KAAA,EAAAC,IAAA,2BAAAK,GAAA,sBAAAA,GAAA,YAAAC,SAAA,4DAAAN,IAAA,gBAAAF,MAAA,GAAAS,MAAA,EAAAR,KAAA;AAsC1B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,eAAeS,YAAYA,CAChCC,QAAkB,EAClBC,EAAe,EACfC,eAAqD;AAAE;AACvDC,YAAqD,EACrDC,aAA4B,EACI;EAChC,IAAI,CAACA,aAAa,CAACC,MAAM,IAAI,CAACH,eAAe,EAC3C,MAAM,IAAII,KAAK,CAAE,kDAAiDL,EAAE,CAACM,QAAQ,CAAC,CAAE,EAAC,CAAC;EACpF,MAAM;IAAEC;EAAc,CAAC,GAAGJ,aAAa;EACvC,IAAIK,WAAW,GAAG,CAAC,CAAC;EACpB,IAAIN,YAAY,IAAIA,YAAY,CAACO,YAAY,IAAIF,aAAa,KAAKG,4BAAY,CAACC,IAAI,EAAE;IACpF;IACA;IACA,IAAI,CAACV,eAAe,EAAE,MAAM,IAAII,KAAK,CAAE,kDAAiDL,EAAE,CAACM,QAAQ,CAAC,CAAE,EAAC,CAAC;IACxGL,eAAe,CAACW,KAAK,CAACnC,OAAO,CAAEoC,IAAI,IAAK;MACtCL,WAAW,CAAC,IAAAM,6BAAoB,EAACD,IAAI,CAACE,QAAQ,CAAC,CAAC,GAAGC,0BAAU,CAACC,SAAS;IACzE,CAAC,CAAC;IACFlB,QAAQ,CAACmB,MAAM,CAACC,iBAAiB,CAACnB,EAAE,CAAC;IACrC,OAAO;MAAEoB,kBAAkB,EAAE;QAAEpB,EAAE;QAAEQ;MAAY;IAAE,CAAC;EACpD;EACA,MAAMa,SAAS,GAAG,MAAMtB,QAAQ,CAACuB,oCAAoC,CAACtB,EAAE,CAAC;EACzE,MAAMuB,YAAY,GAAGtB,eAAe,IAAIA,eAAe,CAACsB,YAAY;EACpE,IAAItB,eAAe,IAAI,CAACsB,YAAY,EAAE,MAAM,KAAIC,uBAAY,EAAC,0CAA0C,CAAC;EAExG,MAAMZ,KAAK,GAAGS,SAAS,CAACT,KAAK;EAC7Ba,gBAAgB,CAACb,KAAK,EAAEJ,WAAW,EAAEP,eAAe,IAAIP,SAAS,CAAC;EAElE,MAAMgC,mBAAmB,CAAClB,WAAW,EAAEP,eAAe,IAAIP,SAAS,CAAC;EAEpE,IAAIQ,YAAY,EAAE;IAChB;IACA,MAAM;MAAEM,WAAW,EAAEmB,cAAc;MAAEC;IAAc,CAAC,GAAGC,oBAAoB,CAACjB,KAAK,EAAEV,YAAY,EAAEK,aAAa,CAAC;IAC/GC,WAAW,GAAAlC,aAAA,CAAAA,aAAA,KAAQkC,WAAW,GAAKmB,cAAc,CAAE;IACnDN,SAAS,CAACT,KAAK,GAAGgB,aAAa;EACjC;EAEA,OAAO;IACLR,kBAAkB,EAAE;MAAEpB,EAAE;MAAEQ;IAAY,CAAC;IACvCa;EACF,CAAC;AACH;AAEO,SAASI,gBAAgBA,CAACb,KAAmB,EAAEJ,WAAwB,EAAEP,eAAmC,EAAE;EACnHW,KAAK,CAACnC,OAAO,CAAEoC,IAAI,IAAK;IACtB,MAAMiB,UAAU,GAAG7B,eAAe,aAAfA,eAAe,uBAAfA,eAAe,CAAEW,KAAK,CAACmB,IAAI,CAAEC,CAAC,IAAKA,CAAC,CAACjB,QAAQ,KAAKF,IAAI,CAACE,QAAQ,CAAC;IACnF,MAAMkB,aAAa,GAAGH,UAAU,IAAII,MAAM,CAACC,OAAO,CAACL,UAAU,CAACM,QAAQ,EAAEvB,IAAI,CAACuB,QAAQ,CAAC,KAAK,CAAC;IAC5F;IACA5B,WAAW,CAAC,IAAAM,6BAAoB,EAACD,IAAI,CAACE,QAAQ,CAAC,CAAC,GAAGkB,aAAa,GAAGjB,0BAAU,CAACC,SAAS,GAAGD,0BAAU,CAACqB,OAAO;EAC9G,CAAC,CAAC;AACJ;;AAEA;AACA;AACA;AACA;AACA;AACA;AACO,eAAeX,mBAAmBA,CAAClB,WAAwB,EAAEP,eAAmC,EAAE;EACvG,IAAI,CAACA,eAAe,EAAE;EACtB,MAAMqC,eAAe,GAAGrC,eAAe,CAACW,KAAK,IAAI,EAAE;EACnD,MAAM2B,aAAa,GAAG,KAAIC,wBAAa,EAAC,CAAC;EACzCF,eAAe,CAAC7D,OAAO,CAAEoC,IAAI,IAAK;IAChC,MAAM4B,QAAQ,GAAG,IAAA3B,6BAAoB,EAACD,IAAI,CAACE,QAAQ,CAAC;IACpD,IAAI,CAACP,WAAW,CAACiC,QAAQ,CAAC,EAAE;MAC1B;MACAjC,WAAW,CAACiC,QAAQ,CAAC,GAAGzB,0BAAU,CAAC0B,OAAO;MAC1CH,aAAa,CAACI,UAAU,CAAC,KAAIC,qBAAU,EAAC/B,IAAI,CAACjF,IAAI,CAAC,CAAC;IACrD;EACF,CAAC,CAAC;EACF,MAAM2G,aAAa,CAACM,cAAc,CAAC,CAAC;AACtC;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,SAAShB,oBAAoBA,CAClCiB,cAA4B,EAC5B5C,YAAkC,EAClCK,aAA+C,EACoB;EACnE,IAAIqB,aAAa,GAAGkB,cAAc,CAACC,GAAG,CAAElC,IAAI,IAAKA,IAAI,CAACmC,KAAK,CAAC,CAAC,CAAC;EAC9D,MAAMxC,WAAW,GAAG,CAAC,CAAC;EACtB,IAAIN,YAAY,CAACO,YAAY,IAAIF,aAAa,KAAKG,4BAAY,CAACuC,MAAM,EAAE;IACtE,OAAO;MAAEzC,WAAW;MAAEoB;IAAc,CAAC;EACvC;EACA1B,YAAY,CAAC0B,aAAa,CAACnD,OAAO,CAAEoC,IAAI,IAAK;IAC3C,MAAMqC,QAAqB,GAAGtH,IAAI,CAAD,CAAC,CAACuH,SAAS,CAACtC,IAAI,CAACqC,QAAQ,CAAC;IAC3D,MAAME,SAAS,GAAGxB,aAAa,CAACG,IAAI,CAAEsB,aAAa,IAAKA,aAAa,CAACtC,QAAQ,KAAKmC,QAAQ,CAAC;IAC5F,IAAI,CAACE,SAAS,EAAE,MAAM,KAAI5B,uBAAY,EAAE,QAAO0B,QAAS,YAAW,CAAC;IACpE,IAAIrC,IAAI,CAACyC,QAAQ,EAAE;MACjBF,SAAS,CAAChB,QAAQ,GAAGF,MAAM,CAACqB,IAAI,CAAC1C,IAAI,CAACyC,QAAQ,CAAC;MAC/C9C,WAAW,CAACK,IAAI,CAACqC,QAAQ,CAAC,GAAGlC,0BAAU,CAACiC,MAAM;IAChD,CAAC,MAAM,IAAI,OAAOpC,IAAI,CAAC2C,MAAM,KAAK,QAAQ,EAAE;MAC1CJ,SAAS,CAAChB,QAAQ,GAAGF,MAAM,CAACqB,IAAI,CAAC1C,IAAI,CAAC2C,MAAM,CAAC;MAC7ChD,WAAW,CAACK,IAAI,CAACqC,QAAQ,CAAC,GAAGlC,0BAAU,CAACyC,MAAM;IAChD,CAAC,MAAM,IAAI5C,IAAI,CAAC6C,gBAAgB,EAAE;MAChC;MACAN,SAAS,CAAChB,QAAQ,GAAGvB,IAAI,CAAC8C,MAAM,CAACvB,QAAQ;MACzC5B,WAAW,CAACK,IAAI,CAACqC,QAAQ,CAAC,GAAGlC,0BAAU,CAAC4C,cAAc;IACxD,CAAC,MAAM;MACL,MAAM,KAAIpC,uBAAY,EAAE,QAAO0B,QAAS,oCAAmC,CAAC;IAC9E;EACF,CAAC,CAAC;EAEFhD,YAAY,CAAC2D,QAAQ,CAACpF,OAAO,CAAEoC,IAAI,IAAK;IACtC,MAAMqC,QAAqB,GAAGtH,IAAI,CAAD,CAAC,CAACuH,SAAS,CAACtC,IAAI,CAACqC,QAAQ,CAAC;IAC3D,IAAItB,aAAa,CAACG,IAAI,CAAE+B,CAAC,IAAKA,CAAC,CAAC/C,QAAQ,KAAKmC,QAAQ,CAAC,EAAE;IACxDtB,aAAa,CAACxD,IAAI,CAACyC,IAAI,CAAC8C,MAAM,CAAC;IAC/BnD,WAAW,CAACK,IAAI,CAACqC,QAAQ,CAAC,GAAGlC,0BAAU,CAAC+C,KAAK;EAC/C,CAAC,CAAC;EACF7D,YAAY,CAAC8D,oBAAoB,CAACvF,OAAO,CAAEoC,IAAI,IAAK;IAClD,IAAI,CAACA,IAAI,CAAC8C,MAAM,EAAE;IAClB,MAAMT,QAAqB,GAAGtH,IAAI,CAAD,CAAC,CAACuH,SAAS,CAACtC,IAAI,CAACqC,QAAQ,CAAC;IAC3D,IAAItB,aAAa,CAACG,IAAI,CAAE+B,CAAC,IAAKA,CAAC,CAAC/C,QAAQ,KAAKmC,QAAQ,CAAC,EAAE;IACxDtB,aAAa,CAACxD,IAAI,CAACyC,IAAI,CAAC8C,MAAM,CAAC;IAC/BnD,WAAW,CAACK,IAAI,CAACqC,QAAQ,CAAC,GAAGlC,0BAAU,CAAC+C,KAAK;EAC/C,CAAC,CAAC;EACF7D,YAAY,CAAC+D,WAAW,CAACxF,OAAO,CAAEoC,IAAI,IAAK;IACzC,MAAMqC,QAAqB,GAAGtH,IAAI,CAAD,CAAC,CAACuH,SAAS,CAACtC,IAAI,CAACqC,QAAQ,CAAC;IAC3D1C,WAAW,CAACK,IAAI,CAACqC,QAAQ,CAAC,GAAGlC,0BAAU,CAAC0B,OAAO;IAC/Cd,aAAa,GAAGA,aAAa,CAAC1D,MAAM,CAAE8D,CAAC,IAAKA,CAAC,CAACjB,QAAQ,KAAKmC,QAAQ,CAAC;EACtE,CAAC,CAAC;EACFhD,YAAY,CAACgE,kBAAkB,CAACzF,OAAO,CAAEoC,IAAI,IAAK;IAChD,MAAMqC,QAAqB,GAAGtH,IAAI,CAAD,CAAC,CAACuH,SAAS,CAACtC,IAAI,CAACqC,QAAQ,CAAC;IAC3DtB,aAAa,GAAGA,aAAa,CAAC1D,MAAM,CAAE8D,CAAC,IAAKA,CAAC,CAACjB,QAAQ,KAAKmC,QAAQ,CAAC;IACpE1C,WAAW,CAACK,IAAI,CAACqC,QAAQ,CAAC,GAAGlC,0BAAU,CAACmD,aAAa;EACvD,CAAC,CAAC;EACFjE,YAAY,CAAC8D,oBAAoB,CAACvF,OAAO,CAAEoC,IAAI,IAAK;IAClDL,WAAW,CAACK,IAAI,CAACqC,QAAQ,CAAC,GAAGlC,0BAAU,CAACoD,eAAe;EACzD,CAAC,CAAC;EAEFlE,YAAY,CAACmE,aAAa,CAAC5F,OAAO,CAAEoC,IAAI,IAAK;IAC3C,MAAMqC,QAAqB,GAAGtH,IAAI,CAAD,CAAC,CAACuH,SAAS,CAACtC,IAAI,CAACqC,QAAQ,CAAC;IAC3D,MAAME,SAAS,GAAGxB,aAAa,CAACG,IAAI,CAAEsB,aAAa,IAAKA,aAAa,CAACtC,QAAQ,KAAKmC,QAAQ,CAAC;IAC5F,IAAI,CAACE,SAAS,EAAE,MAAM,KAAI5B,uBAAY,EAAE,QAAO0B,QAAS,YAAW,CAAC;IACpEE,SAAS,CAAChB,QAAQ,GAAGvB,IAAI,CAAC8C,MAAM,CAACvB,QAAQ;IACzC5B,WAAW,CAACK,IAAI,CAACqC,QAAQ,CAAC,GAAGlC,0BAAU,CAACsD,UAAU;EACpD,CAAC,CAAC;EACFpE,YAAY,CAACqE,YAAY,CAAC9F,OAAO,CAAEoC,IAAI,IAAK;IAC1C,MAAMqC,QAAqB,GAAGtH,IAAI,CAAD,CAAC,CAACuH,SAAS,CAACtC,IAAI,CAACqC,QAAQ,CAAC;IAC3D,MAAME,SAAS,GAAGxB,aAAa,CAACG,IAAI,CAAEsB,aAAa,IAAKA,aAAa,CAACtC,QAAQ,KAAKmC,QAAQ,CAAC;IAC5F,IAAI,CAACE,SAAS,EAAE,MAAM,KAAI5B,uBAAY,EAAE,QAAO0B,QAAS,YAAW,CAAC;IACpEE,SAAS,CAAChB,QAAQ,GAAGvB,IAAI,CAAC2D,OAAO;IACjChE,WAAW,CAACK,IAAI,CAACqC,QAAQ,CAAC,GAAGlC,0BAAU,CAACqB,OAAO;EACjD,CAAC,CAAC;EAEF,OAAO;IAAE7B,WAAW;IAAEoB;EAAc,CAAC;AACvC;AAEO,SAAS6C,gBAAgBA,CAACC,mBAA0C,EAAE;EAC3E,MAAMC,gBAAgB,GAAGD,mBAAmB,CAACxG,MAAM,CAAE0G,CAAC,IAAKA,CAAC,CAACC,gBAAgB,IAAI,CAACD,CAAC,CAACE,qBAAqB,CAAC;EAC1G,IAAIH,gBAAgB,CAACnG,MAAM,EAAE;IAC3B,MAAMuG,WAAW,GAAGJ,gBAAgB,CACjC5B,GAAG,CACDiC,eAAe,IACb,GAAEC,gBAAK,CAACC,IAAI,CAACF,eAAe,CAAChF,EAAE,CAACM,QAAQ,CAAC,CAAC,CAAE,MAAK2E,gBAAK,CAACE,GAAG,CAACH,eAAe,CAACH,gBAA0B,CAAE,EAC5G,CAAC,CACAO,IAAI,CAAC,IAAI,CAAC;IACb,MAAM,KAAIC,oBAAQ,EAAE,qDAAoDN,WAAY,EAAC,CAAC;EACxF;AACF"}

package/dist/esm.d.mts

@@ -0,0 +1,9 @@
+export const CheckoutAspect: any;
+export const applyModifiedVersion: any;
+export const applyVersion: any;
+export const removeFilesIfNeeded: any;
+export const updateFileStatus: any;
+export const throwForFailures: any;
+export const checkoutOutput: any;
+export default cjsModule;
+import cjsModule from "./index.js";

package/dist/esm.mjs

@@ -0,0 +1,13 @@
+// eslint-disable-next-line import/no-unresolved
+import cjsModule from './index.js';
+
+export const CheckoutAspect = cjsModule.CheckoutAspect;
+export const applyModifiedVersion = cjsModule.applyModifiedVersion;
+export const applyVersion = cjsModule.applyVersion;
+export const removeFilesIfNeeded = cjsModule.removeFilesIfNeeded;
+export const updateFileStatus = cjsModule.updateFileStatus;
+export const throwForFailures = cjsModule.throwForFailures;
+export const checkoutOutput = cjsModule.checkoutOutput;
+
+export default cjsModule;
+

package/dist/index.d.ts

@@ -2,5 +2,6 @@ import { CheckoutAspect } from './checkout.aspect';
 export type { CheckoutMain, CheckoutProps } from './checkout.main.runtime';
 export default CheckoutAspect;
 export { CheckoutAspect };
-export { CheckoutProps as CheckoutPropsLegacy, ComponentStatus, applyModifiedVersion, applyVersion, ComponentStatusBase, ApplyVersionWithComps, removeFilesIfNeeded, updateFileStatus, throwForFailures, } from './checkout-version';
+export { applyModifiedVersion, applyVersion, removeFilesIfNeeded, updateFileStatus, throwForFailures, } from './checkout-version';
+export type { CheckoutProps as CheckoutPropsLegacy, ComponentStatus, ComponentStatusBase, ApplyVersionWithComps, } from './checkout-version';
 export { checkoutOutput } from './checkout-cmd';

package/dist/index.js

@@ -3,36 +3,12 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-Object.defineProperty(exports, "ApplyVersionWithComps", {
-  enumerable: true,
-  get: function () {
-    return _checkoutVersion().ApplyVersionWithComps;
-  }
-});
 Object.defineProperty(exports, "CheckoutAspect", {
   enumerable: true,
   get: function () {
     return _checkout().CheckoutAspect;
   }
 });
-Object.defineProperty(exports, "CheckoutPropsLegacy", {
-  enumerable: true,
-  get: function () {
-    return _checkoutVersion().CheckoutProps;
-  }
-});
-Object.defineProperty(exports, "ComponentStatus", {
-  enumerable: true,
-  get: function () {
-    return _checkoutVersion().ComponentStatus;
-  }
-});
-Object.defineProperty(exports, "ComponentStatusBase", {
-  enumerable: true,
-  get: function () {
-    return _checkoutVersion().ComponentStatusBase;
-  }
-});
 Object.defineProperty(exports, "applyModifiedVersion", {
   enumerable: true,
   get: function () {

package/dist/index.js.map

@@ -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  CheckoutProps as CheckoutPropsLegacy,\n  ComponentStatus,\n  applyModifiedVersion,\n  applyVersion,\n  ComponentStatusBase,\n  ApplyVersionWithComps,\n  removeFilesIfNeeded,\n  updateFileStatus,\n  throwForFailures,\n} 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;AAWA,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,GAdjCC,0BAAc"}
+{"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 {\n  CheckoutProps as CheckoutPropsLegacy,\n  ComponentStatus,\n  ComponentStatusBase,\n  ApplyVersionWithComps,\n} 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;AAcA,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,GAjBjCC,0BAAc"}

package/esm.mjs

@@ -0,0 +1,13 @@
+// eslint-disable-next-line import/no-unresolved
+import cjsModule from './index.js';
+
+export const CheckoutAspect = cjsModule.CheckoutAspect;
+export const applyModifiedVersion = cjsModule.applyModifiedVersion;
+export const applyVersion = cjsModule.applyVersion;
+export const removeFilesIfNeeded = cjsModule.removeFilesIfNeeded;
+export const updateFileStatus = cjsModule.updateFileStatus;
+export const throwForFailures = cjsModule.throwForFailures;
+export const checkoutOutput = cjsModule.checkoutOutput;
+
+export default cjsModule;
+

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@teambit/checkout",
-  "version": "1.0.65",
+  "version": "1.0.66",
   "homepage": "https://bit.cloud/teambit/component/checkout",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.component",
     "name": "checkout",
-    "version": "1.0.65"
+    "version": "1.0.66"
   },
   "dependencies": {
     "chalk": "2.4.2",
@@ -17,13 +17,13 @@
     "@teambit/bit-error": "0.0.404",
     "@teambit/component-id": "1.2.0",
     "@teambit/harmony": "0.4.6",
-    "@teambit/cli": "0.0.822",
-    "@teambit/merging": "1.0.65",
-    "@teambit/component-writer": "1.0.65",
-    "@teambit/importer": "1.0.65",
-    "@teambit/logger": "0.0.915",
-    "@teambit/remove": "1.0.65",
-    "@teambit/workspace": "1.0.65"
+    "@teambit/cli": "0.0.823",
+    "@teambit/merging": "1.0.66",
+    "@teambit/component-writer": "1.0.66",
+    "@teambit/importer": "1.0.66",
+    "@teambit/logger": "0.0.916",
+    "@teambit/remove": "1.0.66",
+    "@teambit/workspace": "1.0.66"
   },
   "devDependencies": {
     "@types/lodash": "4.14.165",
@@ -35,7 +35,7 @@
     "@types/testing-library__jest-dom": "5.9.5"
   },
   "peerDependencies": {
-    "@teambit/legacy": "1.0.605",
+    "@teambit/legacy": "1.0.606",
     "react": "^16.8.0 || ^17.0.0",
     "react-dom": "^16.8.0 || ^17.0.0"
   },