@teambit/merging 1.0.317 → 1.0.319

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

@@ -0,0 +1,246 @@
+"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 _repositories() {
+  const data = require("@teambit/legacy/dist/scope/repositories");
+  _repositories = function () {
+    return data;
+  };
+  return data;
+}
+function _utils() {
+  const data = require("@teambit/legacy/dist/utils");
+  _utils = function () {
+    return data;
+  };
+  return data;
+}
+function _mergeFiles() {
+  const data = require("../merge-files");
+  _mergeFiles = function () {
+    return data;
+  };
+  return data;
+}
+function _path() {
+  const data = require("@teambit/legacy/dist/utils/path");
+  _path = function () {
+    return data;
+  };
+  return data;
+}
+function _sources() {
+  const data = require("@teambit/legacy/dist/consumer/component/sources");
+  _sources = function () {
+    return data;
+  };
+  return data;
+}
+function _lodash() {
+  const data = require("lodash");
+  _lodash = function () {
+    return data;
+  };
+  return data;
+}
+/**
+ * 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 = _utils().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, _path().pathNormalizeToLinux)(fsFile.relative);
+    // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!
+    const fsFileHash = (0, _utils().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, _path().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 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 _sources().SourceFile.loadFromSourceFileModel(file, scope.objects);
+    results.addFiles.push({
+      filePath: file.relativePath,
+      fsFile
+    });
+  }));
+  await Promise.all(deletedAndModified.map(async file => {
+    const fsFile = await _sources().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 (_repositories().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

@@ -0,0 +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":[]}

package/dist/merging.main.runtime.d.ts

@@ -1,7 +1,6 @@
 import { CLIMain } from '@teambit/cli';
 import { Workspace } from '@teambit/workspace';
 import { Consumer } from '@teambit/legacy/dist/consumer';
-import { MergeStrategy, FileStatus } from '@teambit/legacy/dist/consumer/versions-ops/merge-version';
 import { SnappingMain } from '@teambit/snapping';
 import { ComponentID, ComponentIdList } from '@teambit/component-id';
 import { LaneId } from '@teambit/lane-id';
@@ -15,7 +14,6 @@ import ConsumerComponent from '@teambit/legacy/dist/consumer/component/consumer-
 import { ImporterMain } from '@teambit/importer';
 import { Logger, LoggerMain } from '@teambit/logger';
 import { GlobalConfigMain } from '@teambit/global-config';
-import { MergeResultsThreeWay } from '@teambit/legacy/dist/consumer/versions-ops/merge-version/three-way-merge';
 import { ApplyVersionWithComps, CheckoutMain, ComponentStatusBase } from '@teambit/checkout';
 import { ConfigMergerMain, ConfigMergeResult, WorkspaceConfigUpdateResult } from '@teambit/config-merger';
 import { SnapsDistance } from '@teambit/legacy/dist/scope/component-ops/snaps-distance';
@@ -23,6 +21,7 @@ import { DependencyResolverMain } from '@teambit/dependency-resolver';
 import { InstallMain } from '@teambit/install';
 import { ScopeMain } from '@teambit/scope';
 import { MergeStatusProviderOptions } from './merge-status-provider';
+import { MergeStrategy, FileStatus, MergeResultsThreeWay } from './merge-version';
 type ResolveUnrelatedData = {
     strategy: MergeStrategy;
     headOnCurrentLane: Ref;
@@ -94,7 +93,7 @@ export declare class MergingMain {
     private configMerger;
     private depResolver;
     constructor(workspace: Workspace, scope: ScopeMain, install: InstallMain, snapping: SnappingMain, checkout: CheckoutMain, logger: Logger, componentWriter: ComponentWriterMain, importer: ImporterMain, config: ConfigMain, remove: RemoveMain, configMerger: ConfigMergerMain, depResolver: DependencyResolverMain);
-    merge(ids: string[], mergeStrategy: MergeStrategy, abort: boolean, resolve: boolean, noSnap: boolean, message: string, build: boolean, skipDependencyInstallation: boolean): Promise<ApplyVersionResults>;
+    merge(pattern: string, mergeStrategy: MergeStrategy, abort: boolean, resolve: boolean, noSnap: boolean, message: string, build: boolean, skipDependencyInstallation: boolean): Promise<ApplyVersionResults>;
     /**
      * when user is on main, it merges the remote main components into local.
      * when user is on a lane, it merges the remote lane components into the local lane.

package/dist/merging.main.runtime.js

@@ -25,13 +25,6 @@ function _componentsList() {
   };
   return data;
 }
-function _mergeVersion() {
-  const data = require("@teambit/legacy/dist/consumer/versions-ops/merge-version");
-  _mergeVersion = function () {
-    return data;
-  };
-  return data;
-}
 function _snapping() {
   const data = require("@teambit/snapping");
   _snapping = function () {
@@ -39,13 +32,6 @@ function _snapping() {
   };
   return data;
 }
-function _hasWildcard() {
-  const data = _interopRequireDefault(require("@teambit/legacy/dist/utils/string/has-wildcard"));
-  _hasWildcard = function () {
-    return data;
-  };
-  return data;
-}
 function _pMapSeries() {
   const data = _interopRequireDefault(require("p-map-series"));
   _pMapSeries = function () {
@@ -207,6 +193,13 @@ function _mergeStatusProvider() {
   };
   return data;
 }
+function _mergeVersion() {
+  const data = require("./merge-version");
+  _mergeVersion = function () {
+    return data;
+  };
+  return data;
+}
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 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; }
 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; }
@@ -230,16 +223,16 @@ class MergingMain {
     this.configMerger = configMerger;
     this.depResolver = depResolver;
   }
-  async merge(ids, mergeStrategy, abort, resolve, noSnap, message, build, skipDependencyInstallation) {
+  async merge(pattern, mergeStrategy, abort, resolve, noSnap, message, build, skipDependencyInstallation) {
     if (!this.workspace) throw new (_workspace().OutsideWorkspaceError)();
     const consumer = this.workspace.consumer;
     let mergeResults;
     if (resolve) {
-      mergeResults = await this.resolveMerge(ids, message, build);
+      mergeResults = await this.resolveMerge(pattern, message, build);
     } else if (abort) {
-      mergeResults = await this.abortMerge(ids);
+      mergeResults = await this.abortMerge(pattern);
     } else {
-      const bitIds = await this.getComponentsToMerge(consumer, ids);
+      const bitIds = await this.getComponentsToMerge(consumer, pattern);
       mergeResults = await this.mergeComponentsFromRemote(consumer, bitIds, mergeStrategy, noSnap, message, build, skipDependencyInstallation);
     }
     await consumer.onDestroy('merge');
@@ -583,9 +576,9 @@ class MergingMain {
       legacyCompToWrite: legacyComponent
     };
   }
-  async abortMerge(values) {
+  async abortMerge(pattern) {
     const consumer = this.workspace.consumer;
-    const ids = await this.getIdsForUnmerged(values);
+    const ids = await this.getIdsForUnmerged(pattern);
     const results = await this.checkout.checkout({
       ids,
       reset: true
@@ -596,8 +589,8 @@ class MergingMain {
       abortedComponents: results.components
     };
   }
-  async resolveMerge(values, snapMessage, build) {
-    const ids = await this.getIdsForUnmerged(values);
+  async resolveMerge(pattern, snapMessage, build) {
+    const ids = await this.getIdsForUnmerged(pattern);
     // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!
     const {
       snappedComponents
@@ -661,9 +654,9 @@ class MergingMain {
       unmodified: true
     });
   }
-  async getIdsForUnmerged(idsStr) {
-    if (idsStr && idsStr.length) {
-      const componentIds = await this.workspace.resolveMultipleComponentIds(idsStr);
+  async getIdsForUnmerged(pattern) {
+    if (pattern) {
+      const componentIds = await this.workspace.idsByPattern(pattern);
       componentIds.forEach(id => {
         const entry = this.workspace.consumer.scope.objects.unmergedComponents.getEntry(id);
         if (!entry) {
@@ -676,16 +669,13 @@ class MergingMain {
     if (!unresolvedComponents.length) throw new (_bitError().BitError)(`all components are resolved already, nothing to do`);
     return unresolvedComponents.map(u => _componentId().ComponentID.fromObject(u.id));
   }
-  async getComponentsToMerge(consumer, ids) {
-    const componentsList = new (_componentsList().default)(consumer);
-    if (!ids.length) {
-      const mergePending = await componentsList.listMergePendingComponents();
-      return mergePending.map(c => c.id);
+  async getComponentsToMerge(consumer, pattern) {
+    if (pattern) {
+      return this.workspace.idsByPattern(pattern);
     }
-    if ((0, _hasWildcard().default)(ids)) {
-      return componentsList.listComponentsByIdsWithWildcard(ids);
-    }
-    return ids.map(id => consumer.getParsedId(id));
+    const componentsList = new (_componentsList().default)(consumer);
+    const mergePending = await componentsList.listMergePendingComponents();
+    return mergePending.map(c => c.id);
   }
   static async provider([cli, workspace, scope, snapping, checkout, install, loggerMain, compWriter, importer, config, remove, globalConfig, configMerger, depResolver]) {
     const logger = loggerMain.createLogger(_merging().MergingAspect.id);