@teambit/merging 0.0.255 → 0.0.257

package/dist/config-merger.d.ts

@@ -52,7 +52,9 @@ export declare class ConfigMerger {
     private basicConflictGenerator;
     private depResolverStrategy;
     private isIdInWorkspace;
+    private getIdFromWorkspace;
     private isEnv;
     private getConfig;
+    private getPolicy;
 }
 export {};

package/dist/config-merger.js

@@ -118,9 +118,14 @@ class ConfigMerger {
       return null;
     });
     const otherAspectsNotHandledResults = this.otherAspects.map(otherExt => {
-      const id = otherExt.stringId;
+      let id = otherExt.stringId;
       if (this.handledExtIds.includes(id)) return null;
       this.handledExtIds.push(id);
+      if (otherExt.extensionId && otherExt.extensionId.hasVersion()) {
+        // avoid using the id from the other lane if it exits in the workspace. prefer the id from the workspace.
+        const idFromWorkspace = this.getIdFromWorkspace(otherExt.extensionId.toStringWithoutVersion());
+        if (idFromWorkspace) id = idFromWorkspace._legacy.toString();
+      }
       const baseExt = this.baseAspects.findExtension(id, true);
       if (baseExt) {
         // was removed on current
@@ -311,10 +316,11 @@ ${'>'.repeat(7)} ${this.otherLabel}
       baseExt
     } = params;
     const currentConfig = this.getConfig(currentExt);
+    const currentPolicy = this.getPolicy(currentConfig);
     const otherConfig = this.getConfig(otherExt);
+    const otherPolicy = this.getPolicy(otherConfig);
     const baseConfig = baseExt ? this.getConfig(baseExt) : undefined;
-    // const mergeStrategyConfigParams = { id, currentConfig, otherConfig, baseConfig };
-
+    const basePolicy = baseConfig ? this.getPolicy(baseConfig) : undefined;
     const mergedPolicy = {
       dependencies: [],
       devDependencies: [],
@@ -328,9 +334,21 @@ ${'>'.repeat(7)} ${this.otherLabel}
     let isMerged = false;
     let hasConflict = false;
     const conflictIndicator = 'CONFLICT::';
-    const nonPolicyConfigToMerged = {};
-    const nonPolicyConfigConflict = {};
+    const lifecycleToDepType = {
+      runtime: 'dependencies',
+      dev: 'devDependencies',
+      peer: 'peerDependencies'
+    };
     const handleConfigMerge = () => {
+      const addVariantPolicyEntryToPolicy = dep => {
+        const depType = lifecycleToDepType[dep.lifecycleType];
+        mergedPolicy[depType].push({
+          name: dep.dependencyId,
+          version: dep.value.version,
+          force: dep.force
+        });
+        isMerged = true;
+      };
       if (this.areConfigsEqual(currentConfig, otherConfig)) {
         return;
       }
@@ -341,25 +359,11 @@ ${'>'.repeat(7)} ${this.otherLabel}
       if (currentConfig === '-' || otherConfig === '-') {
         throw new Error('not implemented. Is it possible to have it as minus?');
       }
-      const allKeys = (0, _lodash().uniq)([...Object.keys(currentConfig), ...Object.keys(otherConfig)]);
-      const otherKeys = allKeys.filter(key => key !== 'policy');
       if (baseConfig && this.areConfigsEqual(baseConfig, currentConfig)) {
         // was changed on other
-        otherKeys.forEach(key => {
-          if (otherConfig[key]) {
-            nonPolicyConfigToMerged[key] = otherConfig[key];
-          }
-        });
-        if (otherConfig.policy) {
-          ['dependencies', 'devDependencies', 'peerDependencies'].forEach(depType => {
-            if (!otherConfig.policy[depType]) return;
-            Object.keys(otherConfig.policy[depType]).forEach(depName => {
-              mergedPolicy[depType].push({
-                name: depName,
-                version: otherConfig.policy[depType][depName],
-                force: true
-              });
-            });
+        if (otherPolicy.length) {
+          otherPolicy.forEach(dep => {
+            addVariantPolicyEntryToPolicy(dep);
           });
         }
         isMerged = true;
@@ -367,76 +371,48 @@ ${'>'.repeat(7)} ${this.otherLabel}
       }
 
       // either no baseConfig, or baseConfig is also different from both: other and local. that's a conflict.
-      // we have to differentiate between a conflict in the policy, which might be merged with conflict with dependencies data.
-      // and a conflict with other fields of config.
-      otherKeys.forEach(key => {
-        if (JSON.stringify(currentConfig[key]) === JSON.stringify(otherConfig[key])) {
+      if (!currentConfig.policy && !otherConfig.policy) return;
+      const currentAndOtherConfig = (0, _lodash().uniqBy)(currentPolicy.concat(otherPolicy), d => d.dependencyId);
+      currentAndOtherConfig.forEach(dep => {
+        const depType = lifecycleToDepType[dep.lifecycleType];
+        const currentDep = currentPolicy.find(d => d.dependencyId === dep.dependencyId);
+        const otherDep = otherPolicy.find(d => d.dependencyId === dep.dependencyId);
+        const baseDep = basePolicy === null || basePolicy === void 0 ? void 0 : basePolicy.find(d => d.dependencyId === dep.dependencyId);
+        if (!otherDep) {
           return;
         }
-        if (baseConfig && JSON.stringify(baseConfig[key]) === JSON.stringify(otherConfig[key])) {
-          // was changed on current
+        if (!currentDep) {
+          // only on other
+          addVariantPolicyEntryToPolicy(otherDep);
           return;
         }
-        if (baseConfig && JSON.stringify(baseConfig[key]) === JSON.stringify(currentConfig[key])) {
-          // was changed on other
-          nonPolicyConfigToMerged[key] = otherConfig[key];
+        const currentVer = currentDep.value.version;
+        const otherVer = otherDep.value.version;
+        if (currentVer === otherVer) {
           return;
         }
-        // conflict
-        nonPolicyConfigConflict[key] = {
-          current: currentConfig[key],
-          other: otherConfig[key]
-        };
-      });
-      if (!currentConfig.policy && !otherConfig.policy) return;
-      ['dependencies', 'devDependencies', 'peerDependencies'].forEach(depType => {
-        var _currentConfig$policy, _otherConfig$policy;
-        const currentPolicy = (_currentConfig$policy = currentConfig.policy) === null || _currentConfig$policy === void 0 ? void 0 : _currentConfig$policy[depType];
-        const otherPolicy = (_otherConfig$policy = otherConfig.policy) === null || _otherConfig$policy === void 0 ? void 0 : _otherConfig$policy[depType];
-        const allPolicyKeys = (0, _lodash().uniq)(Object.keys(currentPolicy || {}).concat(Object.keys(otherPolicy || {})));
-        if (!allPolicyKeys.length) return;
-        allPolicyKeys.forEach(pkgName => {
-          var _baseConfig$policy, _baseConfig$policy$de;
-          const currentVal = currentPolicy === null || currentPolicy === void 0 ? void 0 : currentPolicy[pkgName];
-          const otherVal = otherPolicy === null || otherPolicy === void 0 ? void 0 : otherPolicy[pkgName];
-          const baseVal = baseConfig !== '-' && (baseConfig === null || baseConfig === void 0 ? void 0 : (_baseConfig$policy = baseConfig.policy) === null || _baseConfig$policy === void 0 ? void 0 : (_baseConfig$policy$de = _baseConfig$policy[depType]) === null || _baseConfig$policy$de === void 0 ? void 0 : _baseConfig$policy$de[pkgName]);
-          if (this.isEnv(pkgName)) {
-            // ignore the envs
-            return;
-          }
-          if (currentVal === otherVal) {
-            // mergedPolicy[depType][pkgName] = currentVal;
-            return;
-          }
-          if (baseVal === otherVal) {
-            // mergedPolicy[depType][pkgName] = currentVal;
-            return;
-          }
-          if (baseVal === currentVal) {
-            mergedPolicy[depType].push({
-              name: pkgName,
-              version: otherVal,
-              force: true
-            });
-            isMerged = true;
-            return;
-          }
-          // either no baseVal, or baseVal is also different from both: other and local. that's a conflict.
-          hasConflict = true;
-          conflictedPolicy[depType].push({
-            name: pkgName,
-            version: `${conflictIndicator}${currentVal}::${otherVal}::`,
-            force: true
-          });
+        const baseVer = baseDep === null || baseDep === void 0 ? void 0 : baseDep.value.version;
+        if (baseVer && baseVer === otherVer) {
+          return;
+        }
+        // @todo: needs to ignore if it's in the workspace somehow.
+        // if (currentDep.__type === 'component' && this.isIdInWorkspace(currentId)) {
+        //   // dependencies that exist in the workspace, should be ignored. they'll be resolved later to the version in the ws.
+        //   return;
+        // }
+        if (baseVer && baseVer === currentVer) {
+          addVariantPolicyEntryToPolicy(otherDep);
+          return;
+        }
+        hasConflict = true;
+        conflictedPolicy[depType].push({
+          name: currentDep.dependencyId,
+          version: `${conflictIndicator}${currentVer}::${otherVer}::`,
+          force: currentDep.force
         });
       });
     };
     handleConfigMerge();
-    const lifecycleToDepType = {
-      runtime: 'dependencies',
-      dev: 'devDependencies',
-      peer: 'peerDependencies'
-    };
     const hasConfigForDep = (depType, depName) => mergedPolicy[depType].find(d => d.name === depName);
     const getDepIdAsPkgName = dep => {
       if (dep.__type !== 'component') {
@@ -570,9 +546,9 @@ ${'>'.repeat(7)} ${this.otherLabel}`;
       conflictLines.unshift(`"${params.id}": {`);
       conflictStr = conflictLines.join('\n');
     }
-    const config = isMerged ? _objectSpread(_objectSpread({}, nonPolicyConfigToMerged), {}, {
+    const config = isMerged ? {
       policy: mergedPolicy
-    }) : undefined;
+    } : undefined;
     return {
       id: params.id,
       mergedConfig: config,
@@ -580,7 +556,10 @@ ${'>'.repeat(7)} ${this.otherLabel}`;
     };
   }
   isIdInWorkspace(id) {
-    return Boolean(this.workspaceIds.find(c => c.toStringWithoutVersion() === id));
+    return Boolean(this.getIdFromWorkspace(id));
+  }
+  getIdFromWorkspace(id) {
+    return this.workspaceIds.find(c => c.toStringWithoutVersion() === id);
   }
   isEnv(id) {
     return id === this.currentEnv.id || id === this.otherEnv.id;
@@ -589,6 +568,10 @@ ${'>'.repeat(7)} ${this.otherLabel}`;
     if (ext.rawConfig === '-') return ext.rawConfig;
     return (0, _lodash().omit)(ext.rawConfig, ['__specific']);
   }
+  getPolicy(config) {
+    if (!config.policy) return [];
+    return _dependencyResolver().VariantPolicy.fromConfigObject(config.policy).entries;
+  }
 }
 exports.ConfigMerger = ConfigMerger;
 

package/dist/config-merger.js.map

@@ -1 +1 @@
-{"version":3,"names":["ConfigMerger","constructor","compIdStr","workspaceIds","currentAspects","baseAspects","otherAspects","currentLabel","otherLabel","merge","populateEnvs","results","map","currentExt","id","stringId","handledExtIds","includes","push","baseExt","findExtension","otherExt","mergePerStrategy","basicConflictGenerator","currentConfig","getConfig","otherConfig","otherAspectsNotHandledResults","mergedConfig","envResult","envStrategy","ConfigMergeResult","compact","getEnvId","ext","envsAspect","findCoreExtension","EnvsAspect","Error","env","config","data","currentEnv","otherEnv","baseEnv","undefined","currentEnvAspect","version","extensionId","rawConfig","otherEnvAspect","baseEnvAspect","mergeStrategyParams","baseConfig","isIdInWorkspace","basicConfigMerge","areConfigsEqual","configA","configB","JSON","stringify","depResolverResult","depResolverStrategy","mergeStrategyConfigParams","conflict","repeat","formatConfig","conf","confStr","confStrSplit","split","shift","pop","join","params","DependencyResolverAspect","mergedPolicy","dependencies","devDependencies","peerDependencies","conflictedPolicy","isMerged","hasConflict","conflictIndicator","nonPolicyConfigToMerged","nonPolicyConfigConflict","handleConfigMerge","allKeys","uniq","Object","keys","otherKeys","filter","key","forEach","policy","depType","depName","name","force","current","other","currentPolicy","otherPolicy","allPolicyKeys","concat","length","pkgName","currentVal","otherVal","baseVal","isEnv","lifecycleToDepType","runtime","dev","peer","hasConfigForDep","find","d","getDepIdAsPkgName","dep","__type","packageName","addSerializedDepToPolicy","lifecycle","getAutoDeps","source","idWithoutVersion","existingPolicy","p","dependencyId","getPolicyVer","value","semver","valid","startsWith","currentData","otherData","currentAndOtherData","uniqBy","baseData","depData","currentDep","otherDep","currentId","currentVer","otherVer","baseDep","baseVer","isRange","satisfies","conflictStr","mergedConfigSplit","conflictLines","line","unshift","Boolean","c","toStringWithoutVersion","omit"],"sources":["config-merger.ts"],"sourcesContent":["import { ComponentID } from '@teambit/component-id';\nimport semver from 'semver';\nimport { DependencyResolverAspect, isRange, SerializedDependency } from '@teambit/dependency-resolver';\nimport { EnvsAspect } from '@teambit/envs';\nimport { ExtensionDataEntry, ExtensionDataList } from '@teambit/legacy/dist/consumer/config/extension-data';\nimport { compact, omit, uniq, uniqBy } from 'lodash';\nimport { ConfigMergeResult } from './config-merge-result';\n\ntype GenericConfigOrRemoved = Record<string, any> | '-';\n\ntype EnvData = { id: string; version?: string; config?: GenericConfigOrRemoved };\n\ntype SerializedDependencyWithPolicy = SerializedDependency & { policy?: string };\n\nexport type MergeStrategyResult = {\n  id: string;\n  mergedConfig?: GenericConfigOrRemoved;\n  conflict?: string;\n};\ntype MergeStrategyParamsWithRemoved = {\n  id: string;\n  currentConfig: GenericConfigOrRemoved;\n  otherConfig: GenericConfigOrRemoved;\n  baseConfig?: GenericConfigOrRemoved;\n};\ntype MergeStrategyParams = {\n  id: string;\n  currentExt: ExtensionDataEntry;\n  otherExt: ExtensionDataEntry;\n  baseExt?: ExtensionDataEntry;\n};\n\n/**\n * perform 3-way merge of component configuration (aspects).\n * normally this is needed when merging one lane into another. the component may have different aspects config in each lane.\n * the baseAspects are the aspects of the component in the diversion point (the common ancestor of the two lanes).\n * the currentAspects are the aspects of the component in the current lane.\n * the otherAspects are the aspects of the component in the other lane. this is the lane we merge into the current lane.\n *\n * the basic merging strategy is a simple comparison between the aspect-configs, if they're different, we have a conflict.\n * we have two special cases:\n *\n * 1. dependency-resolver: we do a deeper check for the policy, we compare each dependency separately. also, we take\n * into account not only the config, but also the data. this is needed because some dependencies are automatically\n * added by Bit (from the import statements in the code) and they're not in the config. the final config has the deps\n * from both sources, the config and the data. The way we know to differentiate between them is by the \"force\" prop.\n * the config has always force: true.\n *\n * 2. envs: if we don't treat it specially, the user will need to make the change not only in the envs aspect, but also\n * in the deps-resolver (because the env is added as a devDependency) and also in the aspect itself (because\n * teambit.envs/env has only the id and not the version). to make it simpler, we ignore the envs in the deps-resolver\n * we ignore the individual aspect that is the env itself. we only show teambit.envs/env and we put the env id and\n * version. later, when the component is loaded, we split the id and the version and put them in the correct places.\n * see workspace.componentExtension / adjustEnvsOnConfigMerge for more details.\n */\nexport class ConfigMerger {\n  private currentEnv: EnvData;\n  private otherEnv: EnvData;\n  private baseEnv?: EnvData;\n  private handledExtIds: string[] = [];\n  constructor(\n    private compIdStr: string,\n    private workspaceIds: ComponentID[],\n    private currentAspects: ExtensionDataList,\n    private baseAspects: ExtensionDataList,\n    private otherAspects: ExtensionDataList,\n    private currentLabel: string,\n    private otherLabel: string\n  ) {}\n\n  merge(): ConfigMergeResult {\n    this.populateEnvs();\n    const results = this.currentAspects.map((currentExt) => {\n      const id = currentExt.stringId;\n      if (this.handledExtIds.includes(id)) return null;\n      this.handledExtIds.push(id);\n      const baseExt = this.baseAspects.findExtension(id, true);\n      const otherExt = this.otherAspects.findExtension(id, true);\n      if (otherExt) {\n        // try to 3-way-merge\n        return this.mergePerStrategy({ id, currentExt, otherExt, baseExt });\n      }\n      // exist in current but not in other\n      if (baseExt) {\n        // was removed on other\n        return this.basicConflictGenerator({ id, currentConfig: this.getConfig(currentExt), otherConfig: '-' });\n      }\n      // exist in current but not in other and base, so it got created on current. nothing to do.\n      return null;\n    });\n    const otherAspectsNotHandledResults = this.otherAspects.map((otherExt) => {\n      const id = otherExt.stringId;\n      if (this.handledExtIds.includes(id)) return null;\n      this.handledExtIds.push(id);\n      const baseExt = this.baseAspects.findExtension(id, true);\n      if (baseExt) {\n        // was removed on current\n        return this.basicConflictGenerator({ id, currentConfig: '-', otherConfig: this.getConfig(otherExt) });\n      }\n      // exist in other but not in current and base, so it got created on other.\n      return { id, mergedConfig: this.getConfig(otherExt) };\n    });\n    const envResult = this.envStrategy();\n    return new ConfigMergeResult(this.compIdStr, compact([...results, ...otherAspectsNotHandledResults, envResult]));\n  }\n\n  private populateEnvs() {\n    // populate ids\n    const getEnvId = (ext: ExtensionDataList) => {\n      const envsAspect = ext.findCoreExtension(EnvsAspect.id);\n      if (!envsAspect) throw new Error(`unable to find ${EnvsAspect.id} aspect for ${this.compIdStr}`);\n      const env = envsAspect.config.env || envsAspect.data.id;\n      if (!env)\n        throw new Error(`unable to find env for ${this.compIdStr}, the config and data of ${EnvsAspect.id} are empty}`);\n      return env;\n    };\n    const currentEnv = getEnvId(this.currentAspects);\n    this.currentEnv = { id: currentEnv };\n    const otherEnv = getEnvId(this.otherAspects);\n    this.otherEnv = { id: otherEnv };\n    const baseEnv = this.baseAspects ? getEnvId(this.baseAspects) : undefined;\n    if (baseEnv) this.baseEnv = { id: baseEnv };\n\n    // populate version\n    const currentEnvAspect = this.currentAspects.findExtension(currentEnv, true);\n    if (currentEnvAspect) {\n      this.handledExtIds.push(currentEnvAspect.stringId);\n      this.currentEnv.version = currentEnvAspect.extensionId?.version;\n      this.currentEnv.config = currentEnvAspect.rawConfig;\n    }\n    const otherEnvAspect = this.otherAspects.findExtension(otherEnv, true);\n    if (otherEnvAspect) {\n      this.handledExtIds.push(otherEnvAspect.stringId);\n      this.otherEnv.version = otherEnvAspect.extensionId?.version;\n      this.otherEnv.config = otherEnvAspect.rawConfig;\n    }\n    if (this.baseEnv) {\n      const baseEnvAspect = this.baseAspects.findExtension(baseEnv, true);\n      if (baseEnvAspect) {\n        this.baseEnv.version = baseEnvAspect.extensionId?.version;\n        this.baseEnv.config = baseEnvAspect.rawConfig;\n      }\n    }\n  }\n\n  private envStrategy(): MergeStrategyResult | null {\n    const mergeStrategyParams: MergeStrategyParamsWithRemoved = {\n      id: EnvsAspect.id,\n      currentConfig: {\n        env: this.currentEnv.version ? `${this.currentEnv.id}@${this.currentEnv.version}` : this.currentEnv.id,\n      },\n      otherConfig: { env: this.otherEnv.version ? `${this.otherEnv.id}@${this.otherEnv.version}` : this.otherEnv.id },\n    };\n    if (this.baseEnv) {\n      mergeStrategyParams.baseConfig = {\n        env: this.baseEnv?.version ? `${this.baseEnv.id}@${this.baseEnv.version}` : this.baseEnv?.id,\n      };\n    }\n    if (this.currentEnv.id === this.otherEnv.id && this.currentEnv.version === this.otherEnv.version) {\n      return null;\n    }\n    if (this.isIdInWorkspace(this.currentEnv.id)) {\n      // the env currently used is part of the workspace, that's what the user needs. don't try to resolve anything.\n      return null;\n    }\n    return this.basicConfigMerge(mergeStrategyParams);\n  }\n\n  private areConfigsEqual(configA: GenericConfigOrRemoved, configB: GenericConfigOrRemoved) {\n    return JSON.stringify(configA) === JSON.stringify(configB);\n  }\n\n  private mergePerStrategy(mergeStrategyParams: MergeStrategyParams): MergeStrategyResult | null {\n    const { id, currentExt, otherExt, baseExt } = mergeStrategyParams;\n    const depResolverResult = this.depResolverStrategy(mergeStrategyParams);\n    if (depResolverResult) {\n      return depResolverResult;\n    }\n    const currentConfig = this.getConfig(currentExt);\n    const otherConfig = this.getConfig(otherExt);\n    const baseConfig = baseExt ? this.getConfig(baseExt) : undefined;\n\n    return this.basicConfigMerge({ id, currentConfig, otherConfig, baseConfig });\n  }\n\n  private basicConfigMerge(mergeStrategyParams: MergeStrategyParamsWithRemoved) {\n    const { id, currentConfig, otherConfig, baseConfig } = mergeStrategyParams;\n    if (this.areConfigsEqual(currentConfig, otherConfig)) {\n      return null;\n    }\n    if (baseConfig && this.areConfigsEqual(baseConfig, otherConfig)) {\n      // was changed on current\n      return null;\n    }\n    if (baseConfig && this.areConfigsEqual(baseConfig, currentConfig)) {\n      // was changed on other\n      return { id, mergedConfig: otherConfig };\n    }\n    // either no baseConfig, or baseConfig is also different from both: other and local. that's a conflict.\n    const mergeStrategyConfigParams = { id, currentConfig, otherConfig, baseConfig };\n    return this.basicConflictGenerator(mergeStrategyConfigParams);\n  }\n\n  private basicConflictGenerator({\n    id,\n    currentConfig,\n    otherConfig,\n  }: MergeStrategyParamsWithRemoved): MergeStrategyResult {\n    // uncomment to debug\n    // console.log('basicConflictGenerator', this.compIdStr, id, 'currentConfig', currentConfig, 'otherConfig', otherConfig);\n    let conflict: string;\n    if (currentConfig === '-') {\n      conflict = `${'<'.repeat(7)} ${this.currentLabel}\n=======\n\"${id}\": ${JSON.stringify(otherConfig, undefined, 2)}\n${'>'.repeat(7)} ${this.otherLabel}`;\n    } else if (otherConfig === '-') {\n      conflict = `${'<'.repeat(7)} ${this.currentLabel}\n\"${id}\": ${JSON.stringify(otherConfig, undefined, 2)}\n=======\n${'>'.repeat(7)} ${this.otherLabel}`;\n    } else {\n      const formatConfig = (conf: GenericConfigOrRemoved) => {\n        const confStr = JSON.stringify(conf, undefined, 2);\n        const confStrSplit = confStr.split('\\n');\n        confStrSplit.shift(); // remove first {\n        confStrSplit.pop(); // remove last }\n        return confStrSplit.join('\\n');\n      };\n      conflict = `\"${id}\": {\n${'<'.repeat(7)} ${this.currentLabel}\n${formatConfig(currentConfig)}\n=======\n${formatConfig(otherConfig)}\n${'>'.repeat(7)} ${this.otherLabel}\n}`;\n    }\n\n    return { id, conflict };\n  }\n\n  private depResolverStrategy(params: MergeStrategyParams): MergeStrategyResult | undefined {\n    if (params.id !== DependencyResolverAspect.id) return undefined;\n    const { currentExt, otherExt, baseExt } = params;\n\n    const currentConfig = this.getConfig(currentExt);\n    const otherConfig = this.getConfig(otherExt);\n    const baseConfig = baseExt ? this.getConfig(baseExt) : undefined;\n    // const mergeStrategyConfigParams = { id, currentConfig, otherConfig, baseConfig };\n\n    const mergedPolicy = {\n      dependencies: [],\n      devDependencies: [],\n      peerDependencies: [],\n    };\n    const conflictedPolicy = {\n      dependencies: [],\n      devDependencies: [],\n      peerDependencies: [],\n    };\n    let isMerged = false;\n    let hasConflict = false;\n    const conflictIndicator = 'CONFLICT::';\n    const nonPolicyConfigToMerged = {};\n    const nonPolicyConfigConflict = {};\n    const handleConfigMerge = () => {\n      if (this.areConfigsEqual(currentConfig, otherConfig)) {\n        return;\n      }\n      if (baseConfig && this.areConfigsEqual(baseConfig, otherConfig)) {\n        // was changed on current\n        return;\n      }\n      if (currentConfig === '-' || otherConfig === '-') {\n        throw new Error('not implemented. Is it possible to have it as minus?');\n      }\n      const allKeys = uniq([...Object.keys(currentConfig), ...Object.keys(otherConfig)]);\n      const otherKeys = allKeys.filter((key) => key !== 'policy');\n      if (baseConfig && this.areConfigsEqual(baseConfig, currentConfig)) {\n        // was changed on other\n        otherKeys.forEach((key) => {\n          if (otherConfig[key]) {\n            nonPolicyConfigToMerged[key] = otherConfig[key];\n          }\n        });\n        if (otherConfig.policy) {\n          ['dependencies', 'devDependencies', 'peerDependencies'].forEach((depType) => {\n            if (!otherConfig.policy[depType]) return;\n            Object.keys(otherConfig.policy[depType]).forEach((depName) => {\n              mergedPolicy[depType].push({\n                name: depName,\n                version: otherConfig.policy[depType][depName],\n                force: true,\n              });\n            });\n          });\n        }\n        isMerged = true;\n        return;\n      }\n\n      // either no baseConfig, or baseConfig is also different from both: other and local. that's a conflict.\n      // we have to differentiate between a conflict in the policy, which might be merged with conflict with dependencies data.\n      // and a conflict with other fields of config.\n      otherKeys.forEach((key) => {\n        if (JSON.stringify(currentConfig[key]) === JSON.stringify(otherConfig[key])) {\n          return;\n        }\n        if (baseConfig && JSON.stringify(baseConfig[key]) === JSON.stringify(otherConfig[key])) {\n          // was changed on current\n          return;\n        }\n        if (baseConfig && JSON.stringify(baseConfig[key]) === JSON.stringify(currentConfig[key])) {\n          // was changed on other\n          nonPolicyConfigToMerged[key] = otherConfig[key];\n          return;\n        }\n        // conflict\n        nonPolicyConfigConflict[key] = { current: currentConfig[key], other: otherConfig[key] };\n      });\n\n      if (!currentConfig.policy && !otherConfig.policy) return;\n\n      ['dependencies', 'devDependencies', 'peerDependencies'].forEach((depType) => {\n        const currentPolicy = currentConfig.policy?.[depType];\n        const otherPolicy = otherConfig.policy?.[depType];\n        const allPolicyKeys = uniq(Object.keys(currentPolicy || {}).concat(Object.keys(otherPolicy || {})));\n        if (!allPolicyKeys.length) return;\n\n        allPolicyKeys.forEach((pkgName) => {\n          const currentVal = currentPolicy?.[pkgName];\n          const otherVal = otherPolicy?.[pkgName];\n          const baseVal = baseConfig !== '-' && baseConfig?.policy?.[depType]?.[pkgName];\n          if (this.isEnv(pkgName)) {\n            // ignore the envs\n            return;\n          }\n          if (currentVal === otherVal) {\n            // mergedPolicy[depType][pkgName] = currentVal;\n            return;\n          }\n          if (baseVal === otherVal) {\n            // mergedPolicy[depType][pkgName] = currentVal;\n            return;\n          }\n          if (baseVal === currentVal) {\n            mergedPolicy[depType].push({\n              name: pkgName,\n              version: otherVal,\n              force: true,\n            });\n            isMerged = true;\n            return;\n          }\n          // either no baseVal, or baseVal is also different from both: other and local. that's a conflict.\n          hasConflict = true;\n          conflictedPolicy[depType].push({\n            name: pkgName,\n            version: `${conflictIndicator}${currentVal}::${otherVal}::`,\n            force: true,\n          });\n        });\n      });\n    };\n\n    handleConfigMerge();\n\n    const lifecycleToDepType = {\n      runtime: 'dependencies',\n      dev: 'devDependencies',\n      peer: 'peerDependencies',\n    };\n    const hasConfigForDep = (depType: string, depName: string) => mergedPolicy[depType].find((d) => d.name === depName);\n    const getDepIdAsPkgName = (dep: SerializedDependencyWithPolicy) => {\n      if (dep.__type !== 'component') {\n        return dep.id;\n      }\n      // @ts-ignore\n      return dep.packageName;\n    };\n\n    const addSerializedDepToPolicy = (dep: SerializedDependencyWithPolicy) => {\n      const depType = lifecycleToDepType[dep.lifecycle];\n\n      if (hasConfigForDep(depType, dep.id)) {\n        return; // there is already config for it.\n      }\n      mergedPolicy[depType].push({\n        name: getDepIdAsPkgName(dep),\n        version: dep.policy || dep.version,\n        force: false,\n      });\n      isMerged = true;\n    };\n\n    const getAutoDeps = (ext: ExtensionDataList): SerializedDependencyWithPolicy[] => {\n      const data = ext.findCoreExtension(DependencyResolverAspect.id)?.data.dependencies;\n      if (!data) return [];\n      const policy = ext.findCoreExtension(DependencyResolverAspect.id)?.data.policy || [];\n      return data\n        .filter((d) => d.source === 'auto')\n        .map((d) => {\n          const idWithoutVersion = d.__type === 'package' ? d.id : d.id.split('@')[0];\n          const existingPolicy = policy.find((p) => p.dependencyId === idWithoutVersion);\n          const getPolicyVer = () => {\n            if (d.__type === 'package') return undefined; // for packages, the policy is already the version\n            if (existingPolicy) return existingPolicy.value.version; // currently it's missing, will be implemented by @Gilad\n            if (!semver.valid(d.version)) return d.version; // could be a hash\n            // default to `^` or ~ if starts with zero, until we save the policy from the workspace during tag/snap.\n            return d.version.startsWith('0.') ? `~${d.version}` : `^${d.version}`;\n          };\n          return {\n            ...d,\n            id: idWithoutVersion,\n            policy: getPolicyVer(),\n          };\n        });\n    };\n\n    const currentData = getAutoDeps(this.currentAspects);\n    const otherData = getAutoDeps(this.otherAspects);\n    const currentAndOtherData = uniqBy(currentData.concat(otherData), (d) => d.id);\n    const baseData = getAutoDeps(this.baseAspects);\n\n    // uncomment to debug\n    // console.log('\\n\\n**************', this.compIdStr, '**************');\n    // console.log('currentData', currentData.length, '\\n', currentData.map((d) => `${d.__type} ${d.id} ${d.version}`).join('\\n'));\n    // console.log('otherData', otherData.length, '\\n', otherData.map((d) => `${d.__type} ${d.id} ${d.version}`).join('\\n'));\n    // console.log('otherData', baseData.length, '\\n', baseData.map((d) => `${d.__type} ${d.id} ${d.version}`).join('\\n'));\n    // console.log('** END **\\n\\n');\n\n    currentAndOtherData.forEach((depData) => {\n      if (this.isEnv(depData.id)) {\n        // ignore the envs\n        return;\n      }\n      const currentDep = currentData.find((d) => d.id === depData.id);\n      const otherDep = otherData.find((d) => d.id === depData.id);\n      if (!otherDep) {\n        return;\n      }\n      if (!currentDep) {\n        // only on other\n        addSerializedDepToPolicy(otherDep);\n        return;\n      }\n      const currentId = currentDep.id;\n      const currentVer = currentDep.policy || currentDep.version;\n      const otherVer = otherDep.policy || otherDep.version;\n      if (currentVer === otherVer) {\n        return;\n      }\n      const baseDep = baseData.find((d) => d.id === currentId);\n      const baseVer = baseDep?.policy || baseDep?.version;\n      if (baseVer && baseVer === otherVer) {\n        return;\n      }\n      if (currentDep.__type === 'component' && this.isIdInWorkspace(currentId)) {\n        // dependencies that exist in the workspace, should be ignored. they'll be resolved later to the version in the ws.\n        return;\n      }\n      if (baseVer && baseVer === currentVer) {\n        addSerializedDepToPolicy(otherDep);\n        return;\n      }\n      // either no baseVal, or baseVal is also different from both: other and local. that's probably a conflict.\n      const depType = lifecycleToDepType[currentDep.lifecycle];\n      if (hasConfigForDep(depType, currentDep.id)) {\n        return; // there is already config for it.\n      }\n      // try to resolve according to semver\n      if (\n        currentDep.policy &&\n        otherDep.policy &&\n        isRange(currentDep.policy, currentDep.id) &&\n        isRange(otherDep.policy, otherDep.id)\n      ) {\n        if (semver.satisfies(currentDep.version, otherDep.policy)) {\n          return;\n        }\n        if (semver.satisfies(otherDep.version, currentDep.policy)) {\n          addSerializedDepToPolicy(otherDep);\n          return;\n        }\n      }\n      hasConflict = true;\n      conflictedPolicy[depType].push({\n        name: getDepIdAsPkgName(currentDep),\n        version: `${conflictIndicator}${currentVer}::${otherVer}::`,\n        force: false,\n      });\n    });\n\n    ['dependencies', 'devDependencies', 'peerDependencies'].forEach((depType) => {\n      if (!mergedPolicy[depType].length) delete mergedPolicy[depType];\n      if (!conflictedPolicy[depType].length) delete conflictedPolicy[depType];\n    });\n\n    let conflictStr: string | undefined;\n    if (hasConflict) {\n      const mergedConfigSplit = JSON.stringify({ policy: conflictedPolicy }, undefined, 2).split('\\n');\n      const conflictLines = mergedConfigSplit.map((line) => {\n        if (!line.includes(conflictIndicator)) return line;\n        const [, currentVal, otherVal] = line.split('::');\n        return `${'<'.repeat(7)} ${this.currentLabel}\n        \"version\": \"${currentVal}\",\n=======\n        \"version\": \"${otherVal}\",\n${'>'.repeat(7)} ${this.otherLabel}`;\n      });\n      // replace the first line with line with the id\n      conflictLines.shift();\n      conflictLines.unshift(`\"${params.id}\": {`);\n      conflictStr = conflictLines.join('\\n');\n    }\n    const config = isMerged ? { ...nonPolicyConfigToMerged, policy: mergedPolicy } : undefined;\n\n    return { id: params.id, mergedConfig: config, conflict: conflictStr };\n  }\n\n  private isIdInWorkspace(id: string): boolean {\n    return Boolean(this.workspaceIds.find((c) => c.toStringWithoutVersion() === id));\n  }\n\n  private isEnv(id: string) {\n    return id === this.currentEnv.id || id === this.otherEnv.id;\n  }\n\n  private getConfig(ext: ExtensionDataEntry) {\n    if (ext.rawConfig === '-') return ext.rawConfig;\n    return omit(ext.rawConfig, ['__specific']);\n  }\n}\n"],"mappings":"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"}
+{"version":3,"names":["ConfigMerger","constructor","compIdStr","workspaceIds","currentAspects","baseAspects","otherAspects","currentLabel","otherLabel","merge","populateEnvs","results","map","currentExt","id","stringId","handledExtIds","includes","push","baseExt","findExtension","otherExt","mergePerStrategy","basicConflictGenerator","currentConfig","getConfig","otherConfig","otherAspectsNotHandledResults","extensionId","hasVersion","idFromWorkspace","getIdFromWorkspace","toStringWithoutVersion","_legacy","toString","mergedConfig","envResult","envStrategy","ConfigMergeResult","compact","getEnvId","ext","envsAspect","findCoreExtension","EnvsAspect","Error","env","config","data","currentEnv","otherEnv","baseEnv","undefined","currentEnvAspect","version","rawConfig","otherEnvAspect","baseEnvAspect","mergeStrategyParams","baseConfig","isIdInWorkspace","basicConfigMerge","areConfigsEqual","configA","configB","JSON","stringify","depResolverResult","depResolverStrategy","mergeStrategyConfigParams","conflict","repeat","formatConfig","conf","confStr","confStrSplit","split","shift","pop","join","params","DependencyResolverAspect","currentPolicy","getPolicy","otherPolicy","basePolicy","mergedPolicy","dependencies","devDependencies","peerDependencies","conflictedPolicy","isMerged","hasConflict","conflictIndicator","lifecycleToDepType","runtime","dev","peer","handleConfigMerge","addVariantPolicyEntryToPolicy","dep","depType","lifecycleType","name","dependencyId","value","force","length","forEach","policy","currentAndOtherConfig","uniqBy","concat","d","currentDep","find","otherDep","baseDep","currentVer","otherVer","baseVer","hasConfigForDep","depName","getDepIdAsPkgName","__type","packageName","addSerializedDepToPolicy","lifecycle","getAutoDeps","filter","source","idWithoutVersion","existingPolicy","p","getPolicyVer","semver","valid","startsWith","currentData","otherData","currentAndOtherData","baseData","depData","isEnv","currentId","isRange","satisfies","conflictStr","mergedConfigSplit","conflictLines","line","currentVal","otherVal","unshift","Boolean","c","omit","VariantPolicy","fromConfigObject","entries"],"sources":["config-merger.ts"],"sourcesContent":["import { ComponentID } from '@teambit/component-id';\nimport semver from 'semver';\nimport {\n  DependencyResolverAspect,\n  isRange,\n  SerializedDependency,\n  VariantPolicy,\n  VariantPolicyEntry,\n} from '@teambit/dependency-resolver';\nimport { EnvsAspect } from '@teambit/envs';\nimport { ExtensionDataEntry, ExtensionDataList } from '@teambit/legacy/dist/consumer/config/extension-data';\nimport { compact, omit, uniqBy } from 'lodash';\nimport { ConfigMergeResult } from './config-merge-result';\n\ntype GenericConfigOrRemoved = Record<string, any> | '-';\n\ntype EnvData = { id: string; version?: string; config?: GenericConfigOrRemoved };\n\ntype SerializedDependencyWithPolicy = SerializedDependency & { policy?: string };\n\nexport type MergeStrategyResult = {\n  id: string;\n  mergedConfig?: GenericConfigOrRemoved;\n  conflict?: string;\n};\ntype MergeStrategyParamsWithRemoved = {\n  id: string;\n  currentConfig: GenericConfigOrRemoved;\n  otherConfig: GenericConfigOrRemoved;\n  baseConfig?: GenericConfigOrRemoved;\n};\ntype MergeStrategyParams = {\n  id: string;\n  currentExt: ExtensionDataEntry;\n  otherExt: ExtensionDataEntry;\n  baseExt?: ExtensionDataEntry;\n};\n\n/**\n * perform 3-way merge of component configuration (aspects).\n * normally this is needed when merging one lane into another. the component may have different aspects config in each lane.\n * the baseAspects are the aspects of the component in the diversion point (the common ancestor of the two lanes).\n * the currentAspects are the aspects of the component in the current lane.\n * the otherAspects are the aspects of the component in the other lane. this is the lane we merge into the current lane.\n *\n * the basic merging strategy is a simple comparison between the aspect-configs, if they're different, we have a conflict.\n * we have two special cases:\n *\n * 1. dependency-resolver: we do a deeper check for the policy, we compare each dependency separately. also, we take\n * into account not only the config, but also the data. this is needed because some dependencies are automatically\n * added by Bit (from the import statements in the code) and they're not in the config. the final config has the deps\n * from both sources, the config and the data. The way we know to differentiate between them is by the \"force\" prop.\n * the config has always force: true.\n *\n * 2. envs: if we don't treat it specially, the user will need to make the change not only in the envs aspect, but also\n * in the deps-resolver (because the env is added as a devDependency) and also in the aspect itself (because\n * teambit.envs/env has only the id and not the version). to make it simpler, we ignore the envs in the deps-resolver\n * we ignore the individual aspect that is the env itself. we only show teambit.envs/env and we put the env id and\n * version. later, when the component is loaded, we split the id and the version and put them in the correct places.\n * see workspace.componentExtension / adjustEnvsOnConfigMerge for more details.\n */\nexport class ConfigMerger {\n  private currentEnv: EnvData;\n  private otherEnv: EnvData;\n  private baseEnv?: EnvData;\n  private handledExtIds: string[] = [];\n  constructor(\n    private compIdStr: string,\n    private workspaceIds: ComponentID[],\n    private currentAspects: ExtensionDataList,\n    private baseAspects: ExtensionDataList,\n    private otherAspects: ExtensionDataList,\n    private currentLabel: string,\n    private otherLabel: string\n  ) {}\n\n  merge(): ConfigMergeResult {\n    this.populateEnvs();\n    const results = this.currentAspects.map((currentExt) => {\n      const id = currentExt.stringId;\n      if (this.handledExtIds.includes(id)) return null;\n      this.handledExtIds.push(id);\n      const baseExt = this.baseAspects.findExtension(id, true);\n      const otherExt = this.otherAspects.findExtension(id, true);\n      if (otherExt) {\n        // try to 3-way-merge\n        return this.mergePerStrategy({ id, currentExt, otherExt, baseExt });\n      }\n      // exist in current but not in other\n      if (baseExt) {\n        // was removed on other\n        return this.basicConflictGenerator({ id, currentConfig: this.getConfig(currentExt), otherConfig: '-' });\n      }\n      // exist in current but not in other and base, so it got created on current. nothing to do.\n      return null;\n    });\n    const otherAspectsNotHandledResults = this.otherAspects.map((otherExt) => {\n      let id = otherExt.stringId;\n      if (this.handledExtIds.includes(id)) return null;\n      this.handledExtIds.push(id);\n      if (otherExt.extensionId && otherExt.extensionId.hasVersion()) {\n        // avoid using the id from the other lane if it exits in the workspace. prefer the id from the workspace.\n        const idFromWorkspace = this.getIdFromWorkspace(otherExt.extensionId.toStringWithoutVersion());\n        if (idFromWorkspace) id = idFromWorkspace._legacy.toString();\n      }\n      const baseExt = this.baseAspects.findExtension(id, true);\n      if (baseExt) {\n        // was removed on current\n        return this.basicConflictGenerator({ id, currentConfig: '-', otherConfig: this.getConfig(otherExt) });\n      }\n      // exist in other but not in current and base, so it got created on other.\n      return { id, mergedConfig: this.getConfig(otherExt) };\n    });\n    const envResult = this.envStrategy();\n    return new ConfigMergeResult(this.compIdStr, compact([...results, ...otherAspectsNotHandledResults, envResult]));\n  }\n\n  private populateEnvs() {\n    // populate ids\n    const getEnvId = (ext: ExtensionDataList) => {\n      const envsAspect = ext.findCoreExtension(EnvsAspect.id);\n      if (!envsAspect) throw new Error(`unable to find ${EnvsAspect.id} aspect for ${this.compIdStr}`);\n      const env = envsAspect.config.env || envsAspect.data.id;\n      if (!env)\n        throw new Error(`unable to find env for ${this.compIdStr}, the config and data of ${EnvsAspect.id} are empty}`);\n      return env;\n    };\n    const currentEnv = getEnvId(this.currentAspects);\n    this.currentEnv = { id: currentEnv };\n    const otherEnv = getEnvId(this.otherAspects);\n    this.otherEnv = { id: otherEnv };\n    const baseEnv = this.baseAspects ? getEnvId(this.baseAspects) : undefined;\n    if (baseEnv) this.baseEnv = { id: baseEnv };\n\n    // populate version\n    const currentEnvAspect = this.currentAspects.findExtension(currentEnv, true);\n    if (currentEnvAspect) {\n      this.handledExtIds.push(currentEnvAspect.stringId);\n      this.currentEnv.version = currentEnvAspect.extensionId?.version;\n      this.currentEnv.config = currentEnvAspect.rawConfig;\n    }\n    const otherEnvAspect = this.otherAspects.findExtension(otherEnv, true);\n    if (otherEnvAspect) {\n      this.handledExtIds.push(otherEnvAspect.stringId);\n      this.otherEnv.version = otherEnvAspect.extensionId?.version;\n      this.otherEnv.config = otherEnvAspect.rawConfig;\n    }\n    if (this.baseEnv) {\n      const baseEnvAspect = this.baseAspects.findExtension(baseEnv, true);\n      if (baseEnvAspect) {\n        this.baseEnv.version = baseEnvAspect.extensionId?.version;\n        this.baseEnv.config = baseEnvAspect.rawConfig;\n      }\n    }\n  }\n\n  private envStrategy(): MergeStrategyResult | null {\n    const mergeStrategyParams: MergeStrategyParamsWithRemoved = {\n      id: EnvsAspect.id,\n      currentConfig: {\n        env: this.currentEnv.version ? `${this.currentEnv.id}@${this.currentEnv.version}` : this.currentEnv.id,\n      },\n      otherConfig: { env: this.otherEnv.version ? `${this.otherEnv.id}@${this.otherEnv.version}` : this.otherEnv.id },\n    };\n    if (this.baseEnv) {\n      mergeStrategyParams.baseConfig = {\n        env: this.baseEnv?.version ? `${this.baseEnv.id}@${this.baseEnv.version}` : this.baseEnv?.id,\n      };\n    }\n    if (this.currentEnv.id === this.otherEnv.id && this.currentEnv.version === this.otherEnv.version) {\n      return null;\n    }\n    if (this.isIdInWorkspace(this.currentEnv.id)) {\n      // the env currently used is part of the workspace, that's what the user needs. don't try to resolve anything.\n      return null;\n    }\n    return this.basicConfigMerge(mergeStrategyParams);\n  }\n\n  private areConfigsEqual(configA: GenericConfigOrRemoved, configB: GenericConfigOrRemoved) {\n    return JSON.stringify(configA) === JSON.stringify(configB);\n  }\n\n  private mergePerStrategy(mergeStrategyParams: MergeStrategyParams): MergeStrategyResult | null {\n    const { id, currentExt, otherExt, baseExt } = mergeStrategyParams;\n    const depResolverResult = this.depResolverStrategy(mergeStrategyParams);\n    if (depResolverResult) {\n      return depResolverResult;\n    }\n    const currentConfig = this.getConfig(currentExt);\n    const otherConfig = this.getConfig(otherExt);\n    const baseConfig = baseExt ? this.getConfig(baseExt) : undefined;\n\n    return this.basicConfigMerge({ id, currentConfig, otherConfig, baseConfig });\n  }\n\n  private basicConfigMerge(mergeStrategyParams: MergeStrategyParamsWithRemoved) {\n    const { id, currentConfig, otherConfig, baseConfig } = mergeStrategyParams;\n    if (this.areConfigsEqual(currentConfig, otherConfig)) {\n      return null;\n    }\n    if (baseConfig && this.areConfigsEqual(baseConfig, otherConfig)) {\n      // was changed on current\n      return null;\n    }\n    if (baseConfig && this.areConfigsEqual(baseConfig, currentConfig)) {\n      // was changed on other\n      return { id, mergedConfig: otherConfig };\n    }\n    // either no baseConfig, or baseConfig is also different from both: other and local. that's a conflict.\n    const mergeStrategyConfigParams = { id, currentConfig, otherConfig, baseConfig };\n    return this.basicConflictGenerator(mergeStrategyConfigParams);\n  }\n\n  private basicConflictGenerator({\n    id,\n    currentConfig,\n    otherConfig,\n  }: MergeStrategyParamsWithRemoved): MergeStrategyResult {\n    // uncomment to debug\n    // console.log('basicConflictGenerator', this.compIdStr, id, 'currentConfig', currentConfig, 'otherConfig', otherConfig);\n    let conflict: string;\n    if (currentConfig === '-') {\n      conflict = `${'<'.repeat(7)} ${this.currentLabel}\n=======\n\"${id}\": ${JSON.stringify(otherConfig, undefined, 2)}\n${'>'.repeat(7)} ${this.otherLabel}`;\n    } else if (otherConfig === '-') {\n      conflict = `${'<'.repeat(7)} ${this.currentLabel}\n\"${id}\": ${JSON.stringify(otherConfig, undefined, 2)}\n=======\n${'>'.repeat(7)} ${this.otherLabel}`;\n    } else {\n      const formatConfig = (conf: GenericConfigOrRemoved) => {\n        const confStr = JSON.stringify(conf, undefined, 2);\n        const confStrSplit = confStr.split('\\n');\n        confStrSplit.shift(); // remove first {\n        confStrSplit.pop(); // remove last }\n        return confStrSplit.join('\\n');\n      };\n      conflict = `\"${id}\": {\n${'<'.repeat(7)} ${this.currentLabel}\n${formatConfig(currentConfig)}\n=======\n${formatConfig(otherConfig)}\n${'>'.repeat(7)} ${this.otherLabel}\n}`;\n    }\n\n    return { id, conflict };\n  }\n\n  private depResolverStrategy(params: MergeStrategyParams): MergeStrategyResult | undefined {\n    if (params.id !== DependencyResolverAspect.id) return undefined;\n    const { currentExt, otherExt, baseExt } = params;\n\n    const currentConfig = this.getConfig(currentExt);\n    const currentPolicy = this.getPolicy(currentConfig);\n    const otherConfig = this.getConfig(otherExt);\n    const otherPolicy = this.getPolicy(otherConfig);\n\n    const baseConfig = baseExt ? this.getConfig(baseExt) : undefined;\n    const basePolicy = baseConfig ? this.getPolicy(baseConfig) : undefined;\n\n    const mergedPolicy = {\n      dependencies: [],\n      devDependencies: [],\n      peerDependencies: [],\n    };\n    const conflictedPolicy = {\n      dependencies: [],\n      devDependencies: [],\n      peerDependencies: [],\n    };\n    let isMerged = false;\n    let hasConflict = false;\n    const conflictIndicator = 'CONFLICT::';\n    const lifecycleToDepType = {\n      runtime: 'dependencies',\n      dev: 'devDependencies',\n      peer: 'peerDependencies',\n    };\n    const handleConfigMerge = () => {\n      const addVariantPolicyEntryToPolicy = (dep: VariantPolicyEntry) => {\n        const depType = lifecycleToDepType[dep.lifecycleType];\n        mergedPolicy[depType].push({\n          name: dep.dependencyId,\n          version: dep.value.version,\n          force: dep.force,\n        });\n        isMerged = true;\n      };\n\n      if (this.areConfigsEqual(currentConfig, otherConfig)) {\n        return;\n      }\n      if (baseConfig && this.areConfigsEqual(baseConfig, otherConfig)) {\n        // was changed on current\n        return;\n      }\n      if (currentConfig === '-' || otherConfig === '-') {\n        throw new Error('not implemented. Is it possible to have it as minus?');\n      }\n      if (baseConfig && this.areConfigsEqual(baseConfig, currentConfig)) {\n        // was changed on other\n        if (otherPolicy.length) {\n          otherPolicy.forEach((dep) => {\n            addVariantPolicyEntryToPolicy(dep);\n          });\n        }\n        isMerged = true;\n        return;\n      }\n\n      // either no baseConfig, or baseConfig is also different from both: other and local. that's a conflict.\n      if (!currentConfig.policy && !otherConfig.policy) return;\n      const currentAndOtherConfig = uniqBy(currentPolicy.concat(otherPolicy), (d) => d.dependencyId);\n      currentAndOtherConfig.forEach((dep) => {\n        const depType = lifecycleToDepType[dep.lifecycleType];\n        const currentDep = currentPolicy.find((d) => d.dependencyId === dep.dependencyId);\n        const otherDep = otherPolicy.find((d) => d.dependencyId === dep.dependencyId);\n        const baseDep = basePolicy?.find((d) => d.dependencyId === dep.dependencyId);\n\n        if (!otherDep) {\n          return;\n        }\n        if (!currentDep) {\n          // only on other\n          addVariantPolicyEntryToPolicy(otherDep);\n          return;\n        }\n        const currentVer = currentDep.value.version;\n        const otherVer = otherDep.value.version;\n        if (currentVer === otherVer) {\n          return;\n        }\n        const baseVer = baseDep?.value.version;\n        if (baseVer && baseVer === otherVer) {\n          return;\n        }\n        // @todo: needs to ignore if it's in the workspace somehow.\n        // if (currentDep.__type === 'component' && this.isIdInWorkspace(currentId)) {\n        //   // dependencies that exist in the workspace, should be ignored. they'll be resolved later to the version in the ws.\n        //   return;\n        // }\n        if (baseVer && baseVer === currentVer) {\n          addVariantPolicyEntryToPolicy(otherDep);\n          return;\n        }\n\n        hasConflict = true;\n        conflictedPolicy[depType].push({\n          name: currentDep.dependencyId,\n          version: `${conflictIndicator}${currentVer}::${otherVer}::`,\n          force: currentDep.force,\n        });\n      });\n    };\n\n    handleConfigMerge();\n\n    const hasConfigForDep = (depType: string, depName: string) => mergedPolicy[depType].find((d) => d.name === depName);\n    const getDepIdAsPkgName = (dep: SerializedDependencyWithPolicy) => {\n      if (dep.__type !== 'component') {\n        return dep.id;\n      }\n      // @ts-ignore\n      return dep.packageName;\n    };\n\n    const addSerializedDepToPolicy = (dep: SerializedDependencyWithPolicy) => {\n      const depType = lifecycleToDepType[dep.lifecycle];\n\n      if (hasConfigForDep(depType, dep.id)) {\n        return; // there is already config for it.\n      }\n      mergedPolicy[depType].push({\n        name: getDepIdAsPkgName(dep),\n        version: dep.policy || dep.version,\n        force: false,\n      });\n      isMerged = true;\n    };\n\n    const getAutoDeps = (ext: ExtensionDataList): SerializedDependencyWithPolicy[] => {\n      const data = ext.findCoreExtension(DependencyResolverAspect.id)?.data.dependencies;\n      if (!data) return [];\n      const policy = ext.findCoreExtension(DependencyResolverAspect.id)?.data.policy || [];\n      return data\n        .filter((d) => d.source === 'auto')\n        .map((d) => {\n          const idWithoutVersion = d.__type === 'package' ? d.id : d.id.split('@')[0];\n          const existingPolicy = policy.find((p) => p.dependencyId === idWithoutVersion);\n          const getPolicyVer = () => {\n            if (d.__type === 'package') return undefined; // for packages, the policy is already the version\n            if (existingPolicy) return existingPolicy.value.version; // currently it's missing, will be implemented by @Gilad\n            if (!semver.valid(d.version)) return d.version; // could be a hash\n            // default to `^` or ~ if starts with zero, until we save the policy from the workspace during tag/snap.\n            return d.version.startsWith('0.') ? `~${d.version}` : `^${d.version}`;\n          };\n          return {\n            ...d,\n            id: idWithoutVersion,\n            policy: getPolicyVer(),\n          };\n        });\n    };\n\n    const currentData = getAutoDeps(this.currentAspects);\n    const otherData = getAutoDeps(this.otherAspects);\n    const currentAndOtherData = uniqBy(currentData.concat(otherData), (d) => d.id);\n    const baseData = getAutoDeps(this.baseAspects);\n\n    // uncomment to debug\n    // console.log('\\n\\n**************', this.compIdStr, '**************');\n    // console.log('currentData', currentData.length, '\\n', currentData.map((d) => `${d.__type} ${d.id} ${d.version}`).join('\\n'));\n    // console.log('otherData', otherData.length, '\\n', otherData.map((d) => `${d.__type} ${d.id} ${d.version}`).join('\\n'));\n    // console.log('otherData', baseData.length, '\\n', baseData.map((d) => `${d.__type} ${d.id} ${d.version}`).join('\\n'));\n    // console.log('** END **\\n\\n');\n\n    currentAndOtherData.forEach((depData) => {\n      if (this.isEnv(depData.id)) {\n        // ignore the envs\n        return;\n      }\n      const currentDep = currentData.find((d) => d.id === depData.id);\n      const otherDep = otherData.find((d) => d.id === depData.id);\n      if (!otherDep) {\n        return;\n      }\n      if (!currentDep) {\n        // only on other\n        addSerializedDepToPolicy(otherDep);\n        return;\n      }\n      const currentId = currentDep.id;\n      const currentVer = currentDep.policy || currentDep.version;\n      const otherVer = otherDep.policy || otherDep.version;\n      if (currentVer === otherVer) {\n        return;\n      }\n      const baseDep = baseData.find((d) => d.id === currentId);\n      const baseVer = baseDep?.policy || baseDep?.version;\n      if (baseVer && baseVer === otherVer) {\n        return;\n      }\n      if (currentDep.__type === 'component' && this.isIdInWorkspace(currentId)) {\n        // dependencies that exist in the workspace, should be ignored. they'll be resolved later to the version in the ws.\n        return;\n      }\n      if (baseVer && baseVer === currentVer) {\n        addSerializedDepToPolicy(otherDep);\n        return;\n      }\n      // either no baseVal, or baseVal is also different from both: other and local. that's probably a conflict.\n      const depType = lifecycleToDepType[currentDep.lifecycle];\n      if (hasConfigForDep(depType, currentDep.id)) {\n        return; // there is already config for it.\n      }\n      // try to resolve according to semver\n      if (\n        currentDep.policy &&\n        otherDep.policy &&\n        isRange(currentDep.policy, currentDep.id) &&\n        isRange(otherDep.policy, otherDep.id)\n      ) {\n        if (semver.satisfies(currentDep.version, otherDep.policy)) {\n          return;\n        }\n        if (semver.satisfies(otherDep.version, currentDep.policy)) {\n          addSerializedDepToPolicy(otherDep);\n          return;\n        }\n      }\n      hasConflict = true;\n      conflictedPolicy[depType].push({\n        name: getDepIdAsPkgName(currentDep),\n        version: `${conflictIndicator}${currentVer}::${otherVer}::`,\n        force: false,\n      });\n    });\n\n    ['dependencies', 'devDependencies', 'peerDependencies'].forEach((depType) => {\n      if (!mergedPolicy[depType].length) delete mergedPolicy[depType];\n      if (!conflictedPolicy[depType].length) delete conflictedPolicy[depType];\n    });\n\n    let conflictStr: string | undefined;\n    if (hasConflict) {\n      const mergedConfigSplit = JSON.stringify({ policy: conflictedPolicy }, undefined, 2).split('\\n');\n      const conflictLines = mergedConfigSplit.map((line) => {\n        if (!line.includes(conflictIndicator)) return line;\n        const [, currentVal, otherVal] = line.split('::');\n        return `${'<'.repeat(7)} ${this.currentLabel}\n        \"version\": \"${currentVal}\",\n=======\n        \"version\": \"${otherVal}\",\n${'>'.repeat(7)} ${this.otherLabel}`;\n      });\n      // replace the first line with line with the id\n      conflictLines.shift();\n      conflictLines.unshift(`\"${params.id}\": {`);\n      conflictStr = conflictLines.join('\\n');\n    }\n    const config = isMerged ? { policy: mergedPolicy } : undefined;\n\n    return { id: params.id, mergedConfig: config, conflict: conflictStr };\n  }\n\n  private isIdInWorkspace(id: string): boolean {\n    return Boolean(this.getIdFromWorkspace(id));\n  }\n\n  private getIdFromWorkspace(id: string): ComponentID | undefined {\n    return this.workspaceIds.find((c) => c.toStringWithoutVersion() === id);\n  }\n\n  private isEnv(id: string) {\n    return id === this.currentEnv.id || id === this.otherEnv.id;\n  }\n\n  private getConfig(ext: ExtensionDataEntry) {\n    if (ext.rawConfig === '-') return ext.rawConfig;\n    return omit(ext.rawConfig, ['__specific']);\n  }\n\n  private getPolicy(config): VariantPolicyEntry[] {\n    if (!config.policy) return [];\n    return VariantPolicy.fromConfigObject(config.policy).entries;\n  }\n}\n"],"mappings":"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"}

package/dist/merging.main.runtime.js

@@ -439,7 +439,6 @@ class MergingMain {
       }
     };
     const results = await getComponentsStatusNeedMerge();
-    // throw new Error('stop!')
     results.push(...compStatusNotNeedMerge);
     return results;
   }

package/dist/merging.main.runtime.js.map

@@ -1 +1 @@
-{"version":3,"names":["MergingMain","constructor","workspace","install","snapping","checkout","logger","consumer","merge","values","mergeStrategy","abort","resolve","noSnap","message","build","skipDependencyInstallation","OutsideWorkspaceError","mergeResults","firstValue","R","head","resolveMerge","abortMerge","BitId","isValidVersion","bitIds","getComponentsToMerge","mergeComponentsFromRemote","version","ids","tail","mergeVersion","onDestroy","snapMessage","currentLaneId","getCurrentLaneId","currentLaneObject","getCurrentLaneObject","allComponentsStatus","getAllComponentsStatus","failedComponents","filter","c","unmergedMessage","unmergedLegitimately","length","failureMsgs","map","failedComponent","chalk","bold","id","toString","red","join","BitError","mergeSnaps","laneId","localLane","tag","componentWithConflict","find","component","hasConflicts","getMergeStrategyInteractive","componentStatus","failureMessage","unchangedLegitimately","succeededComponents","componentsResults","mapSeries","currentComponent","resolvedUnrelated","configMergeResult","modelComponent","scope","getModelComponent","updatedLaneId","isDefault","LaneId","from","name","applyVersion","remoteHead","getRef","objects","add","persist","unmergedComponents","write","writeBitMap","componentsHasConfigMergeConflicts","some","leftUnresolvedConflicts","undefined","dedupe","updateExisting","import","err","error","consoleError","getSnapOrTagResults","idsToTag","results","tagAllLaneComponent","taggedComponents","autoTaggedResults","snappedComponents","autoSnappedResults","snapResolvedComponents","mergeSnapResults","mergeSnapError","components","getMergeStatus","currentLane","otherLane","options","componentStatusBeforeMergeAttempt","Promise","all","getComponentStatusBeforeMergeAttempt","toImport","compStatus","divergeData","commonSnapBeforeDiverge","changeVersion","flat","scopeImporter","importManyIfMissingWithoutDeps","BitIds","fromArray","lane","compStatusNotNeedMerge","mergeProps","compStatusNeedMerge","otherLaneName","toLaneId","DEFAULT_LANE","getComponentsStatusNeedMerge","tmp","Tmp","componentsStatus","getComponentMergeStatus","clear","push","returnUnmerged","msg","getModelComponentIfExist","unmerged","getEntry","toStringWithoutVersion","repo","otherLaneHead","existingBitMapId","bitMap","getBitIdIfExist","ignoreVersion","componentOnOther","loadVersion","isRemoved","getCurrentId","idOnLane","getComponent","getHeadAsTagIfExist","currentId","getDivergeData","targetHead","throws","componentFromModel","getCurrentComponent","loadComponent","getConsumerComponent","removed","isModified","componentModificationStatus","getComponentStatusById","modified","baseComponent","ignoreConfigChanges","isComponentSourceCodeModified","isComponentModified","Error","mainHead","NoCommonSnap","resolveUnrelated","hasResolvedFromMain","hashToCompare","divergeDataFromMain","sourceHead","hasResolvedLocally","getHeadRegardlessOfLane","hasResolvedRemotely","versionToSaveInLane","resolvedRef","strategy","isDiverged","isSourceAhead","isTargetAhead","componentMergeStatusBeforeMergeAttempt","baseSnap","otherComponent","currentLaneName","currentLabel","otherLabel","workspaceIds","listIds","configMerger","ConfigMerger","extensions","threeWayMerge","filesStatus","unmergedComponent","remote","handleResolveUnrelated","addComponent","unrelated","addEntry","markAllFilesAsUnchanged","files","forEach","file","pathNormalizeToLinux","relative","FileStatus","unchanged","MergeOptions","ours","remoteId","idToLoad","theirs","componentWithDependencies","loadComponentWithDependenciesFromModel","updated","modifiedStatus","modifiedFiles","applyModifiedVersion","manyComponentsWriter","ManyComponentsWriter","componentsWithDependencies","installNpmPackages","override","writeConfig","verbose","writeAll","writtenPath","configMergeConflictFile","generateMergeConflictFile","configMergePath","path","getPath","MergeConfigFilename","fs","outputFile","successfullyMergedConfig","getSuccessfullyMergedConfig","mergedConfig","manual","unmergedPaths","f","conflict","filePath","setHead","markVersionAsLocal","getIdsForUnmerged","reset","removeComponent","fullName","abortedComponents","snap","legacyBitIds","_legacy","resolvedComponents","localLaneObject","bitId","remoteScopeName","remoteLaneId","remoteLanes","laneIdStr","getComponents","debug","r","tagMessage","unmodified","idsStr","componentIds","resolveMultipleComponentIds","entry","GeneralError","unresolvedComponents","u","ComponentID","fromLegacy","hasWildcard","componentsList","ComponentsList","listComponentsByIdsWithWildcard","getParsedId","provider","cli","loggerMain","createLogger","MergingAspect","merging","register","MergeCmd","CLIAspect","WorkspaceAspect","SnappingAspect","CheckoutAspect","InstallAspect","LoggerAspect","MainRuntime","addRuntime"],"sources":["merging.main.runtime.ts"],"sourcesContent":["import { CLIAspect, CLIMain, MainRuntime } from '@teambit/cli';\nimport path from 'path';\nimport fs from 'fs-extra';\nimport WorkspaceAspect, { OutsideWorkspaceError, Workspace } from '@teambit/workspace';\nimport R from 'ramda';\nimport { Consumer } from '@teambit/legacy/dist/consumer';\nimport ComponentsList from '@teambit/legacy/dist/consumer/component/components-list';\nimport {\n  ApplyVersionResults,\n  MergeStrategy,\n  mergeVersion,\n  ApplyVersionResult,\n  FailedComponents,\n  FileStatus,\n  getMergeStrategyInteractive,\n  MergeOptions,\n} from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport SnappingAspect, { SnappingMain, TagResults } from '@teambit/snapping';\nimport hasWildcard from '@teambit/legacy/dist/utils/string/has-wildcard';\nimport mapSeries from 'p-map-series';\nimport { BitId, BitIds } from '@teambit/legacy/dist/bit-id';\nimport { BitError } from '@teambit/bit-error';\nimport GeneralError from '@teambit/legacy/dist/error/general-error';\nimport { DEFAULT_LANE, LaneId } from '@teambit/lane-id';\nimport { AutoTagResult } from '@teambit/legacy/dist/scope/component-ops/auto-tag';\nimport { getDivergeData } from '@teambit/legacy/dist/scope/component-ops/get-diverge-data';\nimport { UnmergedComponent } from '@teambit/legacy/dist/scope/lanes/unmerged-components';\nimport { Lane, ModelComponent, Version } from '@teambit/legacy/dist/scope/models';\nimport { Ref } from '@teambit/legacy/dist/scope/objects';\nimport chalk from 'chalk';\nimport { Tmp } from '@teambit/legacy/dist/scope/repositories';\nimport { pathNormalizeToLinux } from '@teambit/legacy/dist/utils';\nimport ManyComponentsWriter from '@teambit/legacy/dist/consumer/component-ops/many-components-writer';\nimport ConsumerComponent from '@teambit/legacy/dist/consumer/component/consumer-component';\nimport { Logger, LoggerAspect, LoggerMain } from '@teambit/logger';\nimport { applyModifiedVersion } from '@teambit/legacy/dist/consumer/versions-ops/checkout-version';\nimport threeWayMerge, {\n  MergeResultsThreeWay,\n} from '@teambit/legacy/dist/consumer/versions-ops/merge-version/three-way-merge';\nimport { NoCommonSnap } from '@teambit/legacy/dist/scope/exceptions/no-common-snap';\nimport { CheckoutAspect, CheckoutMain } from '@teambit/checkout';\nimport { ComponentID } from '@teambit/component-id';\nimport { MergeConfigFilename } from '@teambit/legacy/dist/constants';\nimport { SnapsDistance } from '@teambit/legacy/dist/scope/component-ops/snaps-distance';\nimport { InstallMain, InstallAspect } from '@teambit/install';\nimport { MergeCmd } from './merge-cmd';\nimport { MergingAspect } from './merging.aspect';\nimport { ConfigMerger } from './config-merger';\nimport { ConfigMergeResult } from './config-merge-result';\n\ntype ResolveUnrelatedData = { strategy: MergeStrategy; head: Ref };\n\nexport type ComponentMergeStatus = {\n  currentComponent?: ConsumerComponent | null;\n  componentFromModel?: Version;\n  id: BitId;\n  unmergedMessage?: string;\n  unmergedLegitimately?: boolean; // failed to merge but for a legitimate reason, such as, up-to-date\n  mergeResults?: MergeResultsThreeWay | null;\n  divergeData?: SnapsDistance;\n  resolvedUnrelated?: ResolveUnrelatedData;\n  configMergeResult?: ConfigMergeResult;\n};\n\nexport type ComponentMergeStatusBeforeMergeAttempt = {\n  currentComponent?: ConsumerComponent | null;\n  componentFromModel?: Version;\n  id: BitId;\n  unmergedMessage?: string;\n  unmergedLegitimately?: boolean; // failed to merge but for a legitimate reason, such as, up-to-date\n  divergeData?: SnapsDistance;\n  resolvedUnrelated?: ResolveUnrelatedData;\n  mergeProps?: {\n    otherLaneHead: Ref;\n    currentId: BitId;\n    modelComponent: ModelComponent;\n  };\n};\n\nexport class MergingMain {\n  private consumer: Consumer;\n  constructor(\n    private workspace: Workspace,\n    private install: InstallMain,\n    private snapping: SnappingMain,\n    private checkout: CheckoutMain,\n    private logger: Logger\n  ) {\n    this.consumer = this.workspace?.consumer;\n  }\n\n  /**\n   * merge components according to the \"values\" param.\n   * if the first param is a version, then merge the component ids to that version.\n   * otherwise, merge from the remote head to the local.\n   */\n  async merge(\n    values: string[],\n    mergeStrategy: MergeStrategy,\n    abort: boolean,\n    resolve: boolean,\n    noSnap: boolean,\n    message: string,\n    build: boolean,\n    skipDependencyInstallation: boolean\n  ): Promise<ApplyVersionResults> {\n    if (!this.workspace) throw new OutsideWorkspaceError();\n    const consumer: Consumer = this.workspace.consumer;\n    let mergeResults;\n    const firstValue = R.head(values);\n    if (resolve) {\n      mergeResults = await this.resolveMerge(values, message, build);\n    } else if (abort) {\n      mergeResults = await this.abortMerge(values);\n    } else if (!BitId.isValidVersion(firstValue)) {\n      const bitIds = this.getComponentsToMerge(consumer, values);\n      // @todo: version could be the lane only or remote/lane\n      mergeResults = await this.mergeComponentsFromRemote(\n        consumer,\n        bitIds,\n        mergeStrategy,\n        noSnap,\n        message,\n        build,\n        skipDependencyInstallation\n      );\n    } else {\n      const version = firstValue;\n      const ids = R.tail(values);\n      const bitIds = this.getComponentsToMerge(consumer, ids);\n      mergeResults = await mergeVersion(consumer, version, bitIds, mergeStrategy);\n    }\n    await consumer.onDestroy();\n    return mergeResults;\n  }\n\n  /**\n   * when user is on main, it merges the remote main components into local.\n   * when user is on a lane, it merges the remote lane components into the local lane.\n   */\n  async mergeComponentsFromRemote(\n    consumer: Consumer,\n    bitIds: BitId[],\n    mergeStrategy: MergeStrategy,\n    noSnap: boolean,\n    snapMessage: string,\n    build: boolean,\n    skipDependencyInstallation: boolean\n  ): Promise<ApplyVersionResults> {\n    const currentLaneId = consumer.getCurrentLaneId();\n    const currentLaneObject = await consumer.getCurrentLaneObject();\n    const allComponentsStatus = await this.getAllComponentsStatus(bitIds, currentLaneId, currentLaneObject);\n    const failedComponents = allComponentsStatus.filter((c) => c.unmergedMessage && !c.unmergedLegitimately);\n    if (failedComponents.length) {\n      const failureMsgs = failedComponents\n        .map(\n          (failedComponent) =>\n            `${chalk.bold(failedComponent.id.toString())} - ${chalk.red(failedComponent.unmergedMessage as string)}`\n        )\n        .join('\\n');\n      throw new BitError(`unable to merge due to the following failures:\\n${failureMsgs}`);\n    }\n\n    return this.mergeSnaps({\n      mergeStrategy,\n      allComponentsStatus,\n      laneId: currentLaneId,\n      localLane: currentLaneObject,\n      noSnap,\n      snapMessage,\n      build,\n      skipDependencyInstallation,\n    });\n  }\n\n  /**\n   * merge multiple components according to the \"allComponentsStatus\".\n   */\n  async mergeSnaps({\n    mergeStrategy,\n    allComponentsStatus,\n    laneId,\n    localLane,\n    noSnap,\n    tag,\n    snapMessage,\n    build,\n    skipDependencyInstallation,\n  }: {\n    mergeStrategy: MergeStrategy;\n    allComponentsStatus: ComponentMergeStatus[];\n    laneId: LaneId;\n    localLane: Lane | null;\n    noSnap: boolean;\n    tag?: boolean;\n    snapMessage: string;\n    build: boolean;\n    skipDependencyInstallation?: boolean;\n  }): Promise<ApplyVersionResults> {\n    const consumer = this.workspace.consumer;\n    const componentWithConflict = allComponentsStatus.find(\n      (component) => component.mergeResults && component.mergeResults.hasConflicts\n    );\n    if (componentWithConflict && !mergeStrategy) {\n      mergeStrategy = await getMergeStrategyInteractive();\n    }\n    const failedComponents: FailedComponents[] = allComponentsStatus\n      .filter((componentStatus) => componentStatus.unmergedMessage)\n      .map((componentStatus) => ({\n        id: componentStatus.id,\n        failureMessage: componentStatus.unmergedMessage as string,\n        unchangedLegitimately: componentStatus.unmergedLegitimately,\n      }));\n    const succeededComponents = allComponentsStatus.filter((componentStatus) => !componentStatus.unmergedMessage);\n    // do not use Promise.all for applyVersion. otherwise, it'll write all components in parallel,\n    // which can be an issue when some components are also dependencies of others\n    const componentsResults = await mapSeries(\n      succeededComponents,\n      async ({ currentComponent, id, mergeResults, resolvedUnrelated, configMergeResult }) => {\n        const modelComponent = await consumer.scope.getModelComponent(id);\n        const updatedLaneId = laneId.isDefault() ? LaneId.from(laneId.name, id.scope as string) : laneId;\n        return this.applyVersion({\n          currentComponent,\n          id,\n          mergeResults,\n          mergeStrategy,\n          remoteHead: modelComponent.getRef(id.version as string) as Ref,\n          laneId: updatedLaneId,\n          localLane,\n          resolvedUnrelated,\n          configMergeResult,\n        });\n      }\n    );\n\n    if (localLane) consumer.scope.objects.add(localLane);\n\n    await consumer.scope.objects.persist(); // persist anyway, if localLane is null it should save all main heads\n\n    await consumer.scope.objects.unmergedComponents.write();\n\n    await consumer.writeBitMap();\n\n    const componentsHasConfigMergeConflicts = allComponentsStatus.some((c) => c.configMergeResult?.hasConflicts());\n    const leftUnresolvedConflicts = componentWithConflict && mergeStrategy === 'manual';\n    if (!skipDependencyInstallation && !leftUnresolvedConflicts && !componentsHasConfigMergeConflicts) {\n      try {\n        await this.install.install(undefined, {\n          dedupe: true,\n          updateExisting: false,\n          import: false,\n        });\n      } catch (err: any) {\n        this.logger.error(`failed installing packages`, err);\n        this.logger.consoleError(`failed installing packages, see the log for full stacktrace. error: ${err.message}`);\n      }\n    }\n\n    const getSnapOrTagResults = async () => {\n      // if one of the component has conflict, don't snap-merge. otherwise, some of the components would be snap-merged\n      // and some not. besides the fact that it could by mistake tag dependent, it's a confusing state. better not snap.\n      if (noSnap || leftUnresolvedConflicts || componentsHasConfigMergeConflicts) {\n        return null;\n      }\n      if (tag) {\n        const idsToTag = allComponentsStatus.map((c) => c.id);\n        const results = await this.tagAllLaneComponent(idsToTag, snapMessage, build);\n        if (!results) return null;\n        const { taggedComponents, autoTaggedResults } = results;\n        return { snappedComponents: taggedComponents, autoSnappedResults: autoTaggedResults };\n      }\n      return this.snapResolvedComponents(consumer, snapMessage, build);\n    };\n    let mergeSnapResults: ApplyVersionResults['mergeSnapResults'] = null;\n    let mergeSnapError: Error | undefined;\n    try {\n      mergeSnapResults = await getSnapOrTagResults();\n    } catch (err: any) {\n      mergeSnapError = err;\n    }\n\n    return {\n      components: componentsResults,\n      failedComponents,\n      mergeSnapResults,\n      mergeSnapError,\n      leftUnresolvedConflicts,\n    };\n  }\n\n  /**\n   * this function gets called from two different commands:\n   * 1. \"bit merge <ids...>\", when merging a component from a remote to the local.\n   * in this case, the remote and local are on the same lane or both on main.\n   * 2. \"bit lane merge\", when merging from one lane to another.\n   */\n  async getMergeStatus(\n    bitIds: BitId[], // the id.version is the version we want to merge to the current component\n    currentLane: Lane | null, // currently checked out lane. if on main, then it's null.\n    otherLane?: Lane | null, // the lane we want to merged to our lane. (null if it's \"main\").\n    options?: { resolveUnrelated?: MergeStrategy; ignoreConfigChanges?: boolean }\n  ): Promise<ComponentMergeStatus[]> {\n    const componentStatusBeforeMergeAttempt = await Promise.all(\n      bitIds.map((id) => this.getComponentStatusBeforeMergeAttempt(id, currentLane, options))\n    );\n\n    const toImport = componentStatusBeforeMergeAttempt\n      .map((compStatus) => {\n        if (!compStatus.divergeData || !compStatus.divergeData.commonSnapBeforeDiverge) return [];\n        return [compStatus.id.changeVersion(compStatus.divergeData.commonSnapBeforeDiverge.toString())];\n      })\n      .flat();\n\n    await this.consumer.scope.scopeImporter.importManyIfMissingWithoutDeps({\n      ids: BitIds.fromArray(toImport),\n      lane: otherLane || undefined,\n    });\n\n    const compStatusNotNeedMerge = componentStatusBeforeMergeAttempt.filter(\n      (c) => !c.mergeProps\n    ) as ComponentMergeStatus[];\n    const compStatusNeedMerge = componentStatusBeforeMergeAttempt.filter((c) => c.mergeProps);\n\n    const otherLaneName = otherLane ? otherLane.toLaneId().toString() : DEFAULT_LANE;\n    const getComponentsStatusNeedMerge = async (): Promise<ComponentMergeStatus[]> => {\n      const tmp = new Tmp(this.consumer.scope);\n      try {\n        const componentsStatus = await Promise.all(\n          compStatusNeedMerge.map((compStatus) => this.getComponentMergeStatus(currentLane, otherLaneName, compStatus))\n        );\n        await tmp.clear();\n        return componentsStatus;\n      } catch (err: any) {\n        await tmp.clear();\n        throw err;\n      }\n    };\n    const results = await getComponentsStatusNeedMerge();\n    // throw new Error('stop!')\n    results.push(...compStatusNotNeedMerge);\n    return results;\n  }\n\n  private async getComponentStatusBeforeMergeAttempt(\n    id: BitId, // the id.version is the version we want to merge to the current component\n    localLane: Lane | null, // currently checked out lane. if on main, then it's null.\n    options?: { resolveUnrelated?: MergeStrategy; ignoreConfigChanges?: boolean }\n  ): Promise<ComponentMergeStatusBeforeMergeAttempt> {\n    const consumer = this.workspace.consumer;\n    const componentStatus: ComponentMergeStatus = { id };\n    const returnUnmerged = (msg: string, unmergedLegitimately = false) => {\n      componentStatus.unmergedMessage = msg;\n      componentStatus.unmergedLegitimately = unmergedLegitimately;\n      return componentStatus;\n    };\n    const modelComponent = await consumer.scope.getModelComponentIfExist(id);\n    if (!modelComponent) {\n      return returnUnmerged(\n        `component ${id.toString()} is on the lane/main but its objects were not found, please re-import the lane`\n      );\n    }\n    const unmerged = consumer.scope.objects.unmergedComponents.getEntry(id.name);\n    if (unmerged) {\n      return returnUnmerged(\n        `component ${id.toStringWithoutVersion()} is in during-merge state a previous merge, please snap/tag it first (or use bit merge --resolve/--abort)`\n      );\n    }\n    const repo = consumer.scope.objects;\n    const version = id.version as string;\n    const otherLaneHead = modelComponent.getRef(version);\n    const existingBitMapId = consumer.bitMap.getBitIdIfExist(id, { ignoreVersion: true });\n    const componentOnOther: Version = await modelComponent.loadVersion(version, consumer.scope.objects);\n    if (componentOnOther.isRemoved()) {\n      return returnUnmerged(`component has been removed`, true);\n    }\n    const getCurrentId = () => {\n      if (existingBitMapId) return existingBitMapId;\n      if (localLane) {\n        const idOnLane = localLane.getComponent(id);\n        if (!idOnLane) return null;\n        return idOnLane.id.changeVersion(idOnLane.head.toString());\n      }\n      // it's on main\n      const head = modelComponent.getHeadAsTagIfExist();\n      if (head) {\n        return id.changeVersion(head);\n      }\n      return null;\n    };\n    const currentId = getCurrentId();\n    if (!currentId) {\n      const divergeData = await getDivergeData({ repo, modelComponent, targetHead: otherLaneHead, throws: false });\n      return { currentComponent: null, componentFromModel: componentOnOther, id, divergeData };\n    }\n    const getCurrentComponent = () => {\n      if (existingBitMapId) return consumer.loadComponent(existingBitMapId);\n      return consumer.scope.getConsumerComponent(currentId);\n    };\n    const currentComponent = await getCurrentComponent();\n    if (currentComponent.removed) {\n      return returnUnmerged(`component has been removed`, true);\n    }\n    const isModified = async () => {\n      const componentModificationStatus = await consumer.getComponentStatusById(currentComponent.id);\n      if (!componentModificationStatus.modified) return false;\n      if (!existingBitMapId) return false;\n      const baseComponent = await modelComponent.loadVersion(\n        existingBitMapId.version as string,\n        consumer.scope.objects\n      );\n      return options?.ignoreConfigChanges\n        ? consumer.isComponentSourceCodeModified(baseComponent, currentComponent)\n        : true;\n    };\n\n    const isComponentModified = await isModified();\n\n    if (isComponentModified) {\n      return returnUnmerged(`component is modified, please snap/tag it first`);\n    }\n    if (!otherLaneHead) {\n      throw new Error(`merging: unable finding a hash for the version ${version} of ${id.toString()}`);\n    }\n    const divergeData = await getDivergeData({\n      repo,\n      modelComponent,\n      targetHead: otherLaneHead,\n      throws: false,\n    });\n    if (divergeData.err) {\n      const mainHead = modelComponent.head;\n      if (divergeData.err instanceof NoCommonSnap && options?.resolveUnrelated && mainHead) {\n        const hasResolvedFromMain = async (hashToCompare: Ref | null) => {\n          const divergeDataFromMain = await getDivergeData({\n            repo,\n            modelComponent,\n            sourceHead: hashToCompare,\n            targetHead: mainHead,\n            throws: false,\n          });\n          if (!divergeDataFromMain.err) return true;\n          return !(divergeDataFromMain.err instanceof NoCommonSnap);\n        };\n        const hasResolvedLocally = await hasResolvedFromMain(modelComponent.getHeadRegardlessOfLane() as Ref);\n        const hasResolvedRemotely = await hasResolvedFromMain(otherLaneHead);\n        if (!hasResolvedLocally && !hasResolvedRemotely) {\n          return returnUnmerged(\n            `unable to traverse ${currentComponent.id.toString()} history. the main-head ${mainHead.toString()} doesn't appear in both lanes, it was probably created in each lane separately`\n          );\n        }\n        const versionToSaveInLane = hasResolvedLocally ? currentComponent.id.version : id.version;\n        const resolvedRef = modelComponent.getRef(versionToSaveInLane as string);\n        if (!resolvedRef) throw new Error(`unable to get ref of \"${versionToSaveInLane}\" for \"${id.toString()}\"`);\n        if (options?.resolveUnrelated === 'theirs') {\n          // just override with the model data\n          return {\n            currentComponent,\n            componentFromModel: componentOnOther,\n            id,\n            divergeData,\n            resolvedUnrelated: { strategy: 'theirs', head: resolvedRef },\n          };\n        }\n        if (options?.resolveUnrelated === 'ours') {\n          return {\n            currentComponent,\n            id,\n            divergeData,\n            resolvedUnrelated: { strategy: 'ours', head: resolvedRef },\n          };\n        }\n        throw new Error(\n          `unsupported strategy \"${options?.resolveUnrelated}\" of resolve-unrelated. supported strategies are: [ours, theirs]`\n        );\n      }\n      return returnUnmerged(\n        `unable to traverse ${currentComponent.id.toString()} history. error: ${divergeData.err.message}`\n      );\n    }\n    if (!divergeData.isDiverged()) {\n      if (divergeData.isSourceAhead()) {\n        // do nothing!\n        return returnUnmerged(`component ${currentComponent.id.toString()} is ahead, nothing to merge`, true);\n      }\n      if (divergeData.isTargetAhead()) {\n        // just override with the model data\n        return {\n          currentComponent,\n          componentFromModel: componentOnOther,\n          id,\n          divergeData,\n        };\n      }\n      // we know that localHead and remoteHead are set, so if none of them is ahead they must be equal\n      return returnUnmerged(`component ${currentComponent.id.toString()} is already merged`, true);\n    }\n\n    // it's diverged and needs merge operation\n    const mergeProps = {\n      otherLaneHead,\n      currentId,\n      modelComponent,\n    };\n    return { currentComponent, id, divergeData, mergeProps };\n  }\n\n  private async getComponentMergeStatus(\n    localLane: Lane | null, // currently checked out lane. if on main, then it's null.\n    otherLaneName: string, // the lane name we want to merged to our lane. (can be also \"main\").\n    componentMergeStatusBeforeMergeAttempt: ComponentMergeStatusBeforeMergeAttempt\n  ) {\n    const { id, divergeData, currentComponent, mergeProps } = componentMergeStatusBeforeMergeAttempt;\n    if (!mergeProps) throw new Error(`getDivergedMergeStatus, mergeProps is missing for ${id.toString()}`);\n    const { otherLaneHead, currentId, modelComponent } = mergeProps;\n    const consumer = this.workspace.consumer;\n    const repo = consumer.scope.objects;\n    if (!divergeData) throw new Error(`getDivergedMergeStatus, divergeData is missing for ${id.toString()}`);\n    if (!currentComponent) throw new Error(`getDivergedMergeStatus, currentComponent is missing for ${id.toString()}`);\n\n    const baseSnap = divergeData.commonSnapBeforeDiverge as Ref; // must be set when isTrueMerge\n    // uncomment for debugging\n    // console.log('id', id.toStringWithoutVersion(), 'baseSnap', baseSnap.toString(), 'current', currentId.version, 'other', otherLaneHead.toString());\n    const baseComponent: Version = await modelComponent.loadVersion(baseSnap.toString(), repo);\n    const otherComponent: Version = await modelComponent.loadVersion(otherLaneHead.toString(), repo);\n\n    const currentLaneName = localLane?.toLaneId().toString() || 'main';\n    const currentLabel = `${currentId.version} (${currentLaneName === otherLaneName ? 'current' : currentLaneName})`;\n    const otherLabel = `${otherLaneHead.toString()} (${\n      otherLaneName === currentLaneName ? 'incoming' : otherLaneName\n    })`;\n    const workspaceIds = await this.workspace.listIds();\n    const configMerger = new ConfigMerger(\n      id.toStringWithoutVersion(),\n      workspaceIds,\n      currentComponent.extensions,\n      baseComponent.extensions,\n      otherComponent.extensions,\n      currentLabel,\n      otherLabel\n    );\n    const configMergeResult = configMerger.merge();\n\n    const mergeResults = await threeWayMerge({\n      consumer,\n      otherComponent,\n      otherLabel,\n      currentComponent,\n      currentLabel,\n      baseComponent,\n    });\n    return { currentComponent, id, mergeResults, divergeData, configMergeResult };\n  }\n\n  private async applyVersion({\n    currentComponent,\n    id,\n    mergeResults,\n    mergeStrategy,\n    remoteHead,\n    laneId,\n    localLane,\n    resolvedUnrelated,\n    configMergeResult,\n  }: {\n    currentComponent: ConsumerComponent | null | undefined;\n    id: BitId;\n    mergeResults: MergeResultsThreeWay | null | undefined;\n    mergeStrategy: MergeStrategy;\n    remoteHead: Ref;\n    laneId: LaneId;\n    localLane: Lane | null;\n    resolvedUnrelated?: ResolveUnrelatedData;\n    configMergeResult?: ConfigMergeResult;\n  }): Promise<ApplyVersionResult> {\n    const consumer = this.workspace.consumer;\n    let filesStatus = {};\n    const unmergedComponent: UnmergedComponent = {\n      // @ts-ignore\n      id: { name: id.name, scope: id.scope },\n      head: remoteHead,\n      remote: laneId.scope, // @todo: remove. it has been deprecated around 0.0.832\n      lane: laneId.name, // @todo: remove. it has been deprecated around 0.0.832\n      laneId,\n    };\n    id = currentComponent ? currentComponent.id : id;\n\n    const modelComponent = await consumer.scope.getModelComponent(id);\n    const handleResolveUnrelated = () => {\n      if (!currentComponent) throw new Error('currentComponent must be defined when resolvedUnrelated');\n      if (!localLane) throw new Error('localLane must be defined when resolvedUnrelated');\n      if (!resolvedUnrelated?.head) throw new Error('resolvedUnrelated must have head prop');\n      localLane.addComponent({ id, head: resolvedUnrelated.head });\n      const head = modelComponent.getRef(currentComponent.id.version as string);\n      if (!head) throw new Error(`unable to get the head for resolved-unrelated ${id.toString()}`);\n      unmergedComponent.laneId = localLane.toLaneId();\n      unmergedComponent.head = head;\n      unmergedComponent.unrelated = true;\n      consumer.scope.objects.unmergedComponents.addEntry(unmergedComponent);\n      return { id, filesStatus };\n    };\n\n    const markAllFilesAsUnchanged = () => {\n      if (!currentComponent) throw new Error(`applyVersion expect to get currentComponent for ${id.toString()}`);\n      currentComponent.files.forEach((file) => {\n        filesStatus[pathNormalizeToLinux(file.relative)] = FileStatus.unchanged;\n      });\n    };\n    if (mergeResults && mergeResults.hasConflicts && mergeStrategy === MergeOptions.ours) {\n      markAllFilesAsUnchanged();\n      consumer.scope.objects.unmergedComponents.addEntry(unmergedComponent);\n      return { id, filesStatus };\n    }\n    if (resolvedUnrelated?.strategy === 'ours') {\n      markAllFilesAsUnchanged();\n      return handleResolveUnrelated();\n    }\n    const remoteId = id.changeVersion(remoteHead.toString());\n    const idToLoad = !mergeResults || mergeStrategy === MergeOptions.theirs ? remoteId : id;\n    const componentWithDependencies = await consumer.loadComponentWithDependenciesFromModel(idToLoad);\n    const files = componentWithDependencies.component.files;\n    files.forEach((file) => {\n      // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n      filesStatus[pathNormalizeToLinux(file.relative)] = FileStatus.updated;\n    });\n\n    if (mergeResults) {\n      // update files according to the merge results\n      const { filesStatus: modifiedStatus, modifiedFiles } = applyModifiedVersion(files, mergeResults, mergeStrategy);\n      componentWithDependencies.component.files = modifiedFiles;\n      filesStatus = { ...filesStatus, ...modifiedStatus };\n    }\n\n    const manyComponentsWriter = new ManyComponentsWriter({\n      consumer,\n      componentsWithDependencies: [componentWithDependencies],\n      installNpmPackages: false,\n      override: true,\n      writeConfig: false, // @todo: should write if config exists before, needs to figure out how to do it.\n      verbose: false, // @todo: do we need a flag here?\n    });\n    await manyComponentsWriter.writeAll();\n\n    if (configMergeResult) {\n      if (!componentWithDependencies.component.writtenPath) {\n        throw new Error(`componentWithDependencies.component.writtenPath is missing for ${id.toString()}`);\n      }\n      const configMergeConflictFile = configMergeResult.generateMergeConflictFile();\n      if (configMergeConflictFile) {\n        const configMergePath = path.join(\n          consumer.getPath(),\n          componentWithDependencies.component.writtenPath,\n          MergeConfigFilename\n        );\n        await fs.outputFile(configMergePath, configMergeConflictFile);\n      }\n      const successfullyMergedConfig = configMergeResult.getSuccessfullyMergedConfig();\n      if (successfullyMergedConfig) {\n        unmergedComponent.mergedConfig = successfullyMergedConfig;\n        // no need to `unmergedComponents.addEntry` here. it'll be added in the next lines inside `if (mergeResults)`.\n        // because if `configMergeResult` is set, `mergeResults` must be set as well. both happen on diverge.\n      }\n    }\n\n    // if mergeResults, the head snap is going to be updated on a later phase when snapping with two parents\n    // otherwise, update the head of the current lane or main\n    if (mergeResults) {\n      if (mergeResults.hasConflicts && mergeStrategy === MergeOptions.manual) {\n        unmergedComponent.unmergedPaths = mergeResults.modifiedFiles.filter((f) => f.conflict).map((f) => f.filePath);\n      }\n      consumer.scope.objects.unmergedComponents.addEntry(unmergedComponent);\n    } else if (localLane) {\n      if (resolvedUnrelated) {\n        // must be \"theirs\"\n        return handleResolveUnrelated();\n      }\n      localLane.addComponent({ id, head: remoteHead });\n    } else {\n      // this is main\n      modelComponent.setHead(remoteHead);\n      // mark it as local, otherwise, when importing this component from a remote, it'll override it.\n      modelComponent.markVersionAsLocal(remoteHead.toString());\n      consumer.scope.objects.add(modelComponent);\n    }\n\n    return { id, filesStatus };\n  }\n\n  private async abortMerge(values: string[]): Promise<ApplyVersionResults> {\n    const consumer = this.workspace.consumer;\n    const ids = await this.getIdsForUnmerged(values);\n    const results = await this.checkout.checkout({ ids, reset: true });\n    ids.forEach((id) => consumer.scope.objects.unmergedComponents.removeComponent(id.fullName));\n    await consumer.scope.objects.unmergedComponents.write();\n    return { abortedComponents: results.components };\n  }\n\n  private async resolveMerge(values: string[], snapMessage: string, build: boolean): Promise<ApplyVersionResults> {\n    const ids = await this.getIdsForUnmerged(values);\n    // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n    const { snappedComponents } = await this.snapping.snap({\n      legacyBitIds: BitIds.fromArray(ids.map((id) => id._legacy)),\n      build,\n      message: snapMessage,\n    });\n    return { resolvedComponents: snappedComponents };\n  }\n\n  private async getAllComponentsStatus(\n    bitIds: BitId[],\n    laneId: LaneId,\n    localLaneObject: Lane | null\n  ): Promise<ComponentMergeStatus[]> {\n    const ids = await Promise.all(\n      bitIds.map(async (bitId) => {\n        const remoteScopeName = laneId.isDefault() ? bitId.scope : laneId.scope;\n        const remoteLaneId = LaneId.from(laneId.name, remoteScopeName as string);\n        const remoteHead = await this.consumer.scope.objects.remoteLanes.getRef(remoteLaneId, bitId);\n        const laneIdStr = remoteLaneId.toString();\n        if (!remoteHead) {\n          throw new BitError(`unable to find a remote head of \"${bitId.toStringWithoutVersion()}\" in \"${laneIdStr}\"`);\n        }\n        return bitId.changeVersion(remoteHead.toString());\n      })\n    );\n\n    return this.getMergeStatus(ids, localLaneObject, localLaneObject);\n  }\n\n  private async snapResolvedComponents(\n    consumer: Consumer,\n    snapMessage: string,\n    build: boolean\n  ): Promise<null | { snappedComponents: ConsumerComponent[]; autoSnappedResults: AutoTagResult[] }> {\n    const unmergedComponents = consumer.scope.objects.unmergedComponents.getComponents();\n    this.logger.debug(`merge-snaps, snapResolvedComponents, total ${unmergedComponents.length.toString()} components`);\n    if (!unmergedComponents.length) return null;\n    const ids = BitIds.fromArray(unmergedComponents.map((r) => new BitId(r.id)));\n    return this.snapping.snap({\n      legacyBitIds: ids,\n      build,\n      message: snapMessage,\n    });\n  }\n\n  private async tagAllLaneComponent(idsToTag: BitId[], tagMessage: string, build: boolean): Promise<TagResults | null> {\n    const ids = idsToTag.map((id) => {\n      return id.toStringWithoutVersion();\n    });\n    this.logger.debug(`merge-snaps, tagResolvedComponents, total ${idsToTag.length.toString()} components`);\n    return this.snapping.tag({\n      ids,\n      build,\n      message: tagMessage,\n      unmodified: true,\n    });\n  }\n\n  private async getIdsForUnmerged(idsStr?: string[]): Promise<ComponentID[]> {\n    if (idsStr && idsStr.length) {\n      const componentIds = await this.workspace.resolveMultipleComponentIds(idsStr);\n      componentIds.forEach((id) => {\n        const entry = this.workspace.consumer.scope.objects.unmergedComponents.getEntry(id.fullName);\n        if (!entry) {\n          throw new GeneralError(`unable to merge-resolve ${id.toString()}, it is not marked as unresolved`);\n        }\n      });\n      return componentIds;\n    }\n    const unresolvedComponents = this.workspace.consumer.scope.objects.unmergedComponents.getComponents();\n    if (!unresolvedComponents.length) throw new GeneralError(`all components are resolved already, nothing to do`);\n    return unresolvedComponents.map((u) => ComponentID.fromLegacy(new BitId(u.id)));\n  }\n\n  private getComponentsToMerge(consumer: Consumer, ids: string[]): BitId[] {\n    if (hasWildcard(ids)) {\n      const componentsList = new ComponentsList(consumer);\n      return componentsList.listComponentsByIdsWithWildcard(ids);\n    }\n    return ids.map((id) => consumer.getParsedId(id));\n  }\n\n  static slots = [];\n  static dependencies = [CLIAspect, WorkspaceAspect, SnappingAspect, CheckoutAspect, InstallAspect, LoggerAspect];\n  static runtime = MainRuntime;\n  static async provider([cli, workspace, snapping, checkout, install, loggerMain]: [\n    CLIMain,\n    Workspace,\n    SnappingMain,\n    CheckoutMain,\n    InstallMain,\n    LoggerMain\n  ]) {\n    const logger = loggerMain.createLogger(MergingAspect.id);\n    const merging = new MergingMain(workspace, install, snapping, checkout, logger);\n    cli.register(new MergeCmd(merging));\n    return merging;\n  }\n}\n\nMergingAspect.addRuntime(MergingMain);\n"],"mappings":"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"}
+{"version":3,"names":["MergingMain","constructor","workspace","install","snapping","checkout","logger","consumer","merge","values","mergeStrategy","abort","resolve","noSnap","message","build","skipDependencyInstallation","OutsideWorkspaceError","mergeResults","firstValue","R","head","resolveMerge","abortMerge","BitId","isValidVersion","bitIds","getComponentsToMerge","mergeComponentsFromRemote","version","ids","tail","mergeVersion","onDestroy","snapMessage","currentLaneId","getCurrentLaneId","currentLaneObject","getCurrentLaneObject","allComponentsStatus","getAllComponentsStatus","failedComponents","filter","c","unmergedMessage","unmergedLegitimately","length","failureMsgs","map","failedComponent","chalk","bold","id","toString","red","join","BitError","mergeSnaps","laneId","localLane","tag","componentWithConflict","find","component","hasConflicts","getMergeStrategyInteractive","componentStatus","failureMessage","unchangedLegitimately","succeededComponents","componentsResults","mapSeries","currentComponent","resolvedUnrelated","configMergeResult","modelComponent","scope","getModelComponent","updatedLaneId","isDefault","LaneId","from","name","applyVersion","remoteHead","getRef","objects","add","persist","unmergedComponents","write","writeBitMap","componentsHasConfigMergeConflicts","some","leftUnresolvedConflicts","undefined","dedupe","updateExisting","import","err","error","consoleError","getSnapOrTagResults","idsToTag","results","tagAllLaneComponent","taggedComponents","autoTaggedResults","snappedComponents","autoSnappedResults","snapResolvedComponents","mergeSnapResults","mergeSnapError","components","getMergeStatus","currentLane","otherLane","options","componentStatusBeforeMergeAttempt","Promise","all","getComponentStatusBeforeMergeAttempt","toImport","compStatus","divergeData","commonSnapBeforeDiverge","changeVersion","flat","scopeImporter","importManyIfMissingWithoutDeps","BitIds","fromArray","lane","compStatusNotNeedMerge","mergeProps","compStatusNeedMerge","otherLaneName","toLaneId","DEFAULT_LANE","getComponentsStatusNeedMerge","tmp","Tmp","componentsStatus","getComponentMergeStatus","clear","push","returnUnmerged","msg","getModelComponentIfExist","unmerged","getEntry","toStringWithoutVersion","repo","otherLaneHead","existingBitMapId","bitMap","getBitIdIfExist","ignoreVersion","componentOnOther","loadVersion","isRemoved","getCurrentId","idOnLane","getComponent","getHeadAsTagIfExist","currentId","getDivergeData","targetHead","throws","componentFromModel","getCurrentComponent","loadComponent","getConsumerComponent","removed","isModified","componentModificationStatus","getComponentStatusById","modified","baseComponent","ignoreConfigChanges","isComponentSourceCodeModified","isComponentModified","Error","mainHead","NoCommonSnap","resolveUnrelated","hasResolvedFromMain","hashToCompare","divergeDataFromMain","sourceHead","hasResolvedLocally","getHeadRegardlessOfLane","hasResolvedRemotely","versionToSaveInLane","resolvedRef","strategy","isDiverged","isSourceAhead","isTargetAhead","componentMergeStatusBeforeMergeAttempt","baseSnap","otherComponent","currentLaneName","currentLabel","otherLabel","workspaceIds","listIds","configMerger","ConfigMerger","extensions","threeWayMerge","filesStatus","unmergedComponent","remote","handleResolveUnrelated","addComponent","unrelated","addEntry","markAllFilesAsUnchanged","files","forEach","file","pathNormalizeToLinux","relative","FileStatus","unchanged","MergeOptions","ours","remoteId","idToLoad","theirs","componentWithDependencies","loadComponentWithDependenciesFromModel","updated","modifiedStatus","modifiedFiles","applyModifiedVersion","manyComponentsWriter","ManyComponentsWriter","componentsWithDependencies","installNpmPackages","override","writeConfig","verbose","writeAll","writtenPath","configMergeConflictFile","generateMergeConflictFile","configMergePath","path","getPath","MergeConfigFilename","fs","outputFile","successfullyMergedConfig","getSuccessfullyMergedConfig","mergedConfig","manual","unmergedPaths","f","conflict","filePath","setHead","markVersionAsLocal","getIdsForUnmerged","reset","removeComponent","fullName","abortedComponents","snap","legacyBitIds","_legacy","resolvedComponents","localLaneObject","bitId","remoteScopeName","remoteLaneId","remoteLanes","laneIdStr","getComponents","debug","r","tagMessage","unmodified","idsStr","componentIds","resolveMultipleComponentIds","entry","GeneralError","unresolvedComponents","u","ComponentID","fromLegacy","hasWildcard","componentsList","ComponentsList","listComponentsByIdsWithWildcard","getParsedId","provider","cli","loggerMain","createLogger","MergingAspect","merging","register","MergeCmd","CLIAspect","WorkspaceAspect","SnappingAspect","CheckoutAspect","InstallAspect","LoggerAspect","MainRuntime","addRuntime"],"sources":["merging.main.runtime.ts"],"sourcesContent":["import { CLIAspect, CLIMain, MainRuntime } from '@teambit/cli';\nimport path from 'path';\nimport fs from 'fs-extra';\nimport WorkspaceAspect, { OutsideWorkspaceError, Workspace } from '@teambit/workspace';\nimport R from 'ramda';\nimport { Consumer } from '@teambit/legacy/dist/consumer';\nimport ComponentsList from '@teambit/legacy/dist/consumer/component/components-list';\nimport {\n  ApplyVersionResults,\n  MergeStrategy,\n  mergeVersion,\n  ApplyVersionResult,\n  FailedComponents,\n  FileStatus,\n  getMergeStrategyInteractive,\n  MergeOptions,\n} from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport SnappingAspect, { SnappingMain, TagResults } from '@teambit/snapping';\nimport hasWildcard from '@teambit/legacy/dist/utils/string/has-wildcard';\nimport mapSeries from 'p-map-series';\nimport { BitId, BitIds } from '@teambit/legacy/dist/bit-id';\nimport { BitError } from '@teambit/bit-error';\nimport GeneralError from '@teambit/legacy/dist/error/general-error';\nimport { DEFAULT_LANE, LaneId } from '@teambit/lane-id';\nimport { AutoTagResult } from '@teambit/legacy/dist/scope/component-ops/auto-tag';\nimport { getDivergeData } from '@teambit/legacy/dist/scope/component-ops/get-diverge-data';\nimport { UnmergedComponent } from '@teambit/legacy/dist/scope/lanes/unmerged-components';\nimport { Lane, ModelComponent, Version } from '@teambit/legacy/dist/scope/models';\nimport { Ref } from '@teambit/legacy/dist/scope/objects';\nimport chalk from 'chalk';\nimport { Tmp } from '@teambit/legacy/dist/scope/repositories';\nimport { pathNormalizeToLinux } from '@teambit/legacy/dist/utils';\nimport ManyComponentsWriter from '@teambit/legacy/dist/consumer/component-ops/many-components-writer';\nimport ConsumerComponent from '@teambit/legacy/dist/consumer/component/consumer-component';\nimport { Logger, LoggerAspect, LoggerMain } from '@teambit/logger';\nimport { applyModifiedVersion } from '@teambit/legacy/dist/consumer/versions-ops/checkout-version';\nimport threeWayMerge, {\n  MergeResultsThreeWay,\n} from '@teambit/legacy/dist/consumer/versions-ops/merge-version/three-way-merge';\nimport { NoCommonSnap } from '@teambit/legacy/dist/scope/exceptions/no-common-snap';\nimport { CheckoutAspect, CheckoutMain } from '@teambit/checkout';\nimport { ComponentID } from '@teambit/component-id';\nimport { MergeConfigFilename } from '@teambit/legacy/dist/constants';\nimport { SnapsDistance } from '@teambit/legacy/dist/scope/component-ops/snaps-distance';\nimport { InstallMain, InstallAspect } from '@teambit/install';\nimport { MergeCmd } from './merge-cmd';\nimport { MergingAspect } from './merging.aspect';\nimport { ConfigMerger } from './config-merger';\nimport { ConfigMergeResult } from './config-merge-result';\n\ntype ResolveUnrelatedData = { strategy: MergeStrategy; head: Ref };\n\nexport type ComponentMergeStatus = {\n  currentComponent?: ConsumerComponent | null;\n  componentFromModel?: Version;\n  id: BitId;\n  unmergedMessage?: string;\n  unmergedLegitimately?: boolean; // failed to merge but for a legitimate reason, such as, up-to-date\n  mergeResults?: MergeResultsThreeWay | null;\n  divergeData?: SnapsDistance;\n  resolvedUnrelated?: ResolveUnrelatedData;\n  configMergeResult?: ConfigMergeResult;\n};\n\nexport type ComponentMergeStatusBeforeMergeAttempt = {\n  currentComponent?: ConsumerComponent | null;\n  componentFromModel?: Version;\n  id: BitId;\n  unmergedMessage?: string;\n  unmergedLegitimately?: boolean; // failed to merge but for a legitimate reason, such as, up-to-date\n  divergeData?: SnapsDistance;\n  resolvedUnrelated?: ResolveUnrelatedData;\n  mergeProps?: {\n    otherLaneHead: Ref;\n    currentId: BitId;\n    modelComponent: ModelComponent;\n  };\n};\n\nexport class MergingMain {\n  private consumer: Consumer;\n  constructor(\n    private workspace: Workspace,\n    private install: InstallMain,\n    private snapping: SnappingMain,\n    private checkout: CheckoutMain,\n    private logger: Logger\n  ) {\n    this.consumer = this.workspace?.consumer;\n  }\n\n  /**\n   * merge components according to the \"values\" param.\n   * if the first param is a version, then merge the component ids to that version.\n   * otherwise, merge from the remote head to the local.\n   */\n  async merge(\n    values: string[],\n    mergeStrategy: MergeStrategy,\n    abort: boolean,\n    resolve: boolean,\n    noSnap: boolean,\n    message: string,\n    build: boolean,\n    skipDependencyInstallation: boolean\n  ): Promise<ApplyVersionResults> {\n    if (!this.workspace) throw new OutsideWorkspaceError();\n    const consumer: Consumer = this.workspace.consumer;\n    let mergeResults;\n    const firstValue = R.head(values);\n    if (resolve) {\n      mergeResults = await this.resolveMerge(values, message, build);\n    } else if (abort) {\n      mergeResults = await this.abortMerge(values);\n    } else if (!BitId.isValidVersion(firstValue)) {\n      const bitIds = this.getComponentsToMerge(consumer, values);\n      // @todo: version could be the lane only or remote/lane\n      mergeResults = await this.mergeComponentsFromRemote(\n        consumer,\n        bitIds,\n        mergeStrategy,\n        noSnap,\n        message,\n        build,\n        skipDependencyInstallation\n      );\n    } else {\n      const version = firstValue;\n      const ids = R.tail(values);\n      const bitIds = this.getComponentsToMerge(consumer, ids);\n      mergeResults = await mergeVersion(consumer, version, bitIds, mergeStrategy);\n    }\n    await consumer.onDestroy();\n    return mergeResults;\n  }\n\n  /**\n   * when user is on main, it merges the remote main components into local.\n   * when user is on a lane, it merges the remote lane components into the local lane.\n   */\n  async mergeComponentsFromRemote(\n    consumer: Consumer,\n    bitIds: BitId[],\n    mergeStrategy: MergeStrategy,\n    noSnap: boolean,\n    snapMessage: string,\n    build: boolean,\n    skipDependencyInstallation: boolean\n  ): Promise<ApplyVersionResults> {\n    const currentLaneId = consumer.getCurrentLaneId();\n    const currentLaneObject = await consumer.getCurrentLaneObject();\n    const allComponentsStatus = await this.getAllComponentsStatus(bitIds, currentLaneId, currentLaneObject);\n    const failedComponents = allComponentsStatus.filter((c) => c.unmergedMessage && !c.unmergedLegitimately);\n    if (failedComponents.length) {\n      const failureMsgs = failedComponents\n        .map(\n          (failedComponent) =>\n            `${chalk.bold(failedComponent.id.toString())} - ${chalk.red(failedComponent.unmergedMessage as string)}`\n        )\n        .join('\\n');\n      throw new BitError(`unable to merge due to the following failures:\\n${failureMsgs}`);\n    }\n\n    return this.mergeSnaps({\n      mergeStrategy,\n      allComponentsStatus,\n      laneId: currentLaneId,\n      localLane: currentLaneObject,\n      noSnap,\n      snapMessage,\n      build,\n      skipDependencyInstallation,\n    });\n  }\n\n  /**\n   * merge multiple components according to the \"allComponentsStatus\".\n   */\n  async mergeSnaps({\n    mergeStrategy,\n    allComponentsStatus,\n    laneId,\n    localLane,\n    noSnap,\n    tag,\n    snapMessage,\n    build,\n    skipDependencyInstallation,\n  }: {\n    mergeStrategy: MergeStrategy;\n    allComponentsStatus: ComponentMergeStatus[];\n    laneId: LaneId;\n    localLane: Lane | null;\n    noSnap: boolean;\n    tag?: boolean;\n    snapMessage: string;\n    build: boolean;\n    skipDependencyInstallation?: boolean;\n  }): Promise<ApplyVersionResults> {\n    const consumer = this.workspace.consumer;\n    const componentWithConflict = allComponentsStatus.find(\n      (component) => component.mergeResults && component.mergeResults.hasConflicts\n    );\n    if (componentWithConflict && !mergeStrategy) {\n      mergeStrategy = await getMergeStrategyInteractive();\n    }\n    const failedComponents: FailedComponents[] = allComponentsStatus\n      .filter((componentStatus) => componentStatus.unmergedMessage)\n      .map((componentStatus) => ({\n        id: componentStatus.id,\n        failureMessage: componentStatus.unmergedMessage as string,\n        unchangedLegitimately: componentStatus.unmergedLegitimately,\n      }));\n    const succeededComponents = allComponentsStatus.filter((componentStatus) => !componentStatus.unmergedMessage);\n    // do not use Promise.all for applyVersion. otherwise, it'll write all components in parallel,\n    // which can be an issue when some components are also dependencies of others\n    const componentsResults = await mapSeries(\n      succeededComponents,\n      async ({ currentComponent, id, mergeResults, resolvedUnrelated, configMergeResult }) => {\n        const modelComponent = await consumer.scope.getModelComponent(id);\n        const updatedLaneId = laneId.isDefault() ? LaneId.from(laneId.name, id.scope as string) : laneId;\n        return this.applyVersion({\n          currentComponent,\n          id,\n          mergeResults,\n          mergeStrategy,\n          remoteHead: modelComponent.getRef(id.version as string) as Ref,\n          laneId: updatedLaneId,\n          localLane,\n          resolvedUnrelated,\n          configMergeResult,\n        });\n      }\n    );\n\n    if (localLane) consumer.scope.objects.add(localLane);\n\n    await consumer.scope.objects.persist(); // persist anyway, if localLane is null it should save all main heads\n\n    await consumer.scope.objects.unmergedComponents.write();\n\n    await consumer.writeBitMap();\n\n    const componentsHasConfigMergeConflicts = allComponentsStatus.some((c) => c.configMergeResult?.hasConflicts());\n    const leftUnresolvedConflicts = componentWithConflict && mergeStrategy === 'manual';\n    if (!skipDependencyInstallation && !leftUnresolvedConflicts && !componentsHasConfigMergeConflicts) {\n      try {\n        await this.install.install(undefined, {\n          dedupe: true,\n          updateExisting: false,\n          import: false,\n        });\n      } catch (err: any) {\n        this.logger.error(`failed installing packages`, err);\n        this.logger.consoleError(`failed installing packages, see the log for full stacktrace. error: ${err.message}`);\n      }\n    }\n\n    const getSnapOrTagResults = async () => {\n      // if one of the component has conflict, don't snap-merge. otherwise, some of the components would be snap-merged\n      // and some not. besides the fact that it could by mistake tag dependent, it's a confusing state. better not snap.\n      if (noSnap || leftUnresolvedConflicts || componentsHasConfigMergeConflicts) {\n        return null;\n      }\n      if (tag) {\n        const idsToTag = allComponentsStatus.map((c) => c.id);\n        const results = await this.tagAllLaneComponent(idsToTag, snapMessage, build);\n        if (!results) return null;\n        const { taggedComponents, autoTaggedResults } = results;\n        return { snappedComponents: taggedComponents, autoSnappedResults: autoTaggedResults };\n      }\n      return this.snapResolvedComponents(consumer, snapMessage, build);\n    };\n    let mergeSnapResults: ApplyVersionResults['mergeSnapResults'] = null;\n    let mergeSnapError: Error | undefined;\n    try {\n      mergeSnapResults = await getSnapOrTagResults();\n    } catch (err: any) {\n      mergeSnapError = err;\n    }\n\n    return {\n      components: componentsResults,\n      failedComponents,\n      mergeSnapResults,\n      mergeSnapError,\n      leftUnresolvedConflicts,\n    };\n  }\n\n  /**\n   * this function gets called from two different commands:\n   * 1. \"bit merge <ids...>\", when merging a component from a remote to the local.\n   * in this case, the remote and local are on the same lane or both on main.\n   * 2. \"bit lane merge\", when merging from one lane to another.\n   */\n  async getMergeStatus(\n    bitIds: BitId[], // the id.version is the version we want to merge to the current component\n    currentLane: Lane | null, // currently checked out lane. if on main, then it's null.\n    otherLane?: Lane | null, // the lane we want to merged to our lane. (null if it's \"main\").\n    options?: { resolveUnrelated?: MergeStrategy; ignoreConfigChanges?: boolean }\n  ): Promise<ComponentMergeStatus[]> {\n    const componentStatusBeforeMergeAttempt = await Promise.all(\n      bitIds.map((id) => this.getComponentStatusBeforeMergeAttempt(id, currentLane, options))\n    );\n\n    const toImport = componentStatusBeforeMergeAttempt\n      .map((compStatus) => {\n        if (!compStatus.divergeData || !compStatus.divergeData.commonSnapBeforeDiverge) return [];\n        return [compStatus.id.changeVersion(compStatus.divergeData.commonSnapBeforeDiverge.toString())];\n      })\n      .flat();\n\n    await this.consumer.scope.scopeImporter.importManyIfMissingWithoutDeps({\n      ids: BitIds.fromArray(toImport),\n      lane: otherLane || undefined,\n    });\n\n    const compStatusNotNeedMerge = componentStatusBeforeMergeAttempt.filter(\n      (c) => !c.mergeProps\n    ) as ComponentMergeStatus[];\n    const compStatusNeedMerge = componentStatusBeforeMergeAttempt.filter((c) => c.mergeProps);\n\n    const otherLaneName = otherLane ? otherLane.toLaneId().toString() : DEFAULT_LANE;\n    const getComponentsStatusNeedMerge = async (): Promise<ComponentMergeStatus[]> => {\n      const tmp = new Tmp(this.consumer.scope);\n      try {\n        const componentsStatus = await Promise.all(\n          compStatusNeedMerge.map((compStatus) => this.getComponentMergeStatus(currentLane, otherLaneName, compStatus))\n        );\n        await tmp.clear();\n        return componentsStatus;\n      } catch (err: any) {\n        await tmp.clear();\n        throw err;\n      }\n    };\n    const results = await getComponentsStatusNeedMerge();\n\n    results.push(...compStatusNotNeedMerge);\n    return results;\n  }\n\n  private async getComponentStatusBeforeMergeAttempt(\n    id: BitId, // the id.version is the version we want to merge to the current component\n    localLane: Lane | null, // currently checked out lane. if on main, then it's null.\n    options?: { resolveUnrelated?: MergeStrategy; ignoreConfigChanges?: boolean }\n  ): Promise<ComponentMergeStatusBeforeMergeAttempt> {\n    const consumer = this.workspace.consumer;\n    const componentStatus: ComponentMergeStatus = { id };\n    const returnUnmerged = (msg: string, unmergedLegitimately = false) => {\n      componentStatus.unmergedMessage = msg;\n      componentStatus.unmergedLegitimately = unmergedLegitimately;\n      return componentStatus;\n    };\n    const modelComponent = await consumer.scope.getModelComponentIfExist(id);\n    if (!modelComponent) {\n      return returnUnmerged(\n        `component ${id.toString()} is on the lane/main but its objects were not found, please re-import the lane`\n      );\n    }\n    const unmerged = consumer.scope.objects.unmergedComponents.getEntry(id.name);\n    if (unmerged) {\n      return returnUnmerged(\n        `component ${id.toStringWithoutVersion()} is in during-merge state a previous merge, please snap/tag it first (or use bit merge --resolve/--abort)`\n      );\n    }\n    const repo = consumer.scope.objects;\n    const version = id.version as string;\n    const otherLaneHead = modelComponent.getRef(version);\n    const existingBitMapId = consumer.bitMap.getBitIdIfExist(id, { ignoreVersion: true });\n    const componentOnOther: Version = await modelComponent.loadVersion(version, consumer.scope.objects);\n    if (componentOnOther.isRemoved()) {\n      return returnUnmerged(`component has been removed`, true);\n    }\n    const getCurrentId = () => {\n      if (existingBitMapId) return existingBitMapId;\n      if (localLane) {\n        const idOnLane = localLane.getComponent(id);\n        if (!idOnLane) return null;\n        return idOnLane.id.changeVersion(idOnLane.head.toString());\n      }\n      // it's on main\n      const head = modelComponent.getHeadAsTagIfExist();\n      if (head) {\n        return id.changeVersion(head);\n      }\n      return null;\n    };\n    const currentId = getCurrentId();\n    if (!currentId) {\n      const divergeData = await getDivergeData({ repo, modelComponent, targetHead: otherLaneHead, throws: false });\n      return { currentComponent: null, componentFromModel: componentOnOther, id, divergeData };\n    }\n    const getCurrentComponent = () => {\n      if (existingBitMapId) return consumer.loadComponent(existingBitMapId);\n      return consumer.scope.getConsumerComponent(currentId);\n    };\n    const currentComponent = await getCurrentComponent();\n    if (currentComponent.removed) {\n      return returnUnmerged(`component has been removed`, true);\n    }\n    const isModified = async () => {\n      const componentModificationStatus = await consumer.getComponentStatusById(currentComponent.id);\n      if (!componentModificationStatus.modified) return false;\n      if (!existingBitMapId) return false;\n      const baseComponent = await modelComponent.loadVersion(\n        existingBitMapId.version as string,\n        consumer.scope.objects\n      );\n      return options?.ignoreConfigChanges\n        ? consumer.isComponentSourceCodeModified(baseComponent, currentComponent)\n        : true;\n    };\n\n    const isComponentModified = await isModified();\n\n    if (isComponentModified) {\n      return returnUnmerged(`component is modified, please snap/tag it first`);\n    }\n    if (!otherLaneHead) {\n      throw new Error(`merging: unable finding a hash for the version ${version} of ${id.toString()}`);\n    }\n    const divergeData = await getDivergeData({\n      repo,\n      modelComponent,\n      targetHead: otherLaneHead,\n      throws: false,\n    });\n    if (divergeData.err) {\n      const mainHead = modelComponent.head;\n      if (divergeData.err instanceof NoCommonSnap && options?.resolveUnrelated && mainHead) {\n        const hasResolvedFromMain = async (hashToCompare: Ref | null) => {\n          const divergeDataFromMain = await getDivergeData({\n            repo,\n            modelComponent,\n            sourceHead: hashToCompare,\n            targetHead: mainHead,\n            throws: false,\n          });\n          if (!divergeDataFromMain.err) return true;\n          return !(divergeDataFromMain.err instanceof NoCommonSnap);\n        };\n        const hasResolvedLocally = await hasResolvedFromMain(modelComponent.getHeadRegardlessOfLane() as Ref);\n        const hasResolvedRemotely = await hasResolvedFromMain(otherLaneHead);\n        if (!hasResolvedLocally && !hasResolvedRemotely) {\n          return returnUnmerged(\n            `unable to traverse ${currentComponent.id.toString()} history. the main-head ${mainHead.toString()} doesn't appear in both lanes, it was probably created in each lane separately`\n          );\n        }\n        const versionToSaveInLane = hasResolvedLocally ? currentComponent.id.version : id.version;\n        const resolvedRef = modelComponent.getRef(versionToSaveInLane as string);\n        if (!resolvedRef) throw new Error(`unable to get ref of \"${versionToSaveInLane}\" for \"${id.toString()}\"`);\n        if (options?.resolveUnrelated === 'theirs') {\n          // just override with the model data\n          return {\n            currentComponent,\n            componentFromModel: componentOnOther,\n            id,\n            divergeData,\n            resolvedUnrelated: { strategy: 'theirs', head: resolvedRef },\n          };\n        }\n        if (options?.resolveUnrelated === 'ours') {\n          return {\n            currentComponent,\n            id,\n            divergeData,\n            resolvedUnrelated: { strategy: 'ours', head: resolvedRef },\n          };\n        }\n        throw new Error(\n          `unsupported strategy \"${options?.resolveUnrelated}\" of resolve-unrelated. supported strategies are: [ours, theirs]`\n        );\n      }\n      return returnUnmerged(\n        `unable to traverse ${currentComponent.id.toString()} history. error: ${divergeData.err.message}`\n      );\n    }\n    if (!divergeData.isDiverged()) {\n      if (divergeData.isSourceAhead()) {\n        // do nothing!\n        return returnUnmerged(`component ${currentComponent.id.toString()} is ahead, nothing to merge`, true);\n      }\n      if (divergeData.isTargetAhead()) {\n        // just override with the model data\n        return {\n          currentComponent,\n          componentFromModel: componentOnOther,\n          id,\n          divergeData,\n        };\n      }\n      // we know that localHead and remoteHead are set, so if none of them is ahead they must be equal\n      return returnUnmerged(`component ${currentComponent.id.toString()} is already merged`, true);\n    }\n\n    // it's diverged and needs merge operation\n    const mergeProps = {\n      otherLaneHead,\n      currentId,\n      modelComponent,\n    };\n    return { currentComponent, id, divergeData, mergeProps };\n  }\n\n  private async getComponentMergeStatus(\n    localLane: Lane | null, // currently checked out lane. if on main, then it's null.\n    otherLaneName: string, // the lane name we want to merged to our lane. (can be also \"main\").\n    componentMergeStatusBeforeMergeAttempt: ComponentMergeStatusBeforeMergeAttempt\n  ) {\n    const { id, divergeData, currentComponent, mergeProps } = componentMergeStatusBeforeMergeAttempt;\n    if (!mergeProps) throw new Error(`getDivergedMergeStatus, mergeProps is missing for ${id.toString()}`);\n    const { otherLaneHead, currentId, modelComponent } = mergeProps;\n    const consumer = this.workspace.consumer;\n    const repo = consumer.scope.objects;\n    if (!divergeData) throw new Error(`getDivergedMergeStatus, divergeData is missing for ${id.toString()}`);\n    if (!currentComponent) throw new Error(`getDivergedMergeStatus, currentComponent is missing for ${id.toString()}`);\n\n    const baseSnap = divergeData.commonSnapBeforeDiverge as Ref; // must be set when isTrueMerge\n    // uncomment for debugging\n    // console.log('id', id.toStringWithoutVersion(), 'baseSnap', baseSnap.toString(), 'current', currentId.version, 'other', otherLaneHead.toString());\n    const baseComponent: Version = await modelComponent.loadVersion(baseSnap.toString(), repo);\n    const otherComponent: Version = await modelComponent.loadVersion(otherLaneHead.toString(), repo);\n\n    const currentLaneName = localLane?.toLaneId().toString() || 'main';\n    const currentLabel = `${currentId.version} (${currentLaneName === otherLaneName ? 'current' : currentLaneName})`;\n    const otherLabel = `${otherLaneHead.toString()} (${\n      otherLaneName === currentLaneName ? 'incoming' : otherLaneName\n    })`;\n    const workspaceIds = await this.workspace.listIds();\n    const configMerger = new ConfigMerger(\n      id.toStringWithoutVersion(),\n      workspaceIds,\n      currentComponent.extensions,\n      baseComponent.extensions,\n      otherComponent.extensions,\n      currentLabel,\n      otherLabel\n    );\n    const configMergeResult = configMerger.merge();\n\n    const mergeResults = await threeWayMerge({\n      consumer,\n      otherComponent,\n      otherLabel,\n      currentComponent,\n      currentLabel,\n      baseComponent,\n    });\n    return { currentComponent, id, mergeResults, divergeData, configMergeResult };\n  }\n\n  private async applyVersion({\n    currentComponent,\n    id,\n    mergeResults,\n    mergeStrategy,\n    remoteHead,\n    laneId,\n    localLane,\n    resolvedUnrelated,\n    configMergeResult,\n  }: {\n    currentComponent: ConsumerComponent | null | undefined;\n    id: BitId;\n    mergeResults: MergeResultsThreeWay | null | undefined;\n    mergeStrategy: MergeStrategy;\n    remoteHead: Ref;\n    laneId: LaneId;\n    localLane: Lane | null;\n    resolvedUnrelated?: ResolveUnrelatedData;\n    configMergeResult?: ConfigMergeResult;\n  }): Promise<ApplyVersionResult> {\n    const consumer = this.workspace.consumer;\n    let filesStatus = {};\n    const unmergedComponent: UnmergedComponent = {\n      // @ts-ignore\n      id: { name: id.name, scope: id.scope },\n      head: remoteHead,\n      remote: laneId.scope, // @todo: remove. it has been deprecated around 0.0.832\n      lane: laneId.name, // @todo: remove. it has been deprecated around 0.0.832\n      laneId,\n    };\n    id = currentComponent ? currentComponent.id : id;\n\n    const modelComponent = await consumer.scope.getModelComponent(id);\n    const handleResolveUnrelated = () => {\n      if (!currentComponent) throw new Error('currentComponent must be defined when resolvedUnrelated');\n      if (!localLane) throw new Error('localLane must be defined when resolvedUnrelated');\n      if (!resolvedUnrelated?.head) throw new Error('resolvedUnrelated must have head prop');\n      localLane.addComponent({ id, head: resolvedUnrelated.head });\n      const head = modelComponent.getRef(currentComponent.id.version as string);\n      if (!head) throw new Error(`unable to get the head for resolved-unrelated ${id.toString()}`);\n      unmergedComponent.laneId = localLane.toLaneId();\n      unmergedComponent.head = head;\n      unmergedComponent.unrelated = true;\n      consumer.scope.objects.unmergedComponents.addEntry(unmergedComponent);\n      return { id, filesStatus };\n    };\n\n    const markAllFilesAsUnchanged = () => {\n      if (!currentComponent) throw new Error(`applyVersion expect to get currentComponent for ${id.toString()}`);\n      currentComponent.files.forEach((file) => {\n        filesStatus[pathNormalizeToLinux(file.relative)] = FileStatus.unchanged;\n      });\n    };\n    if (mergeResults && mergeResults.hasConflicts && mergeStrategy === MergeOptions.ours) {\n      markAllFilesAsUnchanged();\n      consumer.scope.objects.unmergedComponents.addEntry(unmergedComponent);\n      return { id, filesStatus };\n    }\n    if (resolvedUnrelated?.strategy === 'ours') {\n      markAllFilesAsUnchanged();\n      return handleResolveUnrelated();\n    }\n    const remoteId = id.changeVersion(remoteHead.toString());\n    const idToLoad = !mergeResults || mergeStrategy === MergeOptions.theirs ? remoteId : id;\n    const componentWithDependencies = await consumer.loadComponentWithDependenciesFromModel(idToLoad);\n    const files = componentWithDependencies.component.files;\n    files.forEach((file) => {\n      // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n      filesStatus[pathNormalizeToLinux(file.relative)] = FileStatus.updated;\n    });\n\n    if (mergeResults) {\n      // update files according to the merge results\n      const { filesStatus: modifiedStatus, modifiedFiles } = applyModifiedVersion(files, mergeResults, mergeStrategy);\n      componentWithDependencies.component.files = modifiedFiles;\n      filesStatus = { ...filesStatus, ...modifiedStatus };\n    }\n\n    const manyComponentsWriter = new ManyComponentsWriter({\n      consumer,\n      componentsWithDependencies: [componentWithDependencies],\n      installNpmPackages: false,\n      override: true,\n      writeConfig: false, // @todo: should write if config exists before, needs to figure out how to do it.\n      verbose: false, // @todo: do we need a flag here?\n    });\n    await manyComponentsWriter.writeAll();\n\n    if (configMergeResult) {\n      if (!componentWithDependencies.component.writtenPath) {\n        throw new Error(`componentWithDependencies.component.writtenPath is missing for ${id.toString()}`);\n      }\n      const configMergeConflictFile = configMergeResult.generateMergeConflictFile();\n      if (configMergeConflictFile) {\n        const configMergePath = path.join(\n          consumer.getPath(),\n          componentWithDependencies.component.writtenPath,\n          MergeConfigFilename\n        );\n        await fs.outputFile(configMergePath, configMergeConflictFile);\n      }\n      const successfullyMergedConfig = configMergeResult.getSuccessfullyMergedConfig();\n      if (successfullyMergedConfig) {\n        unmergedComponent.mergedConfig = successfullyMergedConfig;\n        // no need to `unmergedComponents.addEntry` here. it'll be added in the next lines inside `if (mergeResults)`.\n        // because if `configMergeResult` is set, `mergeResults` must be set as well. both happen on diverge.\n      }\n    }\n\n    // if mergeResults, the head snap is going to be updated on a later phase when snapping with two parents\n    // otherwise, update the head of the current lane or main\n    if (mergeResults) {\n      if (mergeResults.hasConflicts && mergeStrategy === MergeOptions.manual) {\n        unmergedComponent.unmergedPaths = mergeResults.modifiedFiles.filter((f) => f.conflict).map((f) => f.filePath);\n      }\n      consumer.scope.objects.unmergedComponents.addEntry(unmergedComponent);\n    } else if (localLane) {\n      if (resolvedUnrelated) {\n        // must be \"theirs\"\n        return handleResolveUnrelated();\n      }\n      localLane.addComponent({ id, head: remoteHead });\n    } else {\n      // this is main\n      modelComponent.setHead(remoteHead);\n      // mark it as local, otherwise, when importing this component from a remote, it'll override it.\n      modelComponent.markVersionAsLocal(remoteHead.toString());\n      consumer.scope.objects.add(modelComponent);\n    }\n\n    return { id, filesStatus };\n  }\n\n  private async abortMerge(values: string[]): Promise<ApplyVersionResults> {\n    const consumer = this.workspace.consumer;\n    const ids = await this.getIdsForUnmerged(values);\n    const results = await this.checkout.checkout({ ids, reset: true });\n    ids.forEach((id) => consumer.scope.objects.unmergedComponents.removeComponent(id.fullName));\n    await consumer.scope.objects.unmergedComponents.write();\n    return { abortedComponents: results.components };\n  }\n\n  private async resolveMerge(values: string[], snapMessage: string, build: boolean): Promise<ApplyVersionResults> {\n    const ids = await this.getIdsForUnmerged(values);\n    // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n    const { snappedComponents } = await this.snapping.snap({\n      legacyBitIds: BitIds.fromArray(ids.map((id) => id._legacy)),\n      build,\n      message: snapMessage,\n    });\n    return { resolvedComponents: snappedComponents };\n  }\n\n  private async getAllComponentsStatus(\n    bitIds: BitId[],\n    laneId: LaneId,\n    localLaneObject: Lane | null\n  ): Promise<ComponentMergeStatus[]> {\n    const ids = await Promise.all(\n      bitIds.map(async (bitId) => {\n        const remoteScopeName = laneId.isDefault() ? bitId.scope : laneId.scope;\n        const remoteLaneId = LaneId.from(laneId.name, remoteScopeName as string);\n        const remoteHead = await this.consumer.scope.objects.remoteLanes.getRef(remoteLaneId, bitId);\n        const laneIdStr = remoteLaneId.toString();\n        if (!remoteHead) {\n          throw new BitError(`unable to find a remote head of \"${bitId.toStringWithoutVersion()}\" in \"${laneIdStr}\"`);\n        }\n        return bitId.changeVersion(remoteHead.toString());\n      })\n    );\n\n    return this.getMergeStatus(ids, localLaneObject, localLaneObject);\n  }\n\n  private async snapResolvedComponents(\n    consumer: Consumer,\n    snapMessage: string,\n    build: boolean\n  ): Promise<null | { snappedComponents: ConsumerComponent[]; autoSnappedResults: AutoTagResult[] }> {\n    const unmergedComponents = consumer.scope.objects.unmergedComponents.getComponents();\n    this.logger.debug(`merge-snaps, snapResolvedComponents, total ${unmergedComponents.length.toString()} components`);\n    if (!unmergedComponents.length) return null;\n    const ids = BitIds.fromArray(unmergedComponents.map((r) => new BitId(r.id)));\n    return this.snapping.snap({\n      legacyBitIds: ids,\n      build,\n      message: snapMessage,\n    });\n  }\n\n  private async tagAllLaneComponent(idsToTag: BitId[], tagMessage: string, build: boolean): Promise<TagResults | null> {\n    const ids = idsToTag.map((id) => {\n      return id.toStringWithoutVersion();\n    });\n    this.logger.debug(`merge-snaps, tagResolvedComponents, total ${idsToTag.length.toString()} components`);\n    return this.snapping.tag({\n      ids,\n      build,\n      message: tagMessage,\n      unmodified: true,\n    });\n  }\n\n  private async getIdsForUnmerged(idsStr?: string[]): Promise<ComponentID[]> {\n    if (idsStr && idsStr.length) {\n      const componentIds = await this.workspace.resolveMultipleComponentIds(idsStr);\n      componentIds.forEach((id) => {\n        const entry = this.workspace.consumer.scope.objects.unmergedComponents.getEntry(id.fullName);\n        if (!entry) {\n          throw new GeneralError(`unable to merge-resolve ${id.toString()}, it is not marked as unresolved`);\n        }\n      });\n      return componentIds;\n    }\n    const unresolvedComponents = this.workspace.consumer.scope.objects.unmergedComponents.getComponents();\n    if (!unresolvedComponents.length) throw new GeneralError(`all components are resolved already, nothing to do`);\n    return unresolvedComponents.map((u) => ComponentID.fromLegacy(new BitId(u.id)));\n  }\n\n  private getComponentsToMerge(consumer: Consumer, ids: string[]): BitId[] {\n    if (hasWildcard(ids)) {\n      const componentsList = new ComponentsList(consumer);\n      return componentsList.listComponentsByIdsWithWildcard(ids);\n    }\n    return ids.map((id) => consumer.getParsedId(id));\n  }\n\n  static slots = [];\n  static dependencies = [CLIAspect, WorkspaceAspect, SnappingAspect, CheckoutAspect, InstallAspect, LoggerAspect];\n  static runtime = MainRuntime;\n  static async provider([cli, workspace, snapping, checkout, install, loggerMain]: [\n    CLIMain,\n    Workspace,\n    SnappingMain,\n    CheckoutMain,\n    InstallMain,\n    LoggerMain\n  ]) {\n    const logger = loggerMain.createLogger(MergingAspect.id);\n    const merging = new MergingMain(workspace, install, snapping, checkout, logger);\n    cli.register(new MergeCmd(merging));\n    return merging;\n  }\n}\n\nMergingAspect.addRuntime(MergingMain);\n"],"mappings":"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"}

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@teambit/merging",
-  "version": "0.0.255",
+  "version": "0.0.257",
   "homepage": "https://bit.dev/teambit/component/merging",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.component",
     "name": "merging",
-    "version": "0.0.255"
+    "version": "0.0.257"
   },
   "dependencies": {
     "lodash": "4.17.21",
@@ -19,16 +19,16 @@
     "@babel/runtime": "7.20.0",
     "@teambit/harmony": "0.4.6",
     "@teambit/component-id": "0.0.425",
-    "@teambit/dependency-resolver": "0.0.940",
-    "@teambit/envs": "0.0.940",
+    "@teambit/dependency-resolver": "0.0.942",
+    "@teambit/envs": "0.0.942",
     "@teambit/bit-error": "0.0.402",
-    "@teambit/cli": "0.0.630",
-    "@teambit/checkout": "0.0.109",
-    "@teambit/install": "0.0.78",
-    "@teambit/lane-id": "0.0.148",
-    "@teambit/logger": "0.0.723",
-    "@teambit/snapping": "0.0.255",
-    "@teambit/workspace": "0.0.940"
+    "@teambit/cli": "0.0.631",
+    "@teambit/checkout": "0.0.111",
+    "@teambit/install": "0.0.79",
+    "@teambit/lane-id": "0.0.149",
+    "@teambit/logger": "0.0.724",
+    "@teambit/snapping": "0.0.257",
+    "@teambit/workspace": "0.0.942"
   },
   "devDependencies": {
     "chai": "4.3.0",
@@ -44,7 +44,7 @@
     "@types/testing-library__jest-dom": "5.9.5"
   },
   "peerDependencies": {
-    "@teambit/legacy": "1.0.411",
+    "@teambit/legacy": "1.0.412",
     "react": "^16.8.0 || ^17.0.0",
     "react-dom": "^16.8.0 || ^17.0.0"
   },