@teambit/merging 0.0.257 → 0.0.258

package/dist/config-merger.js

@@ -141,8 +141,8 @@ class ConfigMerger {
         mergedConfig: this.getConfig(otherExt)
       };
     });
-    const envResult = this.envStrategy();
-    return new (_configMergeResult().ConfigMergeResult)(this.compIdStr, (0, _lodash().compact)([...results, ...otherAspectsNotHandledResults, envResult]));
+    const envResult = [this.envStrategy()] || [];
+    return new (_configMergeResult().ConfigMergeResult)(this.compIdStr, (0, _lodash().compact)([...results, ...otherAspectsNotHandledResults, ...envResult]));
   }
   populateEnvs() {
     // populate ids
@@ -172,21 +172,21 @@ class ConfigMerger {
       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.config = currentEnvAspect.rawConfig;
+      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.config = otherEnvAspect.rawConfig;
+      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.config = baseEnvAspect.rawConfig;
+        this.baseEnv.config = this.getConfig(baseEnvAspect);
       }
     }
   }
@@ -279,13 +279,15 @@ class ConfigMerger {
     let conflict;
     if (currentConfig === '-') {
       conflict = `${'<'.repeat(7)} ${this.currentLabel}
+"${id}": "-"
 =======
 "${id}": ${JSON.stringify(otherConfig, undefined, 2)}
 ${'>'.repeat(7)} ${this.otherLabel}`;
     } else if (otherConfig === '-') {
       conflict = `${'<'.repeat(7)} ${this.currentLabel}
-"${id}": ${JSON.stringify(otherConfig, undefined, 2)}
+"${id}": ${JSON.stringify(currentConfig, undefined, 2)}
 =======
+"${id}": "-"
 ${'>'.repeat(7)} ${this.otherLabel}`;
     } else {
       const formatConfig = conf => {

package/dist/config-merger.js.map

@@ -1 +1 @@
-{"version":3,"names":["ConfigMerger","constructor","compIdStr","workspaceIds","currentAspects","baseAspects","otherAspects","currentLabel","otherLabel","merge","populateEnvs","results","map","currentExt","id","stringId","handledExtIds","includes","push","baseExt","findExtension","otherExt","mergePerStrategy","basicConflictGenerator","currentConfig","getConfig","otherConfig","otherAspectsNotHandledResults","extensionId","hasVersion","idFromWorkspace","getIdFromWorkspace","toStringWithoutVersion","_legacy","toString","mergedConfig","envResult","envStrategy","ConfigMergeResult","compact","getEnvId","ext","envsAspect","findCoreExtension","EnvsAspect","Error","env","config","data","currentEnv","otherEnv","baseEnv","undefined","currentEnvAspect","version","rawConfig","otherEnvAspect","baseEnvAspect","mergeStrategyParams","baseConfig","isIdInWorkspace","basicConfigMerge","areConfigsEqual","configA","configB","JSON","stringify","depResolverResult","depResolverStrategy","mergeStrategyConfigParams","conflict","repeat","formatConfig","conf","confStr","confStrSplit","split","shift","pop","join","params","DependencyResolverAspect","currentPolicy","getPolicy","otherPolicy","basePolicy","mergedPolicy","dependencies","devDependencies","peerDependencies","conflictedPolicy","isMerged","hasConflict","conflictIndicator","lifecycleToDepType","runtime","dev","peer","handleConfigMerge","addVariantPolicyEntryToPolicy","dep","depType","lifecycleType","name","dependencyId","value","force","length","forEach","policy","currentAndOtherConfig","uniqBy","concat","d","currentDep","find","otherDep","baseDep","currentVer","otherVer","baseVer","hasConfigForDep","depName","getDepIdAsPkgName","__type","packageName","addSerializedDepToPolicy","lifecycle","getAutoDeps","filter","source","idWithoutVersion","existingPolicy","p","getPolicyVer","semver","valid","startsWith","currentData","otherData","currentAndOtherData","baseData","depData","isEnv","currentId","isRange","satisfies","conflictStr","mergedConfigSplit","conflictLines","line","currentVal","otherVal","unshift","Boolean","c","omit","VariantPolicy","fromConfigObject","entries"],"sources":["config-merger.ts"],"sourcesContent":["import { ComponentID } from '@teambit/component-id';\nimport semver from 'semver';\nimport {\n  DependencyResolverAspect,\n  isRange,\n  SerializedDependency,\n  VariantPolicy,\n  VariantPolicyEntry,\n} from '@teambit/dependency-resolver';\nimport { EnvsAspect } from '@teambit/envs';\nimport { ExtensionDataEntry, ExtensionDataList } from '@teambit/legacy/dist/consumer/config/extension-data';\nimport { compact, omit, uniqBy } from 'lodash';\nimport { ConfigMergeResult } from './config-merge-result';\n\ntype GenericConfigOrRemoved = Record<string, any> | '-';\n\ntype EnvData = { id: string; version?: string; config?: GenericConfigOrRemoved };\n\ntype SerializedDependencyWithPolicy = SerializedDependency & { policy?: string };\n\nexport type MergeStrategyResult = {\n  id: string;\n  mergedConfig?: GenericConfigOrRemoved;\n  conflict?: string;\n};\ntype MergeStrategyParamsWithRemoved = {\n  id: string;\n  currentConfig: GenericConfigOrRemoved;\n  otherConfig: GenericConfigOrRemoved;\n  baseConfig?: GenericConfigOrRemoved;\n};\ntype MergeStrategyParams = {\n  id: string;\n  currentExt: ExtensionDataEntry;\n  otherExt: ExtensionDataEntry;\n  baseExt?: ExtensionDataEntry;\n};\n\n/**\n * perform 3-way merge of component configuration (aspects).\n * normally this is needed when merging one lane into another. the component may have different aspects config in each lane.\n * the baseAspects are the aspects of the component in the diversion point (the common ancestor of the two lanes).\n * the currentAspects are the aspects of the component in the current lane.\n * the otherAspects are the aspects of the component in the other lane. this is the lane we merge into the current lane.\n *\n * the basic merging strategy is a simple comparison between the aspect-configs, if they're different, we have a conflict.\n * we have two special cases:\n *\n * 1. dependency-resolver: we do a deeper check for the policy, we compare each dependency separately. also, we take\n * into account not only the config, but also the data. this is needed because some dependencies are automatically\n * added by Bit (from the import statements in the code) and they're not in the config. the final config has the deps\n * from both sources, the config and the data. The way we know to differentiate between them is by the \"force\" prop.\n * the config has always force: true.\n *\n * 2. envs: if we don't treat it specially, the user will need to make the change not only in the envs aspect, but also\n * in the deps-resolver (because the env is added as a devDependency) and also in the aspect itself (because\n * teambit.envs/env has only the id and not the version). to make it simpler, we ignore the envs in the deps-resolver\n * we ignore the individual aspect that is the env itself. we only show teambit.envs/env and we put the env id and\n * version. later, when the component is loaded, we split the id and the version and put them in the correct places.\n * see workspace.componentExtension / adjustEnvsOnConfigMerge for more details.\n */\nexport class ConfigMerger {\n  private currentEnv: EnvData;\n  private otherEnv: EnvData;\n  private baseEnv?: EnvData;\n  private handledExtIds: string[] = [];\n  constructor(\n    private compIdStr: string,\n    private workspaceIds: ComponentID[],\n    private currentAspects: ExtensionDataList,\n    private baseAspects: ExtensionDataList,\n    private otherAspects: ExtensionDataList,\n    private currentLabel: string,\n    private otherLabel: string\n  ) {}\n\n  merge(): ConfigMergeResult {\n    this.populateEnvs();\n    const results = this.currentAspects.map((currentExt) => {\n      const id = currentExt.stringId;\n      if (this.handledExtIds.includes(id)) return null;\n      this.handledExtIds.push(id);\n      const baseExt = this.baseAspects.findExtension(id, true);\n      const otherExt = this.otherAspects.findExtension(id, true);\n      if (otherExt) {\n        // try to 3-way-merge\n        return this.mergePerStrategy({ id, currentExt, otherExt, baseExt });\n      }\n      // exist in current but not in other\n      if (baseExt) {\n        // was removed on other\n        return this.basicConflictGenerator({ id, currentConfig: this.getConfig(currentExt), otherConfig: '-' });\n      }\n      // exist in current but not in other and base, so it got created on current. nothing to do.\n      return null;\n    });\n    const otherAspectsNotHandledResults = this.otherAspects.map((otherExt) => {\n      let id = otherExt.stringId;\n      if (this.handledExtIds.includes(id)) return null;\n      this.handledExtIds.push(id);\n      if (otherExt.extensionId && otherExt.extensionId.hasVersion()) {\n        // avoid using the id from the other lane if it exits in the workspace. prefer the id from the workspace.\n        const idFromWorkspace = this.getIdFromWorkspace(otherExt.extensionId.toStringWithoutVersion());\n        if (idFromWorkspace) id = idFromWorkspace._legacy.toString();\n      }\n      const baseExt = this.baseAspects.findExtension(id, true);\n      if (baseExt) {\n        // was removed on current\n        return this.basicConflictGenerator({ id, currentConfig: '-', otherConfig: this.getConfig(otherExt) });\n      }\n      // exist in other but not in current and base, so it got created on other.\n      return { id, mergedConfig: this.getConfig(otherExt) };\n    });\n    const envResult = this.envStrategy();\n    return new ConfigMergeResult(this.compIdStr, compact([...results, ...otherAspectsNotHandledResults, envResult]));\n  }\n\n  private populateEnvs() {\n    // populate ids\n    const getEnvId = (ext: ExtensionDataList) => {\n      const envsAspect = ext.findCoreExtension(EnvsAspect.id);\n      if (!envsAspect) throw new Error(`unable to find ${EnvsAspect.id} aspect for ${this.compIdStr}`);\n      const env = envsAspect.config.env || envsAspect.data.id;\n      if (!env)\n        throw new Error(`unable to find env for ${this.compIdStr}, the config and data of ${EnvsAspect.id} are empty}`);\n      return env;\n    };\n    const currentEnv = getEnvId(this.currentAspects);\n    this.currentEnv = { id: currentEnv };\n    const otherEnv = getEnvId(this.otherAspects);\n    this.otherEnv = { id: otherEnv };\n    const baseEnv = this.baseAspects ? getEnvId(this.baseAspects) : undefined;\n    if (baseEnv) this.baseEnv = { id: baseEnv };\n\n    // populate version\n    const currentEnvAspect = this.currentAspects.findExtension(currentEnv, true);\n    if (currentEnvAspect) {\n      this.handledExtIds.push(currentEnvAspect.stringId);\n      this.currentEnv.version = currentEnvAspect.extensionId?.version;\n      this.currentEnv.config = currentEnvAspect.rawConfig;\n    }\n    const otherEnvAspect = this.otherAspects.findExtension(otherEnv, true);\n    if (otherEnvAspect) {\n      this.handledExtIds.push(otherEnvAspect.stringId);\n      this.otherEnv.version = otherEnvAspect.extensionId?.version;\n      this.otherEnv.config = otherEnvAspect.rawConfig;\n    }\n    if (this.baseEnv) {\n      const baseEnvAspect = this.baseAspects.findExtension(baseEnv, true);\n      if (baseEnvAspect) {\n        this.baseEnv.version = baseEnvAspect.extensionId?.version;\n        this.baseEnv.config = baseEnvAspect.rawConfig;\n      }\n    }\n  }\n\n  private envStrategy(): MergeStrategyResult | null {\n    const mergeStrategyParams: MergeStrategyParamsWithRemoved = {\n      id: EnvsAspect.id,\n      currentConfig: {\n        env: this.currentEnv.version ? `${this.currentEnv.id}@${this.currentEnv.version}` : this.currentEnv.id,\n      },\n      otherConfig: { env: this.otherEnv.version ? `${this.otherEnv.id}@${this.otherEnv.version}` : this.otherEnv.id },\n    };\n    if (this.baseEnv) {\n      mergeStrategyParams.baseConfig = {\n        env: this.baseEnv?.version ? `${this.baseEnv.id}@${this.baseEnv.version}` : this.baseEnv?.id,\n      };\n    }\n    if (this.currentEnv.id === this.otherEnv.id && this.currentEnv.version === this.otherEnv.version) {\n      return null;\n    }\n    if (this.isIdInWorkspace(this.currentEnv.id)) {\n      // the env currently used is part of the workspace, that's what the user needs. don't try to resolve anything.\n      return null;\n    }\n    return this.basicConfigMerge(mergeStrategyParams);\n  }\n\n  private areConfigsEqual(configA: GenericConfigOrRemoved, configB: GenericConfigOrRemoved) {\n    return JSON.stringify(configA) === JSON.stringify(configB);\n  }\n\n  private mergePerStrategy(mergeStrategyParams: MergeStrategyParams): MergeStrategyResult | null {\n    const { id, currentExt, otherExt, baseExt } = mergeStrategyParams;\n    const depResolverResult = this.depResolverStrategy(mergeStrategyParams);\n    if (depResolverResult) {\n      return depResolverResult;\n    }\n    const currentConfig = this.getConfig(currentExt);\n    const otherConfig = this.getConfig(otherExt);\n    const baseConfig = baseExt ? this.getConfig(baseExt) : undefined;\n\n    return this.basicConfigMerge({ id, currentConfig, otherConfig, baseConfig });\n  }\n\n  private basicConfigMerge(mergeStrategyParams: MergeStrategyParamsWithRemoved) {\n    const { id, currentConfig, otherConfig, baseConfig } = mergeStrategyParams;\n    if (this.areConfigsEqual(currentConfig, otherConfig)) {\n      return null;\n    }\n    if (baseConfig && this.areConfigsEqual(baseConfig, otherConfig)) {\n      // was changed on current\n      return null;\n    }\n    if (baseConfig && this.areConfigsEqual(baseConfig, currentConfig)) {\n      // was changed on other\n      return { id, mergedConfig: otherConfig };\n    }\n    // either no baseConfig, or baseConfig is also different from both: other and local. that's a conflict.\n    const mergeStrategyConfigParams = { id, currentConfig, otherConfig, baseConfig };\n    return this.basicConflictGenerator(mergeStrategyConfigParams);\n  }\n\n  private basicConflictGenerator({\n    id,\n    currentConfig,\n    otherConfig,\n  }: MergeStrategyParamsWithRemoved): MergeStrategyResult {\n    // uncomment to debug\n    // console.log('basicConflictGenerator', this.compIdStr, id, 'currentConfig', currentConfig, 'otherConfig', otherConfig);\n    let conflict: string;\n    if (currentConfig === '-') {\n      conflict = `${'<'.repeat(7)} ${this.currentLabel}\n=======\n\"${id}\": ${JSON.stringify(otherConfig, undefined, 2)}\n${'>'.repeat(7)} ${this.otherLabel}`;\n    } else if (otherConfig === '-') {\n      conflict = `${'<'.repeat(7)} ${this.currentLabel}\n\"${id}\": ${JSON.stringify(otherConfig, undefined, 2)}\n=======\n${'>'.repeat(7)} ${this.otherLabel}`;\n    } else {\n      const formatConfig = (conf: GenericConfigOrRemoved) => {\n        const confStr = JSON.stringify(conf, undefined, 2);\n        const confStrSplit = confStr.split('\\n');\n        confStrSplit.shift(); // remove first {\n        confStrSplit.pop(); // remove last }\n        return confStrSplit.join('\\n');\n      };\n      conflict = `\"${id}\": {\n${'<'.repeat(7)} ${this.currentLabel}\n${formatConfig(currentConfig)}\n=======\n${formatConfig(otherConfig)}\n${'>'.repeat(7)} ${this.otherLabel}\n}`;\n    }\n\n    return { id, conflict };\n  }\n\n  private depResolverStrategy(params: MergeStrategyParams): MergeStrategyResult | undefined {\n    if (params.id !== DependencyResolverAspect.id) return undefined;\n    const { currentExt, otherExt, baseExt } = params;\n\n    const currentConfig = this.getConfig(currentExt);\n    const currentPolicy = this.getPolicy(currentConfig);\n    const otherConfig = this.getConfig(otherExt);\n    const otherPolicy = this.getPolicy(otherConfig);\n\n    const baseConfig = baseExt ? this.getConfig(baseExt) : undefined;\n    const basePolicy = baseConfig ? this.getPolicy(baseConfig) : undefined;\n\n    const mergedPolicy = {\n      dependencies: [],\n      devDependencies: [],\n      peerDependencies: [],\n    };\n    const conflictedPolicy = {\n      dependencies: [],\n      devDependencies: [],\n      peerDependencies: [],\n    };\n    let isMerged = false;\n    let hasConflict = false;\n    const conflictIndicator = 'CONFLICT::';\n    const lifecycleToDepType = {\n      runtime: 'dependencies',\n      dev: 'devDependencies',\n      peer: 'peerDependencies',\n    };\n    const handleConfigMerge = () => {\n      const addVariantPolicyEntryToPolicy = (dep: VariantPolicyEntry) => {\n        const depType = lifecycleToDepType[dep.lifecycleType];\n        mergedPolicy[depType].push({\n          name: dep.dependencyId,\n          version: dep.value.version,\n          force: dep.force,\n        });\n        isMerged = true;\n      };\n\n      if (this.areConfigsEqual(currentConfig, otherConfig)) {\n        return;\n      }\n      if (baseConfig && this.areConfigsEqual(baseConfig, otherConfig)) {\n        // was changed on current\n        return;\n      }\n      if (currentConfig === '-' || otherConfig === '-') {\n        throw new Error('not implemented. Is it possible to have it as minus?');\n      }\n      if (baseConfig && this.areConfigsEqual(baseConfig, currentConfig)) {\n        // was changed on other\n        if (otherPolicy.length) {\n          otherPolicy.forEach((dep) => {\n            addVariantPolicyEntryToPolicy(dep);\n          });\n        }\n        isMerged = true;\n        return;\n      }\n\n      // either no baseConfig, or baseConfig is also different from both: other and local. that's a conflict.\n      if (!currentConfig.policy && !otherConfig.policy) return;\n      const currentAndOtherConfig = uniqBy(currentPolicy.concat(otherPolicy), (d) => d.dependencyId);\n      currentAndOtherConfig.forEach((dep) => {\n        const depType = lifecycleToDepType[dep.lifecycleType];\n        const currentDep = currentPolicy.find((d) => d.dependencyId === dep.dependencyId);\n        const otherDep = otherPolicy.find((d) => d.dependencyId === dep.dependencyId);\n        const baseDep = basePolicy?.find((d) => d.dependencyId === dep.dependencyId);\n\n        if (!otherDep) {\n          return;\n        }\n        if (!currentDep) {\n          // only on other\n          addVariantPolicyEntryToPolicy(otherDep);\n          return;\n        }\n        const currentVer = currentDep.value.version;\n        const otherVer = otherDep.value.version;\n        if (currentVer === otherVer) {\n          return;\n        }\n        const baseVer = baseDep?.value.version;\n        if (baseVer && baseVer === otherVer) {\n          return;\n        }\n        // @todo: needs to ignore if it's in the workspace somehow.\n        // if (currentDep.__type === 'component' && this.isIdInWorkspace(currentId)) {\n        //   // dependencies that exist in the workspace, should be ignored. they'll be resolved later to the version in the ws.\n        //   return;\n        // }\n        if (baseVer && baseVer === currentVer) {\n          addVariantPolicyEntryToPolicy(otherDep);\n          return;\n        }\n\n        hasConflict = true;\n        conflictedPolicy[depType].push({\n          name: currentDep.dependencyId,\n          version: `${conflictIndicator}${currentVer}::${otherVer}::`,\n          force: currentDep.force,\n        });\n      });\n    };\n\n    handleConfigMerge();\n\n    const hasConfigForDep = (depType: string, depName: string) => mergedPolicy[depType].find((d) => d.name === depName);\n    const getDepIdAsPkgName = (dep: SerializedDependencyWithPolicy) => {\n      if (dep.__type !== 'component') {\n        return dep.id;\n      }\n      // @ts-ignore\n      return dep.packageName;\n    };\n\n    const addSerializedDepToPolicy = (dep: SerializedDependencyWithPolicy) => {\n      const depType = lifecycleToDepType[dep.lifecycle];\n\n      if (hasConfigForDep(depType, dep.id)) {\n        return; // there is already config for it.\n      }\n      mergedPolicy[depType].push({\n        name: getDepIdAsPkgName(dep),\n        version: dep.policy || dep.version,\n        force: false,\n      });\n      isMerged = true;\n    };\n\n    const getAutoDeps = (ext: ExtensionDataList): SerializedDependencyWithPolicy[] => {\n      const data = ext.findCoreExtension(DependencyResolverAspect.id)?.data.dependencies;\n      if (!data) return [];\n      const policy = ext.findCoreExtension(DependencyResolverAspect.id)?.data.policy || [];\n      return data\n        .filter((d) => d.source === 'auto')\n        .map((d) => {\n          const idWithoutVersion = d.__type === 'package' ? d.id : d.id.split('@')[0];\n          const existingPolicy = policy.find((p) => p.dependencyId === idWithoutVersion);\n          const getPolicyVer = () => {\n            if (d.__type === 'package') return undefined; // for packages, the policy is already the version\n            if (existingPolicy) return existingPolicy.value.version; // currently it's missing, will be implemented by @Gilad\n            if (!semver.valid(d.version)) return d.version; // could be a hash\n            // default to `^` or ~ if starts with zero, until we save the policy from the workspace during tag/snap.\n            return d.version.startsWith('0.') ? `~${d.version}` : `^${d.version}`;\n          };\n          return {\n            ...d,\n            id: idWithoutVersion,\n            policy: getPolicyVer(),\n          };\n        });\n    };\n\n    const currentData = getAutoDeps(this.currentAspects);\n    const otherData = getAutoDeps(this.otherAspects);\n    const currentAndOtherData = uniqBy(currentData.concat(otherData), (d) => d.id);\n    const baseData = getAutoDeps(this.baseAspects);\n\n    // uncomment to debug\n    // console.log('\\n\\n**************', this.compIdStr, '**************');\n    // console.log('currentData', currentData.length, '\\n', currentData.map((d) => `${d.__type} ${d.id} ${d.version}`).join('\\n'));\n    // console.log('otherData', otherData.length, '\\n', otherData.map((d) => `${d.__type} ${d.id} ${d.version}`).join('\\n'));\n    // console.log('otherData', baseData.length, '\\n', baseData.map((d) => `${d.__type} ${d.id} ${d.version}`).join('\\n'));\n    // console.log('** END **\\n\\n');\n\n    currentAndOtherData.forEach((depData) => {\n      if (this.isEnv(depData.id)) {\n        // ignore the envs\n        return;\n      }\n      const currentDep = currentData.find((d) => d.id === depData.id);\n      const otherDep = otherData.find((d) => d.id === depData.id);\n      if (!otherDep) {\n        return;\n      }\n      if (!currentDep) {\n        // only on other\n        addSerializedDepToPolicy(otherDep);\n        return;\n      }\n      const currentId = currentDep.id;\n      const currentVer = currentDep.policy || currentDep.version;\n      const otherVer = otherDep.policy || otherDep.version;\n      if (currentVer === otherVer) {\n        return;\n      }\n      const baseDep = baseData.find((d) => d.id === currentId);\n      const baseVer = baseDep?.policy || baseDep?.version;\n      if (baseVer && baseVer === otherVer) {\n        return;\n      }\n      if (currentDep.__type === 'component' && this.isIdInWorkspace(currentId)) {\n        // dependencies that exist in the workspace, should be ignored. they'll be resolved later to the version in the ws.\n        return;\n      }\n      if (baseVer && baseVer === currentVer) {\n        addSerializedDepToPolicy(otherDep);\n        return;\n      }\n      // either no baseVal, or baseVal is also different from both: other and local. that's probably a conflict.\n      const depType = lifecycleToDepType[currentDep.lifecycle];\n      if (hasConfigForDep(depType, currentDep.id)) {\n        return; // there is already config for it.\n      }\n      // try to resolve according to semver\n      if (\n        currentDep.policy &&\n        otherDep.policy &&\n        isRange(currentDep.policy, currentDep.id) &&\n        isRange(otherDep.policy, otherDep.id)\n      ) {\n        if (semver.satisfies(currentDep.version, otherDep.policy)) {\n          return;\n        }\n        if (semver.satisfies(otherDep.version, currentDep.policy)) {\n          addSerializedDepToPolicy(otherDep);\n          return;\n        }\n      }\n      hasConflict = true;\n      conflictedPolicy[depType].push({\n        name: getDepIdAsPkgName(currentDep),\n        version: `${conflictIndicator}${currentVer}::${otherVer}::`,\n        force: false,\n      });\n    });\n\n    ['dependencies', 'devDependencies', 'peerDependencies'].forEach((depType) => {\n      if (!mergedPolicy[depType].length) delete mergedPolicy[depType];\n      if (!conflictedPolicy[depType].length) delete conflictedPolicy[depType];\n    });\n\n    let conflictStr: string | undefined;\n    if (hasConflict) {\n      const mergedConfigSplit = JSON.stringify({ policy: conflictedPolicy }, undefined, 2).split('\\n');\n      const conflictLines = mergedConfigSplit.map((line) => {\n        if (!line.includes(conflictIndicator)) return line;\n        const [, currentVal, otherVal] = line.split('::');\n        return `${'<'.repeat(7)} ${this.currentLabel}\n        \"version\": \"${currentVal}\",\n=======\n        \"version\": \"${otherVal}\",\n${'>'.repeat(7)} ${this.otherLabel}`;\n      });\n      // replace the first line with line with the id\n      conflictLines.shift();\n      conflictLines.unshift(`\"${params.id}\": {`);\n      conflictStr = conflictLines.join('\\n');\n    }\n    const config = isMerged ? { policy: mergedPolicy } : undefined;\n\n    return { id: params.id, mergedConfig: config, conflict: conflictStr };\n  }\n\n  private isIdInWorkspace(id: string): boolean {\n    return Boolean(this.getIdFromWorkspace(id));\n  }\n\n  private getIdFromWorkspace(id: string): ComponentID | undefined {\n    return this.workspaceIds.find((c) => c.toStringWithoutVersion() === id);\n  }\n\n  private isEnv(id: string) {\n    return id === this.currentEnv.id || id === this.otherEnv.id;\n  }\n\n  private getConfig(ext: ExtensionDataEntry) {\n    if (ext.rawConfig === '-') return ext.rawConfig;\n    return omit(ext.rawConfig, ['__specific']);\n  }\n\n  private getPolicy(config): VariantPolicyEntry[] {\n    if (!config.policy) return [];\n    return VariantPolicy.fromConfigObject(config.policy).entries;\n  }\n}\n"],"mappings":";;;;;;;;;;;;;;;;AACA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AACA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AAOA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AAEA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AACA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AAA0D;AAAA;AA0B1D;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,MAAMA,YAAY,CAAC;EAKxBC,WAAW,CACDC,SAAiB,EACjBC,YAA2B,EAC3BC,cAAiC,EACjCC,WAA8B,EAC9BC,YAA+B,EAC/BC,YAAoB,EACpBC,UAAkB,EAC1B;IAAA,KAPQN,SAAiB,GAAjBA,SAAiB;IAAA,KACjBC,YAA2B,GAA3BA,YAA2B;IAAA,KAC3BC,cAAiC,GAAjCA,cAAiC;IAAA,KACjCC,WAA8B,GAA9BA,WAA8B;IAAA,KAC9BC,YAA+B,GAA/BA,YAA+B;IAAA,KAC/BC,YAAoB,GAApBA,YAAoB;IAAA,KACpBC,UAAkB,GAAlBA,UAAkB;IAAA;IAAA;IAAA;IAAA,uDARM,EAAE;EASjC;EAEHC,KAAK,GAAsB;IACzB,IAAI,CAACC,YAAY,EAAE;IACnB,MAAMC,OAAO,GAAG,IAAI,CAACP,cAAc,CAACQ,GAAG,CAAEC,UAAU,IAAK;MACtD,MAAMC,EAAE,GAAGD,UAAU,CAACE,QAAQ;MAC9B,IAAI,IAAI,CAACC,aAAa,CAACC,QAAQ,CAACH,EAAE,CAAC,EAAE,OAAO,IAAI;MAChD,IAAI,CAACE,aAAa,CAACE,IAAI,CAACJ,EAAE,CAAC;MAC3B,MAAMK,OAAO,GAAG,IAAI,CAACd,WAAW,CAACe,aAAa,CAACN,EAAE,EAAE,IAAI,CAAC;MACxD,MAAMO,QAAQ,GAAG,IAAI,CAACf,YAAY,CAACc,aAAa,CAACN,EAAE,EAAE,IAAI,CAAC;MAC1D,IAAIO,QAAQ,EAAE;QACZ;QACA,OAAO,IAAI,CAACC,gBAAgB,CAAC;UAAER,EAAE;UAAED,UAAU;UAAEQ,QAAQ;UAAEF;QAAQ,CAAC,CAAC;MACrE;MACA;MACA,IAAIA,OAAO,EAAE;QACX;QACA,OAAO,IAAI,CAACI,sBAAsB,CAAC;UAAET,EAAE;UAAEU,aAAa,EAAE,IAAI,CAACC,SAAS,CAACZ,UAAU,CAAC;UAAEa,WAAW,EAAE;QAAI,CAAC,CAAC;MACzG;MACA;MACA,OAAO,IAAI;IACb,CAAC,CAAC;IACF,MAAMC,6BAA6B,GAAG,IAAI,CAACrB,YAAY,CAACM,GAAG,CAAES,QAAQ,IAAK;MACxE,IAAIP,EAAE,GAAGO,QAAQ,CAACN,QAAQ;MAC1B,IAAI,IAAI,CAACC,aAAa,CAACC,QAAQ,CAACH,EAAE,CAAC,EAAE,OAAO,IAAI;MAChD,IAAI,CAACE,aAAa,CAACE,IAAI,CAACJ,EAAE,CAAC;MAC3B,IAAIO,QAAQ,CAACO,WAAW,IAAIP,QAAQ,CAACO,WAAW,CAACC,UAAU,EAAE,EAAE;QAC7D;QACA,MAAMC,eAAe,GAAG,IAAI,CAACC,kBAAkB,CAACV,QAAQ,CAACO,WAAW,CAACI,sBAAsB,EAAE,CAAC;QAC9F,IAAIF,eAAe,EAAEhB,EAAE,GAAGgB,eAAe,CAACG,OAAO,CAACC,QAAQ,EAAE;MAC9D;MACA,MAAMf,OAAO,GAAG,IAAI,CAACd,WAAW,CAACe,aAAa,CAACN,EAAE,EAAE,IAAI,CAAC;MACxD,IAAIK,OAAO,EAAE;QACX;QACA,OAAO,IAAI,CAACI,sBAAsB,CAAC;UAAET,EAAE;UAAEU,aAAa,EAAE,GAAG;UAAEE,WAAW,EAAE,IAAI,CAACD,SAAS,CAACJ,QAAQ;QAAE,CAAC,CAAC;MACvG;MACA;MACA,OAAO;QAAEP,EAAE;QAAEqB,YAAY,EAAE,IAAI,CAACV,SAAS,CAACJ,QAAQ;MAAE,CAAC;IACvD,CAAC,CAAC;IACF,MAAMe,SAAS,GAAG,IAAI,CAACC,WAAW,EAAE;IACpC,OAAO,KAAIC,sCAAiB,EAAC,IAAI,CAACpC,SAAS,EAAE,IAAAqC,iBAAO,EAAC,CAAC,GAAG5B,OAAO,EAAE,GAAGgB,6BAA6B,EAAES,SAAS,CAAC,CAAC,CAAC;EAClH;EAEQ1B,YAAY,GAAG;IACrB;IACA,MAAM8B,QAAQ,GAAIC,GAAsB,IAAK;MAC3C,MAAMC,UAAU,GAAGD,GAAG,CAACE,iBAAiB,CAACC,kBAAU,CAAC9B,EAAE,CAAC;MACvD,IAAI,CAAC4B,UAAU,EAAE,MAAM,IAAIG,KAAK,CAAE,kBAAiBD,kBAAU,CAAC9B,EAAG,eAAc,IAAI,CAACZ,SAAU,EAAC,CAAC;MAChG,MAAM4C,GAAG,GAAGJ,UAAU,CAACK,MAAM,CAACD,GAAG,IAAIJ,UAAU,CAACM,IAAI,CAAClC,EAAE;MACvD,IAAI,CAACgC,GAAG,EACN,MAAM,IAAID,KAAK,CAAE,0BAAyB,IAAI,CAAC3C,SAAU,4BAA2B0C,kBAAU,CAAC9B,EAAG,aAAY,CAAC;MACjH,OAAOgC,GAAG;IACZ,CAAC;IACD,MAAMG,UAAU,GAAGT,QAAQ,CAAC,IAAI,CAACpC,cAAc,CAAC;IAChD,IAAI,CAAC6C,UAAU,GAAG;MAAEnC,EAAE,EAAEmC;IAAW,CAAC;IACpC,MAAMC,QAAQ,GAAGV,QAAQ,CAAC,IAAI,CAAClC,YAAY,CAAC;IAC5C,IAAI,CAAC4C,QAAQ,GAAG;MAAEpC,EAAE,EAAEoC;IAAS,CAAC;IAChC,MAAMC,OAAO,GAAG,IAAI,CAAC9C,WAAW,GAAGmC,QAAQ,CAAC,IAAI,CAACnC,WAAW,CAAC,GAAG+C,SAAS;IACzE,IAAID,OAAO,EAAE,IAAI,CAACA,OAAO,GAAG;MAAErC,EAAE,EAAEqC;IAAQ,CAAC;;IAE3C;IACA,MAAME,gBAAgB,GAAG,IAAI,CAACjD,cAAc,CAACgB,aAAa,CAAC6B,UAAU,EAAE,IAAI,CAAC;IAC5E,IAAII,gBAAgB,EAAE;MAAA;MACpB,IAAI,CAACrC,aAAa,CAACE,IAAI,CAACmC,gBAAgB,CAACtC,QAAQ,CAAC;MAClD,IAAI,CAACkC,UAAU,CAACK,OAAO,4BAAGD,gBAAgB,CAACzB,WAAW,0DAA5B,sBAA8B0B,OAAO;MAC/D,IAAI,CAACL,UAAU,CAACF,MAAM,GAAGM,gBAAgB,CAACE,SAAS;IACrD;IACA,MAAMC,cAAc,GAAG,IAAI,CAAClD,YAAY,CAACc,aAAa,CAAC8B,QAAQ,EAAE,IAAI,CAAC;IACtE,IAAIM,cAAc,EAAE;MAAA;MAClB,IAAI,CAACxC,aAAa,CAACE,IAAI,CAACsC,cAAc,CAACzC,QAAQ,CAAC;MAChD,IAAI,CAACmC,QAAQ,CAACI,OAAO,4BAAGE,cAAc,CAAC5B,WAAW,0DAA1B,sBAA4B0B,OAAO;MAC3D,IAAI,CAACJ,QAAQ,CAACH,MAAM,GAAGS,cAAc,CAACD,SAAS;IACjD;IACA,IAAI,IAAI,CAACJ,OAAO,EAAE;MAChB,MAAMM,aAAa,GAAG,IAAI,CAACpD,WAAW,CAACe,aAAa,CAAC+B,OAAO,EAAE,IAAI,CAAC;MACnE,IAAIM,aAAa,EAAE;QAAA;QACjB,IAAI,CAACN,OAAO,CAACG,OAAO,4BAAGG,aAAa,CAAC7B,WAAW,0DAAzB,sBAA2B0B,OAAO;QACzD,IAAI,CAACH,OAAO,CAACJ,MAAM,GAAGU,aAAa,CAACF,SAAS;MAC/C;IACF;EACF;EAEQlB,WAAW,GAA+B;IAChD,MAAMqB,mBAAmD,GAAG;MAC1D5C,EAAE,EAAE8B,kBAAU,CAAC9B,EAAE;MACjBU,aAAa,EAAE;QACbsB,GAAG,EAAE,IAAI,CAACG,UAAU,CAACK,OAAO,GAAI,GAAE,IAAI,CAACL,UAAU,CAACnC,EAAG,IAAG,IAAI,CAACmC,UAAU,CAACK,OAAQ,EAAC,GAAG,IAAI,CAACL,UAAU,CAACnC;MACtG,CAAC;MACDY,WAAW,EAAE;QAAEoB,GAAG,EAAE,IAAI,CAACI,QAAQ,CAACI,OAAO,GAAI,GAAE,IAAI,CAACJ,QAAQ,CAACpC,EAAG,IAAG,IAAI,CAACoC,QAAQ,CAACI,OAAQ,EAAC,GAAG,IAAI,CAACJ,QAAQ,CAACpC;MAAG;IAChH,CAAC;IACD,IAAI,IAAI,CAACqC,OAAO,EAAE;MAAA;MAChBO,mBAAmB,CAACC,UAAU,GAAG;QAC/Bb,GAAG,EAAE,qBAAI,CAACK,OAAO,0CAAZ,cAAcG,OAAO,GAAI,GAAE,IAAI,CAACH,OAAO,CAACrC,EAAG,IAAG,IAAI,CAACqC,OAAO,CAACG,OAAQ,EAAC,qBAAG,IAAI,CAACH,OAAO,mDAAZ,eAAcrC;MAC5F,CAAC;IACH;IACA,IAAI,IAAI,CAACmC,UAAU,CAACnC,EAAE,KAAK,IAAI,CAACoC,QAAQ,CAACpC,EAAE,IAAI,IAAI,CAACmC,UAAU,CAACK,OAAO,KAAK,IAAI,CAACJ,QAAQ,CAACI,OAAO,EAAE;MAChG,OAAO,IAAI;IACb;IACA,IAAI,IAAI,CAACM,eAAe,CAAC,IAAI,CAACX,UAAU,CAACnC,EAAE,CAAC,EAAE;MAC5C;MACA,OAAO,IAAI;IACb;IACA,OAAO,IAAI,CAAC+C,gBAAgB,CAACH,mBAAmB,CAAC;EACnD;EAEQI,eAAe,CAACC,OAA+B,EAAEC,OAA+B,EAAE;IACxF,OAAOC,IAAI,CAACC,SAAS,CAACH,OAAO,CAAC,KAAKE,IAAI,CAACC,SAAS,CAACF,OAAO,CAAC;EAC5D;EAEQ1C,gBAAgB,CAACoC,mBAAwC,EAA8B;IAC7F,MAAM;MAAE5C,EAAE;MAAED,UAAU;MAAEQ,QAAQ;MAAEF;IAAQ,CAAC,GAAGuC,mBAAmB;IACjE,MAAMS,iBAAiB,GAAG,IAAI,CAACC,mBAAmB,CAACV,mBAAmB,CAAC;IACvE,IAAIS,iBAAiB,EAAE;MACrB,OAAOA,iBAAiB;IAC1B;IACA,MAAM3C,aAAa,GAAG,IAAI,CAACC,SAAS,CAACZ,UAAU,CAAC;IAChD,MAAMa,WAAW,GAAG,IAAI,CAACD,SAAS,CAACJ,QAAQ,CAAC;IAC5C,MAAMsC,UAAU,GAAGxC,OAAO,GAAG,IAAI,CAACM,SAAS,CAACN,OAAO,CAAC,GAAGiC,SAAS;IAEhE,OAAO,IAAI,CAACS,gBAAgB,CAAC;MAAE/C,EAAE;MAAEU,aAAa;MAAEE,WAAW;MAAEiC;IAAW,CAAC,CAAC;EAC9E;EAEQE,gBAAgB,CAACH,mBAAmD,EAAE;IAC5E,MAAM;MAAE5C,EAAE;MAAEU,aAAa;MAAEE,WAAW;MAAEiC;IAAW,CAAC,GAAGD,mBAAmB;IAC1E,IAAI,IAAI,CAACI,eAAe,CAACtC,aAAa,EAAEE,WAAW,CAAC,EAAE;MACpD,OAAO,IAAI;IACb;IACA,IAAIiC,UAAU,IAAI,IAAI,CAACG,eAAe,CAACH,UAAU,EAAEjC,WAAW,CAAC,EAAE;MAC/D;MACA,OAAO,IAAI;IACb;IACA,IAAIiC,UAAU,IAAI,IAAI,CAACG,eAAe,CAACH,UAAU,EAAEnC,aAAa,CAAC,EAAE;MACjE;MACA,OAAO;QAAEV,EAAE;QAAEqB,YAAY,EAAET;MAAY,CAAC;IAC1C;IACA;IACA,MAAM2C,yBAAyB,GAAG;MAAEvD,EAAE;MAAEU,aAAa;MAAEE,WAAW;MAAEiC;IAAW,CAAC;IAChF,OAAO,IAAI,CAACpC,sBAAsB,CAAC8C,yBAAyB,CAAC;EAC/D;EAEQ9C,sBAAsB,CAAC;IAC7BT,EAAE;IACFU,aAAa;IACbE;EAC8B,CAAC,EAAuB;IACtD;IACA;IACA,IAAI4C,QAAgB;IACpB,IAAI9C,aAAa,KAAK,GAAG,EAAE;MACzB8C,QAAQ,GAAI,GAAE,GAAG,CAACC,MAAM,CAAC,CAAC,CAAE,IAAG,IAAI,CAAChE,YAAa;AACvD;AACA,GAAGO,EAAG,MAAKmD,IAAI,CAACC,SAAS,CAACxC,WAAW,EAAE0B,SAAS,EAAE,CAAC,CAAE;AACrD,EAAE,GAAG,CAACmB,MAAM,CAAC,CAAC,CAAE,IAAG,IAAI,CAAC/D,UAAW,EAAC;IAChC,CAAC,MAAM,IAAIkB,WAAW,KAAK,GAAG,EAAE;MAC9B4C,QAAQ,GAAI,GAAE,GAAG,CAACC,MAAM,CAAC,CAAC,CAAE,IAAG,IAAI,CAAChE,YAAa;AACvD,GAAGO,EAAG,MAAKmD,IAAI,CAACC,SAAS,CAACxC,WAAW,EAAE0B,SAAS,EAAE,CAAC,CAAE;AACrD;AACA,EAAE,GAAG,CAACmB,MAAM,CAAC,CAAC,CAAE,IAAG,IAAI,CAAC/D,UAAW,EAAC;IAChC,CAAC,MAAM;MACL,MAAMgE,YAAY,GAAIC,IAA4B,IAAK;QACrD,MAAMC,OAAO,GAAGT,IAAI,CAACC,SAAS,CAACO,IAAI,EAAErB,SAAS,EAAE,CAAC,CAAC;QAClD,MAAMuB,YAAY,GAAGD,OAAO,CAACE,KAAK,CAAC,IAAI,CAAC;QACxCD,YAAY,CAACE,KAAK,EAAE,CAAC,CAAC;QACtBF,YAAY,CAACG,GAAG,EAAE,CAAC,CAAC;QACpB,OAAOH,YAAY,CAACI,IAAI,CAAC,IAAI,CAAC;MAChC,CAAC;MACDT,QAAQ,GAAI,IAAGxD,EAAG;AACxB,EAAE,GAAG,CAACyD,MAAM,CAAC,CAAC,CAAE,IAAG,IAAI,CAAChE,YAAa;AACrC,EAAEiE,YAAY,CAAChD,aAAa,CAAE;AAC9B;AACA,EAAEgD,YAAY,CAAC9C,WAAW,CAAE;AAC5B,EAAE,GAAG,CAAC6C,MAAM,CAAC,CAAC,CAAE,IAAG,IAAI,CAAC/D,UAAW;AACnC,EAAE;IACE;IAEA,OAAO;MAAEM,EAAE;MAAEwD;IAAS,CAAC;EACzB;EAEQF,mBAAmB,CAACY,MAA2B,EAAmC;IACxF,IAAIA,MAAM,CAAClE,EAAE,KAAKmE,8CAAwB,CAACnE,EAAE,EAAE,OAAOsC,SAAS;IAC/D,MAAM;MAAEvC,UAAU;MAAEQ,QAAQ;MAAEF;IAAQ,CAAC,GAAG6D,MAAM;IAEhD,MAAMxD,aAAa,GAAG,IAAI,CAACC,SAAS,CAACZ,UAAU,CAAC;IAChD,MAAMqE,aAAa,GAAG,IAAI,CAACC,SAAS,CAAC3D,aAAa,CAAC;IACnD,MAAME,WAAW,GAAG,IAAI,CAACD,SAAS,CAACJ,QAAQ,CAAC;IAC5C,MAAM+D,WAAW,GAAG,IAAI,CAACD,SAAS,CAACzD,WAAW,CAAC;IAE/C,MAAMiC,UAAU,GAAGxC,OAAO,GAAG,IAAI,CAACM,SAAS,CAACN,OAAO,CAAC,GAAGiC,SAAS;IAChE,MAAMiC,UAAU,GAAG1B,UAAU,GAAG,IAAI,CAACwB,SAAS,CAACxB,UAAU,CAAC,GAAGP,SAAS;IAEtE,MAAMkC,YAAY,GAAG;MACnBC,YAAY,EAAE,EAAE;MAChBC,eAAe,EAAE,EAAE;MACnBC,gBAAgB,EAAE;IACpB,CAAC;IACD,MAAMC,gBAAgB,GAAG;MACvBH,YAAY,EAAE,EAAE;MAChBC,eAAe,EAAE,EAAE;MACnBC,gBAAgB,EAAE;IACpB,CAAC;IACD,IAAIE,QAAQ,GAAG,KAAK;IACpB,IAAIC,WAAW,GAAG,KAAK;IACvB,MAAMC,iBAAiB,GAAG,YAAY;IACtC,MAAMC,kBAAkB,GAAG;MACzBC,OAAO,EAAE,cAAc;MACvBC,GAAG,EAAE,iBAAiB;MACtBC,IAAI,EAAE;IACR,CAAC;IACD,MAAMC,iBAAiB,GAAG,MAAM;MAC9B,MAAMC,6BAA6B,GAAIC,GAAuB,IAAK;QACjE,MAAMC,OAAO,GAAGP,kBAAkB,CAACM,GAAG,CAACE,aAAa,CAAC;QACrDhB,YAAY,CAACe,OAAO,CAAC,CAACnF,IAAI,CAAC;UACzBqF,IAAI,EAAEH,GAAG,CAACI,YAAY;UACtBlD,OAAO,EAAE8C,GAAG,CAACK,KAAK,CAACnD,OAAO;UAC1BoD,KAAK,EAAEN,GAAG,CAACM;QACb,CAAC,CAAC;QACFf,QAAQ,GAAG,IAAI;MACjB,CAAC;MAED,IAAI,IAAI,CAAC7B,eAAe,CAACtC,aAAa,EAAEE,WAAW,CAAC,EAAE;QACpD;MACF;MACA,IAAIiC,UAAU,IAAI,IAAI,CAACG,eAAe,CAACH,UAAU,EAAEjC,WAAW,CAAC,EAAE;QAC/D;QACA;MACF;MACA,IAAIF,aAAa,KAAK,GAAG,IAAIE,WAAW,KAAK,GAAG,EAAE;QAChD,MAAM,IAAImB,KAAK,CAAC,sDAAsD,CAAC;MACzE;MACA,IAAIc,UAAU,IAAI,IAAI,CAACG,eAAe,CAACH,UAAU,EAAEnC,aAAa,CAAC,EAAE;QACjE;QACA,IAAI4D,WAAW,CAACuB,MAAM,EAAE;UACtBvB,WAAW,CAACwB,OAAO,CAAER,GAAG,IAAK;YAC3BD,6BAA6B,CAACC,GAAG,CAAC;UACpC,CAAC,CAAC;QACJ;QACAT,QAAQ,GAAG,IAAI;QACf;MACF;;MAEA;MACA,IAAI,CAACnE,aAAa,CAACqF,MAAM,IAAI,CAACnF,WAAW,CAACmF,MAAM,EAAE;MAClD,MAAMC,qBAAqB,GAAG,IAAAC,gBAAM,EAAC7B,aAAa,CAAC8B,MAAM,CAAC5B,WAAW,CAAC,EAAG6B,CAAC,IAAKA,CAAC,CAACT,YAAY,CAAC;MAC9FM,qBAAqB,CAACF,OAAO,CAAER,GAAG,IAAK;QACrC,MAAMC,OAAO,GAAGP,kBAAkB,CAACM,GAAG,CAACE,aAAa,CAAC;QACrD,MAAMY,UAAU,GAAGhC,aAAa,CAACiC,IAAI,CAAEF,CAAC,IAAKA,CAAC,CAACT,YAAY,KAAKJ,GAAG,CAACI,YAAY,CAAC;QACjF,MAAMY,QAAQ,GAAGhC,WAAW,CAAC+B,IAAI,CAAEF,CAAC,IAAKA,CAAC,CAACT,YAAY,KAAKJ,GAAG,CAACI,YAAY,CAAC;QAC7E,MAAMa,OAAO,GAAGhC,UAAU,aAAVA,UAAU,uBAAVA,UAAU,CAAE8B,IAAI,CAAEF,CAAC,IAAKA,CAAC,CAACT,YAAY,KAAKJ,GAAG,CAACI,YAAY,CAAC;QAE5E,IAAI,CAACY,QAAQ,EAAE;UACb;QACF;QACA,IAAI,CAACF,UAAU,EAAE;UACf;UACAf,6BAA6B,CAACiB,QAAQ,CAAC;UACvC;QACF;QACA,MAAME,UAAU,GAAGJ,UAAU,CAACT,KAAK,CAACnD,OAAO;QAC3C,MAAMiE,QAAQ,GAAGH,QAAQ,CAACX,KAAK,CAACnD,OAAO;QACvC,IAAIgE,UAAU,KAAKC,QAAQ,EAAE;UAC3B;QACF;QACA,MAAMC,OAAO,GAAGH,OAAO,aAAPA,OAAO,uBAAPA,OAAO,CAAEZ,KAAK,CAACnD,OAAO;QACtC,IAAIkE,OAAO,IAAIA,OAAO,KAAKD,QAAQ,EAAE;UACnC;QACF;QACA;QACA;QACA;QACA;QACA;QACA,IAAIC,OAAO,IAAIA,OAAO,KAAKF,UAAU,EAAE;UACrCnB,6BAA6B,CAACiB,QAAQ,CAAC;UACvC;QACF;QAEAxB,WAAW,GAAG,IAAI;QAClBF,gBAAgB,CAACW,OAAO,CAAC,CAACnF,IAAI,CAAC;UAC7BqF,IAAI,EAAEW,UAAU,CAACV,YAAY;UAC7BlD,OAAO,EAAG,GAAEuC,iBAAkB,GAAEyB,UAAW,KAAIC,QAAS,IAAG;UAC3Db,KAAK,EAAEQ,UAAU,CAACR;QACpB,CAAC,CAAC;MACJ,CAAC,CAAC;IACJ,CAAC;IAEDR,iBAAiB,EAAE;IAEnB,MAAMuB,eAAe,GAAG,CAACpB,OAAe,EAAEqB,OAAe,KAAKpC,YAAY,CAACe,OAAO,CAAC,CAACc,IAAI,CAAEF,CAAC,IAAKA,CAAC,CAACV,IAAI,KAAKmB,OAAO,CAAC;IACnH,MAAMC,iBAAiB,GAAIvB,GAAmC,IAAK;MACjE,IAAIA,GAAG,CAACwB,MAAM,KAAK,WAAW,EAAE;QAC9B,OAAOxB,GAAG,CAACtF,EAAE;MACf;MACA;MACA,OAAOsF,GAAG,CAACyB,WAAW;IACxB,CAAC;IAED,MAAMC,wBAAwB,GAAI1B,GAAmC,IAAK;MACxE,MAAMC,OAAO,GAAGP,kBAAkB,CAACM,GAAG,CAAC2B,SAAS,CAAC;MAEjD,IAAIN,eAAe,CAACpB,OAAO,EAAED,GAAG,CAACtF,EAAE,CAAC,EAAE;QACpC,OAAO,CAAC;MACV;;MACAwE,YAAY,CAACe,OAAO,CAAC,CAACnF,IAAI,CAAC;QACzBqF,IAAI,EAAEoB,iBAAiB,CAACvB,GAAG,CAAC;QAC5B9C,OAAO,EAAE8C,GAAG,CAACS,MAAM,IAAIT,GAAG,CAAC9C,OAAO;QAClCoD,KAAK,EAAE;MACT,CAAC,CAAC;MACFf,QAAQ,GAAG,IAAI;IACjB,CAAC;IAED,MAAMqC,WAAW,GAAIvF,GAAsB,IAAuC;MAAA;MAChF,MAAMO,IAAI,4BAAGP,GAAG,CAACE,iBAAiB,CAACsC,8CAAwB,CAACnE,EAAE,CAAC,0DAAlD,sBAAoDkC,IAAI,CAACuC,YAAY;MAClF,IAAI,CAACvC,IAAI,EAAE,OAAO,EAAE;MACpB,MAAM6D,MAAM,GAAG,2BAAApE,GAAG,CAACE,iBAAiB,CAACsC,8CAAwB,CAACnE,EAAE,CAAC,2DAAlD,uBAAoDkC,IAAI,CAAC6D,MAAM,KAAI,EAAE;MACpF,OAAO7D,IAAI,CACRiF,MAAM,CAAEhB,CAAC,IAAKA,CAAC,CAACiB,MAAM,KAAK,MAAM,CAAC,CAClCtH,GAAG,CAAEqG,CAAC,IAAK;QACV,MAAMkB,gBAAgB,GAAGlB,CAAC,CAACW,MAAM,KAAK,SAAS,GAAGX,CAAC,CAACnG,EAAE,GAAGmG,CAAC,CAACnG,EAAE,CAAC8D,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QAC3E,MAAMwD,cAAc,GAAGvB,MAAM,CAACM,IAAI,CAAEkB,CAAC,IAAKA,CAAC,CAAC7B,YAAY,KAAK2B,gBAAgB,CAAC;QAC9E,MAAMG,YAAY,GAAG,MAAM;UACzB,IAAIrB,CAAC,CAACW,MAAM,KAAK,SAAS,EAAE,OAAOxE,SAAS,CAAC,CAAC;UAC9C,IAAIgF,cAAc,EAAE,OAAOA,cAAc,CAAC3B,KAAK,CAACnD,OAAO,CAAC,CAAC;UACzD,IAAI,CAACiF,iBAAM,CAACC,KAAK,CAACvB,CAAC,CAAC3D,OAAO,CAAC,EAAE,OAAO2D,CAAC,CAAC3D,OAAO,CAAC,CAAC;UAChD;UACA,OAAO2D,CAAC,CAAC3D,OAAO,CAACmF,UAAU,CAAC,IAAI,CAAC,GAAI,IAAGxB,CAAC,CAAC3D,OAAQ,EAAC,GAAI,IAAG2D,CAAC,CAAC3D,OAAQ,EAAC;QACvE,CAAC;QACD,uCACK2D,CAAC;UACJnG,EAAE,EAAEqH,gBAAgB;UACpBtB,MAAM,EAAEyB,YAAY;QAAE;MAE1B,CAAC,CAAC;IACN,CAAC;IAED,MAAMI,WAAW,GAAGV,WAAW,CAAC,IAAI,CAAC5H,cAAc,CAAC;IACpD,MAAMuI,SAAS,GAAGX,WAAW,CAAC,IAAI,CAAC1H,YAAY,CAAC;IAChD,MAAMsI,mBAAmB,GAAG,IAAA7B,gBAAM,EAAC2B,WAAW,CAAC1B,MAAM,CAAC2B,SAAS,CAAC,EAAG1B,CAAC,IAAKA,CAAC,CAACnG,EAAE,CAAC;IAC9E,MAAM+H,QAAQ,GAAGb,WAAW,CAAC,IAAI,CAAC3H,WAAW,CAAC;;IAE9C;IACA;IACA;IACA;IACA;IACA;;IAEAuI,mBAAmB,CAAChC,OAAO,CAAEkC,OAAO,IAAK;MACvC,IAAI,IAAI,CAACC,KAAK,CAACD,OAAO,CAAChI,EAAE,CAAC,EAAE;QAC1B;QACA;MACF;MACA,MAAMoG,UAAU,GAAGwB,WAAW,CAACvB,IAAI,CAAEF,CAAC,IAAKA,CAAC,CAACnG,EAAE,KAAKgI,OAAO,CAAChI,EAAE,CAAC;MAC/D,MAAMsG,QAAQ,GAAGuB,SAAS,CAACxB,IAAI,CAAEF,CAAC,IAAKA,CAAC,CAACnG,EAAE,KAAKgI,OAAO,CAAChI,EAAE,CAAC;MAC3D,IAAI,CAACsG,QAAQ,EAAE;QACb;MACF;MACA,IAAI,CAACF,UAAU,EAAE;QACf;QACAY,wBAAwB,CAACV,QAAQ,CAAC;QAClC;MACF;MACA,MAAM4B,SAAS,GAAG9B,UAAU,CAACpG,EAAE;MAC/B,MAAMwG,UAAU,GAAGJ,UAAU,CAACL,MAAM,IAAIK,UAAU,CAAC5D,OAAO;MAC1D,MAAMiE,QAAQ,GAAGH,QAAQ,CAACP,MAAM,IAAIO,QAAQ,CAAC9D,OAAO;MACpD,IAAIgE,UAAU,KAAKC,QAAQ,EAAE;QAC3B;MACF;MACA,MAAMF,OAAO,GAAGwB,QAAQ,CAAC1B,IAAI,CAAEF,CAAC,IAAKA,CAAC,CAACnG,EAAE,KAAKkI,SAAS,CAAC;MACxD,MAAMxB,OAAO,GAAG,CAAAH,OAAO,aAAPA,OAAO,uBAAPA,OAAO,CAAER,MAAM,MAAIQ,OAAO,aAAPA,OAAO,uBAAPA,OAAO,CAAE/D,OAAO;MACnD,IAAIkE,OAAO,IAAIA,OAAO,KAAKD,QAAQ,EAAE;QACnC;MACF;MACA,IAAIL,UAAU,CAACU,MAAM,KAAK,WAAW,IAAI,IAAI,CAAChE,eAAe,CAACoF,SAAS,CAAC,EAAE;QACxE;QACA;MACF;MACA,IAAIxB,OAAO,IAAIA,OAAO,KAAKF,UAAU,EAAE;QACrCQ,wBAAwB,CAACV,QAAQ,CAAC;QAClC;MACF;MACA;MACA,MAAMf,OAAO,GAAGP,kBAAkB,CAACoB,UAAU,CAACa,SAAS,CAAC;MACxD,IAAIN,eAAe,CAACpB,OAAO,EAAEa,UAAU,CAACpG,EAAE,CAAC,EAAE;QAC3C,OAAO,CAAC;MACV;MACA;MACA,IACEoG,UAAU,CAACL,MAAM,IACjBO,QAAQ,CAACP,MAAM,IACf,IAAAoC,6BAAO,EAAC/B,UAAU,CAACL,MAAM,EAAEK,UAAU,CAACpG,EAAE,CAAC,IACzC,IAAAmI,6BAAO,EAAC7B,QAAQ,CAACP,MAAM,EAAEO,QAAQ,CAACtG,EAAE,CAAC,EACrC;QACA,IAAIyH,iBAAM,CAACW,SAAS,CAAChC,UAAU,CAAC5D,OAAO,EAAE8D,QAAQ,CAACP,MAAM,CAAC,EAAE;UACzD;QACF;QACA,IAAI0B,iBAAM,CAACW,SAAS,CAAC9B,QAAQ,CAAC9D,OAAO,EAAE4D,UAAU,CAACL,MAAM,CAAC,EAAE;UACzDiB,wBAAwB,CAACV,QAAQ,CAAC;UAClC;QACF;MACF;MACAxB,WAAW,GAAG,IAAI;MAClBF,gBAAgB,CAACW,OAAO,CAAC,CAACnF,IAAI,CAAC;QAC7BqF,IAAI,EAAEoB,iBAAiB,CAACT,UAAU,CAAC;QACnC5D,OAAO,EAAG,GAAEuC,iBAAkB,GAAEyB,UAAW,KAAIC,QAAS,IAAG;QAC3Db,KAAK,EAAE;MACT,CAAC,CAAC;IACJ,CAAC,CAAC;IAEF,CAAC,cAAc,EAAE,iBAAiB,EAAE,kBAAkB,CAAC,CAACE,OAAO,CAAEP,OAAO,IAAK;MAC3E,IAAI,CAACf,YAAY,CAACe,OAAO,CAAC,CAACM,MAAM,EAAE,OAAOrB,YAAY,CAACe,OAAO,CAAC;MAC/D,IAAI,CAACX,gBAAgB,CAACW,OAAO,CAAC,CAACM,MAAM,EAAE,OAAOjB,gBAAgB,CAACW,OAAO,CAAC;IACzE,CAAC,CAAC;IAEF,IAAI8C,WAA+B;IACnC,IAAIvD,WAAW,EAAE;MACf,MAAMwD,iBAAiB,GAAGnF,IAAI,CAACC,SAAS,CAAC;QAAE2C,MAAM,EAAEnB;MAAiB,CAAC,EAAEtC,SAAS,EAAE,CAAC,CAAC,CAACwB,KAAK,CAAC,IAAI,CAAC;MAChG,MAAMyE,aAAa,GAAGD,iBAAiB,CAACxI,GAAG,CAAE0I,IAAI,IAAK;QACpD,IAAI,CAACA,IAAI,CAACrI,QAAQ,CAAC4E,iBAAiB,CAAC,EAAE,OAAOyD,IAAI;QAClD,MAAM,GAAGC,UAAU,EAAEC,QAAQ,CAAC,GAAGF,IAAI,CAAC1E,KAAK,CAAC,IAAI,CAAC;QACjD,OAAQ,GAAE,GAAG,CAACL,MAAM,CAAC,CAAC,CAAE,IAAG,IAAI,CAAChE,YAAa;AACrD,sBAAsBgJ,UAAW;AACjC;AACA,sBAAsBC,QAAS;AAC/B,EAAE,GAAG,CAACjF,MAAM,CAAC,CAAC,CAAE,IAAG,IAAI,CAAC/D,UAAW,EAAC;MAC9B,CAAC,CAAC;MACF;MACA6I,aAAa,CAACxE,KAAK,EAAE;MACrBwE,aAAa,CAACI,OAAO,CAAE,IAAGzE,MAAM,CAAClE,EAAG,MAAK,CAAC;MAC1CqI,WAAW,GAAGE,aAAa,CAACtE,IAAI,CAAC,IAAI,CAAC;IACxC;IACA,MAAMhC,MAAM,GAAG4C,QAAQ,GAAG;MAAEkB,MAAM,EAAEvB;IAAa,CAAC,GAAGlC,SAAS;IAE9D,OAAO;MAAEtC,EAAE,EAAEkE,MAAM,CAAClE,EAAE;MAAEqB,YAAY,EAAEY,MAAM;MAAEuB,QAAQ,EAAE6E;IAAY,CAAC;EACvE;EAEQvF,eAAe,CAAC9C,EAAU,EAAW;IAC3C,OAAO4I,OAAO,CAAC,IAAI,CAAC3H,kBAAkB,CAACjB,EAAE,CAAC,CAAC;EAC7C;EAEQiB,kBAAkB,CAACjB,EAAU,EAA2B;IAC9D,OAAO,IAAI,CAACX,YAAY,CAACgH,IAAI,CAAEwC,CAAC,IAAKA,CAAC,CAAC3H,sBAAsB,EAAE,KAAKlB,EAAE,CAAC;EACzE;EAEQiI,KAAK,CAACjI,EAAU,EAAE;IACxB,OAAOA,EAAE,KAAK,IAAI,CAACmC,UAAU,CAACnC,EAAE,IAAIA,EAAE,KAAK,IAAI,CAACoC,QAAQ,CAACpC,EAAE;EAC7D;EAEQW,SAAS,CAACgB,GAAuB,EAAE;IACzC,IAAIA,GAAG,CAACc,SAAS,KAAK,GAAG,EAAE,OAAOd,GAAG,CAACc,SAAS;IAC/C,OAAO,IAAAqG,cAAI,EAACnH,GAAG,CAACc,SAAS,EAAE,CAAC,YAAY,CAAC,CAAC;EAC5C;EAEQ4B,SAAS,CAACpC,MAAM,EAAwB;IAC9C,IAAI,CAACA,MAAM,CAAC8D,MAAM,EAAE,OAAO,EAAE;IAC7B,OAAOgD,mCAAa,CAACC,gBAAgB,CAAC/G,MAAM,CAAC8D,MAAM,CAAC,CAACkD,OAAO;EAC9D;AACF;AAAC"}
+{"version":3,"names":["ConfigMerger","constructor","compIdStr","workspaceIds","currentAspects","baseAspects","otherAspects","currentLabel","otherLabel","merge","populateEnvs","results","map","currentExt","id","stringId","handledExtIds","includes","push","baseExt","findExtension","otherExt","mergePerStrategy","basicConflictGenerator","currentConfig","getConfig","otherConfig","otherAspectsNotHandledResults","extensionId","hasVersion","idFromWorkspace","getIdFromWorkspace","toStringWithoutVersion","_legacy","toString","mergedConfig","envResult","envStrategy","ConfigMergeResult","compact","getEnvId","ext","envsAspect","findCoreExtension","EnvsAspect","Error","env","config","data","currentEnv","otherEnv","baseEnv","undefined","currentEnvAspect","version","otherEnvAspect","baseEnvAspect","mergeStrategyParams","baseConfig","isIdInWorkspace","basicConfigMerge","areConfigsEqual","configA","configB","JSON","stringify","depResolverResult","depResolverStrategy","mergeStrategyConfigParams","conflict","repeat","formatConfig","conf","confStr","confStrSplit","split","shift","pop","join","params","DependencyResolverAspect","currentPolicy","getPolicy","otherPolicy","basePolicy","mergedPolicy","dependencies","devDependencies","peerDependencies","conflictedPolicy","isMerged","hasConflict","conflictIndicator","lifecycleToDepType","runtime","dev","peer","handleConfigMerge","addVariantPolicyEntryToPolicy","dep","depType","lifecycleType","name","dependencyId","value","force","length","forEach","policy","currentAndOtherConfig","uniqBy","concat","d","currentDep","find","otherDep","baseDep","currentVer","otherVer","baseVer","hasConfigForDep","depName","getDepIdAsPkgName","__type","packageName","addSerializedDepToPolicy","lifecycle","getAutoDeps","filter","source","idWithoutVersion","existingPolicy","p","getPolicyVer","semver","valid","startsWith","currentData","otherData","currentAndOtherData","baseData","depData","isEnv","currentId","isRange","satisfies","conflictStr","mergedConfigSplit","conflictLines","line","currentVal","otherVal","unshift","Boolean","c","rawConfig","omit","VariantPolicy","fromConfigObject","entries"],"sources":["config-merger.ts"],"sourcesContent":["import { ComponentID } from '@teambit/component-id';\nimport semver from 'semver';\nimport {\n  DependencyResolverAspect,\n  isRange,\n  SerializedDependency,\n  VariantPolicy,\n  VariantPolicyEntry,\n} from '@teambit/dependency-resolver';\nimport { EnvsAspect } from '@teambit/envs';\nimport { ExtensionDataEntry, ExtensionDataList } from '@teambit/legacy/dist/consumer/config/extension-data';\nimport { compact, omit, uniqBy } from 'lodash';\nimport { ConfigMergeResult } from './config-merge-result';\n\ntype GenericConfigOrRemoved = Record<string, any> | '-';\n\ntype EnvData = { id: string; version?: string; config?: GenericConfigOrRemoved };\n\ntype SerializedDependencyWithPolicy = SerializedDependency & { policy?: string };\n\nexport type MergeStrategyResult = {\n  id: string;\n  mergedConfig?: GenericConfigOrRemoved;\n  conflict?: string;\n};\ntype MergeStrategyParamsWithRemoved = {\n  id: string;\n  currentConfig: GenericConfigOrRemoved;\n  otherConfig: GenericConfigOrRemoved;\n  baseConfig?: GenericConfigOrRemoved;\n};\ntype MergeStrategyParams = {\n  id: string;\n  currentExt: ExtensionDataEntry;\n  otherExt: ExtensionDataEntry;\n  baseExt?: ExtensionDataEntry;\n};\n\n/**\n * perform 3-way merge of component configuration (aspects).\n * normally this is needed when merging one lane into another. the component may have different aspects config in each lane.\n * the baseAspects are the aspects of the component in the diversion point (the common ancestor of the two lanes).\n * the currentAspects are the aspects of the component in the current lane.\n * the otherAspects are the aspects of the component in the other lane. this is the lane we merge into the current lane.\n *\n * the basic merging strategy is a simple comparison between the aspect-configs, if they're different, we have a conflict.\n * we have two special cases:\n *\n * 1. dependency-resolver: we do a deeper check for the policy, we compare each dependency separately. also, we take\n * into account not only the config, but also the data. this is needed because some dependencies are automatically\n * added by Bit (from the import statements in the code) and they're not in the config. the final config has the deps\n * from both sources, the config and the data. The way we know to differentiate between them is by the \"force\" prop.\n * the config has always force: true.\n *\n * 2. envs: if we don't treat it specially, the user will need to make the change not only in the envs aspect, but also\n * in the deps-resolver (because the env is added as a devDependency) and also in the aspect itself (because\n * teambit.envs/env has only the id and not the version). to make it simpler, we ignore the envs in the deps-resolver\n * we ignore the individual aspect that is the env itself. we only show teambit.envs/env and we put the env id and\n * version. later, when the component is loaded, we split the id and the version and put them in the correct places.\n * see workspace.componentExtension / adjustEnvsOnConfigMerge for more details.\n */\nexport class ConfigMerger {\n  private currentEnv: EnvData;\n  private otherEnv: EnvData;\n  private baseEnv?: EnvData;\n  private handledExtIds: string[] = [];\n  constructor(\n    private compIdStr: string,\n    private workspaceIds: ComponentID[],\n    private currentAspects: ExtensionDataList,\n    private baseAspects: ExtensionDataList,\n    private otherAspects: ExtensionDataList,\n    private currentLabel: string,\n    private otherLabel: string\n  ) {}\n\n  merge(): ConfigMergeResult {\n    this.populateEnvs();\n    const results = this.currentAspects.map((currentExt) => {\n      const id = currentExt.stringId;\n      if (this.handledExtIds.includes(id)) return null;\n      this.handledExtIds.push(id);\n      const baseExt = this.baseAspects.findExtension(id, true);\n      const otherExt = this.otherAspects.findExtension(id, true);\n      if (otherExt) {\n        // try to 3-way-merge\n        return this.mergePerStrategy({ id, currentExt, otherExt, baseExt });\n      }\n      // exist in current but not in other\n      if (baseExt) {\n        // was removed on other\n        return this.basicConflictGenerator({ id, currentConfig: this.getConfig(currentExt), otherConfig: '-' });\n      }\n      // exist in current but not in other and base, so it got created on current. nothing to do.\n      return null;\n    });\n    const otherAspectsNotHandledResults = this.otherAspects.map((otherExt) => {\n      let id = otherExt.stringId;\n      if (this.handledExtIds.includes(id)) return null;\n      this.handledExtIds.push(id);\n      if (otherExt.extensionId && otherExt.extensionId.hasVersion()) {\n        // avoid using the id from the other lane if it exits in the workspace. prefer the id from the workspace.\n        const idFromWorkspace = this.getIdFromWorkspace(otherExt.extensionId.toStringWithoutVersion());\n        if (idFromWorkspace) id = idFromWorkspace._legacy.toString();\n      }\n      const baseExt = this.baseAspects.findExtension(id, true);\n      if (baseExt) {\n        // was removed on current\n        return this.basicConflictGenerator({ id, currentConfig: '-', otherConfig: this.getConfig(otherExt) });\n      }\n      // exist in other but not in current and base, so it got created on other.\n      return { id, mergedConfig: this.getConfig(otherExt) };\n    });\n    const envResult = [this.envStrategy()] || [];\n    return new ConfigMergeResult(this.compIdStr, compact([...results, ...otherAspectsNotHandledResults, ...envResult]));\n  }\n\n  private populateEnvs() {\n    // populate ids\n    const getEnvId = (ext: ExtensionDataList) => {\n      const envsAspect = ext.findCoreExtension(EnvsAspect.id);\n      if (!envsAspect) throw new Error(`unable to find ${EnvsAspect.id} aspect for ${this.compIdStr}`);\n      const env = envsAspect.config.env || envsAspect.data.id;\n      if (!env)\n        throw new Error(`unable to find env for ${this.compIdStr}, the config and data of ${EnvsAspect.id} are empty}`);\n      return env;\n    };\n    const currentEnv = getEnvId(this.currentAspects);\n    this.currentEnv = { id: currentEnv };\n    const otherEnv = getEnvId(this.otherAspects);\n    this.otherEnv = { id: otherEnv };\n    const baseEnv = this.baseAspects ? getEnvId(this.baseAspects) : undefined;\n    if (baseEnv) this.baseEnv = { id: baseEnv };\n\n    // populate version\n    const currentEnvAspect = this.currentAspects.findExtension(currentEnv, true);\n    if (currentEnvAspect) {\n      this.handledExtIds.push(currentEnvAspect.stringId);\n      this.currentEnv.version = currentEnvAspect.extensionId?.version;\n      this.currentEnv.config = 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.isIdInWorkspace(this.currentEnv.id)) {\n      // the env currently used is part of the workspace, that's what the user needs. don't try to resolve anything.\n      return null;\n    }\n    return this.basicConfigMerge(mergeStrategyParams);\n  }\n\n  private areConfigsEqual(configA: GenericConfigOrRemoved, configB: GenericConfigOrRemoved) {\n    return JSON.stringify(configA) === JSON.stringify(configB);\n  }\n\n  private mergePerStrategy(mergeStrategyParams: MergeStrategyParams): MergeStrategyResult | null {\n    const { id, currentExt, otherExt, baseExt } = mergeStrategyParams;\n    const depResolverResult = this.depResolverStrategy(mergeStrategyParams);\n    if (depResolverResult) {\n      return depResolverResult;\n    }\n    const currentConfig = this.getConfig(currentExt);\n    const otherConfig = this.getConfig(otherExt);\n    const baseConfig = baseExt ? this.getConfig(baseExt) : undefined;\n\n    return this.basicConfigMerge({ id, currentConfig, otherConfig, baseConfig });\n  }\n\n  private basicConfigMerge(mergeStrategyParams: MergeStrategyParamsWithRemoved) {\n    const { id, currentConfig, otherConfig, baseConfig } = mergeStrategyParams;\n    if (this.areConfigsEqual(currentConfig, otherConfig)) {\n      return null;\n    }\n    if (baseConfig && this.areConfigsEqual(baseConfig, otherConfig)) {\n      // was changed on current\n      return null;\n    }\n    if (baseConfig && this.areConfigsEqual(baseConfig, currentConfig)) {\n      // was changed on other\n      return { id, mergedConfig: otherConfig };\n    }\n    // either no baseConfig, or baseConfig is also different from both: other and local. that's a conflict.\n    const mergeStrategyConfigParams = { id, currentConfig, otherConfig, baseConfig };\n    return this.basicConflictGenerator(mergeStrategyConfigParams);\n  }\n\n  private basicConflictGenerator({\n    id,\n    currentConfig,\n    otherConfig,\n  }: MergeStrategyParamsWithRemoved): MergeStrategyResult {\n    // uncomment to debug\n    // console.log('basicConflictGenerator', this.compIdStr, id, 'currentConfig', currentConfig, 'otherConfig', otherConfig);\n    let conflict: string;\n    if (currentConfig === '-') {\n      conflict = `${'<'.repeat(7)} ${this.currentLabel}\n\"${id}\": \"-\"\n=======\n\"${id}\": ${JSON.stringify(otherConfig, undefined, 2)}\n${'>'.repeat(7)} ${this.otherLabel}`;\n    } else if (otherConfig === '-') {\n      conflict = `${'<'.repeat(7)} ${this.currentLabel}\n\"${id}\": ${JSON.stringify(currentConfig, undefined, 2)}\n=======\n\"${id}\": \"-\"\n${'>'.repeat(7)} ${this.otherLabel}`;\n    } else {\n      const formatConfig = (conf: GenericConfigOrRemoved) => {\n        const confStr = JSON.stringify(conf, undefined, 2);\n        const confStrSplit = confStr.split('\\n');\n        confStrSplit.shift(); // remove first {\n        confStrSplit.pop(); // remove last }\n        return confStrSplit.join('\\n');\n      };\n      conflict = `\"${id}\": {\n${'<'.repeat(7)} ${this.currentLabel}\n${formatConfig(currentConfig)}\n=======\n${formatConfig(otherConfig)}\n${'>'.repeat(7)} ${this.otherLabel}\n}`;\n    }\n\n    return { id, conflict };\n  }\n\n  private depResolverStrategy(params: MergeStrategyParams): MergeStrategyResult | undefined {\n    if (params.id !== DependencyResolverAspect.id) return undefined;\n    const { currentExt, otherExt, baseExt } = params;\n\n    const currentConfig = this.getConfig(currentExt);\n    const currentPolicy = this.getPolicy(currentConfig);\n    const otherConfig = this.getConfig(otherExt);\n    const otherPolicy = this.getPolicy(otherConfig);\n\n    const baseConfig = baseExt ? this.getConfig(baseExt) : undefined;\n    const basePolicy = baseConfig ? this.getPolicy(baseConfig) : undefined;\n\n    const mergedPolicy = {\n      dependencies: [],\n      devDependencies: [],\n      peerDependencies: [],\n    };\n    const conflictedPolicy = {\n      dependencies: [],\n      devDependencies: [],\n      peerDependencies: [],\n    };\n    let isMerged = false;\n    let hasConflict = false;\n    const conflictIndicator = 'CONFLICT::';\n    const lifecycleToDepType = {\n      runtime: 'dependencies',\n      dev: 'devDependencies',\n      peer: 'peerDependencies',\n    };\n    const handleConfigMerge = () => {\n      const addVariantPolicyEntryToPolicy = (dep: VariantPolicyEntry) => {\n        const depType = lifecycleToDepType[dep.lifecycleType];\n        mergedPolicy[depType].push({\n          name: dep.dependencyId,\n          version: dep.value.version,\n          force: dep.force,\n        });\n        isMerged = true;\n      };\n\n      if (this.areConfigsEqual(currentConfig, otherConfig)) {\n        return;\n      }\n      if (baseConfig && this.areConfigsEqual(baseConfig, otherConfig)) {\n        // was changed on current\n        return;\n      }\n      if (currentConfig === '-' || otherConfig === '-') {\n        throw new Error('not implemented. Is it possible to have it as minus?');\n      }\n      if (baseConfig && this.areConfigsEqual(baseConfig, currentConfig)) {\n        // was changed on other\n        if (otherPolicy.length) {\n          otherPolicy.forEach((dep) => {\n            addVariantPolicyEntryToPolicy(dep);\n          });\n        }\n        isMerged = true;\n        return;\n      }\n\n      // either no baseConfig, or baseConfig is also different from both: other and local. that's a conflict.\n      if (!currentConfig.policy && !otherConfig.policy) return;\n      const currentAndOtherConfig = uniqBy(currentPolicy.concat(otherPolicy), (d) => d.dependencyId);\n      currentAndOtherConfig.forEach((dep) => {\n        const depType = lifecycleToDepType[dep.lifecycleType];\n        const currentDep = currentPolicy.find((d) => d.dependencyId === dep.dependencyId);\n        const otherDep = otherPolicy.find((d) => d.dependencyId === dep.dependencyId);\n        const baseDep = basePolicy?.find((d) => d.dependencyId === dep.dependencyId);\n\n        if (!otherDep) {\n          return;\n        }\n        if (!currentDep) {\n          // only on other\n          addVariantPolicyEntryToPolicy(otherDep);\n          return;\n        }\n        const currentVer = currentDep.value.version;\n        const otherVer = otherDep.value.version;\n        if (currentVer === otherVer) {\n          return;\n        }\n        const baseVer = baseDep?.value.version;\n        if (baseVer && baseVer === otherVer) {\n          return;\n        }\n        // @todo: needs to ignore if it's in the workspace somehow.\n        // if (currentDep.__type === 'component' && this.isIdInWorkspace(currentId)) {\n        //   // dependencies that exist in the workspace, should be ignored. they'll be resolved later to the version in the ws.\n        //   return;\n        // }\n        if (baseVer && baseVer === currentVer) {\n          addVariantPolicyEntryToPolicy(otherDep);\n          return;\n        }\n\n        hasConflict = true;\n        conflictedPolicy[depType].push({\n          name: currentDep.dependencyId,\n          version: `${conflictIndicator}${currentVer}::${otherVer}::`,\n          force: currentDep.force,\n        });\n      });\n    };\n\n    handleConfigMerge();\n\n    const hasConfigForDep = (depType: string, depName: string) => mergedPolicy[depType].find((d) => d.name === depName);\n    const getDepIdAsPkgName = (dep: SerializedDependencyWithPolicy) => {\n      if (dep.__type !== 'component') {\n        return dep.id;\n      }\n      // @ts-ignore\n      return dep.packageName;\n    };\n\n    const addSerializedDepToPolicy = (dep: SerializedDependencyWithPolicy) => {\n      const depType = lifecycleToDepType[dep.lifecycle];\n\n      if (hasConfigForDep(depType, dep.id)) {\n        return; // there is already config for it.\n      }\n      mergedPolicy[depType].push({\n        name: getDepIdAsPkgName(dep),\n        version: dep.policy || dep.version,\n        force: false,\n      });\n      isMerged = true;\n    };\n\n    const getAutoDeps = (ext: ExtensionDataList): SerializedDependencyWithPolicy[] => {\n      const data = ext.findCoreExtension(DependencyResolverAspect.id)?.data.dependencies;\n      if (!data) return [];\n      const policy = ext.findCoreExtension(DependencyResolverAspect.id)?.data.policy || [];\n      return data\n        .filter((d) => d.source === 'auto')\n        .map((d) => {\n          const idWithoutVersion = d.__type === 'package' ? d.id : d.id.split('@')[0];\n          const existingPolicy = policy.find((p) => p.dependencyId === idWithoutVersion);\n          const getPolicyVer = () => {\n            if (d.__type === 'package') return undefined; // for packages, the policy is already the version\n            if (existingPolicy) return existingPolicy.value.version; // currently it's missing, will be implemented by @Gilad\n            if (!semver.valid(d.version)) return d.version; // could be a hash\n            // default to `^` or ~ if starts with zero, until we save the policy from the workspace during tag/snap.\n            return d.version.startsWith('0.') ? `~${d.version}` : `^${d.version}`;\n          };\n          return {\n            ...d,\n            id: idWithoutVersion,\n            policy: getPolicyVer(),\n          };\n        });\n    };\n\n    const currentData = getAutoDeps(this.currentAspects);\n    const otherData = getAutoDeps(this.otherAspects);\n    const currentAndOtherData = uniqBy(currentData.concat(otherData), (d) => d.id);\n    const baseData = getAutoDeps(this.baseAspects);\n\n    // uncomment to debug\n    // console.log('\\n\\n**************', this.compIdStr, '**************');\n    // console.log('currentData', currentData.length, '\\n', currentData.map((d) => `${d.__type} ${d.id} ${d.version}`).join('\\n'));\n    // console.log('otherData', otherData.length, '\\n', otherData.map((d) => `${d.__type} ${d.id} ${d.version}`).join('\\n'));\n    // console.log('otherData', baseData.length, '\\n', baseData.map((d) => `${d.__type} ${d.id} ${d.version}`).join('\\n'));\n    // console.log('** END **\\n\\n');\n\n    currentAndOtherData.forEach((depData) => {\n      if (this.isEnv(depData.id)) {\n        // ignore the envs\n        return;\n      }\n      const currentDep = currentData.find((d) => d.id === depData.id);\n      const otherDep = otherData.find((d) => d.id === depData.id);\n      if (!otherDep) {\n        return;\n      }\n      if (!currentDep) {\n        // only on other\n        addSerializedDepToPolicy(otherDep);\n        return;\n      }\n      const currentId = currentDep.id;\n      const currentVer = currentDep.policy || currentDep.version;\n      const otherVer = otherDep.policy || otherDep.version;\n      if (currentVer === otherVer) {\n        return;\n      }\n      const baseDep = baseData.find((d) => d.id === currentId);\n      const baseVer = baseDep?.policy || baseDep?.version;\n      if (baseVer && baseVer === otherVer) {\n        return;\n      }\n      if (currentDep.__type === 'component' && this.isIdInWorkspace(currentId)) {\n        // dependencies that exist in the workspace, should be ignored. they'll be resolved later to the version in the ws.\n        return;\n      }\n      if (baseVer && baseVer === currentVer) {\n        addSerializedDepToPolicy(otherDep);\n        return;\n      }\n      // either no baseVal, or baseVal is also different from both: other and local. that's probably a conflict.\n      const depType = lifecycleToDepType[currentDep.lifecycle];\n      if (hasConfigForDep(depType, currentDep.id)) {\n        return; // there is already config for it.\n      }\n      // try to resolve according to semver\n      if (\n        currentDep.policy &&\n        otherDep.policy &&\n        isRange(currentDep.policy, currentDep.id) &&\n        isRange(otherDep.policy, otherDep.id)\n      ) {\n        if (semver.satisfies(currentDep.version, otherDep.policy)) {\n          return;\n        }\n        if (semver.satisfies(otherDep.version, currentDep.policy)) {\n          addSerializedDepToPolicy(otherDep);\n          return;\n        }\n      }\n      hasConflict = true;\n      conflictedPolicy[depType].push({\n        name: getDepIdAsPkgName(currentDep),\n        version: `${conflictIndicator}${currentVer}::${otherVer}::`,\n        force: false,\n      });\n    });\n\n    ['dependencies', 'devDependencies', 'peerDependencies'].forEach((depType) => {\n      if (!mergedPolicy[depType].length) delete mergedPolicy[depType];\n      if (!conflictedPolicy[depType].length) delete conflictedPolicy[depType];\n    });\n\n    let conflictStr: string | undefined;\n    if (hasConflict) {\n      const mergedConfigSplit = JSON.stringify({ policy: conflictedPolicy }, undefined, 2).split('\\n');\n      const conflictLines = mergedConfigSplit.map((line) => {\n        if (!line.includes(conflictIndicator)) return line;\n        const [, currentVal, otherVal] = line.split('::');\n        return `${'<'.repeat(7)} ${this.currentLabel}\n        \"version\": \"${currentVal}\",\n=======\n        \"version\": \"${otherVal}\",\n${'>'.repeat(7)} ${this.otherLabel}`;\n      });\n      // replace the first line with line with the id\n      conflictLines.shift();\n      conflictLines.unshift(`\"${params.id}\": {`);\n      conflictStr = conflictLines.join('\\n');\n    }\n    const config = isMerged ? { policy: mergedPolicy } : undefined;\n\n    return { id: params.id, mergedConfig: config, conflict: conflictStr };\n  }\n\n  private isIdInWorkspace(id: string): boolean {\n    return Boolean(this.getIdFromWorkspace(id));\n  }\n\n  private getIdFromWorkspace(id: string): ComponentID | undefined {\n    return this.workspaceIds.find((c) => c.toStringWithoutVersion() === id);\n  }\n\n  private isEnv(id: string) {\n    return id === this.currentEnv.id || id === this.otherEnv.id;\n  }\n\n  private getConfig(ext: ExtensionDataEntry): 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/package.json

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