@teambit/merging 1.0.677 → 1.0.679

package/dist/merge-version/merge-version.d.ts

@@ -1,25 +0,0 @@
-export declare const mergeOptionsCli: {
-    o: string;
-    t: string;
-    m: string;
-};
-export declare const MergeOptions: {
-    ours: string;
-    theirs: string;
-    manual: string;
-};
-export type MergeStrategy = keyof typeof MergeOptions;
-export declare const FileStatus: {
-    merged: string;
-    manual: string;
-    binaryConflict: string;
-    updated: string;
-    added: string;
-    removed: string;
-    overridden: string;
-    unchanged: string;
-    remainDeleted: string;
-    deletedConflict: string;
-};
-export declare function getMergeStrategyInteractive(): Promise<MergeStrategy>;
-export declare function getMergeStrategy(ours: boolean, theirs: boolean, manual: boolean): MergeStrategy | null | undefined;

package/dist/merge-version/merge-version.js

@@ -1,76 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.MergeOptions = exports.FileStatus = void 0;
-exports.getMergeStrategy = getMergeStrategy;
-exports.getMergeStrategyInteractive = getMergeStrategyInteractive;
-exports.mergeOptionsCli = void 0;
-function _chalk() {
-  const data = _interopRequireDefault(require("chalk"));
-  _chalk = function () {
-    return data;
-  };
-  return data;
-}
-function _bitError() {
-  const data = require("@teambit/bit-error");
-  _bitError = function () {
-    return data;
-  };
-  return data;
-}
-function _legacyCli() {
-  const data = require("@teambit/legacy.cli.prompts");
-  _legacyCli = function () {
-    return data;
-  };
-  return data;
-}
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-const mergeOptionsCli = exports.mergeOptionsCli = {
-  o: 'ours',
-  t: 'theirs',
-  m: 'manual'
-};
-const MergeOptions = exports.MergeOptions = {
-  ours: 'ours',
-  theirs: 'theirs',
-  manual: 'manual'
-};
-// @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!
-
-const FileStatus = exports.FileStatus = {
-  merged: _chalk().default.green('auto-merged'),
-  manual: _chalk().default.red('CONFLICT'),
-  binaryConflict: _chalk().default.red('unchanged-BINARY-CONFLICT'),
-  updated: _chalk().default.green('updated'),
-  added: _chalk().default.green('added'),
-  removed: _chalk().default.green('removed'),
-  overridden: _chalk().default.yellow('overridden'),
-  unchanged: _chalk().default.green('unchanged'),
-  remainDeleted: _chalk().default.green('remain-deleted'),
-  deletedConflict: _chalk().default.red('CONFLICT-deleted-and-modified')
-};
-async function getMergeStrategyInteractive() {
-  try {
-    const result = await (0, _legacyCli().resolveConflictPrompt)();
-    // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!
-    return mergeOptionsCli[result.mergeStrategy];
-  } catch {
-    // probably user clicked ^C
-    throw new (_bitError().BitError)('the action has been canceled');
-  }
-}
-function getMergeStrategy(ours, theirs, manual) {
-  if (ours && theirs || ours && manual || theirs && manual) {
-    throw new (_bitError().BitError)('please choose only one of the following: ours, theirs or manual');
-  }
-  if (ours) return MergeOptions.ours;
-  if (theirs) return MergeOptions.theirs;
-  if (manual) return MergeOptions.manual;
-  return null;
-}
-
-//# sourceMappingURL=merge-version.js.map

