@teambit/config-merger 0.0.2 → 0.0.3

package/artifacts/preview/teambit_workspace_config_merger-preview.js

@@ -0,0 +1 @@
+!function(e,o){"object"==typeof exports&&"object"==typeof module?module.exports=o():"function"==typeof define&&define.amd?define([],o):"object"==typeof exports?exports["teambit.workspace/config-merger-preview"]=o():e["teambit.workspace/config-merger-preview"]=o()}(self,(()=>(()=>{"use strict";var e={d:(o,t)=>{for(var r in t)e.o(t,r)&&!e.o(o,r)&&Object.defineProperty(o,r,{enumerable:!0,get:t[r]})},o:(e,o)=>Object.prototype.hasOwnProperty.call(e,o),r:e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})}},o={};e.r(o),e.d(o,{compositions:()=>t,compositions_metadata:()=>i,overview:()=>r});const t=[],r=[],i={compositions:[]};return o})()));

package/dist/component-config-merger.d.ts

@@ -3,9 +3,9 @@ import { Logger } from '@teambit/logger';
 import { Lane } from '@teambit/legacy/dist/scope/models';
 import { ExtensionDataList } from '@teambit/legacy/dist/consumer/config/extension-data';
 import { ConfigMergeResult } from './config-merge-result';
-export declare type GenericConfigOrRemoved = Record<string, any> | '-';
+export type GenericConfigOrRemoved = Record<string, any> | '-';
 export declare const conflictIndicator = "CONFLICT::";
