@teambit/merging 1.0.330 → 1.0.331

package/dist/merge-files.d.ts

@@ -1,4 +1,4 @@
-import { PathLinux, PathOsBased } from '@teambit/legacy/dist/utils/path';
+import { PathLinux, PathOsBased } from '@teambit/legacy.utils';
 export type MergeFileResult = {
     filePath: PathLinux;
     output: string | null | undefined;

package/dist/merge-files.js

@@ -25,16 +25,9 @@ function _logger() {
   };
   return data;
 }
-function _gitNotFound() {
-  const data = _interopRequireDefault(require("@teambit/legacy/dist/utils/git/exceptions/git-not-found"));
-  _gitNotFound = function () {
-    return data;
-  };
-  return data;
-}
-function _gitExecutable() {
-  const data = _interopRequireDefault(require("@teambit/legacy/dist/utils/git/git-executable"));
-  _gitExecutable = function () {
+function _gitModules() {
+  const data = require("@teambit/git.modules.git-executable");
+  _gitModules = function () {
     return data;
   };
   return data;
@@ -60,7 +53,7 @@ async function mergeFiles({
     output: null,
     conflict: null
   };
-  const gitExecutablePath = (0, _gitExecutable().default)();
+  const gitExecutablePath = (0, _gitModules().getGitExecutablePath)();
   try {
     const result = await (0, _execa().default)('git', ['merge-file', '-L', currentFile.label, '-L', 'Base File', '-L', otherFile.label, currentFile.path, baseFile.path, otherFile.path, '-p'], {
       stripFinalNewline: false
@@ -79,7 +72,7 @@ async function mergeFiles({
     }
     if (err.exitCodeName === 'ENOENT') {
       _logger().default.error(`failed running Git at ${gitExecutablePath}. full command: ${err.command}`);
-      throw new (_gitNotFound().default)(gitExecutablePath, err);
+      throw new (_gitModules().GitNotFound)(gitExecutablePath, err);
     }
     throw new Error(`failed merging "${filePath}" by Git.
 

package/dist/merge-files.js.map

@@ -1 +1 @@
-{"version":3,"names":["_chalk","data","_interopRequireDefault","require","_execa","_logger","_gitNotFound","_gitExecutable","e","__esModule","default","mergeFiles","filePath","currentFile","baseFile","otherFile","mergeResult","output","conflict","gitExecutablePath","getGitExecutablePath","result","execa","label","path","stripFinalNewline","stdout","err","exitCode","Number","isInteger","stderr","includes","isBinaryConflict","exitCodeName","logger","error","command","GitNotFound","Error","chalk","bold","message"],"sources":["merge-files.ts"],"sourcesContent":["import chalk from 'chalk';\nimport execa from 'execa';\nimport logger from '@teambit/legacy/dist/logger/logger';\nimport { PathLinux, PathOsBased } from '@teambit/legacy/dist/utils/path';\nimport GitNotFound from '@teambit/legacy/dist/utils/git/exceptions/git-not-found';\nimport getGitExecutablePath from '@teambit/legacy/dist/utils/git/git-executable';\n\nexport type MergeFileResult = {\n  filePath: PathLinux;\n  output: string | null | undefined;\n  conflict: string | null | undefined;\n  isBinaryConflict?: boolean;\n};\nexport type MergeFileParams = {\n  filePath: PathLinux;\n  currentFile: {\n    label: string;\n    path: PathOsBased;\n  };\n  baseFile: {\n    path: PathOsBased;\n  };\n  otherFile: {\n    label: string;\n    path: PathOsBased;\n  };\n};\n\n/**\n * use git `merge-file` command. 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 * Here, we are not going to write the result into current-file. Instead, we'll use the \"-p\" flag,\n * to just return the results.\n */\nexport async function mergeFiles({\n  filePath,\n  currentFile,\n  baseFile,\n  otherFile,\n}: MergeFileParams): Promise<MergeFileResult> {\n  const mergeResult: MergeFileResult = { filePath, output: null, conflict: null };\n  const gitExecutablePath = getGitExecutablePath();\n  try {\n    const result = await execa(\n      'git',\n      [\n        'merge-file',\n        '-L',\n        currentFile.label,\n        '-L',\n        'Base File',\n        '-L',\n        otherFile.label,\n        currentFile.path,\n        baseFile.path,\n        otherFile.path,\n        '-p',\n      ],\n      { stripFinalNewline: false }\n    );\n    mergeResult.output = result.stdout;\n    return mergeResult;\n  } catch (err: any) {\n    if (err.exitCode && Number.isInteger(err.exitCode) && err.stdout) {\n      // merge has been succeeded, return the diff results.\n      mergeResult.conflict = err.stdout;\n      return mergeResult;\n    }\n    if (err.exitCode && err.exitCode === 255 && err.stderr && err.stderr.includes('Cannot merge binary files')) {\n      mergeResult.isBinaryConflict = true;\n      return mergeResult;\n    }\n    if (err.exitCodeName === 'ENOENT') {\n      logger.error(`failed running Git at ${gitExecutablePath}. full command: ${err.command}`);\n      throw new GitNotFound(gitExecutablePath, err);\n    }\n    throw new Error(`failed merging \"${filePath}\" by Git.\n\n${chalk.bold('command:')} ${err.command}\n${chalk.bold('message:')} ${err.message}\n${chalk.bold('original error:')} ${err.stderr}`);\n    throw err;\n  }\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,OAAA;EAAA,MAAAH,IAAA,GAAAC,sBAAA,CAAAC,OAAA;EAAAC,MAAA,YAAAA,CAAA;IAAA,OAAAH,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAI,QAAA;EAAA,MAAAJ,IAAA,GAAAC,sBAAA,CAAAC,OAAA;EAAAE,OAAA,YAAAA,CAAA;IAAA,OAAAJ,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAEA,SAAAK,aAAA;EAAA,MAAAL,IAAA,GAAAC,sBAAA,CAAAC,OAAA;EAAAG,YAAA,YAAAA,CAAA;IAAA,OAAAL,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAM,eAAA;EAAA,MAAAN,IAAA,GAAAC,sBAAA,CAAAC,OAAA;EAAAI,cAAA,YAAAA,CAAA;IAAA,OAAAN,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAAiF,SAAAC,uBAAAM,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAuBjF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,eAAeG,UAAUA,CAAC;EAC/BC,QAAQ;EACRC,WAAW;EACXC,QAAQ;EACRC;AACe,CAAC,EAA4B;EAC5C,MAAMC,WAA4B,GAAG;IAAEJ,QAAQ;IAAEK,MAAM,EAAE,IAAI;IAAEC,QAAQ,EAAE;EAAK,CAAC;EAC/E,MAAMC,iBAAiB,GAAG,IAAAC,wBAAoB,EAAC,CAAC;EAChD,IAAI;IACF,MAAMC,MAAM,GAAG,MAAM,IAAAC,gBAAK,EACxB,KAAK,EACL,CACE,YAAY,EACZ,IAAI,EACJT,WAAW,CAACU,KAAK,EACjB,IAAI,EACJ,WAAW,EACX,IAAI,EACJR,SAAS,CAACQ,KAAK,EACfV,WAAW,CAACW,IAAI,EAChBV,QAAQ,CAACU,IAAI,EACbT,SAAS,CAACS,IAAI,EACd,IAAI,CACL,EACD;MAAEC,iBAAiB,EAAE;IAAM,CAC7B,CAAC;IACDT,WAAW,CAACC,MAAM,GAAGI,MAAM,CAACK,MAAM;IAClC,OAAOV,WAAW;EACpB,CAAC,CAAC,OAAOW,GAAQ,EAAE;IACjB,IAAIA,GAAG,CAACC,QAAQ,IAAIC,MAAM,CAACC,SAAS,CAACH,GAAG,CAACC,QAAQ,CAAC,IAAID,GAAG,CAACD,MAAM,EAAE;MAChE;MACAV,WAAW,CAACE,QAAQ,GAAGS,GAAG,CAACD,MAAM;MACjC,OAAOV,WAAW;IACpB;IACA,IAAIW,GAAG,CAACC,QAAQ,IAAID,GAAG,CAACC,QAAQ,KAAK,GAAG,IAAID,GAAG,CAACI,MAAM,IAAIJ,GAAG,CAACI,MAAM,CAACC,QAAQ,CAAC,2BAA2B,CAAC,EAAE;MAC1GhB,WAAW,CAACiB,gBAAgB,GAAG,IAAI;MACnC,OAAOjB,WAAW;IACpB;IACA,IAAIW,GAAG,CAACO,YAAY,KAAK,QAAQ,EAAE;MACjCC,iBAAM,CAACC,KAAK,CAAC,yBAAyBjB,iBAAiB,mBAAmBQ,GAAG,CAACU,OAAO,EAAE,CAAC;MACxF,MAAM,KAAIC,sBAAW,EAACnB,iBAAiB,EAAEQ,GAAG,CAAC;IAC/C;IACA,MAAM,IAAIY,KAAK,CAAC,mBAAmB3B,QAAQ;AAC/C;AACA,EAAE4B,gBAAK,CAACC,IAAI,CAAC,UAAU,CAAC,IAAId,GAAG,CAACU,OAAO;AACvC,EAAEG,gBAAK,CAACC,IAAI,CAAC,UAAU,CAAC,IAAId,GAAG,CAACe,OAAO;AACvC,EAAEF,gBAAK,CAACC,IAAI,CAAC,iBAAiB,CAAC,IAAId,GAAG,CAACI,MAAM,EAAE,CAAC;IAC5C,MAAMJ,GAAG;EACX;AACF","ignoreList":[]}
+{"version":3,"names":["_chalk","data","_interopRequireDefault","require","_execa","_logger","_gitModules","e","__esModule","default","mergeFiles","filePath","currentFile","baseFile","otherFile","mergeResult","output","conflict","gitExecutablePath","getGitExecutablePath","result","execa","label","path","stripFinalNewline","stdout","err","exitCode","Number","isInteger","stderr","includes","isBinaryConflict","exitCodeName","logger","error","command","GitNotFound","Error","chalk","bold","message"],"sources":["merge-files.ts"],"sourcesContent":["import chalk from 'chalk';\nimport execa from 'execa';\nimport logger from '@teambit/legacy/dist/logger/logger';\nimport { GitNotFound, getGitExecutablePath } from '@teambit/git.modules.git-executable';\nimport { PathLinux, PathOsBased } from '@teambit/legacy.utils';\n\nexport type MergeFileResult = {\n  filePath: PathLinux;\n  output: string | null | undefined;\n  conflict: string | null | undefined;\n  isBinaryConflict?: boolean;\n};\nexport type MergeFileParams = {\n  filePath: PathLinux;\n  currentFile: {\n    label: string;\n    path: PathOsBased;\n  };\n  baseFile: {\n    path: PathOsBased;\n  };\n  otherFile: {\n    label: string;\n    path: PathOsBased;\n  };\n};\n\n/**\n * use git `merge-file` command. 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 * Here, we are not going to write the result into current-file. Instead, we'll use the \"-p\" flag,\n * to just return the results.\n */\nexport async function mergeFiles({\n  filePath,\n  currentFile,\n  baseFile,\n  otherFile,\n}: MergeFileParams): Promise<MergeFileResult> {\n  const mergeResult: MergeFileResult = { filePath, output: null, conflict: null };\n  const gitExecutablePath = getGitExecutablePath();\n  try {\n    const result = await execa(\n      'git',\n      [\n        'merge-file',\n        '-L',\n        currentFile.label,\n        '-L',\n        'Base File',\n        '-L',\n        otherFile.label,\n        currentFile.path,\n        baseFile.path,\n        otherFile.path,\n        '-p',\n      ],\n      { stripFinalNewline: false }\n    );\n    mergeResult.output = result.stdout;\n    return mergeResult;\n  } catch (err: any) {\n    if (err.exitCode && Number.isInteger(err.exitCode) && err.stdout) {\n      // merge has been succeeded, return the diff results.\n      mergeResult.conflict = err.stdout;\n      return mergeResult;\n    }\n    if (err.exitCode && err.exitCode === 255 && err.stderr && err.stderr.includes('Cannot merge binary files')) {\n      mergeResult.isBinaryConflict = true;\n      return mergeResult;\n    }\n    if (err.exitCodeName === 'ENOENT') {\n      logger.error(`failed running Git at ${gitExecutablePath}. full command: ${err.command}`);\n      throw new GitNotFound(gitExecutablePath, err);\n    }\n    throw new Error(`failed merging \"${filePath}\" by Git.\n\n${chalk.bold('command:')} ${err.command}\n${chalk.bold('message:')} ${err.message}\n${chalk.bold('original error:')} ${err.stderr}`);\n    throw err;\n  }\n}\n"],"mappings":"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","ignoreList":[]}

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

@@ -21,9 +21,9 @@ function _bitError() {
   };
   return data;
 }
-function _prompts() {
-  const data = require("@teambit/legacy/dist/prompts");
-  _prompts = function () {
+function _legacyCli() {
+  const data = require("@teambit/legacy.cli.prompts");
+  _legacyCli = function () {
     return data;
   };
   return data;
@@ -55,7 +55,7 @@ const FileStatus = exports.FileStatus = {
 };
 async function getMergeStrategyInteractive() {
   try {
-    const result = await (0, _prompts().resolveConflictPrompt)();
+    const result = await (0, _legacyCli().resolveConflictPrompt)();
     // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!
     return mergeOptionsCli[result.mergeStrategy];
   } catch (err) {

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

@@ -1 +1 @@
-{"version":3,"names":["_chalk","data","_interopRequireDefault","require","_bitError","_prompts","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","err","BitError","getMergeStrategy"],"sources":["merge-version.ts"],"sourcesContent":["import chalk from 'chalk';\nimport { BitError } from '@teambit/bit-error';\nimport { resolveConflictPrompt } from '@teambit/legacy/dist/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 (err: any) {\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,SAAA;EAAA,MAAAJ,IAAA,GAAAE,OAAA;EAAAE,QAAA,YAAAA,CAAA;IAAA,OAAAJ,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAAqE,SAAAC,uBAAAI,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAE9D,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,gCAAqB,EAAC,CAAC;IAC5C;IACA,OAAOzB,eAAe,CAACwB,MAAM,CAACE,aAAa,CAAC;EAC9C,CAAC,CAAC,OAAOC,GAAQ,EAAE;IACjB;IACA,MAAM,KAAIC,oBAAQ,EAAC,8BAA8B,CAAC;EACpD;AACF;AAEO,SAASC,gBAAgBA,CAACvB,IAAa,EAAEC,MAAe,EAAEC,MAAe,EAAoC;EAClH,IAAKF,IAAI,IAAIC,MAAM,IAAMD,IAAI,IAAIE,MAAO,IAAKD,MAAM,IAAIC,MAAO,EAAE;IAC9D,MAAM,KAAIoB,oBAAQ,EAAC,iEAAiE,CAAC;EACvF;EACA,IAAItB,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":[]}
+{"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","err","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 (err: any) {\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,OAAOC,GAAQ,EAAE;IACjB;IACA,MAAM,KAAIC,oBAAQ,EAAC,8BAA8B,CAAC;EACpD;AACF;AAEO,SAASC,gBAAgBA,CAACvB,IAAa,EAAEC,MAAe,EAAEC,MAAe,EAAoC;EAClH,IAAKF,IAAI,IAAIC,MAAM,IAAMD,IAAI,IAAIE,MAAO,IAAKD,MAAM,IAAIC,MAAO,EAAE;IAC9D,MAAM,KAAIoB,oBAAQ,EAAC,iEAAiE,CAAC;EACvF;EACA,IAAItB,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,6 +1,6 @@
 import { Version } from '@teambit/legacy/dist/scope/models';
 import { SourceFileModel } from '@teambit/legacy/dist/scope/models/version';
-import { PathLinux } from '@teambit/legacy/dist/utils/path';
+import { PathLinux } from '@teambit/toolbox.path.path';
 import Component from '@teambit/legacy/dist/consumer/component';
 import { SourceFile } from '@teambit/legacy/dist/consumer/component/sources';
 import { Scope } from '@teambit/legacy/dist/scope';

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

@@ -18,23 +18,30 @@ function _repositories() {
   };
   return data;
 }
-function _utils() {
-  const data = require("@teambit/legacy/dist/utils");
-  _utils = function () {
+function _toolboxCrypto() {
+  const data = require("@teambit/toolbox.crypto.sha1");
+  _toolboxCrypto = function () {
     return data;
   };
   return data;
 }
-function _mergeFiles() {
-  const data = require("../merge-files");
-  _mergeFiles = function () {
+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 _path() {
-  const data = require("@teambit/legacy/dist/utils/path");
-  _path = function () {
+function _mergeFiles() {
+  const data = require("../merge-files");
+  _mergeFiles = function () {
     return data;
   };
   return data;
@@ -53,6 +60,8 @@ function _lodash() {
   };
   return data;
 }
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
+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; }
 /**
  * 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:
@@ -89,7 +98,7 @@ async function threeWayMerge({
   const otherFiles = otherComponent.files;
   const currentFiles = currentComponent.cloneFilesWithSharedDir();
   currentFiles.forEach(fsFile => {
-    fsFile.contents = _utils().eol.lf(fsFile.contents);
+    fsFile.contents = eol().lf(fsFile.contents);
   });
   const results = {
     addFiles: [],
@@ -103,9 +112,9 @@ async function threeWayMerge({
     hasConflicts: false
   };
   const getFileResult = async (fsFile, baseFile, otherFile) => {
-    const filePath = (0, _path().pathNormalizeToLinux)(fsFile.relative);
+    const filePath = (0, _toolboxPath().pathNormalizeToLinux)(fsFile.relative);
     // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!
-    const fsFileHash = (0, _utils().sha1)(fsFile.contents);
+    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
@@ -163,12 +172,12 @@ async function threeWayMerge({
     });
   };
   await Promise.all(currentFiles.map(async fsFile => {
-    const relativePath = (0, _path().pathNormalizeToLinux)(fsFile.relative);
+    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, _path().pathNormalizeToLinux)(fsFile.relative));
+  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);

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

@@ -1 +1 @@
-{"version":3,"names":["_bitError","data","require","_repositories","_utils","_mergeFiles","_path","_sources","_lodash","threeWayMerge","scope","otherComponent","otherLabel","currentComponent","currentLabel","baseComponent","baseFiles","files","otherFiles","currentFiles","cloneFilesWithSharedDir","forEach","fsFile","contents","eol","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 { Source, Version } from '@teambit/legacy/dist/scope/models';\nimport { SourceFileModel } from '@teambit/legacy/dist/scope/models/version';\nimport { Tmp } from '@teambit/legacy/dist/scope/repositories';\nimport { eol, sha1 } from '@teambit/legacy/dist/utils';\nimport { mergeFiles, MergeFileParams, MergeFileResult } from '../merge-files';\nimport { PathLinux, pathNormalizeToLinux, PathOsBased } from '@teambit/legacy/dist/utils/path';\nimport Component from '@teambit/legacy/dist/consumer/component';\nimport { SourceFile } from '@teambit/legacy/dist/consumer/component/sources';\nimport { Scope } from '@teambit/legacy/dist/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":[]}
+{"version":3,"names":["_bitError","data","require","_repositories","_toolboxCrypto","_toolboxPath","eol","_interopRequireWildcard","_mergeFiles","_sources","_lodash","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","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 { Source, Version } from '@teambit/legacy/dist/scope/models';\nimport { SourceFileModel } from '@teambit/legacy/dist/scope/models/version';\nimport { Tmp } from '@teambit/legacy/dist/scope/repositories';\nimport { sha1 } from '@teambit/toolbox.crypto.sha1';\nimport { PathLinux, pathNormalizeToLinux, PathOsBased } from '@teambit/toolbox.path.path';\nimport * as eol from '@teambit/toolbox.string.eol';\nimport { mergeFiles, MergeFileParams, MergeFileResult } from '../merge-files';\nimport Component from '@teambit/legacy/dist/consumer/component';\nimport { SourceFile } from '@teambit/legacy/dist/consumer/component/sources';\nimport { Scope } from '@teambit/legacy/dist/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/dist/merging.main.runtime.js

@@ -81,9 +81,16 @@ function _remove() {
   };
   return data;
 }
-function _utils() {
-  const data = require("@teambit/legacy/dist/utils");
-  _utils = function () {
+function _toolboxPath() {
+  const data = require("@teambit/toolbox.path.path");
+  _toolboxPath = function () {
+    return data;
+  };
+  return data;
+}
+function _pkgModules() {
+  const data = require("@teambit/pkg.modules.component-package-name");
+  _pkgModules = function () {
     return data;
   };
   return data;
@@ -137,13 +144,6 @@ function _configMerger() {
   };
   return data;
 }
-function _componentIdToPackageName() {
-  const data = _interopRequireDefault(require("@teambit/legacy/dist/utils/bit/component-id-to-package-name"));
-  _componentIdToPackageName = function () {
-    return data;
-  };
-  return data;
-}
 function _dependencyResolver() {
   const data = require("@teambit/dependency-resolver");
   _dependencyResolver = function () {
@@ -380,7 +380,7 @@ class MergingMain {
     const newlyIntroducedIds = currentLane?.toComponentIds().filter(id => !currentLaneIdsBeforeMerge?.hasWithoutVersion(id));
     const newlyIntroducedComponentIds = _componentId().ComponentIdList.fromArray(newlyIntroducedIds || []);
     const components = (0, _lodash().compact)(componentsResults.map(c => c.legacyCompToWrite).filter(c => c && newlyIntroducedComponentIds.hasWithoutVersion(c.id)));
-    const packages = components.map(c => (0, _componentIdToPackageName().default)(c));
+    const packages = components.map(c => (0, _pkgModules().componentIdToPackageName)(c));
     const isRemoved = this.depResolver.removeFromRootPolicy(packages);
     if (isRemoved) await this.depResolver.persistConfig('merge (remove packages)');
   }
@@ -494,7 +494,7 @@ class MergingMain {
     const markAllFilesAsUnchanged = () => {
       if (!currentComponent) throw new Error(`applyVersion expect to get currentComponent for ${id.toString()}`);
       currentComponent.files.forEach(file => {
-        filesStatus[(0, _utils().pathNormalizeToLinux)(file.relative)] = _mergeVersion().FileStatus.unchanged;
+        filesStatus[(0, _toolboxPath().pathNormalizeToLinux)(file.relative)] = _mergeVersion().FileStatus.unchanged;
       });
     };
     if (mergeResults && mergeResults.hasConflicts && mergeStrategy === _mergeVersion().MergeOptions.ours) {