package/dist/merge-version/merge-version.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["_chalk","data","_interopRequireDefault","require","_bitError","_legacyCli","e","__esModule","default","mergeOptionsCli","exports","o","t","m","MergeOptions","ours","theirs","manual","FileStatus","merged","chalk","green","red","binaryConflict","updated","added","removed","overridden","yellow","unchanged","remainDeleted","deletedConflict","getMergeStrategyInteractive","result","resolveConflictPrompt","mergeStrategy","BitError","getMergeStrategy"],"sources":["merge-version.ts"],"sourcesContent":["import chalk from 'chalk';\nimport { BitError } from '@teambit/bit-error';\nimport { resolveConflictPrompt } from '@teambit/legacy.cli.prompts';\n\nexport const mergeOptionsCli = { o: 'ours', t: 'theirs', m: 'manual' };\nexport const MergeOptions = { ours: 'ours', theirs: 'theirs', manual: 'manual' };\n// @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\nexport type MergeStrategy = keyof typeof MergeOptions;\nexport const FileStatus = {\n  merged: chalk.green('auto-merged'),\n  manual: chalk.red('CONFLICT'),\n  binaryConflict: chalk.red('unchanged-BINARY-CONFLICT'),\n  updated: chalk.green('updated'),\n  added: chalk.green('added'),\n  removed: chalk.green('removed'),\n  overridden: chalk.yellow('overridden'),\n  unchanged: chalk.green('unchanged'),\n  remainDeleted: chalk.green('remain-deleted'),\n  deletedConflict: chalk.red('CONFLICT-deleted-and-modified'),\n};\n\nexport async function getMergeStrategyInteractive(): Promise<MergeStrategy> {\n  try {\n    const result = await resolveConflictPrompt();\n    // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n    return mergeOptionsCli[result.mergeStrategy];\n  } catch {\n    // probably user clicked ^C\n    throw new BitError('the action has been canceled');\n  }\n}\n\nexport function getMergeStrategy(ours: boolean, theirs: boolean, manual: boolean): MergeStrategy | null | undefined {\n  if ((ours && theirs) || (ours && manual) || (theirs && manual)) {\n    throw new BitError('please choose only one of the following: ours, theirs or manual');\n  }\n  if (ours) return MergeOptions.ours as any;\n  if (theirs) return MergeOptions.theirs as any;\n  if (manual) return MergeOptions.manual as any;\n  return null;\n}\n"],"mappings":";;;;;;;;;AAAA,SAAAA,OAAA;EAAA,MAAAC,IAAA,GAAAC,sBAAA,CAAAC,OAAA;EAAAH,MAAA,YAAAA,CAAA;IAAA,OAAAC,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAG,UAAA;EAAA,MAAAH,IAAA,GAAAE,OAAA;EAAAC,SAAA,YAAAA,CAAA;IAAA,OAAAH,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAI,WAAA;EAAA,MAAAJ,IAAA,GAAAE,OAAA;EAAAE,UAAA,YAAAA,CAAA;IAAA,OAAAJ,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAAoE,SAAAC,uBAAAI,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAE7D,MAAMG,eAAe,GAAAC,OAAA,CAAAD,eAAA,GAAG;EAAEE,CAAC,EAAE,MAAM;EAAEC,CAAC,EAAE,QAAQ;EAAEC,CAAC,EAAE;AAAS,CAAC;AAC/D,MAAMC,YAAY,GAAAJ,OAAA,CAAAI,YAAA,GAAG;EAAEC,IAAI,EAAE,MAAM;EAAEC,MAAM,EAAE,QAAQ;EAAEC,MAAM,EAAE;AAAS,CAAC;AAChF;;AAEO,MAAMC,UAAU,GAAAR,OAAA,CAAAQ,UAAA,GAAG;EACxBC,MAAM,EAAEC,gBAAK,CAACC,KAAK,CAAC,aAAa,CAAC;EAClCJ,MAAM,EAAEG,gBAAK,CAACE,GAAG,CAAC,UAAU,CAAC;EAC7BC,cAAc,EAAEH,gBAAK,CAACE,GAAG,CAAC,2BAA2B,CAAC;EACtDE,OAAO,EAAEJ,gBAAK,CAACC,KAAK,CAAC,SAAS,CAAC;EAC/BI,KAAK,EAAEL,gBAAK,CAACC,KAAK,CAAC,OAAO,CAAC;EAC3BK,OAAO,EAAEN,gBAAK,CAACC,KAAK,CAAC,SAAS,CAAC;EAC/BM,UAAU,EAAEP,gBAAK,CAACQ,MAAM,CAAC,YAAY,CAAC;EACtCC,SAAS,EAAET,gBAAK,CAACC,KAAK,CAAC,WAAW,CAAC;EACnCS,aAAa,EAAEV,gBAAK,CAACC,KAAK,CAAC,gBAAgB,CAAC;EAC5CU,eAAe,EAAEX,gBAAK,CAACE,GAAG,CAAC,+BAA+B;AAC5D,CAAC;AAEM,eAAeU,2BAA2BA,CAAA,EAA2B;EAC1E,IAAI;IACF,MAAMC,MAAM,GAAG,MAAM,IAAAC,kCAAqB,EAAC,CAAC;IAC5C;IACA,OAAOzB,eAAe,CAACwB,MAAM,CAACE,aAAa,CAAC;EAC9C,CAAC,CAAC,MAAM;IACN;IACA,MAAM,KAAIC,oBAAQ,EAAC,8BAA8B,CAAC;EACpD;AACF;AAEO,SAASC,gBAAgBA,CAACtB,IAAa,EAAEC,MAAe,EAAEC,MAAe,EAAoC;EAClH,IAAKF,IAAI,IAAIC,MAAM,IAAMD,IAAI,IAAIE,MAAO,IAAKD,MAAM,IAAIC,MAAO,EAAE;IAC9D,MAAM,KAAImB,oBAAQ,EAAC,iEAAiE,CAAC;EACvF;EACA,IAAIrB,IAAI,EAAE,OAAOD,YAAY,CAACC,IAAI;EAClC,IAAIC,MAAM,EAAE,OAAOF,YAAY,CAACE,MAAM;EACtC,IAAIC,MAAM,EAAE,OAAOH,YAAY,CAACG,MAAM;EACtC,OAAO,IAAI;AACb","ignoreList":[]}