-export declare type MergeStrategyResult = {
+export type MergeStrategyResult = {
     id: string;
     mergedConfig?: GenericConfigOrRemoved;
     conflict?: Record<string, any>;

package/dist/component-config-merger.js

@@ -99,7 +99,7 @@ class ComponentConfigMerger {
     _defineProperty(this, "handledExtIds", [_builder().default.id]);
     // don't try to merge builder, it's possible that at one end it wasn't built yet, so it's empty
     _defineProperty(this, "otherLaneIdsStr", void 0);
-    this.otherLaneIdsStr = (otherLane === null || otherLane === void 0 ? void 0 : otherLane.toBitIds().map(id => id.toString())) || [];
+    this.otherLaneIdsStr = otherLane?.toBitIds().map(id => id.toString()) || [];
   }
   merge() {
     this.logger.debug(`\n************** start config-merger for ${this.compIdStr} **************`);
@@ -194,23 +194,20 @@ class ComponentConfigMerger {
     // populate version
     const currentEnvAspect = this.currentAspects.findExtension(currentEnv, true);
     if (currentEnvAspect) {
-      var _currentEnvAspect$ext;
       this.handledExtIds.push(currentEnvAspect.stringId);
-      this.currentEnv.version = (_currentEnvAspect$ext = currentEnvAspect.extensionId) === null || _currentEnvAspect$ext === void 0 ? void 0 : _currentEnvAspect$ext.version;
+      this.currentEnv.version = currentEnvAspect.extensionId?.version;
       this.currentEnv.config = this.getConfig(currentEnvAspect);
     }
     const otherEnvAspect = this.otherAspects.findExtension(otherEnv, true);
     if (otherEnvAspect) {
-      var _otherEnvAspect$exten;
       this.handledExtIds.push(otherEnvAspect.stringId);
-      this.otherEnv.version = (_otherEnvAspect$exten = otherEnvAspect.extensionId) === null || _otherEnvAspect$exten === void 0 ? void 0 : _otherEnvAspect$exten.version;
+      this.otherEnv.version = otherEnvAspect.extensionId?.version;
       this.otherEnv.config = this.getConfig(otherEnvAspect);
     }
     if (this.baseEnv) {
       const baseEnvAspect = this.baseAspects.findExtension(baseEnv, true);
       if (baseEnvAspect) {
-        var _baseEnvAspect$extens;
-        this.baseEnv.version = (_baseEnvAspect$extens = baseEnvAspect.extensionId) === null || _baseEnvAspect$extens === void 0 ? void 0 : _baseEnvAspect$extens.version;
+        this.baseEnv.version = baseEnvAspect.extensionId?.version;
         this.baseEnv.config = this.getConfig(baseEnvAspect);
       }
     }
@@ -226,9 +223,8 @@ class ComponentConfigMerger {
       }
     };
     if (this.baseEnv) {
-      var _this$baseEnv, _this$baseEnv2;
       mergeStrategyParams.baseConfig = {
-        env: (_this$baseEnv = this.baseEnv) !== null && _this$baseEnv !== void 0 && _this$baseEnv.version ? `${this.baseEnv.id}@${this.baseEnv.version}` : (_this$baseEnv2 = this.baseEnv) === null || _this$baseEnv2 === void 0 ? void 0 : _this$baseEnv2.id
+        env: this.baseEnv?.version ? `${this.baseEnv.id}@${this.baseEnv.version}` : this.baseEnv?.id
       };
     }
     if (this.currentEnv.id === this.otherEnv.id && this.currentEnv.version === this.otherEnv.version) {
@@ -314,10 +310,9 @@ class ComponentConfigMerger {
     this.logger.debug(`otherConfig, ${JSON.stringify(otherConfig, undefined, 2)}`);
     this.logger.debug(`baseConfig, ${JSON.stringify(baseConfig, undefined, 2)}`);
     const getAllDeps = ext => {
-      var _ext$findCoreExtensio, _ext$findCoreExtensio2;
-      const data = (_ext$findCoreExtensio = ext.findCoreExtension(_dependencyResolver().DependencyResolverAspect.id)) === null || _ext$findCoreExtensio === void 0 ? void 0 : _ext$findCoreExtensio.data.dependencies;
+      const data = ext.findCoreExtension(_dependencyResolver().DependencyResolverAspect.id)?.data.dependencies;
       if (!data) return [];
-      const policy = ((_ext$findCoreExtensio2 = ext.findCoreExtension(_dependencyResolver().DependencyResolverAspect.id)) === null || _ext$findCoreExtensio2 === void 0 ? void 0 : _ext$findCoreExtensio2.data.policy) || [];
+      const policy = ext.findCoreExtension(_dependencyResolver().DependencyResolverAspect.id)?.data.policy || [];
       return data.map(d => {
         const idWithoutVersion = d.__type === 'package' ? d.id : d.id.split('@')[0];
         const existingPolicy = policy.find(p => p.dependencyId === idWithoutVersion);
@@ -336,8 +331,7 @@ class ComponentConfigMerger {
       });
     };
     const getDataPolicy = ext => {
-      var _ext$findCoreExtensio3;
-      return ((_ext$findCoreExtensio3 = ext.findCoreExtension(_dependencyResolver().DependencyResolverAspect.id)) === null || _ext$findCoreExtensio3 === void 0 ? void 0 : _ext$findCoreExtensio3.data.policy) || [];
+      return ext.findCoreExtension(_dependencyResolver().DependencyResolverAspect.id)?.data.policy || [];
     };
     const getAutoDeps = ext => {
       const allDeps = getAllDeps(ext);
@@ -352,7 +346,7 @@ class ComponentConfigMerger {
     const baseData = getAutoDeps(this.baseAspects);
     const getCompIdStrByPkgNameFromData = pkgName => {
       const found = currentAndOtherComponentsData.find(d => d.packageName === pkgName);
-      return found === null || found === void 0 ? void 0 : found.id;
+      return found?.id;
     };
     const getFromCurrentDataByPackageName = pkgName => {
       return currentAllData.find(d => {
@@ -438,7 +432,7 @@ class ComponentConfigMerger {
         const depType = lifecycleToDepType[dep.lifecycleType];
         const currentDep = currentConfigPolicy.find(d => d.dependencyId === dep.dependencyId);
         const otherDep = otherConfigPolicy.find(d => d.dependencyId === dep.dependencyId);
-        const baseDep = baseConfigPolicy === null || baseConfigPolicy === void 0 ? void 0 : baseConfigPolicy.find(d => d.dependencyId === dep.dependencyId);
+        const baseDep = baseConfigPolicy?.find(d => d.dependencyId === dep.dependencyId);
         if (!otherDep) {
           return;
         }
@@ -452,7 +446,7 @@ class ComponentConfigMerger {
         if (currentVer === otherVer) {
           return;
         }
-        const baseVer = baseDep === null || baseDep === void 0 ? void 0 : baseDep.value.version;
+        const baseVer = baseDep?.value.version;
         if (baseVer && baseVer === otherVer) {
           return;
         }
@@ -538,7 +532,7 @@ class ComponentConfigMerger {
       if (currentVer === otherVer) {
         return;
       }
-      const baseVer = (baseDep === null || baseDep === void 0 ? void 0 : baseDep.policy) || (baseDep === null || baseDep === void 0 ? void 0 : baseDep.version);
+      const baseVer = baseDep?.policy || baseDep?.version;
       if (baseVer && baseVer === otherVer) {
         return;
       }

package/dist/component-config-merger.js.map

@@ -1 +1 @@
-{"version":3,"names":["_semver","data","_interopRequireDefault","require","_builder","_componentVersion","_dependencyResolver","_envs","_lodash","_configMergeResult","obj","__esModule","default","ownKeys","e","r","t","Object","keys","getOwnPropertySymbols","o","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","defineProperty","key","value","_toPropertyKey","configurable","writable","i","_toPrimitive","String","Symbol","toPrimitive","call","TypeError","Number","conflictIndicator","exports","ComponentConfigMerger","constructor","compIdStr","workspaceIds","otherLane","currentAspects","baseAspects","otherAspects","currentLabel","otherLabel","logger","BuilderAspect","id","otherLaneIdsStr","toBitIds","map","toString","merge","debug","populateEnvs","results","currentExt","stringId","handledExtIds","includes","baseExt","findExtension","otherExt","mergePerStrategy","conflict","currentConfig","getConfig","otherConfig","otherAspectsNotHandledResults","extensionId","hasVersion","idFromWorkspace","getIdFromWorkspace","toStringWithoutVersion","existingExt","_legacy","mergedConfig","envResult","envStrategy","ConfigMergeResult","compact","getEnvId","ext","envsAspect","findCoreExtension","EnvsAspect","Error","env","config","currentEnv","otherEnv","baseEnv","undefined","currentEnvAspect","_currentEnvAspect$ext","version","otherEnvAspect","_otherEnvAspect$exten","baseEnvAspect","_baseEnvAspect$extens","mergeStrategyParams","_this$baseEnv","_this$baseEnv2","baseConfig","isIdInWorkspaceOrOtherLane","basicConfigMerge","areConfigsEqual","configA","configB","JSON","stringify","depResolverResult","depResolverStrategy","params","DependencyResolverAspect","trace","currentConfigPolicy","getPolicy","otherConfigPolicy","baseConfigPolicy","getAllDeps","_ext$findCoreExtensio","_ext$findCoreExtensio2","dependencies","policy","d","idWithoutVersion","__type","split","existingPolicy","find","p","dependencyId","getPolicyVer","getDataPolicy","_ext$findCoreExtensio3","getAutoDeps","allDeps","source","currentAutoData","currentAllData","currentDataPolicy","otherData","currentAndOtherData","uniqBy","concat","currentAndOtherComponentsData","c","baseData","getCompIdStrByPkgNameFromData","pkgName","found","packageName","getFromCurrentDataByPackageName","getFromCurrentDataPolicyByPackageName","mergedPolicy","devDependencies","peerDependencies","conflictedPolicy","hasConflict","lifecycleToDepType","runtime","dev","peer","handleConfigMerge","addVariantPolicyEntryToPolicy","dep","fromCurrentData","force","isHash","semver","satisfies","fromCurrentDataPolicy","depType","lifecycleType","name","currentAndOtherConfig","currentDep","otherDep","baseDep","currentVer","otherVer","baseVer","hasConfigForDep","depName","getDepIdAsPkgName","addSerializedDepToPolicy","lifecycle","join","depData","isEnv","currentId","versionOnOtherLane","Boolean","rawConfig","omit","VariantPolicy","fromConfigObject","entries"],"sources":["component-config-merger.ts"],"sourcesContent":["import { ComponentID } from '@teambit/component-id';\nimport semver from 'semver';\nimport { Logger } from '@teambit/logger';\nimport BuilderAspect from '@teambit/builder';\nimport { isHash } from '@teambit/component-version';\nimport {\n  DependencyResolverAspect,\n  SerializedDependency,\n  VariantPolicy,\n  VariantPolicyEntry,\n} from '@teambit/dependency-resolver';\nimport { Lane } from '@teambit/legacy/dist/scope/models';\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\nexport type GenericConfigOrRemoved = Record<string, any> | '-';\n\ntype EnvData = { id: string; version?: string; config?: GenericConfigOrRemoved };\n\ntype SerializedDependencyWithPolicy = SerializedDependency & { policy?: string; packageName?: string };\n\nexport const conflictIndicator = 'CONFLICT::';\n\nexport type MergeStrategyResult = {\n  id: string;\n  mergedConfig?: GenericConfigOrRemoved;\n  conflict?: Record<string, any>;\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 ComponentConfigMerger {\n  private currentEnv: EnvData;\n  private otherEnv: EnvData;\n  private baseEnv?: EnvData;\n  private handledExtIds: string[] = [BuilderAspect.id]; // don't try to merge builder, it's possible that at one end it wasn't built yet, so it's empty\n  private otherLaneIdsStr: string[];\n  constructor(\n    private compIdStr: string,\n    private workspaceIds: ComponentID[],\n    otherLane: Lane | undefined,\n    private currentAspects: ExtensionDataList,\n    private baseAspects: ExtensionDataList,\n    private otherAspects: ExtensionDataList,\n    private currentLabel: string,\n    private otherLabel: string,\n    private logger: Logger\n  ) {\n    this.otherLaneIdsStr = otherLane?.toBitIds().map((id) => id.toString()) || [];\n  }\n\n  merge(): ConfigMergeResult {\n    this.logger.debug(`\\n************** start config-merger for ${this.compIdStr} **************`);\n    this.logger.debug(`currentLabel: ${this.currentLabel}`);\n    this.logger.debug(`otherLabel: ${this.otherLabel}`);\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 { id, conflict: { 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) {\n          const existingExt = this.currentAspects.findExtension(otherExt.extensionId.toStringWithoutVersion(), true);\n          if (existingExt) return null; // the aspect is set currently, no need to add it again.\n          id = idFromWorkspace._legacy.toString();\n        }\n      }\n      const baseExt = this.baseAspects.findExtension(id, true);\n      if (baseExt) {\n        // was removed on current\n        return { id, conflict: { 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    this.logger.debug(`*** end config-merger for ${this.compIdStr} ***\\n`);\n    return new ConfigMergeResult(\n      this.compIdStr,\n      this.currentLabel,\n      this.otherLabel,\n      compact([...results, ...otherAspectsNotHandledResults, ...envResult])\n    );\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 = this.getConfig(currentEnvAspect);\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 = this.getConfig(otherEnvAspect);\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 = this.getConfig(baseEnvAspect);\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.isIdInWorkspaceOrOtherLane(this.currentEnv.id, this.otherEnv.version)) {\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\n    if (depResolverResult) {\n      // if (depResolverResult.mergedConfig || depResolverResult?.conflict) console.log(\"\\n\\nDepResolverResult\", this.compIdStr, '\\n', JSON.stringify(depResolverResult, undefined, 2))\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    return { id, conflict: { currentConfig, otherConfig, baseConfig } };\n  }\n\n  private depResolverStrategy(params: MergeStrategyParams): MergeStrategyResult | undefined {\n    if (params.id !== DependencyResolverAspect.id) return undefined;\n    this.logger.trace(`start depResolverStrategy for ${this.compIdStr}`);\n    const { currentExt, otherExt, baseExt } = params;\n\n    const currentConfig = this.getConfig(currentExt);\n    const currentConfigPolicy = this.getPolicy(currentConfig);\n    const otherConfig = this.getConfig(otherExt);\n    const otherConfigPolicy = this.getPolicy(otherConfig);\n\n    const baseConfig = baseExt ? this.getConfig(baseExt) : undefined;\n    const baseConfigPolicy = baseConfig ? this.getPolicy(baseConfig) : undefined;\n\n    this.logger.debug(`currentConfig, ${JSON.stringify(currentConfig, undefined, 2)}`);\n    this.logger.debug(`otherConfig, ${JSON.stringify(otherConfig, undefined, 2)}`);\n    this.logger.debug(`baseConfig, ${JSON.stringify(baseConfig, undefined, 2)}`);\n\n    const getAllDeps = (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.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          return d.version;\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    const getDataPolicy = (ext: ExtensionDataList): VariantPolicyEntry[] => {\n      return ext.findCoreExtension(DependencyResolverAspect.id)?.data.policy || [];\n    };\n\n    const getAutoDeps = (ext: ExtensionDataList): SerializedDependencyWithPolicy[] => {\n      const allDeps = getAllDeps(ext);\n      return allDeps.filter((d) => d.source === 'auto');\n    };\n\n    const currentAutoData = getAutoDeps(this.currentAspects);\n    const currentAllData = getAllDeps(this.currentAspects);\n    const currentDataPolicy = getDataPolicy(this.currentAspects);\n    const otherData = getAutoDeps(this.otherAspects);\n    const currentAndOtherData = uniqBy(currentAutoData.concat(otherData), (d) => d.id);\n    const currentAndOtherComponentsData = currentAndOtherData.filter((c) => c.__type === 'component');\n    const baseData = getAutoDeps(this.baseAspects);\n\n    const getCompIdStrByPkgNameFromData = (pkgName: string): string | undefined => {\n      const found = currentAndOtherComponentsData.find((d) => d.packageName === pkgName);\n      return found?.id;\n    };\n\n    const getFromCurrentDataByPackageName = (pkgName: string) => {\n      return currentAllData.find((d) => {\n        if (d.__type === 'package') return d.id === pkgName;\n        return d.packageName === pkgName;\n      });\n    };\n\n    const getFromCurrentDataPolicyByPackageName = (pkgName: string) => {\n      return currentDataPolicy.find((d) => d.dependencyId === pkgName);\n    };\n\n    const mergedPolicy = {\n      dependencies: [],\n      devDependencies: [],\n      peerDependencies: [],\n    };\n    const conflictedPolicy = {\n      dependencies: [],\n      devDependencies: [],\n      peerDependencies: [],\n    };\n    let hasConflict = false;\n    const lifecycleToDepType = {\n      runtime: 'dependencies',\n      dev: 'devDependencies',\n      peer: 'peerDependencies',\n    };\n    const handleConfigMerge = () => {\n      const addVariantPolicyEntryToPolicy = (dep: VariantPolicyEntry) => {\n        const compIdStr = getCompIdStrByPkgNameFromData(dep.dependencyId);\n        if (compIdStr && this.isIdInWorkspaceOrOtherLane(compIdStr, dep.value.version)) {\n          // no need to add if the id exists in the workspace (regardless the version)\n          return;\n        }\n        const fromCurrentData = getFromCurrentDataByPackageName(dep.dependencyId);\n        if (fromCurrentData && !dep.force) {\n          if (fromCurrentData.version === dep.value.version) return;\n          if (\n            !isHash(fromCurrentData.version) &&\n            !isHash(dep.value.version) &&\n            semver.satisfies(fromCurrentData.version, dep.value.version)\n          ) {\n            return;\n          }\n        }\n        const fromCurrentDataPolicy = getFromCurrentDataPolicyByPackageName(dep.dependencyId);\n        if (fromCurrentDataPolicy && fromCurrentDataPolicy.value.version === dep.value.version) {\n          // -- updated comment --\n          // not sure why this block is needed. this gets called also from this if: `if (baseConfig && this.areConfigsEqual(baseConfig, currentConfig)) {`\n          // and in this case, it's possible that current/base has 5 deps, and other just added one and it has 6.\n          // in which case, we do need to add all these 5 in additional to the new one. otherwise, only the new one appears in the final\n          // merged object, and all the 5 deps are lost.\n          // --- previous comment ---\n          // that's a bug. if it's in the data.policy, it should be in data.dependencies.\n          // return;\n        }\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      };\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 (otherConfigPolicy.length) {\n          otherConfigPolicy.forEach((dep) => {\n            addVariantPolicyEntryToPolicy(dep);\n          });\n        }\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(currentConfigPolicy.concat(otherConfigPolicy), (d) => d.dependencyId);\n      currentAndOtherConfig.forEach((dep) => {\n        const depType = lifecycleToDepType[dep.lifecycleType];\n        const currentDep = currentConfigPolicy.find((d) => d.dependencyId === dep.dependencyId);\n        const otherDep = otherConfigPolicy.find((d) => d.dependencyId === dep.dependencyId);\n        const baseDep = baseConfigPolicy?.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        if (baseVer && baseVer === currentVer) {\n          addVariantPolicyEntryToPolicy(otherDep);\n          return;\n        }\n        const compIdStr = getCompIdStrByPkgNameFromData(dep.dependencyId);\n        if (compIdStr && this.isIdInWorkspaceOrOtherLane(compIdStr, otherVer)) {\n          // no need to add if the id exists in the workspace (regardless the version)\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      if (dep.__type === 'component' && this.isIdInWorkspaceOrOtherLane(dep.id, dep.version)) {\n        return;\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    };\n\n    this.logger.debug(\n      `currentData, ${currentAllData.length}\\n${currentAllData\n        .map((d) => `${d.__type} ${d.id} ${d.version}`)\n        .join('\\n')}`\n    );\n    this.logger.debug(\n      `otherData, ${otherData.length}\\n${otherData.map((d) => `${d.__type} ${d.id} ${d.version}`).join('\\n')}`\n    );\n    this.logger.debug(\n      `baseData, ${baseData.length}\\n${baseData.map((d) => `${d.__type} ${d.id} ${d.version}`).join('\\n')}`\n    );\n\n    // eslint-disable-next-line complexity\n    currentAndOtherData.forEach((depData) => {\n      this.logger.trace(`depData.id, ${depData.id}`);\n      if (this.isEnv(depData.id)) {\n        // ignore the envs\n        return;\n      }\n      const currentDep = currentAllData.find((d) => d.id === depData.id);\n      const otherDep = otherData.find((d) => d.id === depData.id);\n      const baseDep = baseData.find((d) => d.id === depData.id);\n\n      this.logger.trace(`currentDep`, currentDep);\n      this.logger.trace(`otherDep`, otherDep);\n      this.logger.trace(`baseDep`, baseDep);\n      if (!otherDep) {\n        return;\n      }\n      if (!currentDep) {\n        if (baseDep) {\n          // exists in other and base, so it was removed from current\n          return;\n        }\n        // only on other\n        addSerializedDepToPolicy(otherDep);\n        return;\n      }\n\n      if (currentDep.policy && otherDep.policy) {\n        if (semver.satisfies(currentDep.version, otherDep.policy)) {\n          return;\n        }\n        if (semver.satisfies(otherDep.version, currentDep.policy)) {\n          return;\n        }\n      }\n\n      const currentVer = currentDep.policy || currentDep.version;\n      const otherVer = otherDep.policy || otherDep.version;\n      if (currentVer === otherVer) {\n        return;\n      }\n      const baseVer = baseDep?.policy || baseDep?.version;\n      if (baseVer && baseVer === otherVer) {\n        return;\n      }\n      const currentId = currentDep.id;\n      if (currentDep.__type === 'component' && this.isIdInWorkspaceOrOtherLane(currentId, otherDep.version)) {\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      const depType = lifecycleToDepType[currentDep.lifecycle];\n      if (hasConfigForDep(depType, currentDep.id)) {\n        return; // there is already config for it.\n      }\n      if (baseVer && baseVer === currentVer) {\n        addSerializedDepToPolicy(otherDep);\n        return;\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    const config = Object.keys(mergedPolicy).length ? { policy: mergedPolicy } : undefined;\n    const conflict = hasConflict ? conflictedPolicy : undefined;\n\n    this.logger.debug('final mergedConfig', config);\n    this.logger.debug('final conflict', conflict);\n\n    return { id: params.id, mergedConfig: config, conflict };\n  }\n\n  private isIdInWorkspaceOrOtherLane(id: string, versionOnOtherLane?: string): boolean {\n    return Boolean(this.getIdFromWorkspace(id)) || this.otherLaneIdsStr.includes(`${id}@${versionOnOtherLane}`);\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): GenericConfigOrRemoved {\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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"}
+{"version":3,"names":["_semver","data","_interopRequireDefault","require","_builder","_componentVersion","_dependencyResolver","_envs","_lodash","_configMergeResult","obj","__esModule","default","ownKeys","e","r","t","Object","keys","getOwnPropertySymbols","o","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","defineProperty","key","value","_toPropertyKey","configurable","writable","i","_toPrimitive","String","Symbol","toPrimitive","call","TypeError","Number","conflictIndicator","exports","ComponentConfigMerger","constructor","compIdStr","workspaceIds","otherLane","currentAspects","baseAspects","otherAspects","currentLabel","otherLabel","logger","BuilderAspect","id","otherLaneIdsStr","toBitIds","map","toString","merge","debug","populateEnvs","results","currentExt","stringId","handledExtIds","includes","baseExt","findExtension","otherExt","mergePerStrategy","conflict","currentConfig","getConfig","otherConfig","otherAspectsNotHandledResults","extensionId","hasVersion","idFromWorkspace","getIdFromWorkspace","toStringWithoutVersion","existingExt","_legacy","mergedConfig","envResult","envStrategy","ConfigMergeResult","compact","getEnvId","ext","envsAspect","findCoreExtension","EnvsAspect","Error","env","config","currentEnv","otherEnv","baseEnv","undefined","currentEnvAspect","version","otherEnvAspect","baseEnvAspect","mergeStrategyParams","baseConfig","isIdInWorkspaceOrOtherLane","basicConfigMerge","areConfigsEqual","configA","configB","JSON","stringify","depResolverResult","depResolverStrategy","params","DependencyResolverAspect","trace","currentConfigPolicy","getPolicy","otherConfigPolicy","baseConfigPolicy","getAllDeps","dependencies","policy","d","idWithoutVersion","__type","split","existingPolicy","find","p","dependencyId","getPolicyVer","getDataPolicy","getAutoDeps","allDeps","source","currentAutoData","currentAllData","currentDataPolicy","otherData","currentAndOtherData","uniqBy","concat","currentAndOtherComponentsData","c","baseData","getCompIdStrByPkgNameFromData","pkgName","found","packageName","getFromCurrentDataByPackageName","getFromCurrentDataPolicyByPackageName","mergedPolicy","devDependencies","peerDependencies","conflictedPolicy","hasConflict","lifecycleToDepType","runtime","dev","peer","handleConfigMerge","addVariantPolicyEntryToPolicy","dep","fromCurrentData","force","isHash","semver","satisfies","fromCurrentDataPolicy","depType","lifecycleType","name","currentAndOtherConfig","currentDep","otherDep","baseDep","currentVer","otherVer","baseVer","hasConfigForDep","depName","getDepIdAsPkgName","addSerializedDepToPolicy","lifecycle","join","depData","isEnv","currentId","versionOnOtherLane","Boolean","rawConfig","omit","VariantPolicy","fromConfigObject","entries"],"sources":["component-config-merger.ts"],"sourcesContent":["import { ComponentID } from '@teambit/component-id';\nimport semver from 'semver';\nimport { Logger } from '@teambit/logger';\nimport BuilderAspect from '@teambit/builder';\nimport { isHash } from '@teambit/component-version';\nimport {\n  DependencyResolverAspect,\n  SerializedDependency,\n  VariantPolicy,\n  VariantPolicyEntry,\n} from '@teambit/dependency-resolver';\nimport { Lane } from '@teambit/legacy/dist/scope/models';\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\nexport type GenericConfigOrRemoved = Record<string, any> | '-';\n\ntype EnvData = { id: string; version?: string; config?: GenericConfigOrRemoved };\n\ntype SerializedDependencyWithPolicy = SerializedDependency & { policy?: string; packageName?: string };\n\nexport const conflictIndicator = 'CONFLICT::';\n\nexport type MergeStrategyResult = {\n  id: string;\n  mergedConfig?: GenericConfigOrRemoved;\n  conflict?: Record<string, any>;\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 ComponentConfigMerger {\n  private currentEnv: EnvData;\n  private otherEnv: EnvData;\n  private baseEnv?: EnvData;\n  private handledExtIds: string[] = [BuilderAspect.id]; // don't try to merge builder, it's possible that at one end it wasn't built yet, so it's empty\n  private otherLaneIdsStr: string[];\n  constructor(\n    private compIdStr: string,\n    private workspaceIds: ComponentID[],\n    otherLane: Lane | undefined,\n    private currentAspects: ExtensionDataList,\n    private baseAspects: ExtensionDataList,\n    private otherAspects: ExtensionDataList,\n    private currentLabel: string,\n    private otherLabel: string,\n    private logger: Logger\n  ) {\n    this.otherLaneIdsStr = otherLane?.toBitIds().map((id) => id.toString()) || [];\n  }\n\n  merge(): ConfigMergeResult {\n    this.logger.debug(`\\n************** start config-merger for ${this.compIdStr} **************`);\n    this.logger.debug(`currentLabel: ${this.currentLabel}`);\n    this.logger.debug(`otherLabel: ${this.otherLabel}`);\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 { id, conflict: { 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) {\n          const existingExt = this.currentAspects.findExtension(otherExt.extensionId.toStringWithoutVersion(), true);\n          if (existingExt) return null; // the aspect is set currently, no need to add it again.\n          id = idFromWorkspace._legacy.toString();\n        }\n      }\n      const baseExt = this.baseAspects.findExtension(id, true);\n      if (baseExt) {\n        // was removed on current\n        return { id, conflict: { 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    this.logger.debug(`*** end config-merger for ${this.compIdStr} ***\\n`);\n    return new ConfigMergeResult(\n      this.compIdStr,\n      this.currentLabel,\n      this.otherLabel,\n      compact([...results, ...otherAspectsNotHandledResults, ...envResult])\n    );\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 = this.getConfig(currentEnvAspect);\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 = this.getConfig(otherEnvAspect);\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 = this.getConfig(baseEnvAspect);\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.isIdInWorkspaceOrOtherLane(this.currentEnv.id, this.otherEnv.version)) {\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\n    if (depResolverResult) {\n      // if (depResolverResult.mergedConfig || depResolverResult?.conflict) console.log(\"\\n\\nDepResolverResult\", this.compIdStr, '\\n', JSON.stringify(depResolverResult, undefined, 2))\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    return { id, conflict: { currentConfig, otherConfig, baseConfig } };\n  }\n\n  private depResolverStrategy(params: MergeStrategyParams): MergeStrategyResult | undefined {\n    if (params.id !== DependencyResolverAspect.id) return undefined;\n    this.logger.trace(`start depResolverStrategy for ${this.compIdStr}`);\n    const { currentExt, otherExt, baseExt } = params;\n\n    const currentConfig = this.getConfig(currentExt);\n    const currentConfigPolicy = this.getPolicy(currentConfig);\n    const otherConfig = this.getConfig(otherExt);\n    const otherConfigPolicy = this.getPolicy(otherConfig);\n\n    const baseConfig = baseExt ? this.getConfig(baseExt) : undefined;\n    const baseConfigPolicy = baseConfig ? this.getPolicy(baseConfig) : undefined;\n\n    this.logger.debug(`currentConfig, ${JSON.stringify(currentConfig, undefined, 2)}`);\n    this.logger.debug(`otherConfig, ${JSON.stringify(otherConfig, undefined, 2)}`);\n    this.logger.debug(`baseConfig, ${JSON.stringify(baseConfig, undefined, 2)}`);\n\n    const getAllDeps = (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.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          return d.version;\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    const getDataPolicy = (ext: ExtensionDataList): VariantPolicyEntry[] => {\n      return ext.findCoreExtension(DependencyResolverAspect.id)?.data.policy || [];\n    };\n\n    const getAutoDeps = (ext: ExtensionDataList): SerializedDependencyWithPolicy[] => {\n      const allDeps = getAllDeps(ext);\n      return allDeps.filter((d) => d.source === 'auto');\n    };\n\n    const currentAutoData = getAutoDeps(this.currentAspects);\n    const currentAllData = getAllDeps(this.currentAspects);\n    const currentDataPolicy = getDataPolicy(this.currentAspects);\n    const otherData = getAutoDeps(this.otherAspects);\n    const currentAndOtherData = uniqBy(currentAutoData.concat(otherData), (d) => d.id);\n    const currentAndOtherComponentsData = currentAndOtherData.filter((c) => c.__type === 'component');\n    const baseData = getAutoDeps(this.baseAspects);\n\n    const getCompIdStrByPkgNameFromData = (pkgName: string): string | undefined => {\n      const found = currentAndOtherComponentsData.find((d) => d.packageName === pkgName);\n      return found?.id;\n    };\n\n    const getFromCurrentDataByPackageName = (pkgName: string) => {\n      return currentAllData.find((d) => {\n        if (d.__type === 'package') return d.id === pkgName;\n        return d.packageName === pkgName;\n      });\n    };\n\n    const getFromCurrentDataPolicyByPackageName = (pkgName: string) => {\n      return currentDataPolicy.find((d) => d.dependencyId === pkgName);\n    };\n\n    const mergedPolicy = {\n      dependencies: [],\n      devDependencies: [],\n      peerDependencies: [],\n    };\n    const conflictedPolicy = {\n      dependencies: [],\n      devDependencies: [],\n      peerDependencies: [],\n    };\n    let hasConflict = false;\n    const lifecycleToDepType = {\n      runtime: 'dependencies',\n      dev: 'devDependencies',\n      peer: 'peerDependencies',\n    };\n    const handleConfigMerge = () => {\n      const addVariantPolicyEntryToPolicy = (dep: VariantPolicyEntry) => {\n        const compIdStr = getCompIdStrByPkgNameFromData(dep.dependencyId);\n        if (compIdStr && this.isIdInWorkspaceOrOtherLane(compIdStr, dep.value.version)) {\n          // no need to add if the id exists in the workspace (regardless the version)\n          return;\n        }\n        const fromCurrentData = getFromCurrentDataByPackageName(dep.dependencyId);\n        if (fromCurrentData && !dep.force) {\n          if (fromCurrentData.version === dep.value.version) return;\n          if (\n            !isHash(fromCurrentData.version) &&\n            !isHash(dep.value.version) &&\n            semver.satisfies(fromCurrentData.version, dep.value.version)\n          ) {\n            return;\n          }\n        }\n        const fromCurrentDataPolicy = getFromCurrentDataPolicyByPackageName(dep.dependencyId);\n        if (fromCurrentDataPolicy && fromCurrentDataPolicy.value.version === dep.value.version) {\n          // -- updated comment --\n          // not sure why this block is needed. this gets called also from this if: `if (baseConfig && this.areConfigsEqual(baseConfig, currentConfig)) {`\n          // and in this case, it's possible that current/base has 5 deps, and other just added one and it has 6.\n          // in which case, we do need to add all these 5 in additional to the new one. otherwise, only the new one appears in the final\n          // merged object, and all the 5 deps are lost.\n          // --- previous comment ---\n          // that's a bug. if it's in the data.policy, it should be in data.dependencies.\n          // return;\n        }\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      };\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 (otherConfigPolicy.length) {\n          otherConfigPolicy.forEach((dep) => {\n            addVariantPolicyEntryToPolicy(dep);\n          });\n        }\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(currentConfigPolicy.concat(otherConfigPolicy), (d) => d.dependencyId);\n      currentAndOtherConfig.forEach((dep) => {\n        const depType = lifecycleToDepType[dep.lifecycleType];\n        const currentDep = currentConfigPolicy.find((d) => d.dependencyId === dep.dependencyId);\n        const otherDep = otherConfigPolicy.find((d) => d.dependencyId === dep.dependencyId);\n        const baseDep = baseConfigPolicy?.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        if (baseVer && baseVer === currentVer) {\n          addVariantPolicyEntryToPolicy(otherDep);\n          return;\n        }\n        const compIdStr = getCompIdStrByPkgNameFromData(dep.dependencyId);\n        if (compIdStr && this.isIdInWorkspaceOrOtherLane(compIdStr, otherVer)) {\n          // no need to add if the id exists in the workspace (regardless the version)\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      if (dep.__type === 'component' && this.isIdInWorkspaceOrOtherLane(dep.id, dep.version)) {\n        return;\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    };\n\n    this.logger.debug(\n      `currentData, ${currentAllData.length}\\n${currentAllData\n        .map((d) => `${d.__type} ${d.id} ${d.version}`)\n        .join('\\n')}`\n    );\n    this.logger.debug(\n      `otherData, ${otherData.length}\\n${otherData.map((d) => `${d.__type} ${d.id} ${d.version}`).join('\\n')}`\n    );\n    this.logger.debug(\n      `baseData, ${baseData.length}\\n${baseData.map((d) => `${d.__type} ${d.id} ${d.version}`).join('\\n')}`\n    );\n\n    // eslint-disable-next-line complexity\n    currentAndOtherData.forEach((depData) => {\n      this.logger.trace(`depData.id, ${depData.id}`);\n      if (this.isEnv(depData.id)) {\n        // ignore the envs\n        return;\n      }\n      const currentDep = currentAllData.find((d) => d.id === depData.id);\n      const otherDep = otherData.find((d) => d.id === depData.id);\n      const baseDep = baseData.find((d) => d.id === depData.id);\n\n      this.logger.trace(`currentDep`, currentDep);\n      this.logger.trace(`otherDep`, otherDep);\n      this.logger.trace(`baseDep`, baseDep);\n      if (!otherDep) {\n        return;\n      }\n      if (!currentDep) {\n        if (baseDep) {\n          // exists in other and base, so it was removed from current\n          return;\n        }\n        // only on other\n        addSerializedDepToPolicy(otherDep);\n        return;\n      }\n\n      if (currentDep.policy && otherDep.policy) {\n        if (semver.satisfies(currentDep.version, otherDep.policy)) {\n          return;\n        }\n        if (semver.satisfies(otherDep.version, currentDep.policy)) {\n          return;\n        }\n      }\n\n      const currentVer = currentDep.policy || currentDep.version;\n      const otherVer = otherDep.policy || otherDep.version;\n      if (currentVer === otherVer) {\n        return;\n      }\n      const baseVer = baseDep?.policy || baseDep?.version;\n      if (baseVer && baseVer === otherVer) {\n        return;\n      }\n      const currentId = currentDep.id;\n      if (currentDep.__type === 'component' && this.isIdInWorkspaceOrOtherLane(currentId, otherDep.version)) {\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      const depType = lifecycleToDepType[currentDep.lifecycle];\n      if (hasConfigForDep(depType, currentDep.id)) {\n        return; // there is already config for it.\n      }\n      if (baseVer && baseVer === currentVer) {\n        addSerializedDepToPolicy(otherDep);\n        return;\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    const config = Object.keys(mergedPolicy).length ? { policy: mergedPolicy } : undefined;\n    const conflict = hasConflict ? conflictedPolicy : undefined;\n\n    this.logger.debug('final mergedConfig', config);\n    this.logger.debug('final conflict', conflict);\n\n    return { id: params.id, mergedConfig: config, conflict };\n  }\n\n  private isIdInWorkspaceOrOtherLane(id: string, versionOnOtherLane?: string): boolean {\n    return Boolean(this.getIdFromWorkspace(id)) || this.otherLaneIdsStr.includes(`${id}@${versionOnOtherLane}`);\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): GenericConfigOrRemoved {\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/config-merger.main.runtime.d.ts

@@ -3,10 +3,10 @@ import { Workspace } from '@teambit/workspace';
 import { Logger, LoggerMain } from '@teambit/logger';
 import { ConfigMain } from '@teambit/config';
 import { ConfigMergeResult } from './config-merge-result';
-export declare type WorkspaceDepsUpdates = {
+export type WorkspaceDepsUpdates = {
     [pkgName: string]: [string, string];
 };
-export declare type WorkspaceDepsConflicts = Record<WorkspacePolicyConfigKeysNames, Array<{
+export type WorkspaceDepsConflicts = Record<WorkspacePolicyConfigKeysNames, Array<{
     name: string;
     version: string;
 }>>;
@@ -22,7 +22,7 @@ export declare class ConfigMergerMain {
         workspaceDepsUpdates?: WorkspaceDepsUpdates;
         workspaceDepsConflicts?: WorkspaceDepsConflicts;
     }>;
-    static slots: never[];
+    static slots: any[];
     static dependencies: import("@teambit/harmony").Aspect[];
     static runtime: import("@teambit/harmony").RuntimeDefinition;
     static provider([workspace, config, loggerMain]: [Workspace, ConfigMain, LoggerMain]): Promise<ConfigMergerMain>;

package/dist/config-merger.main.runtime.js

@@ -210,8 +210,7 @@ see the conflicts below and edit your workspace.jsonc as you see fit.`;
     const nonConflictDeps = {};
     const nonConflictSources = {}; // for logging/debugging purposes
     allConfigMerge.forEach(configMerge => {
-      var _configMerge$getDepsR;
-      const mergedConfig = (_configMerge$getDepsR = configMerge.getDepsResolverResult()) === null || _configMerge$getDepsR === void 0 ? void 0 : _configMerge$getDepsR.mergedConfig;
+      const mergedConfig = configMerge.getDepsResolverResult()?.mergedConfig;
       if (!mergedConfig || mergedConfig === '-') return;
       const mergedConfigPolicy = mergedConfig.policy || {};
       _constants().DEPENDENCIES_FIELDS.forEach(depField => {
@@ -233,8 +232,7 @@ see the conflicts below and edit your workspace.jsonc as you see fit.`;
     const conflictDeps = {};
     const conflictDepsSources = {}; // for logging/debugging purposes
     allConfigMerge.forEach(configMerge => {
-      var _configMerge$getDepsR2;
-      const mergedConfigConflict = (_configMerge$getDepsR2 = configMerge.getDepsResolverResult()) === null || _configMerge$getDepsR2 === void 0 ? void 0 : _configMerge$getDepsR2.conflict;
+      const mergedConfigConflict = configMerge.getDepsResolverResult()?.conflict;
       if (!mergedConfigConflict) return;
       _constants().DEPENDENCIES_FIELDS.forEach(depField => {
         if (!mergedConfigConflict[depField]) return;
@@ -256,7 +254,7 @@ see the conflicts below and edit your workspace.jsonc as you see fit.`;
     const workspaceConfig = this.config.workspaceConfig;
     if (!workspaceConfig) throw new Error(`updateWorkspaceJsoncWithDepsIfNeeded unable to get workspace config`);
     const depResolver = workspaceConfig.extensions.findCoreExtension(_dependencyResolver().DependencyResolverAspect.id);
-    const policy = depResolver === null || depResolver === void 0 ? void 0 : depResolver.config.policy;
+    const policy = depResolver?.config.policy;
     if (!policy) {
       return {};
     }
@@ -269,8 +267,7 @@ see the conflicts below and edit your workspace.jsonc as you see fit.`;
         return;
       }
       _constants().DEPENDENCIES_FIELDS.forEach(depField => {
-        var _policy$depField;
-        if (!((_policy$depField = policy[depField]) !== null && _policy$depField !== void 0 && _policy$depField[pkgName])) return; // doesn't exists in the workspace.json
+        if (!policy[depField]?.[pkgName]) return; // doesn't exists in the workspace.json
         const currentVer = policy[depField][pkgName];
         const newVer = nonConflictDeps[pkgName][0];
         if (currentVer === newVer) return;
@@ -294,8 +291,7 @@ see the conflicts below and edit your workspace.jsonc as you see fit.`;
       const conflictRaw = conflictDeps[pkgName][0];
       const [, currentVal, otherVal] = conflictRaw.split('::');
       WS_DEPS_FIELDS.forEach(depField => {
-        var _policy$depField2;
-        if (!((_policy$depField2 = policy[depField]) !== null && _policy$depField2 !== void 0 && _policy$depField2[pkgName])) return;
+        if (!policy[depField]?.[pkgName]) return;
         const currentVerInWsJson = policy[depField][pkgName];
         if (!currentVerInWsJson) return;
         // the version is coming from the workspace.jsonc
@@ -318,11 +314,10 @@ see the conflicts below and edit your workspace.jsonc as you see fit.`;
     });
     if (conflictPackagesToRemoveFromConfigMerge.length) {
       allResults.forEach(result => {
-        if (result !== null && result !== void 0 && result.conflict) {
+        if (result?.conflict) {
           _constants().DEPENDENCIES_FIELDS.forEach(depField => {
-            var _result$conflict, _result$conflict2;
-            if (!((_result$conflict = result.conflict) !== null && _result$conflict !== void 0 && _result$conflict[depField])) return;
-            result.conflict[depField] = (_result$conflict2 = result.conflict) === null || _result$conflict2 === void 0 ? void 0 : _result$conflict2[depField].filter(dep => !conflictPackagesToRemoveFromConfigMerge.includes(dep.name));
+            if (!result.conflict?.[depField]) return;
+            result.conflict[depField] = result.conflict?.[depField].filter(dep => !conflictPackagesToRemoveFromConfigMerge.includes(dep.name));
             if (!result.conflict[depField].length) delete result.conflict[depField];
           });
           if ((0, _lodash().isEmpty)(result.conflict)) result.conflict = undefined;

package/dist/config-merger.main.runtime.js.map

@@ -1 +1 @@
-{"version":3,"names":["_semver","data","_interopRequireDefault","require","_lodash","_dependencyResolver","_tempy","_fsExtra","_cli","_workspace","_logger","_constants","_bitError","_mergeFiles","_config","_configMergeResult","_configMerger","obj","__esModule","default","_defineProperty","key","value","_toPropertyKey","Object","defineProperty","enumerable","configurable","writable","t","i","_toPrimitive","String","r","e","Symbol","toPrimitive","call","TypeError","Number","WS_DEPS_FIELDS","ConfigMergerMain","constructor","workspace","logger","config","generateConfigMergeConflictFileForAll","allConfigMerge","configMergeFile","getConflictMergeFile","forEach","configMerge","conflict","generateMergeConflictFile","addConflict","compIdStr","hasConflict","write","writeWorkspaceJsoncWithConflictsGracefully","workspaceDepsConflicts","writeWorkspaceJsoncWithConflicts","undefined","err","error","errTitle","message","conflictsStr","map","depField","name","version","currentVal","otherVal","parseVersionLineWithConflict","flat","join","BitError","wsConfig","workspaceConfig","Error","wsJsoncPath","path","wsJsoncOriginalContent","fs","readFile","wsJsoncContent","originalDep","includes","replace","baseFilePath","tempy","otherFilePath","mergeFilesParams","filePath","currentFile","label","baseFile","otherFile","mergeResult","mergeFiles","conflictFile","debug","backupConfigFile","writeFile","updateWorkspaceJsoncWithDepsIfNeeded","allResults","c","getDepsResolverResult","nonConflictDeps","nonConflictSources","_configMerge$getDepsR","mergedConfig","mergedConfigPolicy","policy","DEPENDENCIES_FIELDS","pkg","force","push","conflictDeps","conflictDepsSources","_configMerge$getDepsR2","mergedConfigConflict","notConflictedPackages","keys","conflictedPackages","length","depResolver","extensions","findCoreExtension","DependencyResolverAspect","id","workspaceJsonUpdates","pkgName","_policy$depField","currentVer","newVer","workspaceJsonConflicts","dependencies","peerDependencies","conflictPackagesToRemoveFromConfigMerge","conflictRaw","split","_policy$depField2","currentVerInWsJson","semver","satisfies","isEmpty","result","_result$conflict","_result$conflict2","filter","dep","reasonForChange","workspaceDepsUpdates","provider","loggerMain","createLogger","ConfigMergerAspect","exports","WorkspaceAspect","ConfigAspect","LoggerAspect","MainRuntime","addRuntime","_default"],"sources":["config-merger.main.runtime.ts"],"sourcesContent":["import semver from 'semver';\nimport { isEmpty } from 'lodash';\nimport { DependencyResolverAspect, WorkspacePolicyConfigKeysNames } from '@teambit/dependency-resolver';\nimport tempy from 'tempy';\nimport fs from 'fs-extra';\nimport { MainRuntime } from '@teambit/cli';\nimport { WorkspaceAspect, Workspace } from '@teambit/workspace';\nimport { Logger, LoggerAspect, LoggerMain } from '@teambit/logger';\nimport { DEPENDENCIES_FIELDS } from '@teambit/legacy/dist/constants';\nimport { BitError } from '@teambit/bit-error';\nimport mergeFiles, { MergeFileParams } from '@teambit/legacy/dist/utils/merge-files';\nimport { ConfigAspect, ConfigMain } from '@teambit/config';\nimport { ConfigMergeResult, parseVersionLineWithConflict } from './config-merge-result';\nimport { ConfigMergerAspect } from './config-merger.aspect';\n\ntype PkgEntry = { name: string; version: string; force: boolean };\n\nconst WS_DEPS_FIELDS = ['dependencies', 'peerDependencies'];\n\nexport type WorkspaceDepsUpdates = { [pkgName: string]: [string, string] }; // from => to\nexport type WorkspaceDepsConflicts = Record<WorkspacePolicyConfigKeysNames, Array<{ name: string; version: string }>>; // the pkg value is in a format of CONFLICT::OURS::THEIRS\n\nexport class ConfigMergerMain {\n  constructor(private workspace: Workspace, private logger: Logger, private config: ConfigMain) {}\n\n  async generateConfigMergeConflictFileForAll(allConfigMerge: ConfigMergeResult[]) {\n    const configMergeFile = this.workspace.getConflictMergeFile();\n    allConfigMerge.forEach((configMerge) => {\n      const conflict = configMerge.generateMergeConflictFile();\n      if (!conflict) return;\n      configMergeFile.addConflict(configMerge.compIdStr, conflict);\n    });\n    if (configMergeFile.hasConflict()) {\n      await configMergeFile.write();\n    }\n  }\n\n  async writeWorkspaceJsoncWithConflictsGracefully(\n    workspaceDepsConflicts: WorkspaceDepsConflicts\n  ): Promise<Error | undefined> {\n    try {\n      await this.writeWorkspaceJsoncWithConflicts(workspaceDepsConflicts);\n      return undefined;\n    } catch (err: any) {\n      this.logger.error(`unable to write workspace.jsonc with conflicts`, err);\n      const errTitle = `unable to write workspace.jsonc with conflicts, due to an error: \"${err.message}\".\nsee the conflicts below and edit your workspace.jsonc as you see fit.`;\n      const conflictsStr = WS_DEPS_FIELDS.map((depField) => {\n        if (!workspaceDepsConflicts[depField]) return [];\n        return workspaceDepsConflicts[depField].map(({ name, version }) => {\n          const { currentVal, otherVal } = parseVersionLineWithConflict(version);\n          return `(${depField}) ${name}: ours: ${currentVal}, theirs: ${otherVal}`;\n        });\n      })\n        .flat()\n        .join('\\n');\n      return new BitError(`${errTitle}\\n${conflictsStr}`);\n    }\n  }\n\n  private async writeWorkspaceJsoncWithConflicts(workspaceDepsConflicts: WorkspaceDepsConflicts) {\n    const wsConfig = this.config.workspaceConfig;\n    if (!wsConfig) throw new Error(`unable to get workspace config`);\n    const wsJsoncPath = wsConfig.path;\n    const wsJsoncOriginalContent = await fs.readFile(wsJsoncPath, 'utf8');\n    let wsJsoncContent = wsJsoncOriginalContent;\n    WS_DEPS_FIELDS.forEach((depField) => {\n      if (!workspaceDepsConflicts[depField]) return;\n      workspaceDepsConflicts[depField].forEach(({ name, version }) => {\n        const { currentVal, otherVal } = parseVersionLineWithConflict(version);\n        // e.g. \"@ci/8oypmb6p-remote.bar.foo\": \"^0.0.3\"\n        const originalDep = `\"${name}\": \"${currentVal}\"`;\n        if (!wsJsoncContent.includes(originalDep)) {\n          throw new Error(`unable to find the dependency ${originalDep} in the workspace.jsonc`);\n        }\n        wsJsoncContent = wsJsoncContent.replace(originalDep, `\"${name}\": \"${otherVal}\"`);\n      });\n    });\n\n    const baseFilePath = await tempy.write('');\n    const otherFilePath = await tempy.write(wsJsoncContent);\n    const mergeFilesParams: MergeFileParams = {\n      filePath: wsJsoncPath,\n      currentFile: {\n        label: 'ours',\n        path: wsJsoncPath,\n      },\n      baseFile: {\n        path: baseFilePath,\n      },\n      otherFile: {\n        label: 'theirs',\n        path: otherFilePath,\n      },\n    };\n    const mergeResult = await mergeFiles(mergeFilesParams);\n    const conflictFile = mergeResult.conflict;\n    if (!conflictFile) {\n      this.logger.debug(`original content:\\n${wsJsoncOriginalContent}`);\n      this.logger.debug(`new content:\\n${wsJsoncContent}`);\n      throw new Error('unable to generate conflict from the workspace.jsonc file. see debug.log for the file content');\n    }\n    await wsConfig.backupConfigFile('before writing conflicts');\n    await fs.writeFile(wsJsoncPath, conflictFile);\n  }\n\n  async updateWorkspaceJsoncWithDepsIfNeeded(\n    allConfigMerge: ConfigMergeResult[]\n  ): Promise<{ workspaceDepsUpdates?: WorkspaceDepsUpdates; workspaceDepsConflicts?: WorkspaceDepsConflicts }> {\n    const allResults = allConfigMerge.map((c) => c.getDepsResolverResult());\n\n    // aggregate all dependencies that can be updated (not conflicting)\n    const nonConflictDeps: { [pkgName: string]: string[] } = {};\n    const nonConflictSources: { [pkgName: string]: string[] } = {}; // for logging/debugging purposes\n    allConfigMerge.forEach((configMerge) => {\n      const mergedConfig = configMerge.getDepsResolverResult()?.mergedConfig;\n      if (!mergedConfig || mergedConfig === '-') return;\n      const mergedConfigPolicy = mergedConfig.policy || {};\n      DEPENDENCIES_FIELDS.forEach((depField) => {\n        if (!mergedConfigPolicy[depField]) return;\n        mergedConfigPolicy[depField].forEach((pkg: PkgEntry) => {\n          if (pkg.force) return; // we only care about auto-detected dependencies\n          if (nonConflictDeps[pkg.name]) {\n            if (!nonConflictDeps[pkg.name].includes(pkg.version)) nonConflictDeps[pkg.name].push(pkg.version);\n            nonConflictSources[pkg.name].push(configMerge.compIdStr);\n            return;\n          }\n          nonConflictDeps[pkg.name] = [pkg.version];\n          nonConflictSources[pkg.name] = [configMerge.compIdStr];\n        });\n      });\n    });\n\n    // aggregate all dependencies that have conflicts\n    const conflictDeps: { [pkgName: string]: string[] } = {};\n    const conflictDepsSources: { [pkgName: string]: string[] } = {}; // for logging/debugging purposes\n    allConfigMerge.forEach((configMerge) => {\n      const mergedConfigConflict = configMerge.getDepsResolverResult()?.conflict;\n      if (!mergedConfigConflict) return;\n      DEPENDENCIES_FIELDS.forEach((depField) => {\n        if (!mergedConfigConflict[depField]) return;\n        mergedConfigConflict[depField].forEach((pkg: PkgEntry) => {\n          if (pkg.force) return; // we only care about auto-detected dependencies\n          if (conflictDeps[pkg.name]) {\n            if (!conflictDeps[pkg.name].includes(pkg.version)) conflictDeps[pkg.name].push(pkg.version);\n            conflictDepsSources[pkg.name].push(configMerge.compIdStr);\n            return;\n          }\n          conflictDeps[pkg.name] = [pkg.version];\n          conflictDepsSources[pkg.name] = [configMerge.compIdStr];\n        });\n      });\n    });\n\n    const notConflictedPackages = Object.keys(nonConflictDeps);\n    const conflictedPackages = Object.keys(conflictDeps);\n    if (!notConflictedPackages.length && !conflictedPackages.length) return {};\n\n    const workspaceConfig = this.config.workspaceConfig;\n    if (!workspaceConfig) throw new Error(`updateWorkspaceJsoncWithDepsIfNeeded unable to get workspace config`);\n    const depResolver = workspaceConfig.extensions.findCoreExtension(DependencyResolverAspect.id);\n    const policy = depResolver?.config.policy;\n    if (!policy) {\n      return {};\n    }\n\n    // calculate the workspace.json updates\n    const workspaceJsonUpdates = {};\n    notConflictedPackages.forEach((pkgName) => {\n      if (nonConflictDeps[pkgName].length > 1) {\n        // we only want the deps that the other lane has them in the workspace.json and that all comps use the same dep.\n        return;\n      }\n      DEPENDENCIES_FIELDS.forEach((depField) => {\n        if (!policy[depField]?.[pkgName]) return; // doesn't exists in the workspace.json\n        const currentVer = policy[depField][pkgName];\n        const newVer = nonConflictDeps[pkgName][0];\n        if (currentVer === newVer) return;\n        workspaceJsonUpdates[pkgName] = [currentVer, newVer];\n        policy[depField][pkgName] = newVer;\n        this.logger.debug(\n          `update workspace.jsonc: ${pkgName} from ${currentVer} to ${newVer}. Triggered by: ${nonConflictSources[\n            pkgName\n          ].join(', ')}`\n        );\n      });\n    });\n\n    // calculate the workspace.json conflicts\n    const workspaceJsonConflicts = { dependencies: [], peerDependencies: [] };\n    const conflictPackagesToRemoveFromConfigMerge: string[] = [];\n    conflictedPackages.forEach((pkgName) => {\n      if (conflictDeps[pkgName].length > 1) {\n        // we only want the deps that the other lane has them in the workspace.json and that all comps use the same dep.\n        return;\n      }\n      const conflictRaw = conflictDeps[pkgName][0];\n      const [, currentVal, otherVal] = conflictRaw.split('::');\n\n      WS_DEPS_FIELDS.forEach((depField) => {\n        if (!policy[depField]?.[pkgName]) return;\n        const currentVerInWsJson = policy[depField][pkgName];\n        if (!currentVerInWsJson) return;\n        // the version is coming from the workspace.jsonc\n        conflictPackagesToRemoveFromConfigMerge.push(pkgName);\n        if (semver.satisfies(otherVal, currentVerInWsJson)) {\n          // the other version is compatible with the current version in the workspace.json\n          return;\n        }\n        workspaceJsonConflicts[depField].push({\n          name: pkgName,\n          version: conflictRaw.replace(currentVal, currentVerInWsJson),\n          force: false,\n        });\n        conflictPackagesToRemoveFromConfigMerge.push(pkgName);\n        this.logger.debug(\n          `conflict workspace.jsonc: ${pkgName} current: ${currentVerInWsJson}, other: ${otherVal}. Triggered by: ${conflictDepsSources[\n            pkgName\n          ].join(', ')}`\n        );\n      });\n    });\n    WS_DEPS_FIELDS.forEach((depField) => {\n      if (isEmpty(workspaceJsonConflicts[depField])) delete workspaceJsonConflicts[depField];\n    });\n\n    if (conflictPackagesToRemoveFromConfigMerge.length) {\n      allResults.forEach((result) => {\n        if (result?.conflict) {\n          DEPENDENCIES_FIELDS.forEach((depField) => {\n            if (!result.conflict?.[depField]) return;\n            result.conflict[depField] = result.conflict?.[depField].filter(\n              (dep) => !conflictPackagesToRemoveFromConfigMerge.includes(dep.name)\n            );\n            if (!result.conflict[depField].length) delete result.conflict[depField];\n          });\n          if (isEmpty(result.conflict)) result.conflict = undefined;\n        }\n      });\n    }\n\n    if (Object.keys(workspaceJsonUpdates).length) {\n      await workspaceConfig.write({ reasonForChange: 'merge (update dependencies)' });\n    }\n\n    this.logger.debug('final workspace.jsonc updates', workspaceJsonUpdates);\n    this.logger.debug('final workspace.jsonc conflicts', workspaceJsonConflicts);\n\n    return {\n      workspaceDepsUpdates: Object.keys(workspaceJsonUpdates).length ? workspaceJsonUpdates : undefined,\n      workspaceDepsConflicts: Object.keys(workspaceJsonConflicts).length ? workspaceJsonConflicts : undefined,\n    };\n  }\n\n  static slots = [];\n  static dependencies = [WorkspaceAspect, ConfigAspect, LoggerAspect];\n  static runtime = MainRuntime;\n  static async provider([workspace, config, loggerMain]: [Workspace, ConfigMain, LoggerMain]) {\n    const logger = loggerMain.createLogger(ConfigMergerAspect.id);\n    return new ConfigMergerMain(workspace, logger, config);\n  }\n}\n\nConfigMergerAspect.addRuntime(ConfigMergerMain);\n\nexport default ConfigMergerMain;\n"],"mappings":"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"}
+{"version":3,"names":["_semver","data","_interopRequireDefault","require","_lodash","_dependencyResolver","_tempy","_fsExtra","_cli","_workspace","_logger","_constants","_bitError","_mergeFiles","_config","_configMergeResult","_configMerger","obj","__esModule","default","_defineProperty","key","value","_toPropertyKey","Object","defineProperty","enumerable","configurable","writable","t","i","_toPrimitive","String","r","e","Symbol","toPrimitive","call","TypeError","Number","WS_DEPS_FIELDS","ConfigMergerMain","constructor","workspace","logger","config","generateConfigMergeConflictFileForAll","allConfigMerge","configMergeFile","getConflictMergeFile","forEach","configMerge","conflict","generateMergeConflictFile","addConflict","compIdStr","hasConflict","write","writeWorkspaceJsoncWithConflictsGracefully","workspaceDepsConflicts","writeWorkspaceJsoncWithConflicts","undefined","err","error","errTitle","message","conflictsStr","map","depField","name","version","currentVal","otherVal","parseVersionLineWithConflict","flat","join","BitError","wsConfig","workspaceConfig","Error","wsJsoncPath","path","wsJsoncOriginalContent","fs","readFile","wsJsoncContent","originalDep","includes","replace","baseFilePath","tempy","otherFilePath","mergeFilesParams","filePath","currentFile","label","baseFile","otherFile","mergeResult","mergeFiles","conflictFile","debug","backupConfigFile","writeFile","updateWorkspaceJsoncWithDepsIfNeeded","allResults","c","getDepsResolverResult","nonConflictDeps","nonConflictSources","mergedConfig","mergedConfigPolicy","policy","DEPENDENCIES_FIELDS","pkg","force","push","conflictDeps","conflictDepsSources","mergedConfigConflict","notConflictedPackages","keys","conflictedPackages","length","depResolver","extensions","findCoreExtension","DependencyResolverAspect","id","workspaceJsonUpdates","pkgName","currentVer","newVer","workspaceJsonConflicts","dependencies","peerDependencies","conflictPackagesToRemoveFromConfigMerge","conflictRaw","split","currentVerInWsJson","semver","satisfies","isEmpty","result","filter","dep","reasonForChange","workspaceDepsUpdates","provider","loggerMain","createLogger","ConfigMergerAspect","exports","WorkspaceAspect","ConfigAspect","LoggerAspect","MainRuntime","addRuntime","_default"],"sources":["config-merger.main.runtime.ts"],"sourcesContent":["import semver from 'semver';\nimport { isEmpty } from 'lodash';\nimport { DependencyResolverAspect, WorkspacePolicyConfigKeysNames } from '@teambit/dependency-resolver';\nimport tempy from 'tempy';\nimport fs from 'fs-extra';\nimport { MainRuntime } from '@teambit/cli';\nimport { WorkspaceAspect, Workspace } from '@teambit/workspace';\nimport { Logger, LoggerAspect, LoggerMain } from '@teambit/logger';\nimport { DEPENDENCIES_FIELDS } from '@teambit/legacy/dist/constants';\nimport { BitError } from '@teambit/bit-error';\nimport mergeFiles, { MergeFileParams } from '@teambit/legacy/dist/utils/merge-files';\nimport { ConfigAspect, ConfigMain } from '@teambit/config';\nimport { ConfigMergeResult, parseVersionLineWithConflict } from './config-merge-result';\nimport { ConfigMergerAspect } from './config-merger.aspect';\n\ntype PkgEntry = { name: string; version: string; force: boolean };\n\nconst WS_DEPS_FIELDS = ['dependencies', 'peerDependencies'];\n\nexport type WorkspaceDepsUpdates = { [pkgName: string]: [string, string] }; // from => to\nexport type WorkspaceDepsConflicts = Record<WorkspacePolicyConfigKeysNames, Array<{ name: string; version: string }>>; // the pkg value is in a format of CONFLICT::OURS::THEIRS\n\nexport class ConfigMergerMain {\n  constructor(private workspace: Workspace, private logger: Logger, private config: ConfigMain) {}\n\n  async generateConfigMergeConflictFileForAll(allConfigMerge: ConfigMergeResult[]) {\n    const configMergeFile = this.workspace.getConflictMergeFile();\n    allConfigMerge.forEach((configMerge) => {\n      const conflict = configMerge.generateMergeConflictFile();\n      if (!conflict) return;\n      configMergeFile.addConflict(configMerge.compIdStr, conflict);\n    });\n    if (configMergeFile.hasConflict()) {\n      await configMergeFile.write();\n    }\n  }\n\n  async writeWorkspaceJsoncWithConflictsGracefully(\n    workspaceDepsConflicts: WorkspaceDepsConflicts\n  ): Promise<Error | undefined> {\n    try {\n      await this.writeWorkspaceJsoncWithConflicts(workspaceDepsConflicts);\n      return undefined;\n    } catch (err: any) {\n      this.logger.error(`unable to write workspace.jsonc with conflicts`, err);\n      const errTitle = `unable to write workspace.jsonc with conflicts, due to an error: \"${err.message}\".\nsee the conflicts below and edit your workspace.jsonc as you see fit.`;\n      const conflictsStr = WS_DEPS_FIELDS.map((depField) => {\n        if (!workspaceDepsConflicts[depField]) return [];\n        return workspaceDepsConflicts[depField].map(({ name, version }) => {\n          const { currentVal, otherVal } = parseVersionLineWithConflict(version);\n          return `(${depField}) ${name}: ours: ${currentVal}, theirs: ${otherVal}`;\n        });\n      })\n        .flat()\n        .join('\\n');\n      return new BitError(`${errTitle}\\n${conflictsStr}`);\n    }\n  }\n\n  private async writeWorkspaceJsoncWithConflicts(workspaceDepsConflicts: WorkspaceDepsConflicts) {\n    const wsConfig = this.config.workspaceConfig;\n    if (!wsConfig) throw new Error(`unable to get workspace config`);\n    const wsJsoncPath = wsConfig.path;\n    const wsJsoncOriginalContent = await fs.readFile(wsJsoncPath, 'utf8');\n    let wsJsoncContent = wsJsoncOriginalContent;\n    WS_DEPS_FIELDS.forEach((depField) => {\n      if (!workspaceDepsConflicts[depField]) return;\n      workspaceDepsConflicts[depField].forEach(({ name, version }) => {\n        const { currentVal, otherVal } = parseVersionLineWithConflict(version);\n        // e.g. \"@ci/8oypmb6p-remote.bar.foo\": \"^0.0.3\"\n        const originalDep = `\"${name}\": \"${currentVal}\"`;\n        if (!wsJsoncContent.includes(originalDep)) {\n          throw new Error(`unable to find the dependency ${originalDep} in the workspace.jsonc`);\n        }\n        wsJsoncContent = wsJsoncContent.replace(originalDep, `\"${name}\": \"${otherVal}\"`);\n      });\n    });\n\n    const baseFilePath = await tempy.write('');\n    const otherFilePath = await tempy.write(wsJsoncContent);\n    const mergeFilesParams: MergeFileParams = {\n      filePath: wsJsoncPath,\n      currentFile: {\n        label: 'ours',\n        path: wsJsoncPath,\n      },\n      baseFile: {\n        path: baseFilePath,\n      },\n      otherFile: {\n        label: 'theirs',\n        path: otherFilePath,\n      },\n    };\n    const mergeResult = await mergeFiles(mergeFilesParams);\n    const conflictFile = mergeResult.conflict;\n    if (!conflictFile) {\n      this.logger.debug(`original content:\\n${wsJsoncOriginalContent}`);\n      this.logger.debug(`new content:\\n${wsJsoncContent}`);\n      throw new Error('unable to generate conflict from the workspace.jsonc file. see debug.log for the file content');\n    }\n    await wsConfig.backupConfigFile('before writing conflicts');\n    await fs.writeFile(wsJsoncPath, conflictFile);\n  }\n\n  async updateWorkspaceJsoncWithDepsIfNeeded(\n    allConfigMerge: ConfigMergeResult[]\n  ): Promise<{ workspaceDepsUpdates?: WorkspaceDepsUpdates; workspaceDepsConflicts?: WorkspaceDepsConflicts }> {\n    const allResults = allConfigMerge.map((c) => c.getDepsResolverResult());\n\n    // aggregate all dependencies that can be updated (not conflicting)\n    const nonConflictDeps: { [pkgName: string]: string[] } = {};\n    const nonConflictSources: { [pkgName: string]: string[] } = {}; // for logging/debugging purposes\n    allConfigMerge.forEach((configMerge) => {\n      const mergedConfig = configMerge.getDepsResolverResult()?.mergedConfig;\n      if (!mergedConfig || mergedConfig === '-') return;\n      const mergedConfigPolicy = mergedConfig.policy || {};\n      DEPENDENCIES_FIELDS.forEach((depField) => {\n        if (!mergedConfigPolicy[depField]) return;\n        mergedConfigPolicy[depField].forEach((pkg: PkgEntry) => {\n          if (pkg.force) return; // we only care about auto-detected dependencies\n          if (nonConflictDeps[pkg.name]) {\n            if (!nonConflictDeps[pkg.name].includes(pkg.version)) nonConflictDeps[pkg.name].push(pkg.version);\n            nonConflictSources[pkg.name].push(configMerge.compIdStr);\n            return;\n          }\n          nonConflictDeps[pkg.name] = [pkg.version];\n          nonConflictSources[pkg.name] = [configMerge.compIdStr];\n        });\n      });\n    });\n\n    // aggregate all dependencies that have conflicts\n    const conflictDeps: { [pkgName: string]: string[] } = {};\n    const conflictDepsSources: { [pkgName: string]: string[] } = {}; // for logging/debugging purposes\n    allConfigMerge.forEach((configMerge) => {\n      const mergedConfigConflict = configMerge.getDepsResolverResult()?.conflict;\n      if (!mergedConfigConflict) return;\n      DEPENDENCIES_FIELDS.forEach((depField) => {\n        if (!mergedConfigConflict[depField]) return;\n        mergedConfigConflict[depField].forEach((pkg: PkgEntry) => {\n          if (pkg.force) return; // we only care about auto-detected dependencies\n          if (conflictDeps[pkg.name]) {\n            if (!conflictDeps[pkg.name].includes(pkg.version)) conflictDeps[pkg.name].push(pkg.version);\n            conflictDepsSources[pkg.name].push(configMerge.compIdStr);\n            return;\n          }\n          conflictDeps[pkg.name] = [pkg.version];\n          conflictDepsSources[pkg.name] = [configMerge.compIdStr];\n        });\n      });\n    });\n\n    const notConflictedPackages = Object.keys(nonConflictDeps);\n    const conflictedPackages = Object.keys(conflictDeps);\n    if (!notConflictedPackages.length && !conflictedPackages.length) return {};\n\n    const workspaceConfig = this.config.workspaceConfig;\n    if (!workspaceConfig) throw new Error(`updateWorkspaceJsoncWithDepsIfNeeded unable to get workspace config`);\n    const depResolver = workspaceConfig.extensions.findCoreExtension(DependencyResolverAspect.id);\n    const policy = depResolver?.config.policy;\n    if (!policy) {\n      return {};\n    }\n\n    // calculate the workspace.json updates\n    const workspaceJsonUpdates = {};\n    notConflictedPackages.forEach((pkgName) => {\n      if (nonConflictDeps[pkgName].length > 1) {\n        // we only want the deps that the other lane has them in the workspace.json and that all comps use the same dep.\n        return;\n      }\n      DEPENDENCIES_FIELDS.forEach((depField) => {\n        if (!policy[depField]?.[pkgName]) return; // doesn't exists in the workspace.json\n        const currentVer = policy[depField][pkgName];\n        const newVer = nonConflictDeps[pkgName][0];\n        if (currentVer === newVer) return;\n        workspaceJsonUpdates[pkgName] = [currentVer, newVer];\n        policy[depField][pkgName] = newVer;\n        this.logger.debug(\n          `update workspace.jsonc: ${pkgName} from ${currentVer} to ${newVer}. Triggered by: ${nonConflictSources[\n            pkgName\n          ].join(', ')}`\n        );\n      });\n    });\n\n    // calculate the workspace.json conflicts\n    const workspaceJsonConflicts = { dependencies: [], peerDependencies: [] };\n    const conflictPackagesToRemoveFromConfigMerge: string[] = [];\n    conflictedPackages.forEach((pkgName) => {\n      if (conflictDeps[pkgName].length > 1) {\n        // we only want the deps that the other lane has them in the workspace.json and that all comps use the same dep.\n        return;\n      }\n      const conflictRaw = conflictDeps[pkgName][0];\n      const [, currentVal, otherVal] = conflictRaw.split('::');\n\n      WS_DEPS_FIELDS.forEach((depField) => {\n        if (!policy[depField]?.[pkgName]) return;\n        const currentVerInWsJson = policy[depField][pkgName];\n        if (!currentVerInWsJson) return;\n        // the version is coming from the workspace.jsonc\n        conflictPackagesToRemoveFromConfigMerge.push(pkgName);\n        if (semver.satisfies(otherVal, currentVerInWsJson)) {\n          // the other version is compatible with the current version in the workspace.json\n          return;\n        }\n        workspaceJsonConflicts[depField].push({\n          name: pkgName,\n          version: conflictRaw.replace(currentVal, currentVerInWsJson),\n          force: false,\n        });\n        conflictPackagesToRemoveFromConfigMerge.push(pkgName);\n        this.logger.debug(\n          `conflict workspace.jsonc: ${pkgName} current: ${currentVerInWsJson}, other: ${otherVal}. Triggered by: ${conflictDepsSources[\n            pkgName\n          ].join(', ')}`\n        );\n      });\n    });\n    WS_DEPS_FIELDS.forEach((depField) => {\n      if (isEmpty(workspaceJsonConflicts[depField])) delete workspaceJsonConflicts[depField];\n    });\n\n    if (conflictPackagesToRemoveFromConfigMerge.length) {\n      allResults.forEach((result) => {\n        if (result?.conflict) {\n          DEPENDENCIES_FIELDS.forEach((depField) => {\n            if (!result.conflict?.[depField]) return;\n            result.conflict[depField] = result.conflict?.[depField].filter(\n              (dep) => !conflictPackagesToRemoveFromConfigMerge.includes(dep.name)\n            );\n            if (!result.conflict[depField].length) delete result.conflict[depField];\n          });\n          if (isEmpty(result.conflict)) result.conflict = undefined;\n        }\n      });\n    }\n\n    if (Object.keys(workspaceJsonUpdates).length) {\n      await workspaceConfig.write({ reasonForChange: 'merge (update dependencies)' });\n    }\n\n    this.logger.debug('final workspace.jsonc updates', workspaceJsonUpdates);\n    this.logger.debug('final workspace.jsonc conflicts', workspaceJsonConflicts);\n\n    return {\n      workspaceDepsUpdates: Object.keys(workspaceJsonUpdates).length ? workspaceJsonUpdates : undefined,\n      workspaceDepsConflicts: Object.keys(workspaceJsonConflicts).length ? workspaceJsonConflicts : undefined,\n    };\n  }\n\n  static slots = [];\n  static dependencies = [WorkspaceAspect, ConfigAspect, LoggerAspect];\n  static runtime = MainRuntime;\n  static async provider([workspace, config, loggerMain]: [Workspace, ConfigMain, LoggerMain]) {\n    const logger = loggerMain.createLogger(ConfigMergerAspect.id);\n    return new ConfigMergerMain(workspace, logger, config);\n  }\n}\n\nConfigMergerAspect.addRuntime(ConfigMergerMain);\n\nexport default ConfigMergerMain;\n"],"mappings":"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"}

package/package.json

@@ -1,55 +1,69 @@
 {
   "name": "@teambit/config-merger",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "homepage": "https://bit.cloud/teambit/workspace/config-merger",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.workspace",
     "name": "config-merger",
-    "version": "0.0.2"
+    "version": "0.0.3"
   },
   "dependencies": {
     "lodash": "4.17.21",
     "semver": "7.5.2",
     "fs-extra": "10.0.0",
     "tempy": "1.0.1",
-    "core-js": "^3.0.0",
-    "@babel/runtime": "7.20.0",
     "@teambit/component-id": "1.2.0",
     "@teambit/component-version": "1.0.3",
     "@teambit/harmony": "0.4.6",
     "@teambit/bit-error": "0.0.404",
-    "@teambit/builder": "1.0.135",
-    "@teambit/dependency-resolver": "1.0.135",
-    "@teambit/envs": "1.0.135",
+    "@teambit/builder": "1.0.136",
+    "@teambit/dependency-resolver": "1.0.136",
+    "@teambit/envs": "1.0.136",
     "@teambit/logger": "0.0.941",
     "@teambit/cli": "0.0.848",
-    "@teambit/config": "0.0.886",
-    "@teambit/workspace": "1.0.135"
+    "@teambit/config": "0.0.887",
+    "@teambit/workspace": "1.0.136"
   },
   "devDependencies": {
     "@types/lodash": "4.14.165",
     "@types/semver": "7.3.4",
     "@types/fs-extra": "9.0.7",
-    "@types/node": "12.20.4",
-    "@types/react": "^17.0.8",
-    "@types/react-dom": "^17.0.5",
-    "@types/jest": "^26.0.0",
-    "@types/testing-library__jest-dom": "5.9.5"
+    "@types/jest": "^29.2.2",
+    "@types/testing-library__jest-dom": "^5.9.5",
+    "@teambit/harmony.envs.core-aspect-env": "0.0.19"
   },
   "peerDependencies": {
-    "@teambit/legacy": "1.0.636",
-    "react": "^16.8.0 || ^17.0.0",
-    "react-dom": "^16.8.0 || ^17.0.0"
+    "@teambit/legacy": "1.0.636"
   },
-  "license": "SEE LICENSE IN LICENSE",
+  "license": "Apache-2.0",
   "optionalDependencies": {},
   "peerDependenciesMeta": {},
   "exports": {
-    "node": {
-      "require": "./dist/index.js",
-      "import": "./dist/esm.mjs"
+    ".": {
+      "node": {
+        "require": "./dist/index.js",
+        "import": "./dist/esm.mjs"
+      },
+      "default": "./dist/index.js"
     },
-    "default": "./dist/index.js"
-  }
+    "./dist/*": "./dist/*",
+    "./artifacts/*": "./artifacts/*"
+  },
+  "private": false,
+  "engines": {
+    "node": ">=16.0.0"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/teambit/bit"
+  },
+  "keywords": [
+    "bit",
+    "bit-aspect",
+    "bit-core-aspect",
+    "components",
+    "collaboration",
+    "web"
+  ]
 }

package/tsconfig.json

@@ -1,38 +1,33 @@
 {
   "compilerOptions": {
     "lib": [
-      "es2019",
-      "DOM",
-      "ES6",
-      "DOM.Iterable",
-      "ScriptHost"
+      "esnext",
+      "dom",
+      "dom.Iterable"
     ],
-    "target": "es2015",
-    "module": "CommonJS",
-    "jsx": "react",
-    "allowJs": true,
-    "composite": true,
+    "target": "es2020",
+    "module": "es2020",
+    "jsx": "react-jsx",
     "declaration": true,
     "sourceMap": true,
-    "skipLibCheck": true,
     "experimentalDecorators": true,
-    "outDir": "dist",
+    "skipLibCheck": true,
     "moduleResolution": "node",
     "esModuleInterop": true,
-    "rootDir": ".",
     "resolveJsonModule": true,
-    "emitDeclarationOnly": true,
-    "emitDecoratorMetadata": true,
-    "allowSyntheticDefaultImports": true,
-    "strictPropertyInitialization": false,
-    "strict": true,
-    "noImplicitAny": false,
-    "preserveConstEnums": true
+    "allowJs": true,
+    "outDir": "dist",
+    "emitDeclarationOnly": true
   },
   "exclude": [
+    "artifacts",
+    "public",
     "dist",
+    "node_modules",
+    "package.json",
     "esm.mjs",
-    "package.json"
+    "**/*.cjs",
+    "./dist"
   ],
   "include": [
     "**/*",

package/types/asset.d.ts

@@ -5,12 +5,12 @@ declare module '*.png' {
 declare module '*.svg' {
   import type { FunctionComponent, SVGProps } from 'react';
 
-  export const ReactComponent: FunctionComponent<SVGProps<SVGSVGElement> & { title?: string }>;
+  export const ReactComponent: FunctionComponent<
+    SVGProps<SVGSVGElement> & { title?: string }
+  >;
   const src: string;
   export default src;
 }
-
-// @TODO Gilad
 declare module '*.jpg' {
   const value: any;
   export = value;
@@ -27,3 +27,15 @@ declare module '*.bmp' {
   const value: any;
   export = value;
 }
+declare module '*.otf' {
+  const value: any;
+  export = value;
+}
+declare module '*.woff' {
+  const value: any;
+  export = value;
+}
+declare module '*.woff2' {
+  const value: any;
+  export = value;
+}