@teambit/checkout 1.0.614 → 1.0.615
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.
package/dist/checkout-version.js
CHANGED
|
@@ -51,8 +51,7 @@ function _merging() {
|
|
|
51
51
|
return data;
|
|
52
52
|
}
|
|
53
53
|
function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
|
|
54
|
-
function
|
|
55
|
-
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
|
|
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); }
|
|
56
55
|
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; }
|
|
57
56
|
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; }
|
|
58
57
|
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; }
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["path","data","_interopRequireWildcard","require","_component","_legacy","_bitError","_chalk","_interopRequireDefault","_merging","e","__esModule","default","_getRequireWildcardCache","WeakMap","r","t","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","ownKeys","keys","getOwnPropertySymbols","o","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","f","areFilesEqual","Buffer","compare","contents","updated","isExistOnFs","getComponentIdIfExist","ignoreVersion","filePathsFromFS","dataToPersist","DataToPersist","filename","removed","removePath","RemovePath","persistAllToFS","componentFiles","map","clone","manual","filePath","normalize","foundFile","componentFile","conflict","from","output","merged","isBinaryConflict","fsFile","binaryConflict","addFiles","m","added","deletedConflictFiles","removeFiles","remainDeletedFiles","remainDeleted","deletedConflict","overrideFiles","overridden","updatedFiles","content","throwForFailures","allComponentsStatus","failedComponents","c","unchangedMessage","unchangedLegitimately","failureMsgs","failedComponent","chalk","bold","red","join"],"sources":["checkout-version.ts"],"sourcesContent":["import * as path from 'path';\nimport { Consumer } from '@teambit/legacy.consumer';\nimport { ComponentID } from '@teambit/component-id';\nimport { Version } from '@teambit/objects';\nimport { SourceFile, RemovePath, DataToPersist } from '@teambit/component.sources';\nimport { pathNormalizeToLinux, PathOsBased } from '@teambit/legacy.utils';\nimport { ConsumerComponent } from '@teambit/legacy.consumer-component';\nimport { BitError } from '@teambit/bit-error';\nimport chalk from 'chalk';\nimport {\n ApplyVersionResult,\n FilesStatus,\n FileStatus,\n MergeOptions,\n MergeStrategy,\n MergeResultsThreeWay,\n} from '@teambit/merging';\nimport { CheckoutProps } from './checkout.main.runtime';\n\nexport type ComponentStatusBase = {\n currentComponent?: ConsumerComponent;\n componentFromModel?: Version;\n id: ComponentID;\n shouldBeRemoved?: boolean; // in case the component is soft-removed, it should be removed from the workspace\n unchangedMessage?: string; // this gets populated either upon skip or failure.\n unchangedLegitimately?: boolean; // true for skipped legitimately (e.g. already up to date). false for failure.\n};\n\nexport type ComponentStatus = ComponentStatusBase & {\n mergeResults?: MergeResultsThreeWay | null | undefined;\n};\n\nexport type ApplyVersionWithComps = {\n applyVersionResult: ApplyVersionResult;\n component?: ConsumerComponent;\n // in case the component needs to be written to the filesystem, this is the component to write.\n legacyCompToWrite?: ConsumerComponent;\n};\n\n/**\n * This function optionally returns \"component\" object. If it returns, it means it needs to be written to the filesystem.\n * Otherwise, it means the component is already up to date and no need to write it.\n *\n * If no need to change anything (ours), then don't return the component object.\n * Otherwise, either return the component object as is (if no conflicts or \"theirs\"), or change the files in this\n * component object. Later, this component object is written to the filesystem.\n *\n * 1) when the files are modified with conflicts and the strategy is \"ours\", or forceOurs was used, leave the FS as is.\n *\n * 2) when the files are modified with conflicts and the strategy is \"theirs\", or forceTheirs was used, write the\n * component according to \"component\" object\n *\n * 3) when files are modified with no conflict or files are modified with conflicts and the\n * strategy is manual, load the component according to id.version and update component.files.\n * applyModifiedVersion() docs explains what files are updated/added.\n *\n * Side note:\n * Deleted file => if files are in used version but not in the modified one, no need to delete it. (similar to git).\n * Added file => if files are not in used version but in the modified one, they'll be under mergeResults.addFiles\n */\nexport async function applyVersion(\n consumer: Consumer,\n id: ComponentID,\n componentFromFS: ConsumerComponent | null | undefined, // it can be null only when isLanes is true\n mergeResults: MergeResultsThreeWay | null | undefined,\n checkoutProps: CheckoutProps\n): Promise<ApplyVersionWithComps> {\n if (!checkoutProps.isLane && !componentFromFS)\n throw new Error(`applyVersion expect to get componentFromFS for ${id.toString()}`);\n const { mergeStrategy, forceOurs } = checkoutProps;\n let filesStatus = {};\n if ((mergeResults?.hasConflicts && mergeStrategy === MergeOptions.ours) || forceOurs) {\n // even when isLane is true, the mergeResults is possible only when the component is on the filesystem\n // otherwise it's impossible to have conflicts\n if (!componentFromFS) throw new Error(`applyVersion expect to get componentFromFS for ${id.toString()}`);\n componentFromFS.files.forEach((file) => {\n filesStatus[pathNormalizeToLinux(file.relative)] = FileStatus.unchanged;\n });\n consumer.bitMap.updateComponentId(id);\n return { applyVersionResult: { id, filesStatus } };\n }\n const component = await consumer.loadComponentFromModelImportIfNeeded(id);\n const componentMap = componentFromFS && componentFromFS.componentMap;\n if (componentFromFS && !componentMap) throw new 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":["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 { Consumer } from '@teambit/legacy.consumer';\nimport { ComponentID } from '@teambit/component-id';\nimport { Version } from '@teambit/objects';\nimport { SourceFile, RemovePath, DataToPersist } from '@teambit/component.sources';\nimport { pathNormalizeToLinux, PathOsBased } from '@teambit/legacy.utils';\nimport { ConsumerComponent } from '@teambit/legacy.consumer-component';\nimport { BitError } from '@teambit/bit-error';\nimport chalk from 'chalk';\nimport {\n ApplyVersionResult,\n FilesStatus,\n FileStatus,\n MergeOptions,\n MergeStrategy,\n MergeResultsThreeWay,\n} from '@teambit/merging';\nimport { CheckoutProps } from './checkout.main.runtime';\n\nexport type ComponentStatusBase = {\n currentComponent?: ConsumerComponent;\n componentFromModel?: Version;\n id: ComponentID;\n shouldBeRemoved?: boolean; // in case the component is soft-removed, it should be removed from the workspace\n unchangedMessage?: string; // this gets populated either upon skip or failure.\n unchangedLegitimately?: boolean; // true for skipped legitimately (e.g. already up to date). false for failure.\n};\n\nexport type ComponentStatus = ComponentStatusBase & {\n mergeResults?: MergeResultsThreeWay | null | undefined;\n};\n\nexport type ApplyVersionWithComps = {\n applyVersionResult: ApplyVersionResult;\n component?: ConsumerComponent;\n // in case the component needs to be written to the filesystem, this is the component to write.\n legacyCompToWrite?: ConsumerComponent;\n};\n\n/**\n * This function optionally returns \"component\" object. If it returns, it means it needs to be written to the filesystem.\n * Otherwise, it means the component is already up to date and no need to write it.\n *\n * If no need to change anything (ours), then don't return the component object.\n * Otherwise, either return the component object as is (if no conflicts or \"theirs\"), or change the files in this\n * component object. Later, this component object is written to the filesystem.\n *\n * 1) when the files are modified with conflicts and the strategy is \"ours\", or forceOurs was used, leave the FS as is.\n *\n * 2) when the files are modified with conflicts and the strategy is \"theirs\", or forceTheirs was used, write the\n * component according to \"component\" object\n *\n * 3) when files are modified with no conflict or files are modified with conflicts and the\n * strategy is manual, load the component according to id.version and update component.files.\n * applyModifiedVersion() docs explains what files are updated/added.\n *\n * Side note:\n * Deleted file => if files are in used version but not in the modified one, no need to delete it. (similar to git).\n * Added file => if files are not in used version but in the modified one, they'll be under mergeResults.addFiles\n */\nexport async function applyVersion(\n consumer: Consumer,\n id: ComponentID,\n componentFromFS: ConsumerComponent | null | undefined, // it can be null only when isLanes is true\n mergeResults: MergeResultsThreeWay | null | undefined,\n checkoutProps: CheckoutProps\n): Promise<ApplyVersionWithComps> {\n if (!checkoutProps.isLane && !componentFromFS)\n throw new Error(`applyVersion expect to get componentFromFS for ${id.toString()}`);\n const { mergeStrategy, forceOurs } = checkoutProps;\n let filesStatus = {};\n if ((mergeResults?.hasConflicts && mergeStrategy === MergeOptions.ours) || forceOurs) {\n // even when isLane is true, the mergeResults is possible only when the component is on the filesystem\n // otherwise it's impossible to have conflicts\n if (!componentFromFS) throw new Error(`applyVersion expect to get componentFromFS for ${id.toString()}`);\n componentFromFS.files.forEach((file) => {\n filesStatus[pathNormalizeToLinux(file.relative)] = FileStatus.unchanged;\n });\n consumer.bitMap.updateComponentId(id);\n return { applyVersionResult: { id, filesStatus } };\n }\n const component = await consumer.loadComponentFromModelImportIfNeeded(id);\n const componentMap = componentFromFS && componentFromFS.componentMap;\n if (componentFromFS && !componentMap) throw new 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":[]}
|
package/dist/checkout.spec.js
CHANGED
|
@@ -64,8 +64,7 @@ function _checkout() {
|
|
|
64
64
|
return data;
|
|
65
65
|
}
|
|
66
66
|
function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
|
|
67
|
-
function
|
|
68
|
-
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
|
|
67
|
+
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); }
|
|
69
68
|
_chai().default.use(require('chai-fs'));
|
|
70
69
|
describe('CheckoutAspect', function () {
|
|
71
70
|
this.timeout(0);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_chai","data","_interopRequireWildcard","require","_fsExtra","_interopRequireDefault","_harmonyTesting","_snapping","_workspace","_workspaceTesting","_componentTesting","_lister","_checkout","e","__esModule","default","_getRequireWildcardCache","WeakMap","r","t","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","chai","use","describe","timeout","checkout","workspace","workspaceData","compDir","compId","before","mockWorkspace","workspacePath","compsDir","mockComponents","snapping","loadAspect","SnappingAspect","tag","ids","build","ignoreIssues","id","dir","fs","remove","expect","to","not","be","path","WorkspaceAspect","components","invalidComponents","componentLoader","getMany","undefined","have","lengthOf","CheckoutAspect","reset","after","destroyWorkspace","it","harmony","numOfComponents","loadManyAspects","ListerAspect","tagOpts","unmodified","checkoutByCLIValues","ancestor","all","skipNpmInstall","lister","list","localList","currentlyUsedVersion","equal"],"sources":["checkout.spec.ts"],"sourcesContent":["import chai, { expect } from 'chai';\nimport fs from 'fs-extra';\nimport { Harmony } from '@teambit/harmony';\nimport { ComponentID } from '@teambit/component-id';\nimport { loadAspect, loadManyAspects } from '@teambit/harmony.testing.load-aspect';\nimport { SnappingAspect, SnappingMain } from '@teambit/snapping';\nimport { WorkspaceAspect, Workspace } from '@teambit/workspace';\nimport { mockWorkspace, destroyWorkspace, WorkspaceData } from '@teambit/workspace.testing.mock-workspace';\nimport { mockComponents } from '@teambit/component.testing.mock-components';\nimport { ListerAspect, ListerMain } from '@teambit/lister';\nimport { CheckoutMain } from './checkout.main.runtime';\nimport { CheckoutAspect } from './checkout.aspect';\n\nchai.use(require('chai-fs'));\n\ndescribe('CheckoutAspect', function () {\n this.timeout(0);\n\n describe('checkout reset when the component files were deleted', () => {\n let checkout: CheckoutMain;\n let workspace: Workspace;\n let workspaceData: WorkspaceData;\n let compDir: string;\n let compId: ComponentID;\n before(async () => {\n workspaceData = mockWorkspace();\n const { workspacePath } = workspaceData;\n const compsDir = await mockComponents(workspacePath);\n const snapping: SnappingMain = await loadAspect(SnappingAspect, workspacePath);\n await snapping.tag({ ids: ['comp1'], build: false, ignoreIssues: 'MissingManuallyConfiguredPackages' });\n const { id, dir } = compsDir[0];\n compId = id;\n compDir = dir;\n await fs.remove(dir);\n\n // an intermediate step, check sure that the dir is not there and the component is invalid\n expect(dir).to.not.be.a.path();\n workspace = await loadAspect(WorkspaceAspect, workspacePath);\n const { components, invalidComponents } = await workspace.componentLoader.getMany([id], undefined, false);\n expect(components).to.have.lengthOf(0);\n expect(invalidComponents).to.have.lengthOf(1);\n\n checkout = await loadAspect(CheckoutAspect, workspacePath);\n await checkout.checkout({ reset: true, ids: [id] });\n });\n after(async () => {\n await destroyWorkspace(workspaceData);\n });\n it('should bring the files back', () => {\n expect(compDir).to.be.a.path();\n });\n it('the workspace should get the component as a valid component', async () => {\n workspace = await loadAspect(WorkspaceAspect, workspaceData.workspacePath);\n const { components, invalidComponents } = await workspace.componentLoader.getMany([compId], undefined, false);\n expect(components).to.have.lengthOf(1);\n expect(invalidComponents).to.have.lengthOf(0);\n });\n });\n\n describe('checkout to an ancestor', () => {\n let workspaceData: WorkspaceData;\n let harmony: Harmony;\n before(async () => {\n workspaceData = mockWorkspace();\n const { workspacePath } = workspaceData;\n await mockComponents(workspacePath, { numOfComponents: 2 });\n harmony = await loadManyAspects([SnappingAspect, ListerAspect, CheckoutAspect], workspacePath);\n const snapping: SnappingMain = harmony.get(SnappingAspect.id);\n const tagOpts = { build: false, ignoreIssues: 'MissingManuallyConfiguredPackages', unmodified: true };\n await snapping.tag(tagOpts); // 0.0.1\n await snapping.tag(tagOpts); // 0.0.2\n await snapping.tag(tagOpts); // 0.0.3\n await snapping.tag(tagOpts); // 0.0.4\n\n const checkout: CheckoutMain = harmony.get(CheckoutAspect.id);\n await checkout.checkoutByCLIValues('', { ancestor: 2, all: true, skipNpmInstall: true });\n });\n it('should checkout according to the number of generations specified', async () => {\n const lister: ListerMain = harmony.get(ListerAspect.id);\n const list = await lister.localList();\n expect(list).to.have.lengthOf(2);\n expect(list[0].currentlyUsedVersion).to.equal('0.0.2');\n expect(list[1].currentlyUsedVersion).to.equal('0.0.2');\n });\n });\n});\n"],"mappings":"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","ignoreList":[]}
|
|
1
|
+
{"version":3,"names":["_chai","data","_interopRequireWildcard","require","_fsExtra","_interopRequireDefault","_harmonyTesting","_snapping","_workspace","_workspaceTesting","_componentTesting","_lister","_checkout","e","__esModule","default","t","WeakMap","r","n","o","i","f","__proto__","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","chai","use","describe","timeout","checkout","workspace","workspaceData","compDir","compId","before","mockWorkspace","workspacePath","compsDir","mockComponents","snapping","loadAspect","SnappingAspect","tag","ids","build","ignoreIssues","id","dir","fs","remove","expect","to","not","be","a","path","WorkspaceAspect","components","invalidComponents","componentLoader","getMany","undefined","have","lengthOf","CheckoutAspect","reset","after","destroyWorkspace","it","harmony","numOfComponents","loadManyAspects","ListerAspect","tagOpts","unmodified","checkoutByCLIValues","ancestor","all","skipNpmInstall","lister","list","localList","currentlyUsedVersion","equal"],"sources":["checkout.spec.ts"],"sourcesContent":["import chai, { expect } from 'chai';\nimport fs from 'fs-extra';\nimport { Harmony } from '@teambit/harmony';\nimport { ComponentID } from '@teambit/component-id';\nimport { loadAspect, loadManyAspects } from '@teambit/harmony.testing.load-aspect';\nimport { SnappingAspect, SnappingMain } from '@teambit/snapping';\nimport { WorkspaceAspect, Workspace } from '@teambit/workspace';\nimport { mockWorkspace, destroyWorkspace, WorkspaceData } from '@teambit/workspace.testing.mock-workspace';\nimport { mockComponents } from '@teambit/component.testing.mock-components';\nimport { ListerAspect, ListerMain } from '@teambit/lister';\nimport { CheckoutMain } from './checkout.main.runtime';\nimport { CheckoutAspect } from './checkout.aspect';\n\nchai.use(require('chai-fs'));\n\ndescribe('CheckoutAspect', function () {\n this.timeout(0);\n\n describe('checkout reset when the component files were deleted', () => {\n let checkout: CheckoutMain;\n let workspace: Workspace;\n let workspaceData: WorkspaceData;\n let compDir: string;\n let compId: ComponentID;\n before(async () => {\n workspaceData = mockWorkspace();\n const { workspacePath } = workspaceData;\n const compsDir = await mockComponents(workspacePath);\n const snapping: SnappingMain = await loadAspect(SnappingAspect, workspacePath);\n await snapping.tag({ ids: ['comp1'], build: false, ignoreIssues: 'MissingManuallyConfiguredPackages' });\n const { id, dir } = compsDir[0];\n compId = id;\n compDir = dir;\n await fs.remove(dir);\n\n // an intermediate step, check sure that the dir is not there and the component is invalid\n expect(dir).to.not.be.a.path();\n workspace = await loadAspect(WorkspaceAspect, workspacePath);\n const { components, invalidComponents } = await workspace.componentLoader.getMany([id], undefined, false);\n expect(components).to.have.lengthOf(0);\n expect(invalidComponents).to.have.lengthOf(1);\n\n checkout = await loadAspect(CheckoutAspect, workspacePath);\n await checkout.checkout({ reset: true, ids: [id] });\n });\n after(async () => {\n await destroyWorkspace(workspaceData);\n });\n it('should bring the files back', () => {\n expect(compDir).to.be.a.path();\n });\n it('the workspace should get the component as a valid component', async () => {\n workspace = await loadAspect(WorkspaceAspect, workspaceData.workspacePath);\n const { components, invalidComponents } = await workspace.componentLoader.getMany([compId], undefined, false);\n expect(components).to.have.lengthOf(1);\n expect(invalidComponents).to.have.lengthOf(0);\n });\n });\n\n describe('checkout to an ancestor', () => {\n let workspaceData: WorkspaceData;\n let harmony: Harmony;\n before(async () => {\n workspaceData = mockWorkspace();\n const { workspacePath } = workspaceData;\n await mockComponents(workspacePath, { numOfComponents: 2 });\n harmony = await loadManyAspects([SnappingAspect, ListerAspect, CheckoutAspect], workspacePath);\n const snapping: SnappingMain = harmony.get(SnappingAspect.id);\n const tagOpts = { build: false, ignoreIssues: 'MissingManuallyConfiguredPackages', unmodified: true };\n await snapping.tag(tagOpts); // 0.0.1\n await snapping.tag(tagOpts); // 0.0.2\n await snapping.tag(tagOpts); // 0.0.3\n await snapping.tag(tagOpts); // 0.0.4\n\n const checkout: CheckoutMain = harmony.get(CheckoutAspect.id);\n await checkout.checkoutByCLIValues('', { ancestor: 2, all: true, skipNpmInstall: true });\n });\n it('should checkout according to the number of generations specified', async () => {\n const lister: ListerMain = harmony.get(ListerAspect.id);\n const list = await lister.localList();\n expect(list).to.have.lengthOf(2);\n expect(list[0].currentlyUsedVersion).to.equal('0.0.2');\n expect(list[1].currentlyUsedVersion).to.equal('0.0.2');\n });\n });\n});\n"],"mappings":"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","ignoreList":[]}
|
package/package.json
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@teambit/checkout",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.615",
|
|
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.
|
|
9
|
+
"version": "1.0.615"
|
|
10
10
|
},
|
|
11
11
|
"dependencies": {
|
|
12
12
|
"chalk": "4.1.2",
|
|
@@ -15,21 +15,21 @@
|
|
|
15
15
|
"@teambit/bit-error": "0.0.404",
|
|
16
16
|
"@teambit/component-id": "1.2.4",
|
|
17
17
|
"@teambit/harmony": "0.4.7",
|
|
18
|
-
"@teambit/cli": "0.0.
|
|
18
|
+
"@teambit/cli": "0.0.1192",
|
|
19
19
|
"@teambit/legacy.constants": "0.0.11",
|
|
20
|
-
"@teambit/merging": "1.0.
|
|
20
|
+
"@teambit/merging": "1.0.615",
|
|
21
21
|
"@teambit/component.sources": "0.0.101",
|
|
22
22
|
"@teambit/legacy.consumer-component": "0.0.50",
|
|
23
23
|
"@teambit/legacy.consumer": "0.0.49",
|
|
24
24
|
"@teambit/legacy.utils": "0.0.21",
|
|
25
|
-
"@teambit/objects": "0.0.
|
|
26
|
-
"@teambit/component-writer": "1.0.
|
|
27
|
-
"@teambit/importer": "1.0.
|
|
25
|
+
"@teambit/objects": "0.0.122",
|
|
26
|
+
"@teambit/component-writer": "1.0.615",
|
|
27
|
+
"@teambit/importer": "1.0.615",
|
|
28
28
|
"@teambit/legacy.bit-map": "0.0.106",
|
|
29
29
|
"@teambit/legacy.scope": "0.0.49",
|
|
30
|
-
"@teambit/logger": "0.0.
|
|
31
|
-
"@teambit/remove": "1.0.
|
|
32
|
-
"@teambit/workspace": "1.0.
|
|
30
|
+
"@teambit/logger": "0.0.1285",
|
|
31
|
+
"@teambit/remove": "1.0.615",
|
|
32
|
+
"@teambit/workspace": "1.0.615"
|
|
33
33
|
},
|
|
34
34
|
"devDependencies": {
|
|
35
35
|
"@types/lodash": "4.14.165",
|
|
@@ -39,8 +39,8 @@
|
|
|
39
39
|
"@teambit/harmony.envs.core-aspect-env": "0.0.69",
|
|
40
40
|
"@teambit/component.testing.mock-components": "0.0.310",
|
|
41
41
|
"@teambit/harmony.testing.load-aspect": "0.0.305",
|
|
42
|
-
"@teambit/lister": "1.0.
|
|
43
|
-
"@teambit/snapping": "1.0.
|
|
42
|
+
"@teambit/lister": "1.0.615",
|
|
43
|
+
"@teambit/snapping": "1.0.615",
|
|
44
44
|
"@teambit/workspace.testing.mock-workspace": "0.0.87"
|
|
45
45
|
},
|
|
46
46
|
"peerDependencies": {
|
|
File without changes
|