package/dist/merge-version/three-way-merge.d.ts

@@ -1,65 +0,0 @@
-import type { Version, SourceFileModel } from '@teambit/objects';
-import type { PathLinux } from '@teambit/toolbox.path.path';
-import type { ConsumerComponent as Component } from '@teambit/legacy.consumer-component';
-import { SourceFile } from '@teambit/component.sources';
-import type { Scope } from '@teambit/legacy.scope';
-export type MergeResultsThreeWay = {
-    addFiles: Array<{
-        filePath: PathLinux;
-        fsFile: SourceFile;
-    }>;
-    removeFiles: Array<{
-        filePath: PathLinux;
-    }>;
-    remainDeletedFiles: Array<{
-        filePath: PathLinux;
-    }>;
-    deletedConflictFiles: Array<{
-        filePath: PathLinux;
-        fsFile?: SourceFile;
-    }>;
-    modifiedFiles: Array<{
-        filePath: PathLinux;
-        fsFile: SourceFile;
-        baseFile?: SourceFileModel;
-        otherFile: SourceFileModel;
-        output: string | null | undefined;
-        conflict: string | null | undefined;
-        isBinaryConflict?: boolean;
-    }>;
-    unModifiedFiles: Array<{
-        filePath: PathLinux;
-        fsFile: SourceFile;
-    }>;
-    overrideFiles: Array<{
-        filePath: PathLinux;
-        fsFile: SourceFile;
-    }>;
-    updatedFiles: Array<{
-        filePath: PathLinux;
-        otherFile: SourceFileModel;
-        content: Buffer;
-    }>;
-    hasConflicts: boolean;
-};
-/**
- * to do the actual merge we use git, specifically `merge-file` command, so we try to use the same
- * terminology as git. From the command help:
- * `git merge-file <current-file> <base-file> <other-file>
- * git merge-file incorporates all changes that lead from the <base-file> to <other-file> into
- * <current-file>. The result ordinarily goes into <current-file>.`
- *
- * see checkout-version.getBaseVersion() for a case when a component is modified and then the base-file is not the
- * common file before other-file and current-file.
- * otherwise, Git terminology pretty much reflects what we do here. current-file is the one that is currently written
- * to the filesystem. other-file is the one the user wants to checkout to. base-file is the original file where both:
- * base-file and other-file were originated from.
- */
-export declare function threeWayMerge({ scope, otherComponent, otherLabel, currentComponent, currentLabel, baseComponent, }: {
-    scope: Scope;
-    otherComponent: Version;
-    otherLabel: string;
-    currentComponent: Component;
-    currentLabel: string;
-    baseComponent: Version;
-}): Promise<MergeResultsThreeWay>;

package/dist/merge-version/three-way-merge.js

