@teambit/merging 1.0.133 → 1.0.135

package/dist/merging.main.runtime.js

@@ -11,27 +11,6 @@ function _cli() {
   };
   return data;
 }
-function _semver() {
-  const data = _interopRequireDefault(require("semver"));
-  _semver = function () {
-    return data;
-  };
-  return data;
-}
-function _tempy() {
-  const data = _interopRequireDefault(require("tempy"));
-  _tempy = function () {
-    return data;
-  };
-  return data;
-}
-function _fsExtra() {
-  const data = _interopRequireDefault(require("fs-extra"));
-  _fsExtra = function () {
-    return data;
-  };
-  return data;
-}
 function _workspace() {
   const data = _interopRequireWildcard(require("@teambit/workspace"));
   _workspace = function () {
@@ -165,13 +144,6 @@ function _lodash() {
   };
   return data;
 }
-function _dependencyResolver() {
-  const data = require("@teambit/dependency-resolver");
-  _dependencyResolver = function () {
-    return data;
-  };
-  return data;
-}
 function _checkout() {
   const data = require("@teambit/checkout");
   _checkout = function () {
@@ -179,13 +151,6 @@ function _checkout() {
   };
   return data;
 }
-function _constants() {
-  const data = require("@teambit/legacy/dist/constants");
-  _constants = function () {
-    return data;
-  };
-  return data;
-}
 function _deleteComponentFiles() {
   const data = _interopRequireDefault(require("@teambit/legacy/dist/consumer/component-ops/delete-component-files"));
   _deleteComponentFiles = function () {
@@ -193,9 +158,9 @@ function _deleteComponentFiles() {
   };
   return data;
 }
-function _mergeFiles() {
-  const data = _interopRequireDefault(require("@teambit/legacy/dist/utils/merge-files"));
-  _mergeFiles = function () {
+function _configMerger() {
+  const data = require("@teambit/config-merger");
+  _configMerger = function () {
     return data;
   };
   return data;
@@ -221,13 +186,6 @@ function _merging() {
   };
   return data;
 }
-function _configMergeResult() {
-  const data = require("./config-merge-result");
-  _configMergeResult = function () {
-    return data;
-  };
-  return data;
-}
 function _mergeStatusProvider() {
   const data = require("./merge-status-provider");
   _mergeStatusProvider = function () {
@@ -235,23 +193,18 @@ function _mergeStatusProvider() {
   };
   return data;
 }
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 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 && Object.prototype.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; }
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 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; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-const WS_DEPS_FIELDS = ['dependencies', 'peerDependencies'];
-
-// from => to
-// the pkg value is in a format of CONFLICT::OURS::THEIRS
-
 // fileName is PathLinux. TS doesn't let anything else in the keys other than string and number
 
 class MergingMain {
-  constructor(workspace, install, snapping, checkout, logger, componentWriter, importer, config, remove) {
+  constructor(workspace, install, snapping, checkout, logger, componentWriter, importer, config, remove, configMerger) {
     this.workspace = workspace;
     this.install = install;
     this.snapping = snapping;
@@ -261,6 +214,7 @@ class MergingMain {
     this.importer = importer;
     this.config = config;
     this.remove = remove;
+    this.configMerger = configMerger;
   }
   async merge(ids, mergeStrategy, abort, resolve, noSnap, message, build, skipDependencyInstallation) {
     if (!this.workspace) throw new (_workspace().OutsideWorkspaceError)();
@@ -334,12 +288,12 @@ class MergingMain {
     const {
       workspaceDepsUpdates,
       workspaceDepsConflicts
-    } = await this.updateWorkspaceJsoncWithDepsIfNeeded(allConfigMerge);
+    } = await this.configMerger.updateWorkspaceJsoncWithDepsIfNeeded(allConfigMerge);
     let workspaceConflictError;
     if (workspaceDepsConflicts) {
-      workspaceConflictError = await this.writeWorkspaceJsoncWithConflictsGracefully(workspaceDepsConflicts);
+      workspaceConflictError = await this.configMerger.writeWorkspaceJsoncWithConflictsGracefully(workspaceDepsConflicts);
     }
-    await this.generateConfigMergeConflictFileForAll(allConfigMerge);
+    await this.configMerger.generateConfigMergeConflictFileForAll(allConfigMerge);
     if (currentLane) consumer.scope.objects.add(currentLane);
     await consumer.scope.objects.persist(); // persist anyway, if currentLane is null it should save all main heads
 
@@ -408,224 +362,6 @@ class MergingMain {
       workspaceDepsUpdates
     };
   }
-  async generateConfigMergeConflictFileForAll(allConfigMerge) {
-    const configMergeFile = this.workspace.getConflictMergeFile();
-    allConfigMerge.forEach(configMerge => {
-      const conflict = configMerge.generateMergeConflictFile();
-      if (!conflict) return;
-      configMergeFile.addConflict(configMerge.compIdStr, conflict);
-    });
-    if (configMergeFile.hasConflict()) {
-      await configMergeFile.write();
-    }
-  }
-  async writeWorkspaceJsoncWithConflictsGracefully(workspaceDepsConflicts) {
-    try {
-      await this.writeWorkspaceJsoncWithConflicts(workspaceDepsConflicts);
-      return undefined;
-    } catch (err) {
-      this.logger.error(`unable to write workspace.jsonc with conflicts`, err);
-      const errTitle = `unable to write workspace.jsonc with conflicts, due to an error: "${err.message}".
-see the conflicts below and edit your workspace.jsonc as you see fit.`;
-      const conflictsStr = WS_DEPS_FIELDS.map(depField => {
-        if (!workspaceDepsConflicts[depField]) return [];
-        return workspaceDepsConflicts[depField].map(({
-          name,
-          version
-        }) => {
-          const {
-            currentVal,
-            otherVal
-          } = (0, _configMergeResult().parseVersionLineWithConflict)(version);
-          return `(${depField}) ${name}: ours: ${currentVal}, theirs: ${otherVal}`;
-        });
-      }).flat().join('\n');
-      return new (_bitError().BitError)(`${errTitle}\n${conflictsStr}`);
-    }
-  }
-  async writeWorkspaceJsoncWithConflicts(workspaceDepsConflicts) {
-    const wsConfig = this.config.workspaceConfig;
-    if (!wsConfig) throw new Error(`unable to get workspace config`);
-    const wsJsoncPath = wsConfig.path;
-    const wsJsoncOriginalContent = await _fsExtra().default.readFile(wsJsoncPath, 'utf8');
-    let wsJsoncContent = wsJsoncOriginalContent;
-    WS_DEPS_FIELDS.forEach(depField => {
-      if (!workspaceDepsConflicts[depField]) return;
-      workspaceDepsConflicts[depField].forEach(({
-        name,
-        version
-      }) => {
-        const {
-          currentVal,
-          otherVal
-        } = (0, _configMergeResult().parseVersionLineWithConflict)(version);
-        // e.g. "@ci/8oypmb6p-remote.bar.foo": "^0.0.3"
-        const originalDep = `"${name}": "${currentVal}"`;
-        if (!wsJsoncContent.includes(originalDep)) {
-          throw new Error(`unable to find the dependency ${originalDep} in the workspace.jsonc`);
-        }
-        wsJsoncContent = wsJsoncContent.replace(originalDep, `"${name}": "${otherVal}"`);
-      });
-    });
-    const baseFilePath = await _tempy().default.write('');
-    const otherFilePath = await _tempy().default.write(wsJsoncContent);
-    const mergeFilesParams = {
-      filePath: wsJsoncPath,
-      currentFile: {
-        label: 'ours',
-        path: wsJsoncPath
-      },
-      baseFile: {
-        path: baseFilePath
-      },
-      otherFile: {
-        label: 'theirs',
-        path: otherFilePath
-      }
-    };
-    const mergeResult = await (0, _mergeFiles().default)(mergeFilesParams);
-    const conflictFile = mergeResult.conflict;
-    if (!conflictFile) {
-      this.logger.debug(`original content:\n${wsJsoncOriginalContent}`);
-      this.logger.debug(`new content:\n${wsJsoncContent}`);
-      throw new Error('unable to generate conflict from the workspace.jsonc file. see debug.log for the file content');
-    }
-    await wsConfig.backupConfigFile('before writing conflicts');
-    await _fsExtra().default.writeFile(wsJsoncPath, conflictFile);
-  }
-  async updateWorkspaceJsoncWithDepsIfNeeded(allConfigMerge) {
-    const allResults = allConfigMerge.map(c => c.getDepsResolverResult());
-
-    // aggregate all dependencies that can be updated (not conflicting)
-    const nonConflictDeps = {};
-    const nonConflictSources = {}; // for logging/debugging purposes
-    allConfigMerge.forEach(configMerge => {
-      const mergedConfig = configMerge.getDepsResolverResult()?.mergedConfig;
-      if (!mergedConfig || mergedConfig === '-') return;
-      const mergedConfigPolicy = mergedConfig.policy || {};
-      _constants().DEPENDENCIES_FIELDS.forEach(depField => {
-        if (!mergedConfigPolicy[depField]) return;
-        mergedConfigPolicy[depField].forEach(pkg => {
-          if (pkg.force) return; // we only care about auto-detected dependencies
-          if (nonConflictDeps[pkg.name]) {
-            if (!nonConflictDeps[pkg.name].includes(pkg.version)) nonConflictDeps[pkg.name].push(pkg.version);
-            nonConflictSources[pkg.name].push(configMerge.compIdStr);
-            return;
-          }
-          nonConflictDeps[pkg.name] = [pkg.version];
-          nonConflictSources[pkg.name] = [configMerge.compIdStr];
-        });
-      });
-    });
-
-    // aggregate all dependencies that have conflicts
-    const conflictDeps = {};
-    const conflictDepsSources = {}; // for logging/debugging purposes
-    allConfigMerge.forEach(configMerge => {
-      const mergedConfigConflict = configMerge.getDepsResolverResult()?.conflict;
-      if (!mergedConfigConflict) return;
-      _constants().DEPENDENCIES_FIELDS.forEach(depField => {
-        if (!mergedConfigConflict[depField]) return;
-        mergedConfigConflict[depField].forEach(pkg => {
-          if (pkg.force) return; // we only care about auto-detected dependencies
-          if (conflictDeps[pkg.name]) {
-            if (!conflictDeps[pkg.name].includes(pkg.version)) conflictDeps[pkg.name].push(pkg.version);
-            conflictDepsSources[pkg.name].push(configMerge.compIdStr);
-            return;
-          }
-          conflictDeps[pkg.name] = [pkg.version];
-          conflictDepsSources[pkg.name] = [configMerge.compIdStr];
-        });
-      });
-    });
-    const notConflictedPackages = Object.keys(nonConflictDeps);
-    const conflictedPackages = Object.keys(conflictDeps);
-    if (!notConflictedPackages.length && !conflictedPackages.length) return {};
-    const workspaceConfig = this.config.workspaceConfig;
-    if (!workspaceConfig) throw new Error(`updateWorkspaceJsoncWithDepsIfNeeded unable to get workspace config`);
-    const depResolver = workspaceConfig.extensions.findCoreExtension(_dependencyResolver().DependencyResolverAspect.id);
-    const policy = depResolver?.config.policy;
-    if (!policy) {
-      return {};
-    }
-
-    // calculate the workspace.json updates
-    const workspaceJsonUpdates = {};
-    notConflictedPackages.forEach(pkgName => {
-      if (nonConflictDeps[pkgName].length > 1) {
-        // we only want the deps that the other lane has them in the workspace.json and that all comps use the same dep.
-        return;
-      }
-      _constants().DEPENDENCIES_FIELDS.forEach(depField => {
-        if (!policy[depField]?.[pkgName]) return; // doesn't exists in the workspace.json
-        const currentVer = policy[depField][pkgName];
-        const newVer = nonConflictDeps[pkgName][0];
-        if (currentVer === newVer) return;
-        workspaceJsonUpdates[pkgName] = [currentVer, newVer];
-        policy[depField][pkgName] = newVer;
-        this.logger.debug(`update workspace.jsonc: ${pkgName} from ${currentVer} to ${newVer}. Triggered by: ${nonConflictSources[pkgName].join(', ')}`);
-      });
-    });
-
-    // calculate the workspace.json conflicts
-    const workspaceJsonConflicts = {
-      dependencies: [],
-      peerDependencies: []
-    };
-    const conflictPackagesToRemoveFromConfigMerge = [];
-    conflictedPackages.forEach(pkgName => {
-      if (conflictDeps[pkgName].length > 1) {
-        // we only want the deps that the other lane has them in the workspace.json and that all comps use the same dep.
-        return;
-      }
-      const conflictRaw = conflictDeps[pkgName][0];
-      const [, currentVal, otherVal] = conflictRaw.split('::');
-      WS_DEPS_FIELDS.forEach(depField => {
-        if (!policy[depField]?.[pkgName]) return;
-        const currentVerInWsJson = policy[depField][pkgName];
-        if (!currentVerInWsJson) return;
-        // the version is coming from the workspace.jsonc
-        conflictPackagesToRemoveFromConfigMerge.push(pkgName);
-        if (_semver().default.satisfies(otherVal, currentVerInWsJson)) {
-          // the other version is compatible with the current version in the workspace.json
-          return;
-        }
-        workspaceJsonConflicts[depField].push({
-          name: pkgName,
-          version: conflictRaw.replace(currentVal, currentVerInWsJson),
-          force: false
-        });
-        conflictPackagesToRemoveFromConfigMerge.push(pkgName);
-        this.logger.debug(`conflict workspace.jsonc: ${pkgName} current: ${currentVerInWsJson}, other: ${otherVal}. Triggered by: ${conflictDepsSources[pkgName].join(', ')}`);
-      });
-    });
-    WS_DEPS_FIELDS.forEach(depField => {
-      if ((0, _lodash().isEmpty)(workspaceJsonConflicts[depField])) delete workspaceJsonConflicts[depField];
-    });
-    if (conflictPackagesToRemoveFromConfigMerge.length) {
-      allResults.forEach(result => {
-        if (result?.conflict) {
-          _constants().DEPENDENCIES_FIELDS.forEach(depField => {
-            if (!result.conflict?.[depField]) return;
-            result.conflict[depField] = result.conflict?.[depField].filter(dep => !conflictPackagesToRemoveFromConfigMerge.includes(dep.name));
-            if (!result.conflict[depField].length) delete result.conflict[depField];
-          });
-          if ((0, _lodash().isEmpty)(result.conflict)) result.conflict = undefined;
-        }
-      });
-    }
-    if (Object.keys(workspaceJsonUpdates).length) {
-      await workspaceConfig.write({
-        reasonForChange: 'merge (update dependencies)'
-      });
-    }
-    this.logger.debug('final workspace.jsonc updates', workspaceJsonUpdates);
-    this.logger.debug('final workspace.jsonc conflicts', workspaceJsonConflicts);
-    return {
-      workspaceDepsUpdates: Object.keys(workspaceJsonUpdates).length ? workspaceJsonUpdates : undefined,
-      workspaceDepsConflicts: Object.keys(workspaceJsonConflicts).length ? workspaceJsonConflicts : undefined
-    };
-  }
 
   /**
    * this function gets called from two different commands:
@@ -902,16 +638,16 @@ see the conflicts below and edit your workspace.jsonc as you see fit.`;
     }
     return ids.map(id => consumer.getParsedId(id));
   }
-  static async provider([cli, workspace, snapping, checkout, install, loggerMain, compWriter, importer, config, remove, globalConfig]) {
+  static async provider([cli, workspace, snapping, checkout, install, loggerMain, compWriter, importer, config, remove, globalConfig, configMerger]) {
     const logger = loggerMain.createLogger(_merging().MergingAspect.id);
-    const merging = new MergingMain(workspace, install, snapping, checkout, logger, compWriter, importer, config, remove);
+    const merging = new MergingMain(workspace, install, snapping, checkout, logger, compWriter, importer, config, remove, configMerger);
     cli.register(new (_mergeCmd().MergeCmd)(merging, globalConfig));
     return merging;
   }
 }
 exports.MergingMain = MergingMain;
 _defineProperty(MergingMain, "slots", []);
-_defineProperty(MergingMain, "dependencies", [_cli().CLIAspect, _workspace().default, _snapping().default, _checkout().CheckoutAspect, _install().InstallAspect, _logger().LoggerAspect, _componentWriter().ComponentWriterAspect, _importer().default, _config().ConfigAspect, _remove().default, _globalConfig().default]);
+_defineProperty(MergingMain, "dependencies", [_cli().CLIAspect, _workspace().default, _snapping().default, _checkout().CheckoutAspect, _install().InstallAspect, _logger().LoggerAspect, _componentWriter().ComponentWriterAspect, _importer().default, _config().ConfigAspect, _remove().default, _globalConfig().default, _configMerger().ConfigMergerAspect]);
 _defineProperty(MergingMain, "runtime", _cli().MainRuntime);
 _merging().MergingAspect.addRuntime(MergingMain);