@teambit/config-merger 0.0.544 → 0.0.545

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

@@ -2,7 +2,7 @@ import type { ComponentID } from '@teambit/component-id';
 import type { Logger } from '@teambit/logger';
 import type { Lane } from '@teambit/objects';
 import type { ExtensionDataList } from '@teambit/legacy.extension-data';
-import type { MergeStrategy } from '@teambit/merging';
+import type { MergeStrategy } from '@teambit/component.modules.merge-helper';
 import { ConfigMergeResult } from './config-merge-result';
 export type GenericConfigOrRemoved = Record<string, any> | '-';
 export declare const conflictIndicator = "CONFLICT::";

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

@@ -1 +1 @@
-{"version":3,"names":["_semver","data","_interopRequireDefault","require","_builder","_componentVersion","_dependencyResolver","_envs","_lodash","_configMergeResult","e","__esModule","default","ownKeys","r","t","Object","keys","getOwnPropertySymbols","o","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","defineProperty","_toPropertyKey","value","configurable","writable","i","_toPrimitive","Symbol","toPrimitive","call","TypeError","String","Number","conflictIndicator","exports","ComponentConfigMerger","constructor","compIdStr","workspaceIds","otherLane","currentAspects","baseAspects","otherAspects","currentLabel","otherLabel","logger","mergeStrategy","BuilderAspect","id","otherLaneIdsStr","toComponentIds","map","toString","merge","debug","populateEnvs","results","currentExt","stringId","handledExtIds","includes","baseExt","findExtension","otherExt","mergePerStrategy","mergedConfig","conflict","currentConfig","getConfig","otherConfig","otherAspectsNotHandledResults","extensionId","hasVersion","idFromWorkspace","getIdFromWorkspace","toStringWithoutVersion","existingExt","_legacy","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 type { ComponentID } from '@teambit/component-id';\nimport semver from 'semver';\nimport type { Logger } from '@teambit/logger';\nimport { BuilderAspect } from '@teambit/builder';\nimport { isHash } from '@teambit/component-version';\nimport type { SerializedDependency, VariantPolicyEntry } from '@teambit/dependency-resolver';\nimport { DependencyResolverAspect, VariantPolicy } from '@teambit/dependency-resolver';\nimport type { Lane } from '@teambit/objects';\nimport { EnvsAspect } from '@teambit/envs';\nimport type { ExtensionDataEntry, ExtensionDataList } from '@teambit/legacy.extension-data';\nimport type { MergeStrategy } from '@teambit/merging';\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    private mergeStrategy: MergeStrategy\n  ) {\n    this.otherLaneIdsStr = otherLane?.toComponentIds().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        if (this.mergeStrategy === 'theirs') {\n          return { id, mergedConfig: '-' } as MergeStrategyResult;\n        }\n        if (this.mergeStrategy === 'ours') {\n          return null;\n        }\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    if (this.mergeStrategy === 'theirs') {\n      return { id, mergedConfig: otherConfig };\n    }\n    if (this.mergeStrategy === 'ours') {\n      return null;\n    }\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        if (this.mergeStrategy === 'theirs') {\n          addVariantPolicyEntryToPolicy(otherDep);\n          return;\n        }\n        if (this.mergeStrategy === 'ours') {\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      if (this.mergeStrategy === 'theirs') {\n        addSerializedDepToPolicy(otherDep);\n        return;\n      }\n      if (this.mergeStrategy === 'ours') {\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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","ignoreList":[]}
+{"version":3,"names":["_semver","data","_interopRequireDefault","require","_builder","_componentVersion","_dependencyResolver","_envs","_lodash","_configMergeResult","e","__esModule","default","ownKeys","r","t","Object","keys","getOwnPropertySymbols","o","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","defineProperty","_toPropertyKey","value","configurable","writable","i","_toPrimitive","Symbol","toPrimitive","call","TypeError","String","Number","conflictIndicator","exports","ComponentConfigMerger","constructor","compIdStr","workspaceIds","otherLane","currentAspects","baseAspects","otherAspects","currentLabel","otherLabel","logger","mergeStrategy","BuilderAspect","id","otherLaneIdsStr","toComponentIds","map","toString","merge","debug","populateEnvs","results","currentExt","stringId","handledExtIds","includes","baseExt","findExtension","otherExt","mergePerStrategy","mergedConfig","conflict","currentConfig","getConfig","otherConfig","otherAspectsNotHandledResults","extensionId","hasVersion","idFromWorkspace","getIdFromWorkspace","toStringWithoutVersion","existingExt","_legacy","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 type { ComponentID } from '@teambit/component-id';\nimport semver from 'semver';\nimport type { Logger } from '@teambit/logger';\nimport { BuilderAspect } from '@teambit/builder';\nimport { isHash } from '@teambit/component-version';\nimport type { SerializedDependency, VariantPolicyEntry } from '@teambit/dependency-resolver';\nimport { DependencyResolverAspect, VariantPolicy } from '@teambit/dependency-resolver';\nimport type { Lane } from '@teambit/objects';\nimport { EnvsAspect } from '@teambit/envs';\nimport type { ExtensionDataEntry, ExtensionDataList } from '@teambit/legacy.extension-data';\nimport type { MergeStrategy } from '@teambit/component.modules.merge-helper';\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    private mergeStrategy: MergeStrategy\n  ) {\n    this.otherLaneIdsStr = otherLane?.toComponentIds().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        if (this.mergeStrategy === 'theirs') {\n          return { id, mergedConfig: '-' } as MergeStrategyResult;\n        }\n        if (this.mergeStrategy === 'ours') {\n          return null;\n        }\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    if (this.mergeStrategy === 'theirs') {\n      return { id, mergedConfig: otherConfig };\n    }\n    if (this.mergeStrategy === 'ours') {\n      return null;\n    }\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        if (this.mergeStrategy === 'theirs') {\n          addVariantPolicyEntryToPolicy(otherDep);\n          return;\n        }\n        if (this.mergeStrategy === 'ours') {\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      if (this.mergeStrategy === 'theirs') {\n        addSerializedDepToPolicy(otherDep);\n        return;\n      }\n      if (this.mergeStrategy === 'ours') {\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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","ignoreList":[]}

package/dist/config-merger.main.runtime.d.ts

@@ -1,32 +1,15 @@
-import type { DependencyResolverMain, WorkspacePolicyConfigKeysNames } from '@teambit/dependency-resolver';
+import type { DependencyResolverMain } from '@teambit/dependency-resolver';
 import type { Workspace } from '@teambit/workspace';
 import type { Logger, LoggerMain } from '@teambit/logger';
 import type { ConsumerComponent } from '@teambit/legacy.consumer-component';
 import type { ConfigMain } from '@teambit/config';
-import type { MergeStrategy } from '@teambit/merging';
 import type { ConfigMergeResult } from './config-merge-result';
+import type { MergeStrategy, WorkspaceConfigUpdateResult, WorkspaceDepsConflicts, WorkspaceDepsUnchanged, WorkspaceDepsUpdates } from '@teambit/component.modules.merge-helper';
 export type PkgEntry = {
     name: string;
     version: string;
     force: boolean;
 };
-export type WorkspaceDepsUpdates = {
-    [pkgName: string]: [string, string];
-};
-export type WorkspaceDepsConflicts = Record<WorkspacePolicyConfigKeysNames, Array<{
-    name: string;
-    version: string;
-}>>;
-export type WorkspaceDepsUnchanged = {
-    [pkgName: string]: string;
-};
-export type WorkspaceConfigUpdateResult = {
-    workspaceDepsUpdates?: WorkspaceDepsUpdates;
-    workspaceDepsConflicts?: WorkspaceDepsConflicts;
-    workspaceDepsUnchanged?: WorkspaceDepsUnchanged;
-    workspaceConfigConflictWriteError?: Error;
-    logs?: string[];
-};
 export declare class ConfigMergerMain {
     private workspace;
     private logger;

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

@@ -88,9 +88,9 @@ function _config() {
   };
   return data;
 }
-function _merging() {
-  const data = require("@teambit/merging");
-  _merging = function () {
+function _componentModules() {
+  const data = require("@teambit/component.modules.merge-helper");
+  _componentModules = function () {
     return data;
   };
   return data;
@@ -128,11 +128,6 @@ function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 const WS_DEPS_FIELDS = ['dependencies', 'peerDependencies'];
-
-// from => to
-// the pkg value is in a format of CONFLICT::OURS::THEIRS
-// the pkg value is the message why it wasn't updated
-
 class ConfigMergerMain {
   constructor(workspace, logger, config, depsResolver) {
     this.workspace = workspace;
@@ -215,7 +210,7 @@ see the conflicts below and edit your workspace.jsonc as you see fit.`;
         path: otherFilePath
       }
     };
-    const mergeResult = await (0, _merging().mergeFiles)(mergeFilesParams);
+    const mergeResult = await (0, _componentModules().mergeFiles)(mergeFilesParams);
     const conflictFile = mergeResult.conflict;
     if (!conflictFile) {
       this.logger.debug(`original content:\n${wsJsoncOriginalContent}`);

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

@@ -1 +1 @@
-{"version":3,"names":["_semver","data","_interopRequireDefault","require","_lodash","_dependencyResolver","_componentPackageVersion","_tempy","_fsExtra","_cli","_workspace","_logger","_legacy","_bitError","_config","_merging","_pkgModules","_configMergeResult","_configMerger","_aggregatedDeps","e","__esModule","default","_defineProperty","r","t","_toPropertyKey","Object","defineProperty","value","enumerable","configurable","writable","i","_toPrimitive","Symbol","toPrimitive","call","TypeError","String","Number","WS_DEPS_FIELDS","ConfigMergerMain","constructor","workspace","logger","config","depsResolver","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","AggregatedDeps","mergedConfig","mergedConfigPolicy","policy","DEPENDENCIES_FIELDS","pkg","push","conflictDeps","mergedConfigConflict","notConflictedPackages","depsNames","conflictedPackages","length","depResolver","extensions","findCoreExtension","DependencyResolverAspect","id","workspaceDepsUnchanged","workspaceJsonUpdates","pkgName","currentVer","hasSameVersions","reportMultipleVersions","newVer","getFirstVersion","compIds","getCompIdsBy","workspaceJsonConflicts","dependencies","peerDependencies","conflictPackagesToRemoveFromConfigMerge","conflictRaw","split","otherValValid","snapToSemver","currentVerInWsJson","semver","satisfies","force","isEmpty","result","filter","dep","keys","reasonForChange","workspaceDepsUpdates","updateDepsInWorkspaceConfig","components","mergeStrategy","workspacePolicy","getWorkspacePolicyFromConfig","workspacePolicyObj","entries","reduce","acc","current","dependencyId","componentDepsWithMultipleVer","component","deps","getDependenciesFromLegacyComponent","source","depId","getPackageName","compToLog","info","componentDeps","logs","depInCompVer","depInWsVer","isDepInCompVersion","Boolean","valid","isDepInCompRange","validRange","addNotUpdateToLogs","reason","isDepInWsVersion","isDepInWsRange","lifeCycle","find","d","lifecycleType","addToUpdate","addRangeFrom","potentialRangeChar","newRange","warnMsg","warn","addToConflict","gt","isRange1GreaterThanRange2Naively","wsMinVer","minVersion","compMinVer","JSON","stringify","updateWsConfigWithGivenChanges","workspaceConfigConflictWriteError","wsPolicy","getLifeCycle","newWorkspacePolicyEntries","addToRootPolicy","updateExisting","persistConfig","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 type {\n  DependencyResolverMain,\n  WorkspacePolicy,\n  WorkspacePolicyConfigKeysNames,\n  WorkspacePolicyEntry,\n} from '@teambit/dependency-resolver';\nimport { DependencyResolverAspect } from '@teambit/dependency-resolver';\nimport { snapToSemver } from '@teambit/component-package-version';\nimport tempy from 'tempy';\nimport fs from 'fs-extra';\nimport { MainRuntime } from '@teambit/cli';\nimport type { Workspace } from '@teambit/workspace';\nimport { WorkspaceAspect } from '@teambit/workspace';\nimport type { Logger, LoggerMain } from '@teambit/logger';\nimport { LoggerAspect } from '@teambit/logger';\nimport type { ConsumerComponent } from '@teambit/legacy.consumer-component';\nimport { DEPENDENCIES_FIELDS } from '@teambit/legacy.constants';\nimport { BitError } from '@teambit/bit-error';\nimport type { ConfigMain } from '@teambit/config';\nimport { ConfigAspect } from '@teambit/config';\nimport type { MergeStrategy, MergeFileParams } from '@teambit/merging';\nimport { mergeFiles } from '@teambit/merging';\nimport { isRange1GreaterThanRange2Naively } from '@teambit/pkg.modules.semver-helper';\nimport type { ConfigMergeResult } from './config-merge-result';\nimport { parseVersionLineWithConflict } from './config-merge-result';\nimport { ConfigMergerAspect } from './config-merger.aspect';\nimport { AggregatedDeps } from './aggregated-deps';\n\nexport type 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\nexport type WorkspaceDepsUnchanged = { [pkgName: string]: string }; // the pkg value is the message why it wasn't updated\n\nexport type WorkspaceConfigUpdateResult = {\n  workspaceDepsUpdates?: WorkspaceDepsUpdates; // in case workspace.jsonc has been updated with dependencies versions\n  workspaceDepsConflicts?: WorkspaceDepsConflicts; // in case workspace.jsonc has conflicts\n  workspaceDepsUnchanged?: WorkspaceDepsUnchanged; // in case the deps in workspace.jsonc couldn't be updated\n  workspaceConfigConflictWriteError?: Error; // in case workspace.jsonc has conflicts and we failed to write the conflicts to the file\n  logs?: string[]; // verbose details about the updates/conflicts for each one of the deps\n};\nexport class ConfigMergerMain {\n  constructor(\n    private workspace: Workspace,\n    private logger: Logger,\n    private config: ConfigMain,\n    private depsResolver: DependencyResolverMain\n  ) {}\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    this.logger.debug('writing workspace.jsonc with conflicts');\n    await fs.writeFile(wsJsoncPath, conflictFile);\n  }\n\n  async updateWorkspaceJsoncWithDepsIfNeeded(allConfigMerge: ConfigMergeResult[]): Promise<{\n    workspaceDepsUpdates?: WorkspaceDepsUpdates;\n    workspaceDepsConflicts?: WorkspaceDepsConflicts;\n    workspaceDepsUnchanged?: WorkspaceDepsUnchanged;\n  }> {\n    const allResults = allConfigMerge.map((c) => c.getDepsResolverResult());\n\n    // aggregate all dependencies that can be updated (not conflicting)\n    const nonConflictDeps = new AggregatedDeps();\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        mergedConfigPolicy[depField]?.forEach((pkg: PkgEntry) => nonConflictDeps.push(pkg, configMerge.compIdStr));\n      });\n    });\n\n    // aggregate all dependencies that have conflicts\n    const conflictDeps = new AggregatedDeps();\n    allConfigMerge.forEach((configMerge) => {\n      const mergedConfigConflict = configMerge.getDepsResolverResult()?.conflict;\n      if (!mergedConfigConflict) return;\n      DEPENDENCIES_FIELDS.forEach((depField) => {\n        mergedConfigConflict[depField]?.forEach((pkg: PkgEntry) => conflictDeps.push(pkg, configMerge.compIdStr));\n      });\n    });\n\n    // uncomment to get the aggregated deps of both the conflicted and non-conflicted\n    // console.log('nonConflictDeps', nonConflictDeps.toString(), 'conflictDeps', conflictDeps.toString());\n\n    const notConflictedPackages = nonConflictDeps.depsNames;\n    const conflictedPackages = conflictDeps.depsNames;\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    const workspaceDepsUnchanged: { [pkgName: string]: string } = {};\n\n    // calculate the workspace.json updates\n    const workspaceJsonUpdates: WorkspaceDepsUpdates = {};\n    notConflictedPackages.forEach((pkgName) => {\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        if (!nonConflictDeps.hasSameVersions(pkgName)) {\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          workspaceDepsUnchanged[pkgName] = nonConflictDeps.reportMultipleVersions(pkgName);\n          return;\n        }\n        const newVer = nonConflictDeps.getFirstVersion(pkgName);\n        if (currentVer === newVer) return;\n        workspaceJsonUpdates[pkgName] = [currentVer, newVer];\n        policy[depField][pkgName] = newVer;\n        const compIds = nonConflictDeps.getCompIdsBy(pkgName).join(', ');\n        this.logger.debug(\n          `update workspace.jsonc: ${pkgName} from ${currentVer} to ${newVer}. Triggered by: ${compIds}`\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.hasSameVersions(pkgName)) {\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        workspaceDepsUnchanged[pkgName] = conflictDeps.reportMultipleVersions(pkgName);\n        return;\n      }\n      const conflictRaw = conflictDeps.getFirstVersion(pkgName);\n      const [, currentVal, otherVal] = conflictRaw.split('::');\n      // in case of a snap, the otherVal is the snap-hash, we need to convert it to semver\n      const otherValValid = snapToSemver(otherVal);\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(otherValValid, 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        const compIds = conflictDeps.getCompIdsBy(pkgName).join(', ');\n        this.logger.debug(\n          `conflict workspace.jsonc: ${pkgName} current: ${currentVerInWsJson}, other: ${otherValValid}. Triggered by: ${compIds}`\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      workspaceDepsUnchanged: Object.keys(workspaceDepsUnchanged).length ? workspaceDepsUnchanged : undefined,\n    };\n  }\n\n  async updateDepsInWorkspaceConfig(\n    components: ConsumerComponent[],\n    mergeStrategy?: MergeStrategy\n  ): Promise<WorkspaceConfigUpdateResult | undefined> {\n    if (mergeStrategy === 'ours') {\n      this.logger.debug('mergeStrategy is \"ours\", skipping the workspace.jsonc update');\n      return undefined;\n    }\n    const workspacePolicy = this.depsResolver.getWorkspacePolicyFromConfig();\n    const workspacePolicyObj = workspacePolicy.entries.reduce((acc, current) => {\n      acc[current.dependencyId] = current.value.version;\n      return acc;\n    }, {});\n    const componentDepsWithMultipleVer: Record<string, string[]> = {};\n    components.forEach((component) => {\n      const deps = this.depsResolver.getDependenciesFromLegacyComponent(component);\n      deps.forEach((dep) => {\n        if (dep.source !== 'auto') return;\n        const depId = dep.getPackageName?.();\n        if (!depId) return; // unclear when this happens.\n        if (!workspacePolicyObj[depId]) return;\n        if (workspacePolicyObj[depId] === dep.version) return;\n        if (componentDepsWithMultipleVer[depId]?.includes(dep.version)) return;\n\n        (componentDepsWithMultipleVer[depId] ||= []).push(dep.version);\n      });\n    });\n\n    const compToLog = Object.keys(componentDepsWithMultipleVer)\n      .map(\n        (depId) =>\n          `${depId} => workspace: ${workspacePolicyObj[depId]}, components: ${componentDepsWithMultipleVer[depId].join(\n            ', '\n          )}`\n      )\n      .join('\\n');\n    this.logger.info(`found the following deps to update/conflict:\\n${compToLog}`);\n\n    const componentDeps = Object.keys(componentDepsWithMultipleVer).reduce((acc, depId) => {\n      // if there are different versions of this dep between the components, forget about it.\n      if (componentDepsWithMultipleVer[depId].length > 1) return acc;\n      acc[depId] = componentDepsWithMultipleVer[depId][0];\n      return acc;\n    }, {});\n\n    if (isEmpty(componentDeps)) {\n      return undefined;\n    }\n\n    const workspaceDepsUpdates: WorkspaceDepsUpdates = {};\n    const workspaceDepsConflicts: WorkspaceDepsConflicts = { dependencies: [], peerDependencies: [] };\n\n    const logs: string[] = [];\n\n    Object.keys(componentDeps).forEach((depId) => {\n      const depInCompVer: string = componentDeps[depId];\n      const depInWsVer: string = workspacePolicyObj[depId];\n      const isDepInCompVersion = Boolean(semver.valid(depInCompVer));\n      const isDepInCompRange = !isDepInCompVersion && Boolean(semver.validRange(depInCompVer));\n\n      const addNotUpdateToLogs = (reason: string) => {\n        logs.push(`${depId} - not updating. ${reason}`);\n      };\n\n      if (!isDepInCompVersion && !isDepInCompRange) {\n        addNotUpdateToLogs(`probably a snap-hash`);\n        return; // probably a snap-hash.\n      }\n      const isDepInWsVersion = Boolean(semver.valid(depInWsVer));\n      const isDepInWsRange = !isDepInWsVersion && Boolean(semver.validRange(depInWsVer));\n      if (!isDepInWsVersion && !isDepInWsRange) {\n        addNotUpdateToLogs(`probably a snap-hash`);\n        return; // probably a snap-hash.\n      }\n\n      // both are either versions or ranges\n      const lifeCycle =\n        workspacePolicy.entries.find((d) => d.dependencyId === depId)?.lifecycleType === 'peer'\n          ? 'peerDependencies'\n          : 'dependencies';\n\n      const addToUpdate = (addRangeFrom?: string) => {\n        if (addRangeFrom) {\n          // depInCompVer is a version, depInWsVer is a range\n          const potentialRangeChar = depInWsVer[0];\n          const newRange = potentialRangeChar + depInCompVer;\n          if (newRange === depInWsVer) {\n            addNotUpdateToLogs(`the min version from ws ${depInWsVer} is the same as ${depInCompVer} from comp`);\n            return;\n          }\n          if (!semver.validRange(newRange)) {\n            const warnMsg = `failed to add the range \"${potentialRangeChar}\" to ${depInCompVer}, the result is not a valid range`;\n            this.logger.warn(warnMsg);\n            addNotUpdateToLogs(warnMsg);\n            return;\n          }\n          logs.push(`${depId} - updating from ${depInWsVer} to ${newRange} (new range based on ${depInCompVer})`);\n          workspaceDepsUpdates[depId] = [depInWsVer, newRange];\n        } else {\n          logs.push(`${depId} - updating from ${depInWsVer} to ${depInCompVer}`);\n          workspaceDepsUpdates[depId] = [depInWsVer, depInCompVer];\n        }\n      };\n      const addToConflict = () => {\n        if (mergeStrategy === 'theirs') {\n          addToUpdate();\n          return;\n        }\n        workspaceDepsConflicts[lifeCycle].push({ name: depId, version: `CONFLICT::${depInWsVer}::${depInCompVer}` });\n        logs.push(`${depId} - conflict. ours: ${depInWsVer}, theirs: ${depInCompVer}`);\n      };\n\n      // both are versions\n      if (isDepInCompVersion && isDepInWsVersion) {\n        if (semver.gt(depInCompVer, depInWsVer)) {\n          addToConflict();\n          return;\n        }\n        addNotUpdateToLogs(`the version from ws ${depInWsVer} is greater than ${depInCompVer} from comp`);\n        return;\n      }\n\n      // both are ranges\n      if (isDepInCompRange && isDepInWsRange) {\n        if (isRange1GreaterThanRange2Naively(depInCompVer, depInWsVer)) {\n          addToUpdate();\n          return;\n        }\n        addNotUpdateToLogs(`the range from ws ${depInWsVer} is greater than ${depInCompVer} from comp`);\n        return;\n      }\n\n      if (isDepInCompVersion && isDepInWsRange) {\n        const wsMinVer = semver.minVersion(depInWsVer);\n        if (!wsMinVer) {\n          this.logger.warn(`unable to calculate the min version of ${depInWsVer}`);\n          addNotUpdateToLogs(`unable to calculate the min version of ${depInWsVer} from ws`);\n          return;\n        }\n        if (semver.gt(wsMinVer, depInCompVer)) {\n          addNotUpdateToLogs(`the min version from ws ${depInWsVer} is greater than ${depInCompVer} from comp`);\n          return;\n        }\n        if (semver.satisfies(depInCompVer, depInWsVer)) {\n          addToUpdate(depInWsVer);\n          return;\n        }\n        addToConflict();\n        return;\n      }\n\n      if (isDepInCompRange && isDepInWsVersion) {\n        if (semver.satisfies(depInWsVer, depInCompVer)) {\n          addToUpdate();\n          return;\n        }\n        const compMinVer = semver.minVersion(depInCompVer);\n        if (!compMinVer) {\n          this.logger.warn(`unable to calculate the min version of ${compMinVer}`);\n          addNotUpdateToLogs(`unable to calculate the min version of ${compMinVer} from comp`);\n          return;\n        }\n        if (semver.gt(compMinVer, depInWsVer)) {\n          addToConflict();\n          return;\n        }\n        addNotUpdateToLogs(`the min version from comp ${compMinVer} is less than ${depInWsVer} from ws`);\n      }\n      throw new Error(`unhandled case: comp: ${depInCompVer}, ws: ${depInWsVer}`);\n    });\n\n    WS_DEPS_FIELDS.forEach((depField) => {\n      if (isEmpty(workspaceDepsConflicts[depField])) delete workspaceDepsConflicts[depField];\n    });\n\n    this.logger.debug(`workspace config-merge all components logs\\n${logs.join('\\n')}`);\n    this.logger.debug('final workspace.jsonc updates [from, to]', workspaceDepsUpdates);\n    this.logger.debug(`final workspace.jsonc conflicts ${JSON.stringify(workspaceDepsConflicts, undefined, 2)}`);\n\n    await this.updateWsConfigWithGivenChanges(workspaceDepsUpdates, workspacePolicy);\n    let workspaceConfigConflictWriteError: Error | undefined;\n    if (!isEmpty(workspaceDepsConflicts)) {\n      workspaceConfigConflictWriteError = await this.writeWorkspaceJsoncWithConflictsGracefully(workspaceDepsConflicts);\n    }\n\n    return {\n      workspaceDepsUpdates: isEmpty(workspaceDepsUpdates) ? undefined : workspaceDepsUpdates,\n      workspaceDepsConflicts: isEmpty(workspaceDepsConflicts) ? undefined : workspaceDepsConflicts,\n      workspaceConfigConflictWriteError,\n      logs,\n    };\n  }\n\n  private async updateWsConfigWithGivenChanges(workspaceDepsUpdates: WorkspaceDepsUpdates, wsPolicy: WorkspacePolicy) {\n    if (isEmpty(workspaceDepsUpdates)) return;\n    const getLifeCycle = (depId: string) => {\n      const lifeCycle = wsPolicy.entries.find((d) => d.dependencyId === depId)?.lifecycleType;\n      if (!lifeCycle) throw new Error(`unable to find the lifecycle of ${depId}`);\n      return lifeCycle;\n    };\n\n    const newWorkspacePolicyEntries: WorkspacePolicyEntry[] = Object.keys(workspaceDepsUpdates).map((pkgName) => {\n      return {\n        dependencyId: pkgName,\n        lifecycleType: getLifeCycle(pkgName),\n        value: {\n          version: workspaceDepsUpdates[pkgName][1],\n        },\n      };\n    });\n    this.depsResolver.addToRootPolicy(newWorkspacePolicyEntries, {\n      updateExisting: true,\n    });\n    await this.depsResolver.persistConfig('config-merger (update root policy)');\n  }\n\n  static slots = [];\n  static dependencies = [WorkspaceAspect, ConfigAspect, LoggerAspect, DependencyResolverAspect];\n  static runtime = MainRuntime;\n  static async provider([workspace, config, loggerMain, depsResolver]: [\n    Workspace,\n    ConfigMain,\n    LoggerMain,\n    DependencyResolverMain,\n  ]) {\n    const logger = loggerMain.createLogger(ConfigMergerAspect.id);\n    return new ConfigMergerMain(workspace, logger, config, depsResolver);\n  }\n}\n\nConfigMergerAspect.addRuntime(ConfigMergerMain);\n\nexport default ConfigMergerMain;\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_semver","data","_interopRequireDefault","require","_lodash","_dependencyResolver","_componentPackageVersion","_tempy","_fsExtra","_cli","_workspace","_logger","_legacy","_bitError","_config","_componentModules","_pkgModules","_configMergeResult","_configMerger","_aggregatedDeps","e","__esModule","default","_defineProperty","r","t","_toPropertyKey","Object","defineProperty","value","enumerable","configurable","writable","i","_toPrimitive","Symbol","toPrimitive","call","TypeError","String","Number","WS_DEPS_FIELDS","ConfigMergerMain","constructor","workspace","logger","config","depsResolver","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","AggregatedDeps","mergedConfig","mergedConfigPolicy","policy","DEPENDENCIES_FIELDS","pkg","push","conflictDeps","mergedConfigConflict","notConflictedPackages","depsNames","conflictedPackages","length","depResolver","extensions","findCoreExtension","DependencyResolverAspect","id","workspaceDepsUnchanged","workspaceJsonUpdates","pkgName","currentVer","hasSameVersions","reportMultipleVersions","newVer","getFirstVersion","compIds","getCompIdsBy","workspaceJsonConflicts","dependencies","peerDependencies","conflictPackagesToRemoveFromConfigMerge","conflictRaw","split","otherValValid","snapToSemver","currentVerInWsJson","semver","satisfies","force","isEmpty","result","filter","dep","keys","reasonForChange","workspaceDepsUpdates","updateDepsInWorkspaceConfig","components","mergeStrategy","workspacePolicy","getWorkspacePolicyFromConfig","workspacePolicyObj","entries","reduce","acc","current","dependencyId","componentDepsWithMultipleVer","component","deps","getDependenciesFromLegacyComponent","source","depId","getPackageName","compToLog","info","componentDeps","logs","depInCompVer","depInWsVer","isDepInCompVersion","Boolean","valid","isDepInCompRange","validRange","addNotUpdateToLogs","reason","isDepInWsVersion","isDepInWsRange","lifeCycle","find","d","lifecycleType","addToUpdate","addRangeFrom","potentialRangeChar","newRange","warnMsg","warn","addToConflict","gt","isRange1GreaterThanRange2Naively","wsMinVer","minVersion","compMinVer","JSON","stringify","updateWsConfigWithGivenChanges","workspaceConfigConflictWriteError","wsPolicy","getLifeCycle","newWorkspacePolicyEntries","addToRootPolicy","updateExisting","persistConfig","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 type { DependencyResolverMain, WorkspacePolicy, WorkspacePolicyEntry } from '@teambit/dependency-resolver';\nimport { DependencyResolverAspect } from '@teambit/dependency-resolver';\nimport { snapToSemver } from '@teambit/component-package-version';\nimport tempy from 'tempy';\nimport fs from 'fs-extra';\nimport { MainRuntime } from '@teambit/cli';\nimport type { Workspace } from '@teambit/workspace';\nimport { WorkspaceAspect } from '@teambit/workspace';\nimport type { Logger, LoggerMain } from '@teambit/logger';\nimport { LoggerAspect } from '@teambit/logger';\nimport type { ConsumerComponent } from '@teambit/legacy.consumer-component';\nimport { DEPENDENCIES_FIELDS } from '@teambit/legacy.constants';\nimport { BitError } from '@teambit/bit-error';\nimport type { ConfigMain } from '@teambit/config';\nimport { ConfigAspect } from '@teambit/config';\nimport { mergeFiles } from '@teambit/component.modules.merge-helper';\nimport { isRange1GreaterThanRange2Naively } from '@teambit/pkg.modules.semver-helper';\nimport type { ConfigMergeResult } from './config-merge-result';\nimport { parseVersionLineWithConflict } from './config-merge-result';\nimport { ConfigMergerAspect } from './config-merger.aspect';\nimport { AggregatedDeps } from './aggregated-deps';\nimport type {\n  MergeFileParams,\n  MergeStrategy,\n  WorkspaceConfigUpdateResult,\n  WorkspaceDepsConflicts,\n  WorkspaceDepsUnchanged,\n  WorkspaceDepsUpdates,\n} from '@teambit/component.modules.merge-helper';\n\nexport type PkgEntry = { name: string; version: string; force: boolean };\n\nconst WS_DEPS_FIELDS = ['dependencies', 'peerDependencies'];\n\nexport class ConfigMergerMain {\n  constructor(\n    private workspace: Workspace,\n    private logger: Logger,\n    private config: ConfigMain,\n    private depsResolver: DependencyResolverMain\n  ) {}\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    this.logger.debug('writing workspace.jsonc with conflicts');\n    await fs.writeFile(wsJsoncPath, conflictFile);\n  }\n\n  async updateWorkspaceJsoncWithDepsIfNeeded(allConfigMerge: ConfigMergeResult[]): Promise<{\n    workspaceDepsUpdates?: WorkspaceDepsUpdates;\n    workspaceDepsConflicts?: WorkspaceDepsConflicts;\n    workspaceDepsUnchanged?: WorkspaceDepsUnchanged;\n  }> {\n    const allResults = allConfigMerge.map((c) => c.getDepsResolverResult());\n\n    // aggregate all dependencies that can be updated (not conflicting)\n    const nonConflictDeps = new AggregatedDeps();\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        mergedConfigPolicy[depField]?.forEach((pkg: PkgEntry) => nonConflictDeps.push(pkg, configMerge.compIdStr));\n      });\n    });\n\n    // aggregate all dependencies that have conflicts\n    const conflictDeps = new AggregatedDeps();\n    allConfigMerge.forEach((configMerge) => {\n      const mergedConfigConflict = configMerge.getDepsResolverResult()?.conflict;\n      if (!mergedConfigConflict) return;\n      DEPENDENCIES_FIELDS.forEach((depField) => {\n        mergedConfigConflict[depField]?.forEach((pkg: PkgEntry) => conflictDeps.push(pkg, configMerge.compIdStr));\n      });\n    });\n\n    // uncomment to get the aggregated deps of both the conflicted and non-conflicted\n    // console.log('nonConflictDeps', nonConflictDeps.toString(), 'conflictDeps', conflictDeps.toString());\n\n    const notConflictedPackages = nonConflictDeps.depsNames;\n    const conflictedPackages = conflictDeps.depsNames;\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    const workspaceDepsUnchanged: { [pkgName: string]: string } = {};\n\n    // calculate the workspace.json updates\n    const workspaceJsonUpdates: WorkspaceDepsUpdates = {};\n    notConflictedPackages.forEach((pkgName) => {\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        if (!nonConflictDeps.hasSameVersions(pkgName)) {\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          workspaceDepsUnchanged[pkgName] = nonConflictDeps.reportMultipleVersions(pkgName);\n          return;\n        }\n        const newVer = nonConflictDeps.getFirstVersion(pkgName);\n        if (currentVer === newVer) return;\n        workspaceJsonUpdates[pkgName] = [currentVer, newVer];\n        policy[depField][pkgName] = newVer;\n        const compIds = nonConflictDeps.getCompIdsBy(pkgName).join(', ');\n        this.logger.debug(\n          `update workspace.jsonc: ${pkgName} from ${currentVer} to ${newVer}. Triggered by: ${compIds}`\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.hasSameVersions(pkgName)) {\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        workspaceDepsUnchanged[pkgName] = conflictDeps.reportMultipleVersions(pkgName);\n        return;\n      }\n      const conflictRaw = conflictDeps.getFirstVersion(pkgName);\n      const [, currentVal, otherVal] = conflictRaw.split('::');\n      // in case of a snap, the otherVal is the snap-hash, we need to convert it to semver\n      const otherValValid = snapToSemver(otherVal);\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(otherValValid, 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        const compIds = conflictDeps.getCompIdsBy(pkgName).join(', ');\n        this.logger.debug(\n          `conflict workspace.jsonc: ${pkgName} current: ${currentVerInWsJson}, other: ${otherValValid}. Triggered by: ${compIds}`\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      workspaceDepsUnchanged: Object.keys(workspaceDepsUnchanged).length ? workspaceDepsUnchanged : undefined,\n    };\n  }\n\n  async updateDepsInWorkspaceConfig(\n    components: ConsumerComponent[],\n    mergeStrategy?: MergeStrategy\n  ): Promise<WorkspaceConfigUpdateResult | undefined> {\n    if (mergeStrategy === 'ours') {\n      this.logger.debug('mergeStrategy is \"ours\", skipping the workspace.jsonc update');\n      return undefined;\n    }\n    const workspacePolicy = this.depsResolver.getWorkspacePolicyFromConfig();\n    const workspacePolicyObj = workspacePolicy.entries.reduce((acc, current) => {\n      acc[current.dependencyId] = current.value.version;\n      return acc;\n    }, {});\n    const componentDepsWithMultipleVer: Record<string, string[]> = {};\n    components.forEach((component) => {\n      const deps = this.depsResolver.getDependenciesFromLegacyComponent(component);\n      deps.forEach((dep) => {\n        if (dep.source !== 'auto') return;\n        const depId = dep.getPackageName?.();\n        if (!depId) return; // unclear when this happens.\n        if (!workspacePolicyObj[depId]) return;\n        if (workspacePolicyObj[depId] === dep.version) return;\n        if (componentDepsWithMultipleVer[depId]?.includes(dep.version)) return;\n\n        (componentDepsWithMultipleVer[depId] ||= []).push(dep.version);\n      });\n    });\n\n    const compToLog = Object.keys(componentDepsWithMultipleVer)\n      .map(\n        (depId) =>\n          `${depId} => workspace: ${workspacePolicyObj[depId]}, components: ${componentDepsWithMultipleVer[depId].join(\n            ', '\n          )}`\n      )\n      .join('\\n');\n    this.logger.info(`found the following deps to update/conflict:\\n${compToLog}`);\n\n    const componentDeps = Object.keys(componentDepsWithMultipleVer).reduce((acc, depId) => {\n      // if there are different versions of this dep between the components, forget about it.\n      if (componentDepsWithMultipleVer[depId].length > 1) return acc;\n      acc[depId] = componentDepsWithMultipleVer[depId][0];\n      return acc;\n    }, {});\n\n    if (isEmpty(componentDeps)) {\n      return undefined;\n    }\n\n    const workspaceDepsUpdates: WorkspaceDepsUpdates = {};\n    const workspaceDepsConflicts: WorkspaceDepsConflicts = { dependencies: [], peerDependencies: [] };\n\n    const logs: string[] = [];\n\n    Object.keys(componentDeps).forEach((depId) => {\n      const depInCompVer: string = componentDeps[depId];\n      const depInWsVer: string = workspacePolicyObj[depId];\n      const isDepInCompVersion = Boolean(semver.valid(depInCompVer));\n      const isDepInCompRange = !isDepInCompVersion && Boolean(semver.validRange(depInCompVer));\n\n      const addNotUpdateToLogs = (reason: string) => {\n        logs.push(`${depId} - not updating. ${reason}`);\n      };\n\n      if (!isDepInCompVersion && !isDepInCompRange) {\n        addNotUpdateToLogs(`probably a snap-hash`);\n        return; // probably a snap-hash.\n      }\n      const isDepInWsVersion = Boolean(semver.valid(depInWsVer));\n      const isDepInWsRange = !isDepInWsVersion && Boolean(semver.validRange(depInWsVer));\n      if (!isDepInWsVersion && !isDepInWsRange) {\n        addNotUpdateToLogs(`probably a snap-hash`);\n        return; // probably a snap-hash.\n      }\n\n      // both are either versions or ranges\n      const lifeCycle =\n        workspacePolicy.entries.find((d) => d.dependencyId === depId)?.lifecycleType === 'peer'\n          ? 'peerDependencies'\n          : 'dependencies';\n\n      const addToUpdate = (addRangeFrom?: string) => {\n        if (addRangeFrom) {\n          // depInCompVer is a version, depInWsVer is a range\n          const potentialRangeChar = depInWsVer[0];\n          const newRange = potentialRangeChar + depInCompVer;\n          if (newRange === depInWsVer) {\n            addNotUpdateToLogs(`the min version from ws ${depInWsVer} is the same as ${depInCompVer} from comp`);\n            return;\n          }\n          if (!semver.validRange(newRange)) {\n            const warnMsg = `failed to add the range \"${potentialRangeChar}\" to ${depInCompVer}, the result is not a valid range`;\n            this.logger.warn(warnMsg);\n            addNotUpdateToLogs(warnMsg);\n            return;\n          }\n          logs.push(`${depId} - updating from ${depInWsVer} to ${newRange} (new range based on ${depInCompVer})`);\n          workspaceDepsUpdates[depId] = [depInWsVer, newRange];\n        } else {\n          logs.push(`${depId} - updating from ${depInWsVer} to ${depInCompVer}`);\n          workspaceDepsUpdates[depId] = [depInWsVer, depInCompVer];\n        }\n      };\n      const addToConflict = () => {\n        if (mergeStrategy === 'theirs') {\n          addToUpdate();\n          return;\n        }\n        workspaceDepsConflicts[lifeCycle].push({ name: depId, version: `CONFLICT::${depInWsVer}::${depInCompVer}` });\n        logs.push(`${depId} - conflict. ours: ${depInWsVer}, theirs: ${depInCompVer}`);\n      };\n\n      // both are versions\n      if (isDepInCompVersion && isDepInWsVersion) {\n        if (semver.gt(depInCompVer, depInWsVer)) {\n          addToConflict();\n          return;\n        }\n        addNotUpdateToLogs(`the version from ws ${depInWsVer} is greater than ${depInCompVer} from comp`);\n        return;\n      }\n\n      // both are ranges\n      if (isDepInCompRange && isDepInWsRange) {\n        if (isRange1GreaterThanRange2Naively(depInCompVer, depInWsVer)) {\n          addToUpdate();\n          return;\n        }\n        addNotUpdateToLogs(`the range from ws ${depInWsVer} is greater than ${depInCompVer} from comp`);\n        return;\n      }\n\n      if (isDepInCompVersion && isDepInWsRange) {\n        const wsMinVer = semver.minVersion(depInWsVer);\n        if (!wsMinVer) {\n          this.logger.warn(`unable to calculate the min version of ${depInWsVer}`);\n          addNotUpdateToLogs(`unable to calculate the min version of ${depInWsVer} from ws`);\n          return;\n        }\n        if (semver.gt(wsMinVer, depInCompVer)) {\n          addNotUpdateToLogs(`the min version from ws ${depInWsVer} is greater than ${depInCompVer} from comp`);\n          return;\n        }\n        if (semver.satisfies(depInCompVer, depInWsVer)) {\n          addToUpdate(depInWsVer);\n          return;\n        }\n        addToConflict();\n        return;\n      }\n\n      if (isDepInCompRange && isDepInWsVersion) {\n        if (semver.satisfies(depInWsVer, depInCompVer)) {\n          addToUpdate();\n          return;\n        }\n        const compMinVer = semver.minVersion(depInCompVer);\n        if (!compMinVer) {\n          this.logger.warn(`unable to calculate the min version of ${compMinVer}`);\n          addNotUpdateToLogs(`unable to calculate the min version of ${compMinVer} from comp`);\n          return;\n        }\n        if (semver.gt(compMinVer, depInWsVer)) {\n          addToConflict();\n          return;\n        }\n        addNotUpdateToLogs(`the min version from comp ${compMinVer} is less than ${depInWsVer} from ws`);\n      }\n      throw new Error(`unhandled case: comp: ${depInCompVer}, ws: ${depInWsVer}`);\n    });\n\n    WS_DEPS_FIELDS.forEach((depField) => {\n      if (isEmpty(workspaceDepsConflicts[depField])) delete workspaceDepsConflicts[depField];\n    });\n\n    this.logger.debug(`workspace config-merge all components logs\\n${logs.join('\\n')}`);\n    this.logger.debug('final workspace.jsonc updates [from, to]', workspaceDepsUpdates);\n    this.logger.debug(`final workspace.jsonc conflicts ${JSON.stringify(workspaceDepsConflicts, undefined, 2)}`);\n\n    await this.updateWsConfigWithGivenChanges(workspaceDepsUpdates, workspacePolicy);\n    let workspaceConfigConflictWriteError: Error | undefined;\n    if (!isEmpty(workspaceDepsConflicts)) {\n      workspaceConfigConflictWriteError = await this.writeWorkspaceJsoncWithConflictsGracefully(workspaceDepsConflicts);\n    }\n\n    return {\n      workspaceDepsUpdates: isEmpty(workspaceDepsUpdates) ? undefined : workspaceDepsUpdates,\n      workspaceDepsConflicts: isEmpty(workspaceDepsConflicts) ? undefined : workspaceDepsConflicts,\n      workspaceConfigConflictWriteError,\n      logs,\n    };\n  }\n\n  private async updateWsConfigWithGivenChanges(workspaceDepsUpdates: WorkspaceDepsUpdates, wsPolicy: WorkspacePolicy) {\n    if (isEmpty(workspaceDepsUpdates)) return;\n    const getLifeCycle = (depId: string) => {\n      const lifeCycle = wsPolicy.entries.find((d) => d.dependencyId === depId)?.lifecycleType;\n      if (!lifeCycle) throw new Error(`unable to find the lifecycle of ${depId}`);\n      return lifeCycle;\n    };\n\n    const newWorkspacePolicyEntries: WorkspacePolicyEntry[] = Object.keys(workspaceDepsUpdates).map((pkgName) => {\n      return {\n        dependencyId: pkgName,\n        lifecycleType: getLifeCycle(pkgName),\n        value: {\n          version: workspaceDepsUpdates[pkgName][1],\n        },\n      };\n    });\n    this.depsResolver.addToRootPolicy(newWorkspacePolicyEntries, {\n      updateExisting: true,\n    });\n    await this.depsResolver.persistConfig('config-merger (update root policy)');\n  }\n\n  static slots = [];\n  static dependencies = [WorkspaceAspect, ConfigAspect, LoggerAspect, DependencyResolverAspect];\n  static runtime = MainRuntime;\n  static async provider([workspace, config, loggerMain, depsResolver]: [\n    Workspace,\n    ConfigMain,\n    LoggerMain,\n    DependencyResolverMain,\n  ]) {\n    const logger = loggerMain.createLogger(ConfigMergerAspect.id);\n    return new ConfigMergerMain(workspace, logger, config, depsResolver);\n  }\n}\n\nConfigMergerAspect.addRuntime(ConfigMergerMain);\n\nexport default ConfigMergerMain;\n"],"mappings":"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","ignoreList":[]}

package/dist/index.d.ts

@@ -1,5 +1,6 @@
 import { ConfigMergerAspect } from './config-merger.aspect';
-export type { ConfigMergerMain, WorkspaceDepsUpdates, WorkspaceDepsConflicts, WorkspaceConfigUpdateResult, } from './config-merger.main.runtime';
+export type { ConfigMergerMain } from './config-merger.main.runtime';
+export type { WorkspaceDepsUpdates, WorkspaceDepsConflicts, WorkspaceConfigUpdateResult, } from '@teambit/component.modules.merge-helper';
 export type { ConfigMergeResult } from './config-merge-result';
 export { ComponentConfigMerger } from './component-config-merger';
 export default ConfigMergerAspect;

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["_configMerger","data","require","_componentConfigMerger","_default","exports","default","ConfigMergerAspect"],"sources":["index.ts"],"sourcesContent":["import { ConfigMergerAspect } from './config-merger.aspect';\n\nexport type {\n  ConfigMergerMain,\n  WorkspaceDepsUpdates,\n  WorkspaceDepsConflicts,\n  WorkspaceConfigUpdateResult,\n} from './config-merger.main.runtime';\nexport type { ConfigMergeResult } from './config-merge-result';\nexport { ComponentConfigMerger } from './component-config-merger';\nexport default ConfigMergerAspect;\nexport { ConfigMergerAspect };\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA,SAAAA,cAAA;EAAA,MAAAC,IAAA,GAAAC,OAAA;EAAAF,aAAA,YAAAA,CAAA;IAAA,OAAAC,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AASA,SAAAE,uBAAA;EAAA,MAAAF,IAAA,GAAAC,OAAA;EAAAC,sBAAA,YAAAA,CAAA;IAAA,OAAAF,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAAkE,IAAAG,QAAA,GAAAC,OAAA,CAAAC,OAAA,GACnDC,kCAAkB","ignoreList":[]}
+{"version":3,"names":["_configMerger","data","require","_componentConfigMerger","_default","exports","default","ConfigMergerAspect"],"sources":["index.ts"],"sourcesContent":["import { ConfigMergerAspect } from './config-merger.aspect';\n\nexport type { ConfigMergerMain } from './config-merger.main.runtime';\nexport type {\n  WorkspaceDepsUpdates,\n  WorkspaceDepsConflicts,\n  WorkspaceConfigUpdateResult,\n} from '@teambit/component.modules.merge-helper';\nexport type { ConfigMergeResult } from './config-merge-result';\nexport { ComponentConfigMerger } from './component-config-merger';\nexport default ConfigMergerAspect;\nexport { ConfigMergerAspect };\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA,SAAAA,cAAA;EAAA,MAAAC,IAAA,GAAAC,OAAA;EAAAF,aAAA,YAAAA,CAAA;IAAA,OAAAC,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AASA,SAAAE,uBAAA;EAAA,MAAAF,IAAA,GAAAC,OAAA;EAAAC,sBAAA,YAAAA,CAAA;IAAA,OAAAF,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAAkE,IAAAG,QAAA,GAAAC,OAAA,CAAAC,OAAA,GACnDC,kCAAkB","ignoreList":[]}

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@teambit/config-merger",
-  "version": "0.0.544",
+  "version": "0.0.545",
   "homepage": "https://bit.cloud/teambit/workspace/config-merger",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.workspace",
     "name": "config-merger",
-    "version": "0.0.544"
+    "version": "0.0.545"
   },
   "dependencies": {
     "lodash": "4.17.21",
@@ -15,22 +15,22 @@
     "tempy": "1.0.1",
     "@teambit/component-id": "1.2.4",
     "@teambit/component-version": "1.0.4",
-    "@teambit/harmony": "0.4.7",
-    "@teambit/bit-error": "0.0.404",
-    "@teambit/component-package-version": "0.0.440",
-    "@teambit/legacy.constants": "0.0.14",
-    "@teambit/pkg.modules.semver-helper": "0.0.13",
-    "@teambit/builder": "1.0.677",
-    "@teambit/dependency-resolver": "1.0.677",
-    "@teambit/envs": "1.0.677",
     "@teambit/legacy.extension-data": "0.0.63",
     "@teambit/logger": "0.0.1344",
-    "@teambit/merging": "1.0.677",
-    "@teambit/objects": "0.0.184",
+    "@teambit/harmony": "0.4.7",
+    "@teambit/bit-error": "0.0.404",
     "@teambit/cli": "0.0.1251",
+    "@teambit/component-package-version": "0.0.440",
     "@teambit/config": "0.0.1425",
+    "@teambit/legacy.constants": "0.0.14",
     "@teambit/legacy.consumer-component": "0.0.62",
-    "@teambit/workspace": "1.0.677"
+    "@teambit/pkg.modules.semver-helper": "0.0.13",
+    "@teambit/builder": "1.0.678",
+    "@teambit/component.modules.merge-helper": "0.0.1",
+    "@teambit/dependency-resolver": "1.0.678",
+    "@teambit/envs": "1.0.678",
+    "@teambit/objects": "0.0.185",
+    "@teambit/workspace": "1.0.678"
   },
   "devDependencies": {
     "@types/lodash": "4.14.165",