@@ -1,254 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.threeWayMerge = threeWayMerge;
-function _bitError() {
-  const data = require("@teambit/bit-error");
-  _bitError = function () {
-    return data;
-  };
-  return data;
-}
-function _toolboxCrypto() {
-  const data = require("@teambit/toolbox.crypto.sha1");
-  _toolboxCrypto = function () {
-    return data;
-  };
-  return data;
-}
-function _toolboxPath() {
-  const data = require("@teambit/toolbox.path.path");
-  _toolboxPath = function () {
-    return data;
-  };
-  return data;
-}
-function eol() {
-  const data = _interopRequireWildcard(require("@teambit/toolbox.string.eol"));
-  eol = function () {
-    return data;
-  };
-  return data;
-}
-function _mergeFiles() {
-  const data = require("../merge-files");
-  _mergeFiles = function () {
-    return data;
-  };
-  return data;
-}
-function _component() {
-  const data = require("@teambit/component.sources");
-  _component = function () {
-    return data;
-  };
-  return data;
-}
-function _legacy() {
-  const data = require("@teambit/legacy.scope");
-  _legacy = function () {
-    return data;
-  };
-  return data;
-}
-function _lodash() {
-  const data = require("lodash");
-  _lodash = function () {
-    return data;
-  };
-  return data;
-}
-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); }
-/**
- * to do the actual merge we use git, specifically `merge-file` command, so we try to use the same
- * terminology as git. From the command help:
- * `git merge-file <current-file> <base-file> <other-file>
- * git merge-file incorporates all changes that lead from the <base-file> to <other-file> into
- * <current-file>. The result ordinarily goes into <current-file>.`
- *
- * see checkout-version.getBaseVersion() for a case when a component is modified and then the base-file is not the
- * common file before other-file and current-file.
- * otherwise, Git terminology pretty much reflects what we do here. current-file is the one that is currently written
- * to the filesystem. other-file is the one the user wants to checkout to. base-file is the original file where both:
- * base-file and other-file were originated from.
- */
-async function threeWayMerge({
-  scope,
-  otherComponent,
-  otherLabel,
-  currentComponent,
-  currentLabel,
-  baseComponent
-}) {
-  // baseFiles and currentFiles come from the model, therefore their paths include the
-  // sharedOriginallyDir. fsFiles come from the Fs, therefore their paths don't include the
-  // sharedOriginallyDir.
-  // option 1) strip sharedOriginallyDir from baseFiles and currentFiles. the problem is that the
-  // sharedDir can be different if the dependencies were changes for example, as a result, it won't
-  // be possible to compare between the files as the paths are different.
-  // in the previous it was implemented this way and caused a bug, which now has an e2e-test to
-  // block it. see https://github.com/teambit/bit/pull/2070 PR.
-  // option 2) add sharedOriginallyDir to the fsFiles. we must go with this option.
-  // one thing we have to change is the end-of-line, it should be set as LF, same way we do before
-  // saving the file as an object.
-  const baseFiles = baseComponent.files;
-  const otherFiles = otherComponent.files;
-  const currentFiles = currentComponent.cloneFilesWithSharedDir();
-  currentFiles.forEach(fsFile => {
-    fsFile.contents = eol().lf(fsFile.contents);
-  });
-  const results = {
-    addFiles: [],
-    removeFiles: [],
-    remainDeletedFiles: [],
-    deletedConflictFiles: [],
-    modifiedFiles: [],
-    unModifiedFiles: [],
-    overrideFiles: [],
-    updatedFiles: [],
-    hasConflicts: false
-  };
-  const getFileResult = async (fsFile, baseFile, otherFile) => {
-    const filePath = (0, _toolboxPath().pathNormalizeToLinux)(fsFile.relative);
-    // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!
-    const fsFileHash = (0, _toolboxCrypto().sha1)(fsFile.contents);
-    if (!otherFile) {
-      // if !otherFile && !baseFile, the file was created after the last tag, no need to do any
-      // calculation, the file should be added
-      if (!baseFile) {
-        results.addFiles.push({
-          filePath,
-          fsFile
-        });
-        return;
-      }
-      const baseFileHash = baseFile.file.hash;
-      if (fsFileHash === baseFileHash) {
-        results.removeFiles.push({
-          filePath
-        });
-        return;
-      }
-      results.deletedConflictFiles.push({
-        filePath
-      });
-      return;
-    }
-    const otherFileHash = otherFile.file.hash;
-    if (fsFileHash === otherFileHash) {
-      // if fs === other, no need to take any action (regardless the base)
-      results.unModifiedFiles.push({
-        filePath,
-        fsFile
-      });
-      return;
-    }
-    if (baseFile && fsFileHash === baseFile.file.hash) {
-      // the file has no local modification.
-      // the file currently in the fs, is not the same as the file we want to write (other).
-      // but no need to check whether it has conflicts because we always want to write the other.
-      const content = await otherFile.file.load(scope.objects);
-      results.updatedFiles.push({
-        filePath,
-        otherFile,
-        content: content.contents
-      });
-      return;
-    }
-    // it was changed in both, there is a chance for conflict. (regardless the base)
-    fsFile.label = currentLabel;
-    // @ts-ignore it's a hack to pass the data, version is not a valid attribute.
-    otherFile.label = otherLabel;
-    results.modifiedFiles.push({
-      filePath,
-      fsFile,
-      baseFile,
-      otherFile,
-      output: null,
-      conflict: null
-    });
-  };
-  await Promise.all(currentFiles.map(async fsFile => {
-    const relativePath = (0, _toolboxPath().pathNormalizeToLinux)(fsFile.relative);
-    const baseFile = baseFiles.find(file => file.relativePath === relativePath);
-    const otherFile = otherFiles.find(file => file.relativePath === relativePath);
-    await getFileResult(fsFile, baseFile, otherFile);
-  }));
-  const fsFilesPaths = currentFiles.map(fsFile => (0, _toolboxPath().pathNormalizeToLinux)(fsFile.relative));
-  const baseFilesPaths = baseFiles.map(baseFile => baseFile.relativePath);
-  const isOtherSameAsBase = otherFile => {
-    const baseFile = baseFiles.find(file => file.relativePath === otherFile.relativePath);
-    if (!baseFile) throw new Error('isOtherSameAsBase expect the base to be there');
-    return baseFile.file.hash === otherFile.file.hash;
-  };
-  const deletedFromFs = otherFiles.filter(otherFile => !fsFilesPaths.includes(otherFile.relativePath) && baseFilesPaths.includes(otherFile.relativePath) && isOtherSameAsBase(otherFile));
-  const deletedAndModified = otherFiles.filter(otherFile => !fsFilesPaths.includes(otherFile.relativePath) && baseFilesPaths.includes(otherFile.relativePath) && !isOtherSameAsBase(otherFile));
-  const addedOnOther = otherFiles.filter(otherFile => !fsFilesPaths.includes(otherFile.relativePath) && !baseFilesPaths.includes(otherFile.relativePath));
-  deletedFromFs.forEach(file => results.remainDeletedFiles.push({
-    filePath: file.relativePath
-  }));
-  deletedAndModified.forEach(file => results.deletedConflictFiles.push({
-    filePath: file.relativePath
-  }));
-  await Promise.all(addedOnOther.map(async file => {
-    const fsFile = await _component().SourceFile.loadFromSourceFileModel(file, scope.objects);
-    results.addFiles.push({
-      filePath: file.relativePath,
-      fsFile
-    });
-  }));
-  await Promise.all(deletedAndModified.map(async file => {
-    const fsFile = await _component().SourceFile.loadFromSourceFileModel(file, scope.objects);
-    results.deletedConflictFiles.push({
-      filePath: file.relativePath,
-      fsFile
-    });
-  }));
-  if ((0, _lodash().isEmpty)(results.modifiedFiles)) return results;
-  const conflictResults = await getMergeResults(scope, results.modifiedFiles);
-  conflictResults.forEach(conflictResult => {
-    const modifiedFile = results.modifiedFiles.find(file => file.filePath === conflictResult.filePath);
-    if (!modifiedFile) throw new (_bitError().BitError)(`unable to find ${conflictResult.filePath} in modified files array`);
-    modifiedFile.output = conflictResult.output;
-    modifiedFile.conflict = conflictResult.conflict;
-    modifiedFile.isBinaryConflict = conflictResult.isBinaryConflict;
-    if (conflictResult.conflict || conflictResult.isBinaryConflict) results.hasConflicts = true;
-  });
-  return results;
-}
-async function getMergeResults(scope, modifiedFiles) {
-  const tmp = new (_legacy().Tmp)(scope);
-  const conflictResultsP = modifiedFiles.map(async modifiedFile => {
-    // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!
-    const fsFilePathP = tmp.save(modifiedFile.fsFile.contents);
-    const writeFile = async file => {
-      const content = await file.file.load(scope.objects);
-      // @ts-ignore
-      return tmp.save(content.contents.toString());
-    };
-    const baseFilePathP = modifiedFile.baseFile ? writeFile(modifiedFile.baseFile) : tmp.save('');
-    const otherFilePathP = writeFile(modifiedFile.otherFile);
-    const [fsFilePath, baseFilePath, otherFilePath] = await Promise.all([fsFilePathP, baseFilePathP, otherFilePathP]);
-    const mergeFilesParams = {
-      filePath: modifiedFile.filePath,
-      currentFile: {
-        label: modifiedFile.fsFile.label,
-        path: fsFilePath
-      },
-      baseFile: {
-        path: baseFilePath
-      },
-      otherFile: {
-        // @ts-ignore
-        label: modifiedFile.otherFile.label,
-        path: otherFilePath
-      }
-    };
-    return (0, _mergeFiles().mergeFiles)(mergeFilesParams);
-  });
-  return Promise.all(conflictResultsP);
-}
-
-//# sourceMappingURL=three-way-merge.js.map

package/dist/merge-version/three-way-merge.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["_bitError","data","require","_toolboxCrypto","_toolboxPath","eol","_interopRequireWildcard","_mergeFiles","_component","_legacy","_lodash","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","threeWayMerge","scope","otherComponent","otherLabel","currentComponent","currentLabel","baseComponent","baseFiles","files","otherFiles","currentFiles","cloneFilesWithSharedDir","forEach","fsFile","contents","lf","results","addFiles","removeFiles","remainDeletedFiles","deletedConflictFiles","modifiedFiles","unModifiedFiles","overrideFiles","updatedFiles","hasConflicts","getFileResult","baseFile","otherFile","filePath","pathNormalizeToLinux","relative","fsFileHash","sha1","push","baseFileHash","file","hash","otherFileHash","content","load","objects","label","output","conflict","Promise","all","map","relativePath","find","fsFilesPaths","baseFilesPaths","isOtherSameAsBase","Error","deletedFromFs","filter","includes","deletedAndModified","addedOnOther","SourceFile","loadFromSourceFileModel","isEmpty","conflictResults","getMergeResults","conflictResult","modifiedFile","BitError","isBinaryConflict","tmp","Tmp","conflictResultsP","fsFilePathP","save","writeFile","toString","baseFilePathP","otherFilePathP","fsFilePath","baseFilePath","otherFilePath","mergeFilesParams","currentFile","path","mergeFiles"],"sources":["three-way-merge.ts"],"sourcesContent":["import { BitError } from '@teambit/bit-error';\nimport type { Source, Version, SourceFileModel } from '@teambit/objects';\nimport { sha1 } from '@teambit/toolbox.crypto.sha1';\nimport type { PathLinux, PathOsBased } from '@teambit/toolbox.path.path';\nimport { pathNormalizeToLinux } from '@teambit/toolbox.path.path';\nimport * as eol from '@teambit/toolbox.string.eol';\nimport type { MergeFileParams, MergeFileResult } from '../merge-files';\nimport { mergeFiles } from '../merge-files';\nimport type { ConsumerComponent as Component } from '@teambit/legacy.consumer-component';\nimport { SourceFile } from '@teambit/component.sources';\nimport type { Scope } from '@teambit/legacy.scope';\nimport { Tmp } from '@teambit/legacy.scope';\nimport { isEmpty } from 'lodash';\n\nexport type MergeResultsThreeWay = {\n  addFiles: Array<{\n    filePath: PathLinux;\n    fsFile: SourceFile;\n  }>;\n  removeFiles: Array<{\n    filePath: PathLinux;\n  }>;\n  remainDeletedFiles: Array<{\n    filePath: PathLinux;\n  }>;\n  deletedConflictFiles: Array<{\n    filePath: PathLinux;\n    fsFile?: SourceFile;\n  }>;\n  modifiedFiles: Array<{\n    filePath: PathLinux;\n    fsFile: SourceFile;\n    baseFile?: SourceFileModel;\n    otherFile: SourceFileModel;\n    output: string | null | undefined;\n    conflict: string | null | undefined;\n    isBinaryConflict?: boolean;\n  }>;\n  unModifiedFiles: Array<{\n    filePath: PathLinux;\n    fsFile: SourceFile;\n  }>;\n  overrideFiles: Array<{\n    filePath: PathLinux;\n    fsFile: SourceFile;\n  }>;\n  updatedFiles: Array<{\n    filePath: PathLinux;\n    otherFile: SourceFileModel;\n    content: Buffer;\n  }>;\n  hasConflicts: boolean;\n};\n\n/**\n * to do the actual merge we use git, specifically `merge-file` command, so we try to use the same\n * terminology as git. From the command help:\n * `git merge-file <current-file> <base-file> <other-file>\n * git merge-file incorporates all changes that lead from the <base-file> to <other-file> into\n * <current-file>. The result ordinarily goes into <current-file>.`\n *\n * see checkout-version.getBaseVersion() for a case when a component is modified and then the base-file is not the\n * common file before other-file and current-file.\n * otherwise, Git terminology pretty much reflects what we do here. current-file is the one that is currently written\n * to the filesystem. other-file is the one the user wants to checkout to. base-file is the original file where both:\n * base-file and other-file were originated from.\n */\nexport async function threeWayMerge({\n  scope,\n  otherComponent,\n  otherLabel,\n  currentComponent,\n  currentLabel,\n  baseComponent,\n}: {\n  scope: Scope;\n  otherComponent: Version;\n  otherLabel: string;\n  currentComponent: Component;\n  currentLabel: string;\n  baseComponent: Version;\n}): Promise<MergeResultsThreeWay> {\n  // baseFiles and currentFiles come from the model, therefore their paths include the\n  // sharedOriginallyDir. fsFiles come from the Fs, therefore their paths don't include the\n  // sharedOriginallyDir.\n  // option 1) strip sharedOriginallyDir from baseFiles and currentFiles. the problem is that the\n  // sharedDir can be different if the dependencies were changes for example, as a result, it won't\n  // be possible to compare between the files as the paths are different.\n  // in the previous it was implemented this way and caused a bug, which now has an e2e-test to\n  // block it. see https://github.com/teambit/bit/pull/2070 PR.\n  // option 2) add sharedOriginallyDir to the fsFiles. we must go with this option.\n  // one thing we have to change is the end-of-line, it should be set as LF, same way we do before\n  // saving the file as an object.\n  const baseFiles: SourceFileModel[] = baseComponent.files;\n  const otherFiles: SourceFileModel[] = otherComponent.files;\n  const currentFiles: SourceFile[] = currentComponent.cloneFilesWithSharedDir();\n  currentFiles.forEach((fsFile) => {\n    fsFile.contents = eol.lf(fsFile.contents) as Buffer;\n  });\n  const results: MergeResultsThreeWay = {\n    addFiles: [],\n    removeFiles: [],\n    remainDeletedFiles: [],\n    deletedConflictFiles: [],\n    modifiedFiles: [],\n    unModifiedFiles: [],\n    overrideFiles: [],\n    updatedFiles: [],\n    hasConflicts: false,\n  };\n  const getFileResult = async (fsFile: SourceFile, baseFile?: SourceFileModel, otherFile?: SourceFileModel) => {\n    const filePath: PathLinux = pathNormalizeToLinux(fsFile.relative);\n    // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n    const fsFileHash = sha1(fsFile.contents);\n    if (!otherFile) {\n      // if !otherFile && !baseFile, the file was created after the last tag, no need to do any\n      // calculation, the file should be added\n      if (!baseFile) {\n        results.addFiles.push({ filePath, fsFile });\n        return;\n      }\n      const baseFileHash = baseFile.file.hash;\n      if (fsFileHash === baseFileHash) {\n        results.removeFiles.push({ filePath });\n        return;\n      }\n      results.deletedConflictFiles.push({ filePath });\n      return;\n    }\n    const otherFileHash = otherFile.file.hash;\n    if (fsFileHash === otherFileHash) {\n      // if fs === other, no need to take any action (regardless the base)\n      results.unModifiedFiles.push({ filePath, fsFile });\n      return;\n    }\n    if (baseFile && fsFileHash === baseFile.file.hash) {\n      // the file has no local modification.\n      // the file currently in the fs, is not the same as the file we want to write (other).\n      // but no need to check whether it has conflicts because we always want to write the other.\n      const content = (await otherFile.file.load(scope.objects)) as Source;\n      results.updatedFiles.push({ filePath, otherFile, content: content.contents });\n      return;\n    }\n    // it was changed in both, there is a chance for conflict. (regardless the base)\n    fsFile.label = currentLabel;\n    // @ts-ignore it's a hack to pass the data, version is not a valid attribute.\n    otherFile.label = otherLabel;\n    results.modifiedFiles.push({ filePath, fsFile, baseFile, otherFile, output: null, conflict: null });\n  };\n\n  await Promise.all(\n    currentFiles.map(async (fsFile) => {\n      const relativePath = pathNormalizeToLinux(fsFile.relative);\n      const baseFile = baseFiles.find((file) => file.relativePath === relativePath);\n      const otherFile = otherFiles.find((file) => file.relativePath === relativePath);\n      await getFileResult(fsFile, baseFile, otherFile);\n    })\n  );\n  const fsFilesPaths = currentFiles.map((fsFile) => pathNormalizeToLinux(fsFile.relative));\n  const baseFilesPaths = baseFiles.map((baseFile) => baseFile.relativePath);\n  const isOtherSameAsBase = (otherFile: SourceFileModel) => {\n    const baseFile = baseFiles.find((file) => file.relativePath === otherFile.relativePath);\n    if (!baseFile) throw new Error('isOtherSameAsBase expect the base to be there');\n    return baseFile.file.hash === otherFile.file.hash;\n  };\n  const deletedFromFs = otherFiles.filter(\n    (otherFile) =>\n      !fsFilesPaths.includes(otherFile.relativePath) &&\n      baseFilesPaths.includes(otherFile.relativePath) &&\n      isOtherSameAsBase(otherFile)\n  );\n  const deletedAndModified = otherFiles.filter(\n    (otherFile) =>\n      !fsFilesPaths.includes(otherFile.relativePath) &&\n      baseFilesPaths.includes(otherFile.relativePath) &&\n      !isOtherSameAsBase(otherFile)\n  );\n  const addedOnOther = otherFiles.filter(\n    (otherFile) => !fsFilesPaths.includes(otherFile.relativePath) && !baseFilesPaths.includes(otherFile.relativePath)\n  );\n  deletedFromFs.forEach((file) => results.remainDeletedFiles.push({ filePath: file.relativePath }));\n  deletedAndModified.forEach((file) => results.deletedConflictFiles.push({ filePath: file.relativePath }));\n\n  await Promise.all(\n    addedOnOther.map(async (file) => {\n      const fsFile = await SourceFile.loadFromSourceFileModel(file, scope.objects);\n      results.addFiles.push({ filePath: file.relativePath, fsFile });\n    })\n  );\n  await Promise.all(\n    deletedAndModified.map(async (file) => {\n      const fsFile = await SourceFile.loadFromSourceFileModel(file, scope.objects);\n      results.deletedConflictFiles.push({ filePath: file.relativePath, fsFile });\n    })\n  );\n  if (isEmpty(results.modifiedFiles)) return results;\n\n  const conflictResults = await getMergeResults(scope, results.modifiedFiles);\n  conflictResults.forEach((conflictResult: MergeFileResult) => {\n    const modifiedFile = results.modifiedFiles.find((file) => file.filePath === conflictResult.filePath);\n    if (!modifiedFile) throw new BitError(`unable to find ${conflictResult.filePath} in modified files array`);\n    modifiedFile.output = conflictResult.output;\n    modifiedFile.conflict = conflictResult.conflict;\n    modifiedFile.isBinaryConflict = conflictResult.isBinaryConflict;\n    if (conflictResult.conflict || conflictResult.isBinaryConflict) results.hasConflicts = true;\n  });\n\n  return results;\n}\n\nasync function getMergeResults(\n  scope: Scope,\n  modifiedFiles: MergeResultsThreeWay['modifiedFiles']\n): Promise<MergeFileResult[]> {\n  const tmp = new Tmp(scope);\n  const conflictResultsP = modifiedFiles.map(async (modifiedFile) => {\n    // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n    const fsFilePathP = tmp.save(modifiedFile.fsFile.contents);\n    const writeFile = async (file: SourceFileModel): Promise<PathOsBased> => {\n      const content = await file.file.load(scope.objects);\n      // @ts-ignore\n      return tmp.save(content.contents.toString());\n    };\n    const baseFilePathP = modifiedFile.baseFile ? writeFile(modifiedFile.baseFile) : tmp.save('');\n    const otherFilePathP = writeFile(modifiedFile.otherFile);\n    const [fsFilePath, baseFilePath, otherFilePath] = await Promise.all([fsFilePathP, baseFilePathP, otherFilePathP]);\n    const mergeFilesParams: MergeFileParams = {\n      filePath: modifiedFile.filePath,\n      currentFile: {\n        label: modifiedFile.fsFile.label,\n        path: fsFilePath,\n      },\n      baseFile: {\n        path: baseFilePath,\n      },\n      otherFile: {\n        // @ts-ignore\n        label: modifiedFile.otherFile.label,\n        path: otherFilePath,\n      },\n    };\n    return mergeFiles(mergeFilesParams);\n  });\n  return Promise.all(conflictResultsP);\n}\n"],"mappings":"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","ignoreList":[]}

package/merge-version/index.ts

@@ -1,8 +0,0 @@
-export { threeWayMerge, MergeResultsThreeWay } from './three-way-merge';
-export {
-  FileStatus,
-  getMergeStrategyInteractive,
-  getMergeStrategy,
-  MergeOptions,
-  MergeStrategy,
-} from './merge-version';

package/merge-version/merge-version.ts

@@ -1,41 +0,0 @@
-import chalk from 'chalk';
-import { BitError } from '@teambit/bit-error';
-import { resolveConflictPrompt } from '@teambit/legacy.cli.prompts';
-
-export const mergeOptionsCli = { o: 'ours', t: 'theirs', m: 'manual' };
-export const MergeOptions = { ours: 'ours', theirs: 'theirs', manual: 'manual' };
-// @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!
-export type MergeStrategy = keyof typeof MergeOptions;
-export const FileStatus = {
-  merged: chalk.green('auto-merged'),
-  manual: chalk.red('CONFLICT'),
-  binaryConflict: chalk.red('unchanged-BINARY-CONFLICT'),
-  updated: chalk.green('updated'),
-  added: chalk.green('added'),
-  removed: chalk.green('removed'),
-  overridden: chalk.yellow('overridden'),
-  unchanged: chalk.green('unchanged'),
-  remainDeleted: chalk.green('remain-deleted'),
-  deletedConflict: chalk.red('CONFLICT-deleted-and-modified'),
-};
-
-export async function getMergeStrategyInteractive(): Promise<MergeStrategy> {
-  try {
-    const result = await resolveConflictPrompt();
-    // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!
-    return mergeOptionsCli[result.mergeStrategy];
-  } catch {
-    // probably user clicked ^C
-    throw new BitError('the action has been canceled');
-  }
-}
-
-export function getMergeStrategy(ours: boolean, theirs: boolean, manual: boolean): MergeStrategy | null | undefined {
-  if ((ours && theirs) || (ours && manual) || (theirs && manual)) {
-    throw new BitError('please choose only one of the following: ours, theirs or manual');
-  }
-  if (ours) return MergeOptions.ours as any;
-  if (theirs) return MergeOptions.theirs as any;
-  if (manual) return MergeOptions.manual as any;
-  return null;
-}