@teambit/merging 0.0.361 → 0.0.363

package/dist/config-merger.js

@@ -515,7 +515,7 @@ class ConfigMerger {
         addSerializedDepToPolicy(otherDep);
         return;
       }
-      if (currentDep.policy && otherDep.policy && (0, _dependencyResolver().isRange)(currentDep.policy, currentDep.id) && (0, _dependencyResolver().isRange)(otherDep.policy, otherDep.id)) {
+      if (currentDep.policy && otherDep.policy) {
         if (_semver().default.satisfies(currentDep.version, otherDep.policy)) {
           return;
         }

package/dist/config-merger.js.map

@@ -1 +1 @@
-{"version":3,"names":["conflictIndicator","ConfigMerger","constructor","compIdStr","workspaceIds","otherLane","currentAspects","baseAspects","otherAspects","currentLabel","otherLabel","logger","otherLaneIdsStr","components","map","c","id","toStringWithoutVersion","merge","debug","populateEnvs","results","currentExt","stringId","handledExtIds","includes","push","baseExt","findExtension","otherExt","mergePerStrategy","conflict","currentConfig","getConfig","otherConfig","otherAspectsNotHandledResults","extensionId","hasVersion","idFromWorkspace","getIdFromWorkspace","existingExt","_legacy","toString","mergedConfig","envResult","envStrategy","ConfigMergeResult","compact","getEnvId","ext","envsAspect","findCoreExtension","EnvsAspect","Error","env","config","data","currentEnv","otherEnv","baseEnv","undefined","currentEnvAspect","version","otherEnvAspect","baseEnvAspect","mergeStrategyParams","baseConfig","isIdInWorkspace","basicConfigMerge","areConfigsEqual","configA","configB","JSON","stringify","depResolverResult","depResolverStrategy","params","DependencyResolverAspect","trace","currentPolicy","getPolicy","otherPolicy","basePolicy","getAllDeps","dependencies","policy","d","idWithoutVersion","__type","split","existingPolicy","find","p","dependencyId","getPolicyVer","value","getDataPolicy","getAutoDeps","allDeps","filter","source","currentAutoData","currentAllData","currentDataPolicy","otherData","currentAndOtherData","uniqBy","concat","currentAndOtherComponentsData","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","length","forEach","currentAndOtherConfig","currentDep","otherDep","baseDep","currentVer","otherVer","baseVer","hasConfigForDep","depName","getDepIdAsPkgName","addSerializedDepToPolicy","lifecycle","join","depData","isEnv","isRange","currentId","Object","keys","Boolean","rawConfig","omit","VariantPolicy","fromConfigObject","entries"],"sources":["config-merger.ts"],"sourcesContent":["import { ComponentID } from '@teambit/component-id';\nimport semver from 'semver';\nimport { Logger } from '@teambit/logger';\nimport { isHash } from '@teambit/component-version';\nimport {\n  DependencyResolverAspect,\n  isRange,\n  SerializedDependency,\n  VariantPolicy,\n  VariantPolicyEntry,\n} from '@teambit/dependency-resolver';\nimport { Lane } from '@teambit/legacy/dist/scope/models';\nimport { EnvsAspect } from '@teambit/envs';\nimport { ExtensionDataEntry, ExtensionDataList } from '@teambit/legacy/dist/consumer/config/extension-data';\nimport { compact, omit, uniqBy } from 'lodash';\nimport { ConfigMergeResult } from './config-merge-result';\n\nexport type GenericConfigOrRemoved = Record<string, any> | '-';\n\ntype EnvData = { id: string; version?: string; config?: GenericConfigOrRemoved };\n\ntype SerializedDependencyWithPolicy = SerializedDependency & { policy?: string; packageName?: string };\n\nexport const conflictIndicator = 'CONFLICT::';\n\nexport type MergeStrategyResult = {\n  id: string;\n  mergedConfig?: GenericConfigOrRemoved;\n  conflict?: Record<string, any>;\n};\ntype MergeStrategyParamsWithRemoved = {\n  id: string;\n  currentConfig: GenericConfigOrRemoved;\n  otherConfig: GenericConfigOrRemoved;\n  baseConfig?: GenericConfigOrRemoved;\n};\ntype MergeStrategyParams = {\n  id: string;\n  currentExt: ExtensionDataEntry;\n  otherExt: ExtensionDataEntry;\n  baseExt?: ExtensionDataEntry;\n};\n\n/**\n * perform 3-way merge of component configuration (aspects).\n * normally this is needed when merging one lane into another. the component may have different aspects config in each lane.\n * the baseAspects are the aspects of the component in the diversion point (the common ancestor of the two lanes).\n * the currentAspects are the aspects of the component in the current lane.\n * the otherAspects are the aspects of the component in the other lane. this is the lane we merge into the current lane.\n *\n * the basic merging strategy is a simple comparison between the aspect-configs, if they're different, we have a conflict.\n * we have two special cases:\n *\n * 1. dependency-resolver: we do a deeper check for the policy, we compare each dependency separately. also, we take\n * into account not only the config, but also the data. this is needed because some dependencies are automatically\n * added by Bit (from the import statements in the code) and they're not in the config. the final config has the deps\n * from both sources, the config and the data. The way we know to differentiate between them is by the \"force\" prop.\n * the config has always force: true.\n *\n * 2. envs: if we don't treat it specially, the user will need to make the change not only in the envs aspect, but also\n * in the deps-resolver (because the env is added as a devDependency) and also in the aspect itself (because\n * teambit.envs/env has only the id and not the version). to make it simpler, we ignore the envs in the deps-resolver\n * we ignore the individual aspect that is the env itself. we only show teambit.envs/env and we put the env id and\n * version. later, when the component is loaded, we split the id and the version and put them in the correct places.\n * see workspace.componentExtension / adjustEnvsOnConfigMerge for more details.\n */\nexport class ConfigMerger {\n  private currentEnv: EnvData;\n  private otherEnv: EnvData;\n  private baseEnv?: EnvData;\n  private handledExtIds: string[] = [];\n  private otherLaneIdsStr: string[];\n  constructor(\n    private compIdStr: string,\n    private workspaceIds: ComponentID[],\n    otherLane: Lane | undefined,\n    private currentAspects: ExtensionDataList,\n    private baseAspects: ExtensionDataList,\n    private otherAspects: ExtensionDataList,\n    private currentLabel: string,\n    private otherLabel: string,\n    private logger: Logger\n  ) {\n    this.otherLaneIdsStr = otherLane?.components.map((c) => c.id.toStringWithoutVersion()) || [];\n  }\n\n  merge(): ConfigMergeResult {\n    this.logger.debug(`\\n************** start config-merger for ${this.compIdStr} **************`);\n    this.populateEnvs();\n    const results = this.currentAspects.map((currentExt) => {\n      const id = currentExt.stringId;\n      if (this.handledExtIds.includes(id)) return null;\n      this.handledExtIds.push(id);\n      const baseExt = this.baseAspects.findExtension(id, true);\n      const otherExt = this.otherAspects.findExtension(id, true);\n      if (otherExt) {\n        // try to 3-way-merge\n        return this.mergePerStrategy({ id, currentExt, otherExt, baseExt });\n      }\n      // exist in current but not in other\n      if (baseExt) {\n        // was removed on other\n        return { id, conflict: { currentConfig: this.getConfig(currentExt), otherConfig: '-' } };\n      }\n      // exist in current but not in other and base, so it got created on current. nothing to do.\n      return null;\n    });\n    const otherAspectsNotHandledResults = this.otherAspects.map((otherExt) => {\n      let id = otherExt.stringId;\n      if (this.handledExtIds.includes(id)) return null;\n      this.handledExtIds.push(id);\n      if (otherExt.extensionId && otherExt.extensionId.hasVersion()) {\n        // avoid using the id from the other lane if it exits in the workspace. prefer the id from the workspace.\n        const idFromWorkspace = this.getIdFromWorkspace(otherExt.extensionId.toStringWithoutVersion());\n        if (idFromWorkspace) {\n          const existingExt = this.currentAspects.findExtension(otherExt.extensionId.toStringWithoutVersion(), true);\n          if (existingExt) return null; // the aspect is set currently, no need to add it again.\n          id = idFromWorkspace._legacy.toString();\n        }\n      }\n      const baseExt = this.baseAspects.findExtension(id, true);\n      if (baseExt) {\n        // was removed on current\n        return { id, conflict: { currentConfig: '-', otherConfig: this.getConfig(otherExt) } };\n      }\n      // exist in other but not in current and base, so it got created on other.\n      return { id, mergedConfig: this.getConfig(otherExt) };\n    });\n    const envResult = [this.envStrategy()] || [];\n    this.logger.debug(`*** end config-merger for ${this.compIdStr} ***\\n`);\n    return new ConfigMergeResult(\n      this.compIdStr,\n      this.currentLabel,\n      this.otherLabel,\n      compact([...results, ...otherAspectsNotHandledResults, ...envResult])\n    );\n  }\n\n  private populateEnvs() {\n    // populate ids\n    const getEnvId = (ext: ExtensionDataList) => {\n      const envsAspect = ext.findCoreExtension(EnvsAspect.id);\n      if (!envsAspect) throw new Error(`unable to find ${EnvsAspect.id} aspect for ${this.compIdStr}`);\n      const env = envsAspect.config.env || envsAspect.data.id;\n      if (!env)\n        throw new Error(`unable to find env for ${this.compIdStr}, the config and data of ${EnvsAspect.id} are empty}`);\n      return env;\n    };\n    const currentEnv = getEnvId(this.currentAspects);\n    this.currentEnv = { id: currentEnv };\n    const otherEnv = getEnvId(this.otherAspects);\n    this.otherEnv = { id: otherEnv };\n    const baseEnv = this.baseAspects ? getEnvId(this.baseAspects) : undefined;\n    if (baseEnv) this.baseEnv = { id: baseEnv };\n\n    // populate version\n    const currentEnvAspect = this.currentAspects.findExtension(currentEnv, true);\n    if (currentEnvAspect) {\n      this.handledExtIds.push(currentEnvAspect.stringId);\n      this.currentEnv.version = currentEnvAspect.extensionId?.version;\n      this.currentEnv.config = this.getConfig(currentEnvAspect);\n    }\n    const otherEnvAspect = this.otherAspects.findExtension(otherEnv, true);\n    if (otherEnvAspect) {\n      this.handledExtIds.push(otherEnvAspect.stringId);\n      this.otherEnv.version = otherEnvAspect.extensionId?.version;\n      this.otherEnv.config = this.getConfig(otherEnvAspect);\n    }\n    if (this.baseEnv) {\n      const baseEnvAspect = this.baseAspects.findExtension(baseEnv, true);\n      if (baseEnvAspect) {\n        this.baseEnv.version = baseEnvAspect.extensionId?.version;\n        this.baseEnv.config = this.getConfig(baseEnvAspect);\n      }\n    }\n  }\n\n  private envStrategy(): MergeStrategyResult | null {\n    const mergeStrategyParams: MergeStrategyParamsWithRemoved = {\n      id: EnvsAspect.id,\n      currentConfig: {\n        env: this.currentEnv.version ? `${this.currentEnv.id}@${this.currentEnv.version}` : this.currentEnv.id,\n      },\n      otherConfig: { env: this.otherEnv.version ? `${this.otherEnv.id}@${this.otherEnv.version}` : this.otherEnv.id },\n    };\n    if (this.baseEnv) {\n      mergeStrategyParams.baseConfig = {\n        env: this.baseEnv?.version ? `${this.baseEnv.id}@${this.baseEnv.version}` : this.baseEnv?.id,\n      };\n    }\n    if (this.currentEnv.id === this.otherEnv.id && this.currentEnv.version === this.otherEnv.version) {\n      return null;\n    }\n    if (this.isIdInWorkspace(this.currentEnv.id)) {\n      // the env currently used is part of the workspace, that's what the user needs. don't try to resolve anything.\n      return null;\n    }\n    return this.basicConfigMerge(mergeStrategyParams);\n  }\n\n  private areConfigsEqual(configA: GenericConfigOrRemoved, configB: GenericConfigOrRemoved) {\n    return JSON.stringify(configA) === JSON.stringify(configB);\n  }\n\n  private mergePerStrategy(mergeStrategyParams: MergeStrategyParams): MergeStrategyResult | null {\n    const { id, currentExt, otherExt, baseExt } = mergeStrategyParams;\n    const depResolverResult = this.depResolverStrategy(mergeStrategyParams);\n\n    if (depResolverResult) {\n      // if (depResolverResult.mergedConfig || depResolverResult?.conflict) console.log(\"\\n\\nDepResolverResult\", this.compIdStr, '\\n', JSON.stringify(depResolverResult, undefined, 2))\n      return depResolverResult;\n    }\n    const currentConfig = this.getConfig(currentExt);\n    const otherConfig = this.getConfig(otherExt);\n    const baseConfig = baseExt ? this.getConfig(baseExt) : undefined;\n\n    return this.basicConfigMerge({ id, currentConfig, otherConfig, baseConfig });\n  }\n\n  private basicConfigMerge(mergeStrategyParams: MergeStrategyParamsWithRemoved) {\n    const { id, currentConfig, otherConfig, baseConfig } = mergeStrategyParams;\n    if (this.areConfigsEqual(currentConfig, otherConfig)) {\n      return null;\n    }\n    if (baseConfig && this.areConfigsEqual(baseConfig, otherConfig)) {\n      // was changed on current\n      return null;\n    }\n    if (baseConfig && this.areConfigsEqual(baseConfig, currentConfig)) {\n      // was changed on other\n      return { id, mergedConfig: otherConfig };\n    }\n    // either no baseConfig, or baseConfig is also different from both: other and local. that's a conflict.\n    return { id, conflict: { currentConfig, otherConfig, baseConfig } };\n  }\n\n  private depResolverStrategy(params: MergeStrategyParams): MergeStrategyResult | undefined {\n    if (params.id !== DependencyResolverAspect.id) return undefined;\n    this.logger.trace(`start depResolverStrategy for ${this.compIdStr}`);\n    const { currentExt, otherExt, baseExt } = params;\n\n    const currentConfig = this.getConfig(currentExt);\n    const currentPolicy = this.getPolicy(currentConfig);\n    const otherConfig = this.getConfig(otherExt);\n    const otherPolicy = this.getPolicy(otherConfig);\n\n    const baseConfig = baseExt ? this.getConfig(baseExt) : undefined;\n    const basePolicy = baseConfig ? this.getPolicy(baseConfig) : undefined;\n\n    const 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.isIdInWorkspace(compIdStr)) {\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          // 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 (otherPolicy.length) {\n          otherPolicy.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(currentPolicy.concat(otherPolicy), (d) => d.dependencyId);\n      currentAndOtherConfig.forEach((dep) => {\n        const depType = lifecycleToDepType[dep.lifecycleType];\n        const currentDep = currentPolicy.find((d) => d.dependencyId === dep.dependencyId);\n        const otherDep = otherPolicy.find((d) => d.dependencyId === dep.dependencyId);\n        const baseDep = basePolicy?.find((d) => d.dependencyId === dep.dependencyId);\n\n        if (!otherDep) {\n          return;\n        }\n        if (!currentDep) {\n          // only on other\n          addVariantPolicyEntryToPolicy(otherDep);\n          return;\n        }\n        const currentVer = currentDep.value.version;\n        const otherVer = otherDep.value.version;\n        if (currentVer === otherVer) {\n          return;\n        }\n        const baseVer = baseDep?.value.version;\n        if (baseVer && baseVer === otherVer) {\n          return;\n        }\n        if (baseVer && baseVer === currentVer) {\n          addVariantPolicyEntryToPolicy(otherDep);\n          return;\n        }\n        const compIdStr = getCompIdStrByPkgNameFromData(dep.dependencyId);\n        if (compIdStr && this.isIdInWorkspace(compIdStr)) {\n          // no need to add if the id exists in the workspace (regardless the version)\n          return;\n        }\n\n        hasConflict = true;\n        conflictedPolicy[depType].push({\n          name: currentDep.dependencyId,\n          version: `${conflictIndicator}${currentVer}::${otherVer}::`,\n          force: currentDep.force,\n        });\n      });\n    };\n\n    handleConfigMerge();\n\n    const hasConfigForDep = (depType: string, depName: string) => mergedPolicy[depType].find((d) => d.name === depName);\n    const getDepIdAsPkgName = (dep: SerializedDependencyWithPolicy) => {\n      if (dep.__type !== 'component') {\n        return dep.id;\n      }\n      // @ts-ignore\n      return dep.packageName;\n    };\n\n    const addSerializedDepToPolicy = (dep: SerializedDependencyWithPolicy) => {\n      const depType = lifecycleToDepType[dep.lifecycle];\n      if (dep.__type === 'component' && this.isIdInWorkspace(dep.id)) {\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 (\n        currentDep.policy &&\n        otherDep.policy &&\n        isRange(currentDep.policy, currentDep.id) &&\n        isRange(otherDep.policy, otherDep.id)\n      ) {\n        if (semver.satisfies(currentDep.version, otherDep.policy)) {\n          return;\n        }\n        if (semver.satisfies(otherDep.version, currentDep.policy)) {\n          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.isIdInWorkspace(currentId)) {\n        // dependencies that exist in the workspace, should be ignored. they'll be resolved later to the version in the ws.\n        return;\n      }\n      const depType = lifecycleToDepType[currentDep.lifecycle];\n      if (hasConfigForDep(depType, currentDep.id)) {\n        return; // there is already config for it.\n      }\n      if (baseVer && baseVer === currentVer) {\n        addSerializedDepToPolicy(otherDep);\n        return;\n      }\n      hasConflict = true;\n      conflictedPolicy[depType].push({\n        name: getDepIdAsPkgName(currentDep),\n        version: `${conflictIndicator}${currentVer}::${otherVer}::`,\n        force: false,\n      });\n    });\n\n    ['dependencies', 'devDependencies', 'peerDependencies'].forEach((depType) => {\n      if (!mergedPolicy[depType].length) delete mergedPolicy[depType];\n      if (!conflictedPolicy[depType].length) delete conflictedPolicy[depType];\n    });\n\n    const config = Object.keys(mergedPolicy).length ? { policy: mergedPolicy } : undefined;\n    const conflict = hasConflict ? conflictedPolicy : undefined;\n\n    this.logger.debug('final mergedConfig', config);\n    this.logger.debug('final conflict', conflict);\n\n    return { id: params.id, mergedConfig: config, conflict };\n  }\n\n  private isIdInWorkspace(id: string): boolean {\n    return Boolean(this.getIdFromWorkspace(id)) || this.otherLaneIdsStr.includes(id);\n  }\n\n  private getIdFromWorkspace(id: string): ComponentID | undefined {\n    return this.workspaceIds.find((c) => c.toStringWithoutVersion() === id);\n  }\n\n  private isEnv(id: string) {\n    return id === this.currentEnv.id || id === this.otherEnv.id;\n  }\n\n  private getConfig(ext: ExtensionDataEntry): GenericConfigOrRemoved {\n    if (ext.rawConfig === '-') return ext.rawConfig;\n    return omit(ext.rawConfig, ['__specific']);\n  }\n\n  private getPolicy(config): VariantPolicyEntry[] {\n    if (!config.policy) return [];\n    return VariantPolicy.fromConfigObject(config.policy).entries;\n  }\n}\n"],"mappings":"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"}
+{"version":3,"names":["conflictIndicator","ConfigMerger","constructor","compIdStr","workspaceIds","otherLane","currentAspects","baseAspects","otherAspects","currentLabel","otherLabel","logger","otherLaneIdsStr","components","map","c","id","toStringWithoutVersion","merge","debug","populateEnvs","results","currentExt","stringId","handledExtIds","includes","push","baseExt","findExtension","otherExt","mergePerStrategy","conflict","currentConfig","getConfig","otherConfig","otherAspectsNotHandledResults","extensionId","hasVersion","idFromWorkspace","getIdFromWorkspace","existingExt","_legacy","toString","mergedConfig","envResult","envStrategy","ConfigMergeResult","compact","getEnvId","ext","envsAspect","findCoreExtension","EnvsAspect","Error","env","config","data","currentEnv","otherEnv","baseEnv","undefined","currentEnvAspect","version","otherEnvAspect","baseEnvAspect","mergeStrategyParams","baseConfig","isIdInWorkspace","basicConfigMerge","areConfigsEqual","configA","configB","JSON","stringify","depResolverResult","depResolverStrategy","params","DependencyResolverAspect","trace","currentPolicy","getPolicy","otherPolicy","basePolicy","getAllDeps","dependencies","policy","d","idWithoutVersion","__type","split","existingPolicy","find","p","dependencyId","getPolicyVer","value","getDataPolicy","getAutoDeps","allDeps","filter","source","currentAutoData","currentAllData","currentDataPolicy","otherData","currentAndOtherData","uniqBy","concat","currentAndOtherComponentsData","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","length","forEach","currentAndOtherConfig","currentDep","otherDep","baseDep","currentVer","otherVer","baseVer","hasConfigForDep","depName","getDepIdAsPkgName","addSerializedDepToPolicy","lifecycle","join","depData","isEnv","currentId","Object","keys","Boolean","rawConfig","omit","VariantPolicy","fromConfigObject","entries"],"sources":["config-merger.ts"],"sourcesContent":["import { ComponentID } from '@teambit/component-id';\nimport semver from 'semver';\nimport { Logger } from '@teambit/logger';\nimport { isHash } from '@teambit/component-version';\nimport {\n  DependencyResolverAspect,\n  SerializedDependency,\n  VariantPolicy,\n  VariantPolicyEntry,\n} from '@teambit/dependency-resolver';\nimport { Lane } from '@teambit/legacy/dist/scope/models';\nimport { EnvsAspect } from '@teambit/envs';\nimport { ExtensionDataEntry, ExtensionDataList } from '@teambit/legacy/dist/consumer/config/extension-data';\nimport { compact, omit, uniqBy } from 'lodash';\nimport { ConfigMergeResult } from './config-merge-result';\n\nexport type GenericConfigOrRemoved = Record<string, any> | '-';\n\ntype EnvData = { id: string; version?: string; config?: GenericConfigOrRemoved };\n\ntype SerializedDependencyWithPolicy = SerializedDependency & { policy?: string; packageName?: string };\n\nexport const conflictIndicator = 'CONFLICT::';\n\nexport type MergeStrategyResult = {\n  id: string;\n  mergedConfig?: GenericConfigOrRemoved;\n  conflict?: Record<string, any>;\n};\ntype MergeStrategyParamsWithRemoved = {\n  id: string;\n  currentConfig: GenericConfigOrRemoved;\n  otherConfig: GenericConfigOrRemoved;\n  baseConfig?: GenericConfigOrRemoved;\n};\ntype MergeStrategyParams = {\n  id: string;\n  currentExt: ExtensionDataEntry;\n  otherExt: ExtensionDataEntry;\n  baseExt?: ExtensionDataEntry;\n};\n\n/**\n * perform 3-way merge of component configuration (aspects).\n * normally this is needed when merging one lane into another. the component may have different aspects config in each lane.\n * the baseAspects are the aspects of the component in the diversion point (the common ancestor of the two lanes).\n * the currentAspects are the aspects of the component in the current lane.\n * the otherAspects are the aspects of the component in the other lane. this is the lane we merge into the current lane.\n *\n * the basic merging strategy is a simple comparison between the aspect-configs, if they're different, we have a conflict.\n * we have two special cases:\n *\n * 1. dependency-resolver: we do a deeper check for the policy, we compare each dependency separately. also, we take\n * into account not only the config, but also the data. this is needed because some dependencies are automatically\n * added by Bit (from the import statements in the code) and they're not in the config. the final config has the deps\n * from both sources, the config and the data. The way we know to differentiate between them is by the \"force\" prop.\n * the config has always force: true.\n *\n * 2. envs: if we don't treat it specially, the user will need to make the change not only in the envs aspect, but also\n * in the deps-resolver (because the env is added as a devDependency) and also in the aspect itself (because\n * teambit.envs/env has only the id and not the version). to make it simpler, we ignore the envs in the deps-resolver\n * we ignore the individual aspect that is the env itself. we only show teambit.envs/env and we put the env id and\n * version. later, when the component is loaded, we split the id and the version and put them in the correct places.\n * see workspace.componentExtension / adjustEnvsOnConfigMerge for more details.\n */\nexport class ConfigMerger {\n  private currentEnv: EnvData;\n  private otherEnv: EnvData;\n  private baseEnv?: EnvData;\n  private handledExtIds: string[] = [];\n  private otherLaneIdsStr: string[];\n  constructor(\n    private compIdStr: string,\n    private workspaceIds: ComponentID[],\n    otherLane: Lane | undefined,\n    private currentAspects: ExtensionDataList,\n    private baseAspects: ExtensionDataList,\n    private otherAspects: ExtensionDataList,\n    private currentLabel: string,\n    private otherLabel: string,\n    private logger: Logger\n  ) {\n    this.otherLaneIdsStr = otherLane?.components.map((c) => c.id.toStringWithoutVersion()) || [];\n  }\n\n  merge(): ConfigMergeResult {\n    this.logger.debug(`\\n************** start config-merger for ${this.compIdStr} **************`);\n    this.populateEnvs();\n    const results = this.currentAspects.map((currentExt) => {\n      const id = currentExt.stringId;\n      if (this.handledExtIds.includes(id)) return null;\n      this.handledExtIds.push(id);\n      const baseExt = this.baseAspects.findExtension(id, true);\n      const otherExt = this.otherAspects.findExtension(id, true);\n      if (otherExt) {\n        // try to 3-way-merge\n        return this.mergePerStrategy({ id, currentExt, otherExt, baseExt });\n      }\n      // exist in current but not in other\n      if (baseExt) {\n        // was removed on other\n        return { id, conflict: { currentConfig: this.getConfig(currentExt), otherConfig: '-' } };\n      }\n      // exist in current but not in other and base, so it got created on current. nothing to do.\n      return null;\n    });\n    const otherAspectsNotHandledResults = this.otherAspects.map((otherExt) => {\n      let id = otherExt.stringId;\n      if (this.handledExtIds.includes(id)) return null;\n      this.handledExtIds.push(id);\n      if (otherExt.extensionId && otherExt.extensionId.hasVersion()) {\n        // avoid using the id from the other lane if it exits in the workspace. prefer the id from the workspace.\n        const idFromWorkspace = this.getIdFromWorkspace(otherExt.extensionId.toStringWithoutVersion());\n        if (idFromWorkspace) {\n          const existingExt = this.currentAspects.findExtension(otherExt.extensionId.toStringWithoutVersion(), true);\n          if (existingExt) return null; // the aspect is set currently, no need to add it again.\n          id = idFromWorkspace._legacy.toString();\n        }\n      }\n      const baseExt = this.baseAspects.findExtension(id, true);\n      if (baseExt) {\n        // was removed on current\n        return { id, conflict: { currentConfig: '-', otherConfig: this.getConfig(otherExt) } };\n      }\n      // exist in other but not in current and base, so it got created on other.\n      return { id, mergedConfig: this.getConfig(otherExt) };\n    });\n    const envResult = [this.envStrategy()] || [];\n    this.logger.debug(`*** end config-merger for ${this.compIdStr} ***\\n`);\n    return new ConfigMergeResult(\n      this.compIdStr,\n      this.currentLabel,\n      this.otherLabel,\n      compact([...results, ...otherAspectsNotHandledResults, ...envResult])\n    );\n  }\n\n  private populateEnvs() {\n    // populate ids\n    const getEnvId = (ext: ExtensionDataList) => {\n      const envsAspect = ext.findCoreExtension(EnvsAspect.id);\n      if (!envsAspect) throw new Error(`unable to find ${EnvsAspect.id} aspect for ${this.compIdStr}`);\n      const env = envsAspect.config.env || envsAspect.data.id;\n      if (!env)\n        throw new Error(`unable to find env for ${this.compIdStr}, the config and data of ${EnvsAspect.id} are empty}`);\n      return env;\n    };\n    const currentEnv = getEnvId(this.currentAspects);\n    this.currentEnv = { id: currentEnv };\n    const otherEnv = getEnvId(this.otherAspects);\n    this.otherEnv = { id: otherEnv };\n    const baseEnv = this.baseAspects ? getEnvId(this.baseAspects) : undefined;\n    if (baseEnv) this.baseEnv = { id: baseEnv };\n\n    // populate version\n    const currentEnvAspect = this.currentAspects.findExtension(currentEnv, true);\n    if (currentEnvAspect) {\n      this.handledExtIds.push(currentEnvAspect.stringId);\n      this.currentEnv.version = currentEnvAspect.extensionId?.version;\n      this.currentEnv.config = this.getConfig(currentEnvAspect);\n    }\n    const otherEnvAspect = this.otherAspects.findExtension(otherEnv, true);\n    if (otherEnvAspect) {\n      this.handledExtIds.push(otherEnvAspect.stringId);\n      this.otherEnv.version = otherEnvAspect.extensionId?.version;\n      this.otherEnv.config = this.getConfig(otherEnvAspect);\n    }\n    if (this.baseEnv) {\n      const baseEnvAspect = this.baseAspects.findExtension(baseEnv, true);\n      if (baseEnvAspect) {\n        this.baseEnv.version = baseEnvAspect.extensionId?.version;\n        this.baseEnv.config = this.getConfig(baseEnvAspect);\n      }\n    }\n  }\n\n  private envStrategy(): MergeStrategyResult | null {\n    const mergeStrategyParams: MergeStrategyParamsWithRemoved = {\n      id: EnvsAspect.id,\n      currentConfig: {\n        env: this.currentEnv.version ? `${this.currentEnv.id}@${this.currentEnv.version}` : this.currentEnv.id,\n      },\n      otherConfig: { env: this.otherEnv.version ? `${this.otherEnv.id}@${this.otherEnv.version}` : this.otherEnv.id },\n    };\n    if (this.baseEnv) {\n      mergeStrategyParams.baseConfig = {\n        env: this.baseEnv?.version ? `${this.baseEnv.id}@${this.baseEnv.version}` : this.baseEnv?.id,\n      };\n    }\n    if (this.currentEnv.id === this.otherEnv.id && this.currentEnv.version === this.otherEnv.version) {\n      return null;\n    }\n    if (this.isIdInWorkspace(this.currentEnv.id)) {\n      // the env currently used is part of the workspace, that's what the user needs. don't try to resolve anything.\n      return null;\n    }\n    return this.basicConfigMerge(mergeStrategyParams);\n  }\n\n  private areConfigsEqual(configA: GenericConfigOrRemoved, configB: GenericConfigOrRemoved) {\n    return JSON.stringify(configA) === JSON.stringify(configB);\n  }\n\n  private mergePerStrategy(mergeStrategyParams: MergeStrategyParams): MergeStrategyResult | null {\n    const { id, currentExt, otherExt, baseExt } = mergeStrategyParams;\n    const depResolverResult = this.depResolverStrategy(mergeStrategyParams);\n\n    if (depResolverResult) {\n      // if (depResolverResult.mergedConfig || depResolverResult?.conflict) console.log(\"\\n\\nDepResolverResult\", this.compIdStr, '\\n', JSON.stringify(depResolverResult, undefined, 2))\n      return depResolverResult;\n    }\n    const currentConfig = this.getConfig(currentExt);\n    const otherConfig = this.getConfig(otherExt);\n    const baseConfig = baseExt ? this.getConfig(baseExt) : undefined;\n\n    return this.basicConfigMerge({ id, currentConfig, otherConfig, baseConfig });\n  }\n\n  private basicConfigMerge(mergeStrategyParams: MergeStrategyParamsWithRemoved) {\n    const { id, currentConfig, otherConfig, baseConfig } = mergeStrategyParams;\n    if (this.areConfigsEqual(currentConfig, otherConfig)) {\n      return null;\n    }\n    if (baseConfig && this.areConfigsEqual(baseConfig, otherConfig)) {\n      // was changed on current\n      return null;\n    }\n    if (baseConfig && this.areConfigsEqual(baseConfig, currentConfig)) {\n      // was changed on other\n      return { id, mergedConfig: otherConfig };\n    }\n    // either no baseConfig, or baseConfig is also different from both: other and local. that's a conflict.\n    return { id, conflict: { currentConfig, otherConfig, baseConfig } };\n  }\n\n  private depResolverStrategy(params: MergeStrategyParams): MergeStrategyResult | undefined {\n    if (params.id !== DependencyResolverAspect.id) return undefined;\n    this.logger.trace(`start depResolverStrategy for ${this.compIdStr}`);\n    const { currentExt, otherExt, baseExt } = params;\n\n    const currentConfig = this.getConfig(currentExt);\n    const currentPolicy = this.getPolicy(currentConfig);\n    const otherConfig = this.getConfig(otherExt);\n    const otherPolicy = this.getPolicy(otherConfig);\n\n    const baseConfig = baseExt ? this.getConfig(baseExt) : undefined;\n    const basePolicy = baseConfig ? this.getPolicy(baseConfig) : undefined;\n\n    const 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.isIdInWorkspace(compIdStr)) {\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          // 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 (otherPolicy.length) {\n          otherPolicy.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(currentPolicy.concat(otherPolicy), (d) => d.dependencyId);\n      currentAndOtherConfig.forEach((dep) => {\n        const depType = lifecycleToDepType[dep.lifecycleType];\n        const currentDep = currentPolicy.find((d) => d.dependencyId === dep.dependencyId);\n        const otherDep = otherPolicy.find((d) => d.dependencyId === dep.dependencyId);\n        const baseDep = basePolicy?.find((d) => d.dependencyId === dep.dependencyId);\n\n        if (!otherDep) {\n          return;\n        }\n        if (!currentDep) {\n          // only on other\n          addVariantPolicyEntryToPolicy(otherDep);\n          return;\n        }\n        const currentVer = currentDep.value.version;\n        const otherVer = otherDep.value.version;\n        if (currentVer === otherVer) {\n          return;\n        }\n        const baseVer = baseDep?.value.version;\n        if (baseVer && baseVer === otherVer) {\n          return;\n        }\n        if (baseVer && baseVer === currentVer) {\n          addVariantPolicyEntryToPolicy(otherDep);\n          return;\n        }\n        const compIdStr = getCompIdStrByPkgNameFromData(dep.dependencyId);\n        if (compIdStr && this.isIdInWorkspace(compIdStr)) {\n          // no need to add if the id exists in the workspace (regardless the version)\n          return;\n        }\n\n        hasConflict = true;\n        conflictedPolicy[depType].push({\n          name: currentDep.dependencyId,\n          version: `${conflictIndicator}${currentVer}::${otherVer}::`,\n          force: currentDep.force,\n        });\n      });\n    };\n\n    handleConfigMerge();\n\n    const hasConfigForDep = (depType: string, depName: string) => mergedPolicy[depType].find((d) => d.name === depName);\n    const getDepIdAsPkgName = (dep: SerializedDependencyWithPolicy) => {\n      if (dep.__type !== 'component') {\n        return dep.id;\n      }\n      // @ts-ignore\n      return dep.packageName;\n    };\n\n    const addSerializedDepToPolicy = (dep: SerializedDependencyWithPolicy) => {\n      const depType = lifecycleToDepType[dep.lifecycle];\n      if (dep.__type === 'component' && this.isIdInWorkspace(dep.id)) {\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.isIdInWorkspace(currentId)) {\n        // dependencies that exist in the workspace, should be ignored. they'll be resolved later to the version in the ws.\n        return;\n      }\n      const depType = lifecycleToDepType[currentDep.lifecycle];\n      if (hasConfigForDep(depType, currentDep.id)) {\n        return; // there is already config for it.\n      }\n      if (baseVer && baseVer === currentVer) {\n        addSerializedDepToPolicy(otherDep);\n        return;\n      }\n      hasConflict = true;\n      conflictedPolicy[depType].push({\n        name: getDepIdAsPkgName(currentDep),\n        version: `${conflictIndicator}${currentVer}::${otherVer}::`,\n        force: false,\n      });\n    });\n\n    ['dependencies', 'devDependencies', 'peerDependencies'].forEach((depType) => {\n      if (!mergedPolicy[depType].length) delete mergedPolicy[depType];\n      if (!conflictedPolicy[depType].length) delete conflictedPolicy[depType];\n    });\n\n    const config = Object.keys(mergedPolicy).length ? { policy: mergedPolicy } : undefined;\n    const conflict = hasConflict ? conflictedPolicy : undefined;\n\n    this.logger.debug('final mergedConfig', config);\n    this.logger.debug('final conflict', conflict);\n\n    return { id: params.id, mergedConfig: config, conflict };\n  }\n\n  private isIdInWorkspace(id: string): boolean {\n    return Boolean(this.getIdFromWorkspace(id)) || this.otherLaneIdsStr.includes(id);\n  }\n\n  private getIdFromWorkspace(id: string): ComponentID | undefined {\n    return this.workspaceIds.find((c) => c.toStringWithoutVersion() === id);\n  }\n\n  private isEnv(id: string) {\n    return id === this.currentEnv.id || id === this.otherEnv.id;\n  }\n\n  private getConfig(ext: ExtensionDataEntry): GenericConfigOrRemoved {\n    if (ext.rawConfig === '-') return ext.rawConfig;\n    return omit(ext.rawConfig, ['__specific']);\n  }\n\n  private getPolicy(config): VariantPolicyEntry[] {\n    if (!config.policy) return [];\n    return VariantPolicy.fromConfigObject(config.policy).entries;\n  }\n}\n"],"mappings":";;;;;;;;;;;;;;;;AACA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AAEA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AACA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AAOA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AAEA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AACA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AAA0D;AAAA;AAQnD,MAAMA,iBAAiB,GAAG,YAAY;AAAC;AAoB9C;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,MAAMC,YAAY,CAAC;EAMxBC,WAAW,CACDC,SAAiB,EACjBC,YAA2B,EACnCC,SAA2B,EACnBC,cAAiC,EACjCC,WAA8B,EAC9BC,YAA+B,EAC/BC,YAAoB,EACpBC,UAAkB,EAClBC,MAAc,EACtB;IAAA,KATQR,SAAiB,GAAjBA,SAAiB;IAAA,KACjBC,YAA2B,GAA3BA,YAA2B;IAAA,KAE3BE,cAAiC,GAAjCA,cAAiC;IAAA,KACjCC,WAA8B,GAA9BA,WAA8B;IAAA,KAC9BC,YAA+B,GAA/BA,YAA+B;IAAA,KAC/BC,YAAoB,GAApBA,YAAoB;IAAA,KACpBC,UAAkB,GAAlBA,UAAkB;IAAA,KAClBC,MAAc,GAAdA,MAAc;IAAA;IAAA;IAAA;IAAA,uDAXU,EAAE;IAAA;IAalC,IAAI,CAACC,eAAe,GAAG,CAAAP,SAAS,aAATA,SAAS,uBAATA,SAAS,CAAEQ,UAAU,CAACC,GAAG,CAAEC,CAAC,IAAKA,CAAC,CAACC,EAAE,CAACC,sBAAsB,EAAE,CAAC,KAAI,EAAE;EAC9F;EAEAC,KAAK,GAAsB;IACzB,IAAI,CAACP,MAAM,CAACQ,KAAK,CAAE,4CAA2C,IAAI,CAAChB,SAAU,iBAAgB,CAAC;IAC9F,IAAI,CAACiB,YAAY,EAAE;IACnB,MAAMC,OAAO,GAAG,IAAI,CAACf,cAAc,CAACQ,GAAG,CAAEQ,UAAU,IAAK;MACtD,MAAMN,EAAE,GAAGM,UAAU,CAACC,QAAQ;MAC9B,IAAI,IAAI,CAACC,aAAa,CAACC,QAAQ,CAACT,EAAE,CAAC,EAAE,OAAO,IAAI;MAChD,IAAI,CAACQ,aAAa,CAACE,IAAI,CAACV,EAAE,CAAC;MAC3B,MAAMW,OAAO,GAAG,IAAI,CAACpB,WAAW,CAACqB,aAAa,CAACZ,EAAE,EAAE,IAAI,CAAC;MACxD,MAAMa,QAAQ,GAAG,IAAI,CAACrB,YAAY,CAACoB,aAAa,CAACZ,EAAE,EAAE,IAAI,CAAC;MAC1D,IAAIa,QAAQ,EAAE;QACZ;QACA,OAAO,IAAI,CAACC,gBAAgB,CAAC;UAAEd,EAAE;UAAEM,UAAU;UAAEO,QAAQ;UAAEF;QAAQ,CAAC,CAAC;MACrE;MACA;MACA,IAAIA,OAAO,EAAE;QACX;QACA,OAAO;UAAEX,EAAE;UAAEe,QAAQ,EAAE;YAAEC,aAAa,EAAE,IAAI,CAACC,SAAS,CAACX,UAAU,CAAC;YAAEY,WAAW,EAAE;UAAI;QAAE,CAAC;MAC1F;MACA;MACA,OAAO,IAAI;IACb,CAAC,CAAC;IACF,MAAMC,6BAA6B,GAAG,IAAI,CAAC3B,YAAY,CAACM,GAAG,CAAEe,QAAQ,IAAK;MACxE,IAAIb,EAAE,GAAGa,QAAQ,CAACN,QAAQ;MAC1B,IAAI,IAAI,CAACC,aAAa,CAACC,QAAQ,CAACT,EAAE,CAAC,EAAE,OAAO,IAAI;MAChD,IAAI,CAACQ,aAAa,CAACE,IAAI,CAACV,EAAE,CAAC;MAC3B,IAAIa,QAAQ,CAACO,WAAW,IAAIP,QAAQ,CAACO,WAAW,CAACC,UAAU,EAAE,EAAE;QAC7D;QACA,MAAMC,eAAe,GAAG,IAAI,CAACC,kBAAkB,CAACV,QAAQ,CAACO,WAAW,CAACnB,sBAAsB,EAAE,CAAC;QAC9F,IAAIqB,eAAe,EAAE;UACnB,MAAME,WAAW,GAAG,IAAI,CAAClC,cAAc,CAACsB,aAAa,CAACC,QAAQ,CAACO,WAAW,CAACnB,sBAAsB,EAAE,EAAE,IAAI,CAAC;UAC1G,IAAIuB,WAAW,EAAE,OAAO,IAAI,CAAC,CAAC;UAC9BxB,EAAE,GAAGsB,eAAe,CAACG,OAAO,CAACC,QAAQ,EAAE;QACzC;MACF;MACA,MAAMf,OAAO,GAAG,IAAI,CAACpB,WAAW,CAACqB,aAAa,CAACZ,EAAE,EAAE,IAAI,CAAC;MACxD,IAAIW,OAAO,EAAE;QACX;QACA,OAAO;UAAEX,EAAE;UAAEe,QAAQ,EAAE;YAAEC,aAAa,EAAE,GAAG;YAAEE,WAAW,EAAE,IAAI,CAACD,SAAS,CAACJ,QAAQ;UAAE;QAAE,CAAC;MACxF;MACA;MACA,OAAO;QAAEb,EAAE;QAAE2B,YAAY,EAAE,IAAI,CAACV,SAAS,CAACJ,QAAQ;MAAE,CAAC;IACvD,CAAC,CAAC;IACF,MAAMe,SAAS,GAAG,CAAC,IAAI,CAACC,WAAW,EAAE,CAAC,IAAI,EAAE;IAC5C,IAAI,CAAClC,MAAM,CAACQ,KAAK,CAAE,6BAA4B,IAAI,CAAChB,SAAU,QAAO,CAAC;IACtE,OAAO,KAAI2C,sCAAiB,EAC1B,IAAI,CAAC3C,SAAS,EACd,IAAI,CAACM,YAAY,EACjB,IAAI,CAACC,UAAU,EACf,IAAAqC,iBAAO,EAAC,CAAC,GAAG1B,OAAO,EAAE,GAAGc,6BAA6B,EAAE,GAAGS,SAAS,CAAC,CAAC,CACtE;EACH;EAEQxB,YAAY,GAAG;IACrB;IACA,MAAM4B,QAAQ,GAAIC,GAAsB,IAAK;MAC3C,MAAMC,UAAU,GAAGD,GAAG,CAACE,iBAAiB,CAACC,kBAAU,CAACpC,EAAE,CAAC;MACvD,IAAI,CAACkC,UAAU,EAAE,MAAM,IAAIG,KAAK,CAAE,kBAAiBD,kBAAU,CAACpC,EAAG,eAAc,IAAI,CAACb,SAAU,EAAC,CAAC;MAChG,MAAMmD,GAAG,GAAGJ,UAAU,CAACK,MAAM,CAACD,GAAG,IAAIJ,UAAU,CAACM,IAAI,CAACxC,EAAE;MACvD,IAAI,CAACsC,GAAG,EACN,MAAM,IAAID,KAAK,CAAE,0BAAyB,IAAI,CAAClD,SAAU,4BAA2BiD,kBAAU,CAACpC,EAAG,aAAY,CAAC;MACjH,OAAOsC,GAAG;IACZ,CAAC;IACD,MAAMG,UAAU,GAAGT,QAAQ,CAAC,IAAI,CAAC1C,cAAc,CAAC;IAChD,IAAI,CAACmD,UAAU,GAAG;MAAEzC,EAAE,EAAEyC;IAAW,CAAC;IACpC,MAAMC,QAAQ,GAAGV,QAAQ,CAAC,IAAI,CAACxC,YAAY,CAAC;IAC5C,IAAI,CAACkD,QAAQ,GAAG;MAAE1C,EAAE,EAAE0C;IAAS,CAAC;IAChC,MAAMC,OAAO,GAAG,IAAI,CAACpD,WAAW,GAAGyC,QAAQ,CAAC,IAAI,CAACzC,WAAW,CAAC,GAAGqD,SAAS;IACzE,IAAID,OAAO,EAAE,IAAI,CAACA,OAAO,GAAG;MAAE3C,EAAE,EAAE2C;IAAQ,CAAC;;IAE3C;IACA,MAAME,gBAAgB,GAAG,IAAI,CAACvD,cAAc,CAACsB,aAAa,CAAC6B,UAAU,EAAE,IAAI,CAAC;IAC5E,IAAII,gBAAgB,EAAE;MAAA;MACpB,IAAI,CAACrC,aAAa,CAACE,IAAI,CAACmC,gBAAgB,CAACtC,QAAQ,CAAC;MAClD,IAAI,CAACkC,UAAU,CAACK,OAAO,4BAAGD,gBAAgB,CAACzB,WAAW,0DAA5B,sBAA8B0B,OAAO;MAC/D,IAAI,CAACL,UAAU,CAACF,MAAM,GAAG,IAAI,CAACtB,SAAS,CAAC4B,gBAAgB,CAAC;IAC3D;IACA,MAAME,cAAc,GAAG,IAAI,CAACvD,YAAY,CAACoB,aAAa,CAAC8B,QAAQ,EAAE,IAAI,CAAC;IACtE,IAAIK,cAAc,EAAE;MAAA;MAClB,IAAI,CAACvC,aAAa,CAACE,IAAI,CAACqC,cAAc,CAACxC,QAAQ,CAAC;MAChD,IAAI,CAACmC,QAAQ,CAACI,OAAO,4BAAGC,cAAc,CAAC3B,WAAW,0DAA1B,sBAA4B0B,OAAO;MAC3D,IAAI,CAACJ,QAAQ,CAACH,MAAM,GAAG,IAAI,CAACtB,SAAS,CAAC8B,cAAc,CAAC;IACvD;IACA,IAAI,IAAI,CAACJ,OAAO,EAAE;MAChB,MAAMK,aAAa,GAAG,IAAI,CAACzD,WAAW,CAACqB,aAAa,CAAC+B,OAAO,EAAE,IAAI,CAAC;MACnE,IAAIK,aAAa,EAAE;QAAA;QACjB,IAAI,CAACL,OAAO,CAACG,OAAO,4BAAGE,aAAa,CAAC5B,WAAW,0DAAzB,sBAA2B0B,OAAO;QACzD,IAAI,CAACH,OAAO,CAACJ,MAAM,GAAG,IAAI,CAACtB,SAAS,CAAC+B,aAAa,CAAC;MACrD;IACF;EACF;EAEQnB,WAAW,GAA+B;IAChD,MAAMoB,mBAAmD,GAAG;MAC1DjD,EAAE,EAAEoC,kBAAU,CAACpC,EAAE;MACjBgB,aAAa,EAAE;QACbsB,GAAG,EAAE,IAAI,CAACG,UAAU,CAACK,OAAO,GAAI,GAAE,IAAI,CAACL,UAAU,CAACzC,EAAG,IAAG,IAAI,CAACyC,UAAU,CAACK,OAAQ,EAAC,GAAG,IAAI,CAACL,UAAU,CAACzC;MACtG,CAAC;MACDkB,WAAW,EAAE;QAAEoB,GAAG,EAAE,IAAI,CAACI,QAAQ,CAACI,OAAO,GAAI,GAAE,IAAI,CAACJ,QAAQ,CAAC1C,EAAG,IAAG,IAAI,CAAC0C,QAAQ,CAACI,OAAQ,EAAC,GAAG,IAAI,CAACJ,QAAQ,CAAC1C;MAAG;IAChH,CAAC;IACD,IAAI,IAAI,CAAC2C,OAAO,EAAE;MAAA;MAChBM,mBAAmB,CAACC,UAAU,GAAG;QAC/BZ,GAAG,EAAE,qBAAI,CAACK,OAAO,0CAAZ,cAAcG,OAAO,GAAI,GAAE,IAAI,CAACH,OAAO,CAAC3C,EAAG,IAAG,IAAI,CAAC2C,OAAO,CAACG,OAAQ,EAAC,qBAAG,IAAI,CAACH,OAAO,mDAAZ,eAAc3C;MAC5F,CAAC;IACH;IACA,IAAI,IAAI,CAACyC,UAAU,CAACzC,EAAE,KAAK,IAAI,CAAC0C,QAAQ,CAAC1C,EAAE,IAAI,IAAI,CAACyC,UAAU,CAACK,OAAO,KAAK,IAAI,CAACJ,QAAQ,CAACI,OAAO,EAAE;MAChG,OAAO,IAAI;IACb;IACA,IAAI,IAAI,CAACK,eAAe,CAAC,IAAI,CAACV,UAAU,CAACzC,EAAE,CAAC,EAAE;MAC5C;MACA,OAAO,IAAI;IACb;IACA,OAAO,IAAI,CAACoD,gBAAgB,CAACH,mBAAmB,CAAC;EACnD;EAEQI,eAAe,CAACC,OAA+B,EAAEC,OAA+B,EAAE;IACxF,OAAOC,IAAI,CAACC,SAAS,CAACH,OAAO,CAAC,KAAKE,IAAI,CAACC,SAAS,CAACF,OAAO,CAAC;EAC5D;EAEQzC,gBAAgB,CAACmC,mBAAwC,EAA8B;IAC7F,MAAM;MAAEjD,EAAE;MAAEM,UAAU;MAAEO,QAAQ;MAAEF;IAAQ,CAAC,GAAGsC,mBAAmB;IACjE,MAAMS,iBAAiB,GAAG,IAAI,CAACC,mBAAmB,CAACV,mBAAmB,CAAC;IAEvE,IAAIS,iBAAiB,EAAE;MACrB;MACA,OAAOA,iBAAiB;IAC1B;IACA,MAAM1C,aAAa,GAAG,IAAI,CAACC,SAAS,CAACX,UAAU,CAAC;IAChD,MAAMY,WAAW,GAAG,IAAI,CAACD,SAAS,CAACJ,QAAQ,CAAC;IAC5C,MAAMqC,UAAU,GAAGvC,OAAO,GAAG,IAAI,CAACM,SAAS,CAACN,OAAO,CAAC,GAAGiC,SAAS;IAEhE,OAAO,IAAI,CAACQ,gBAAgB,CAAC;MAAEpD,EAAE;MAAEgB,aAAa;MAAEE,WAAW;MAAEgC;IAAW,CAAC,CAAC;EAC9E;EAEQE,gBAAgB,CAACH,mBAAmD,EAAE;IAC5E,MAAM;MAAEjD,EAAE;MAAEgB,aAAa;MAAEE,WAAW;MAAEgC;IAAW,CAAC,GAAGD,mBAAmB;IAC1E,IAAI,IAAI,CAACI,eAAe,CAACrC,aAAa,EAAEE,WAAW,CAAC,EAAE;MACpD,OAAO,IAAI;IACb;IACA,IAAIgC,UAAU,IAAI,IAAI,CAACG,eAAe,CAACH,UAAU,EAAEhC,WAAW,CAAC,EAAE;MAC/D;MACA,OAAO,IAAI;IACb;IACA,IAAIgC,UAAU,IAAI,IAAI,CAACG,eAAe,CAACH,UAAU,EAAElC,aAAa,CAAC,EAAE;MACjE;MACA,OAAO;QAAEhB,EAAE;QAAE2B,YAAY,EAAET;MAAY,CAAC;IAC1C;IACA;IACA,OAAO;MAAElB,EAAE;MAAEe,QAAQ,EAAE;QAAEC,aAAa;QAAEE,WAAW;QAAEgC;MAAW;IAAE,CAAC;EACrE;EAEQS,mBAAmB,CAACC,MAA2B,EAAmC;IACxF,IAAIA,MAAM,CAAC5D,EAAE,KAAK6D,8CAAwB,CAAC7D,EAAE,EAAE,OAAO4C,SAAS;IAC/D,IAAI,CAACjD,MAAM,CAACmE,KAAK,CAAE,iCAAgC,IAAI,CAAC3E,SAAU,EAAC,CAAC;IACpE,MAAM;MAAEmB,UAAU;MAAEO,QAAQ;MAAEF;IAAQ,CAAC,GAAGiD,MAAM;IAEhD,MAAM5C,aAAa,GAAG,IAAI,CAACC,SAAS,CAACX,UAAU,CAAC;IAChD,MAAMyD,aAAa,GAAG,IAAI,CAACC,SAAS,CAAChD,aAAa,CAAC;IACnD,MAAME,WAAW,GAAG,IAAI,CAACD,SAAS,CAACJ,QAAQ,CAAC;IAC5C,MAAMoD,WAAW,GAAG,IAAI,CAACD,SAAS,CAAC9C,WAAW,CAAC;IAE/C,MAAMgC,UAAU,GAAGvC,OAAO,GAAG,IAAI,CAACM,SAAS,CAACN,OAAO,CAAC,GAAGiC,SAAS;IAChE,MAAMsB,UAAU,GAAGhB,UAAU,GAAG,IAAI,CAACc,SAAS,CAACd,UAAU,CAAC,GAAGN,SAAS;IAEtE,MAAMuB,UAAU,GAAIlC,GAAsB,IAAuC;MAAA;MAC/E,MAAMO,IAAI,4BAAGP,GAAG,CAACE,iBAAiB,CAAC0B,8CAAwB,CAAC7D,EAAE,CAAC,0DAAlD,sBAAoDwC,IAAI,CAAC4B,YAAY;MAClF,IAAI,CAAC5B,IAAI,EAAE,OAAO,EAAE;MACpB,MAAM6B,MAAM,GAAG,2BAAApC,GAAG,CAACE,iBAAiB,CAAC0B,8CAAwB,CAAC7D,EAAE,CAAC,2DAAlD,uBAAoDwC,IAAI,CAAC6B,MAAM,KAAI,EAAE;MACpF,OAAO7B,IAAI,CAAC1C,GAAG,CAAEwE,CAAC,IAAK;QACrB,MAAMC,gBAAgB,GAAGD,CAAC,CAACE,MAAM,KAAK,SAAS,GAAGF,CAAC,CAACtE,EAAE,GAAGsE,CAAC,CAACtE,EAAE,CAACyE,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QAC3E,MAAMC,cAAc,GAAGL,MAAM,CAACM,IAAI,CAAEC,CAAC,IAAKA,CAAC,CAACC,YAAY,KAAKN,gBAAgB,CAAC;QAC9E,MAAMO,YAAY,GAAG,MAAM;UACzB,IAAIR,CAAC,CAACE,MAAM,KAAK,SAAS,EAAE,OAAO5B,SAAS,CAAC,CAAC;UAC9C,IAAI8B,cAAc,EAAE,OAAOA,cAAc,CAACK,KAAK,CAACjC,OAAO,CAAC,CAAC;UACzD,OAAOwB,CAAC,CAACxB,OAAO;UAChB;UACA;UACA;QACF,CAAC;;QACD,uCACKwB,CAAC;UACJtE,EAAE,EAAEuE,gBAAgB;UACpBF,MAAM,EAAES,YAAY;QAAE;MAE1B,CAAC,CAAC;IACJ,CAAC;IACD,MAAME,aAAa,GAAI/C,GAAsB,IAA2B;MAAA;MACtE,OAAO,2BAAAA,GAAG,CAACE,iBAAiB,CAAC0B,8CAAwB,CAAC7D,EAAE,CAAC,2DAAlD,uBAAoDwC,IAAI,CAAC6B,MAAM,KAAI,EAAE;IAC9E,CAAC;IAED,MAAMY,WAAW,GAAIhD,GAAsB,IAAuC;MAChF,MAAMiD,OAAO,GAAGf,UAAU,CAAClC,GAAG,CAAC;MAC/B,OAAOiD,OAAO,CAACC,MAAM,CAAEb,CAAC,IAAKA,CAAC,CAACc,MAAM,KAAK,MAAM,CAAC;IACnD,CAAC;IAED,MAAMC,eAAe,GAAGJ,WAAW,CAAC,IAAI,CAAC3F,cAAc,CAAC;IACxD,MAAMgG,cAAc,GAAGnB,UAAU,CAAC,IAAI,CAAC7E,cAAc,CAAC;IACtD,MAAMiG,iBAAiB,GAAGP,aAAa,CAAC,IAAI,CAAC1F,cAAc,CAAC;IAC5D,MAAMkG,SAAS,GAAGP,WAAW,CAAC,IAAI,CAACzF,YAAY,CAAC;IAChD,MAAMiG,mBAAmB,GAAG,IAAAC,gBAAM,EAACL,eAAe,CAACM,MAAM,CAACH,SAAS,CAAC,EAAGlB,CAAC,IAAKA,CAAC,CAACtE,EAAE,CAAC;IAClF,MAAM4F,6BAA6B,GAAGH,mBAAmB,CAACN,MAAM,CAAEpF,CAAC,IAAKA,CAAC,CAACyE,MAAM,KAAK,WAAW,CAAC;IACjG,MAAMqB,QAAQ,GAAGZ,WAAW,CAAC,IAAI,CAAC1F,WAAW,CAAC;IAE9C,MAAMuG,6BAA6B,GAAIC,OAAe,IAAyB;MAC7E,MAAMC,KAAK,GAAGJ,6BAA6B,CAACjB,IAAI,CAAEL,CAAC,IAAKA,CAAC,CAAC2B,WAAW,KAAKF,OAAO,CAAC;MAClF,OAAOC,KAAK,aAALA,KAAK,uBAALA,KAAK,CAAEhG,EAAE;IAClB,CAAC;IAED,MAAMkG,+BAA+B,GAAIH,OAAe,IAAK;MAC3D,OAAOT,cAAc,CAACX,IAAI,CAAEL,CAAC,IAAK;QAChC,IAAIA,CAAC,CAACE,MAAM,KAAK,SAAS,EAAE,OAAOF,CAAC,CAACtE,EAAE,KAAK+F,OAAO;QACnD,OAAOzB,CAAC,CAAC2B,WAAW,KAAKF,OAAO;MAClC,CAAC,CAAC;IACJ,CAAC;IAED,MAAMI,qCAAqC,GAAIJ,OAAe,IAAK;MACjE,OAAOR,iBAAiB,CAACZ,IAAI,CAAEL,CAAC,IAAKA,CAAC,CAACO,YAAY,KAAKkB,OAAO,CAAC;IAClE,CAAC;IAED,MAAMK,YAAY,GAAG;MACnBhC,YAAY,EAAE,EAAE;MAChBiC,eAAe,EAAE,EAAE;MACnBC,gBAAgB,EAAE;IACpB,CAAC;IACD,MAAMC,gBAAgB,GAAG;MACvBnC,YAAY,EAAE,EAAE;MAChBiC,eAAe,EAAE,EAAE;MACnBC,gBAAgB,EAAE;IACpB,CAAC;IACD,IAAIE,WAAW,GAAG,KAAK;IACvB,MAAMC,kBAAkB,GAAG;MACzBC,OAAO,EAAE,cAAc;MACvBC,GAAG,EAAE,iBAAiB;MACtBC,IAAI,EAAE;IACR,CAAC;IACD,MAAMC,iBAAiB,GAAG,MAAM;MAC9B,MAAMC,6BAA6B,GAAIC,GAAuB,IAAK;QACjE,MAAM5H,SAAS,GAAG2G,6BAA6B,CAACiB,GAAG,CAAClC,YAAY,CAAC;QACjE,IAAI1F,SAAS,IAAI,IAAI,CAACgE,eAAe,CAAChE,SAAS,CAAC,EAAE;UAChD;UACA;QACF;QACA,MAAM6H,eAAe,GAAGd,+BAA+B,CAACa,GAAG,CAAClC,YAAY,CAAC;QACzE,IAAImC,eAAe,IAAI,CAACD,GAAG,CAACE,KAAK,EAAE;UACjC,IAAID,eAAe,CAAClE,OAAO,KAAKiE,GAAG,CAAChC,KAAK,CAACjC,OAAO,EAAE;UACnD,IACE,CAAC,IAAAoE,0BAAM,EAACF,eAAe,CAAClE,OAAO,CAAC,IAChC,CAAC,IAAAoE,0BAAM,EAACH,GAAG,CAAChC,KAAK,CAACjC,OAAO,CAAC,IAC1BqE,iBAAM,CAACC,SAAS,CAACJ,eAAe,CAAClE,OAAO,EAAEiE,GAAG,CAAChC,KAAK,CAACjC,OAAO,CAAC,EAC5D;YACA;UACF;QACF;QACA,MAAMuE,qBAAqB,GAAGlB,qCAAqC,CAACY,GAAG,CAAClC,YAAY,CAAC;QACrF,IAAIwC,qBAAqB,IAAIA,qBAAqB,CAACtC,KAAK,CAACjC,OAAO,KAAKiE,GAAG,CAAChC,KAAK,CAACjC,OAAO,EAAE;UACtF;UACA;QACF;QACA,MAAMwE,OAAO,GAAGb,kBAAkB,CAACM,GAAG,CAACQ,aAAa,CAAC;QACrDnB,YAAY,CAACkB,OAAO,CAAC,CAAC5G,IAAI,CAAC;UACzB8G,IAAI,EAAET,GAAG,CAAClC,YAAY;UACtB/B,OAAO,EAAEiE,GAAG,CAAChC,KAAK,CAACjC,OAAO;UAC1BmE,KAAK,EAAEF,GAAG,CAACE;QACb,CAAC,CAAC;MACJ,CAAC;MAED,IAAI,IAAI,CAAC5D,eAAe,CAACrC,aAAa,EAAEE,WAAW,CAAC,EAAE;QACpD;MACF;MACA,IAAIgC,UAAU,IAAI,IAAI,CAACG,eAAe,CAACH,UAAU,EAAEhC,WAAW,CAAC,EAAE;QAC/D;QACA;MACF;MACA,IAAIF,aAAa,KAAK,GAAG,IAAIE,WAAW,KAAK,GAAG,EAAE;QAChD,MAAM,IAAImB,KAAK,CAAC,sDAAsD,CAAC;MACzE;MACA,IAAIa,UAAU,IAAI,IAAI,CAACG,eAAe,CAACH,UAAU,EAAElC,aAAa,CAAC,EAAE;QACjE;QACA,IAAIiD,WAAW,CAACwD,MAAM,EAAE;UACtBxD,WAAW,CAACyD,OAAO,CAAEX,GAAG,IAAK;YAC3BD,6BAA6B,CAACC,GAAG,CAAC;UACpC,CAAC,CAAC;QACJ;QACA;MACF;;MAEA;MACA,IAAI,CAAC/F,aAAa,CAACqD,MAAM,IAAI,CAACnD,WAAW,CAACmD,MAAM,EAAE;MAClD,MAAMsD,qBAAqB,GAAG,IAAAjC,gBAAM,EAAC3B,aAAa,CAAC4B,MAAM,CAAC1B,WAAW,CAAC,EAAGK,CAAC,IAAKA,CAAC,CAACO,YAAY,CAAC;MAC9F8C,qBAAqB,CAACD,OAAO,CAAEX,GAAG,IAAK;QACrC,MAAMO,OAAO,GAAGb,kBAAkB,CAACM,GAAG,CAACQ,aAAa,CAAC;QACrD,MAAMK,UAAU,GAAG7D,aAAa,CAACY,IAAI,CAAEL,CAAC,IAAKA,CAAC,CAACO,YAAY,KAAKkC,GAAG,CAAClC,YAAY,CAAC;QACjF,MAAMgD,QAAQ,GAAG5D,WAAW,CAACU,IAAI,CAAEL,CAAC,IAAKA,CAAC,CAACO,YAAY,KAAKkC,GAAG,CAAClC,YAAY,CAAC;QAC7E,MAAMiD,OAAO,GAAG5D,UAAU,aAAVA,UAAU,uBAAVA,UAAU,CAAES,IAAI,CAAEL,CAAC,IAAKA,CAAC,CAACO,YAAY,KAAKkC,GAAG,CAAClC,YAAY,CAAC;QAE5E,IAAI,CAACgD,QAAQ,EAAE;UACb;QACF;QACA,IAAI,CAACD,UAAU,EAAE;UACf;UACAd,6BAA6B,CAACe,QAAQ,CAAC;UACvC;QACF;QACA,MAAME,UAAU,GAAGH,UAAU,CAAC7C,KAAK,CAACjC,OAAO;QAC3C,MAAMkF,QAAQ,GAAGH,QAAQ,CAAC9C,KAAK,CAACjC,OAAO;QACvC,IAAIiF,UAAU,KAAKC,QAAQ,EAAE;UAC3B;QACF;QACA,MAAMC,OAAO,GAAGH,OAAO,aAAPA,OAAO,uBAAPA,OAAO,CAAE/C,KAAK,CAACjC,OAAO;QACtC,IAAImF,OAAO,IAAIA,OAAO,KAAKD,QAAQ,EAAE;UACnC;QACF;QACA,IAAIC,OAAO,IAAIA,OAAO,KAAKF,UAAU,EAAE;UACrCjB,6BAA6B,CAACe,QAAQ,CAAC;UACvC;QACF;QACA,MAAM1I,SAAS,GAAG2G,6BAA6B,CAACiB,GAAG,CAAClC,YAAY,CAAC;QACjE,IAAI1F,SAAS,IAAI,IAAI,CAACgE,eAAe,CAAChE,SAAS,CAAC,EAAE;UAChD;UACA;QACF;QAEAqH,WAAW,GAAG,IAAI;QAClBD,gBAAgB,CAACe,OAAO,CAAC,CAAC5G,IAAI,CAAC;UAC7B8G,IAAI,EAAEI,UAAU,CAAC/C,YAAY;UAC7B/B,OAAO,EAAG,GAAE9D,iBAAkB,GAAE+I,UAAW,KAAIC,QAAS,IAAG;UAC3Df,KAAK,EAAEW,UAAU,CAACX;QACpB,CAAC,CAAC;MACJ,CAAC,CAAC;IACJ,CAAC;IAEDJ,iBAAiB,EAAE;IAEnB,MAAMqB,eAAe,GAAG,CAACZ,OAAe,EAAEa,OAAe,KAAK/B,YAAY,CAACkB,OAAO,CAAC,CAAC3C,IAAI,CAAEL,CAAC,IAAKA,CAAC,CAACkD,IAAI,KAAKW,OAAO,CAAC;IACnH,MAAMC,iBAAiB,GAAIrB,GAAmC,IAAK;MACjE,IAAIA,GAAG,CAACvC,MAAM,KAAK,WAAW,EAAE;QAC9B,OAAOuC,GAAG,CAAC/G,EAAE;MACf;MACA;MACA,OAAO+G,GAAG,CAACd,WAAW;IACxB,CAAC;IAED,MAAMoC,wBAAwB,GAAItB,GAAmC,IAAK;MACxE,MAAMO,OAAO,GAAGb,kBAAkB,CAACM,GAAG,CAACuB,SAAS,CAAC;MACjD,IAAIvB,GAAG,CAACvC,MAAM,KAAK,WAAW,IAAI,IAAI,CAACrB,eAAe,CAAC4D,GAAG,CAAC/G,EAAE,CAAC,EAAE;QAC9D;MACF;MACA,IAAIkI,eAAe,CAACZ,OAAO,EAAEP,GAAG,CAAC/G,EAAE,CAAC,EAAE;QACpC,OAAO,CAAC;MACV;;MACAoG,YAAY,CAACkB,OAAO,CAAC,CAAC5G,IAAI,CAAC;QACzB8G,IAAI,EAAEY,iBAAiB,CAACrB,GAAG,CAAC;QAC5BjE,OAAO,EAAEiE,GAAG,CAAC1C,MAAM,IAAI0C,GAAG,CAACjE,OAAO;QAClCmE,KAAK,EAAE;MACT,CAAC,CAAC;IACJ,CAAC;IAED,IAAI,CAACtH,MAAM,CAACQ,KAAK,CACd,gBAAemF,cAAc,CAACmC,MAAO,KAAInC,cAAc,CACrDxF,GAAG,CAAEwE,CAAC,IAAM,GAAEA,CAAC,CAACE,MAAO,IAAGF,CAAC,CAACtE,EAAG,IAAGsE,CAAC,CAACxB,OAAQ,EAAC,CAAC,CAC9CyF,IAAI,CAAC,IAAI,CAAE,EAAC,CAChB;IACD,IAAI,CAAC5I,MAAM,CAACQ,KAAK,CACd,cAAaqF,SAAS,CAACiC,MAAO,KAAIjC,SAAS,CAAC1F,GAAG,CAAEwE,CAAC,IAAM,GAAEA,CAAC,CAACE,MAAO,IAAGF,CAAC,CAACtE,EAAG,IAAGsE,CAAC,CAACxB,OAAQ,EAAC,CAAC,CAACyF,IAAI,CAAC,IAAI,CAAE,EAAC,CACzG;IACD,IAAI,CAAC5I,MAAM,CAACQ,KAAK,CACd,aAAY0F,QAAQ,CAAC4B,MAAO,KAAI5B,QAAQ,CAAC/F,GAAG,CAAEwE,CAAC,IAAM,GAAEA,CAAC,CAACE,MAAO,IAAGF,CAAC,CAACtE,EAAG,IAAGsE,CAAC,CAACxB,OAAQ,EAAC,CAAC,CAACyF,IAAI,CAAC,IAAI,CAAE,EAAC,CACtG;;IAED;IACA9C,mBAAmB,CAACiC,OAAO,CAAEc,OAAO,IAAK;MACvC,IAAI,CAAC7I,MAAM,CAACmE,KAAK,CAAE,eAAc0E,OAAO,CAACxI,EAAG,EAAC,CAAC;MAC9C,IAAI,IAAI,CAACyI,KAAK,CAACD,OAAO,CAACxI,EAAE,CAAC,EAAE;QAC1B;QACA;MACF;MACA,MAAM4H,UAAU,GAAGtC,cAAc,CAACX,IAAI,CAAEL,CAAC,IAAKA,CAAC,CAACtE,EAAE,KAAKwI,OAAO,CAACxI,EAAE,CAAC;MAClE,MAAM6H,QAAQ,GAAGrC,SAAS,CAACb,IAAI,CAAEL,CAAC,IAAKA,CAAC,CAACtE,EAAE,KAAKwI,OAAO,CAACxI,EAAE,CAAC;MAC3D,MAAM8H,OAAO,GAAGjC,QAAQ,CAAClB,IAAI,CAAEL,CAAC,IAAKA,CAAC,CAACtE,EAAE,KAAKwI,OAAO,CAACxI,EAAE,CAAC;MAEzD,IAAI,CAACL,MAAM,CAACmE,KAAK,CAAE,YAAW,EAAE8D,UAAU,CAAC;MAC3C,IAAI,CAACjI,MAAM,CAACmE,KAAK,CAAE,UAAS,EAAE+D,QAAQ,CAAC;MACvC,IAAI,CAAClI,MAAM,CAACmE,KAAK,CAAE,SAAQ,EAAEgE,OAAO,CAAC;MACrC,IAAI,CAACD,QAAQ,EAAE;QACb;MACF;MACA,IAAI,CAACD,UAAU,EAAE;QACf,IAAIE,OAAO,EAAE;UACX;UACA;QACF;QACA;QACAO,wBAAwB,CAACR,QAAQ,CAAC;QAClC;MACF;MAEA,IAAID,UAAU,CAACvD,MAAM,IAAIwD,QAAQ,CAACxD,MAAM,EAAE;QACxC,IAAI8C,iBAAM,CAACC,SAAS,CAACQ,UAAU,CAAC9E,OAAO,EAAE+E,QAAQ,CAACxD,MAAM,CAAC,EAAE;UACzD;QACF;QACA,IAAI8C,iBAAM,CAACC,SAAS,CAACS,QAAQ,CAAC/E,OAAO,EAAE8E,UAAU,CAACvD,MAAM,CAAC,EAAE;UACzD;QACF;MACF;MAEA,MAAM0D,UAAU,GAAGH,UAAU,CAACvD,MAAM,IAAIuD,UAAU,CAAC9E,OAAO;MAC1D,MAAMkF,QAAQ,GAAGH,QAAQ,CAACxD,MAAM,IAAIwD,QAAQ,CAAC/E,OAAO;MACpD,IAAIiF,UAAU,KAAKC,QAAQ,EAAE;QAC3B;MACF;MACA,MAAMC,OAAO,GAAG,CAAAH,OAAO,aAAPA,OAAO,uBAAPA,OAAO,CAAEzD,MAAM,MAAIyD,OAAO,aAAPA,OAAO,uBAAPA,OAAO,CAAEhF,OAAO;MACnD,IAAImF,OAAO,IAAIA,OAAO,KAAKD,QAAQ,EAAE;QACnC;MACF;MACA,MAAMU,SAAS,GAAGd,UAAU,CAAC5H,EAAE;MAC/B,IAAI4H,UAAU,CAACpD,MAAM,KAAK,WAAW,IAAI,IAAI,CAACrB,eAAe,CAACuF,SAAS,CAAC,EAAE;QACxE;QACA;MACF;MACA,MAAMpB,OAAO,GAAGb,kBAAkB,CAACmB,UAAU,CAACU,SAAS,CAAC;MACxD,IAAIJ,eAAe,CAACZ,OAAO,EAAEM,UAAU,CAAC5H,EAAE,CAAC,EAAE;QAC3C,OAAO,CAAC;MACV;;MACA,IAAIiI,OAAO,IAAIA,OAAO,KAAKF,UAAU,EAAE;QACrCM,wBAAwB,CAACR,QAAQ,CAAC;QAClC;MACF;MACArB,WAAW,GAAG,IAAI;MAClBD,gBAAgB,CAACe,OAAO,CAAC,CAAC5G,IAAI,CAAC;QAC7B8G,IAAI,EAAEY,iBAAiB,CAACR,UAAU,CAAC;QACnC9E,OAAO,EAAG,GAAE9D,iBAAkB,GAAE+I,UAAW,KAAIC,QAAS,IAAG;QAC3Df,KAAK,EAAE;MACT,CAAC,CAAC;IACJ,CAAC,CAAC;IAEF,CAAC,cAAc,EAAE,iBAAiB,EAAE,kBAAkB,CAAC,CAACS,OAAO,CAAEJ,OAAO,IAAK;MAC3E,IAAI,CAAClB,YAAY,CAACkB,OAAO,CAAC,CAACG,MAAM,EAAE,OAAOrB,YAAY,CAACkB,OAAO,CAAC;MAC/D,IAAI,CAACf,gBAAgB,CAACe,OAAO,CAAC,CAACG,MAAM,EAAE,OAAOlB,gBAAgB,CAACe,OAAO,CAAC;IACzE,CAAC,CAAC;IAEF,MAAM/E,MAAM,GAAGoG,MAAM,CAACC,IAAI,CAACxC,YAAY,CAAC,CAACqB,MAAM,GAAG;MAAEpD,MAAM,EAAE+B;IAAa,CAAC,GAAGxD,SAAS;IACtF,MAAM7B,QAAQ,GAAGyF,WAAW,GAAGD,gBAAgB,GAAG3D,SAAS;IAE3D,IAAI,CAACjD,MAAM,CAACQ,KAAK,CAAC,oBAAoB,EAAEoC,MAAM,CAAC;IAC/C,IAAI,CAAC5C,MAAM,CAACQ,KAAK,CAAC,gBAAgB,EAAEY,QAAQ,CAAC;IAE7C,OAAO;MAAEf,EAAE,EAAE4D,MAAM,CAAC5D,EAAE;MAAE2B,YAAY,EAAEY,MAAM;MAAExB;IAAS,CAAC;EAC1D;EAEQoC,eAAe,CAACnD,EAAU,EAAW;IAC3C,OAAO6I,OAAO,CAAC,IAAI,CAACtH,kBAAkB,CAACvB,EAAE,CAAC,CAAC,IAAI,IAAI,CAACJ,eAAe,CAACa,QAAQ,CAACT,EAAE,CAAC;EAClF;EAEQuB,kBAAkB,CAACvB,EAAU,EAA2B;IAC9D,OAAO,IAAI,CAACZ,YAAY,CAACuF,IAAI,CAAE5E,CAAC,IAAKA,CAAC,CAACE,sBAAsB,EAAE,KAAKD,EAAE,CAAC;EACzE;EAEQyI,KAAK,CAACzI,EAAU,EAAE;IACxB,OAAOA,EAAE,KAAK,IAAI,CAACyC,UAAU,CAACzC,EAAE,IAAIA,EAAE,KAAK,IAAI,CAAC0C,QAAQ,CAAC1C,EAAE;EAC7D;EAEQiB,SAAS,CAACgB,GAAuB,EAA0B;IACjE,IAAIA,GAAG,CAAC6G,SAAS,KAAK,GAAG,EAAE,OAAO7G,GAAG,CAAC6G,SAAS;IAC/C,OAAO,IAAAC,cAAI,EAAC9G,GAAG,CAAC6G,SAAS,EAAE,CAAC,YAAY,CAAC,CAAC;EAC5C;EAEQ9E,SAAS,CAACzB,MAAM,EAAwB;IAC9C,IAAI,CAACA,MAAM,CAAC8B,MAAM,EAAE,OAAO,EAAE;IAC7B,OAAO2E,mCAAa,CAACC,gBAAgB,CAAC1G,MAAM,CAAC8B,MAAM,CAAC,CAAC6E,OAAO;EAC9D;AACF;AAAC"}

package/dist/merging.main.runtime.js

@@ -25,6 +25,13 @@ function _cli() {
   };
   return data;
 }
+function _semver() {
+  const data = _interopRequireDefault(require("semver"));
+  _semver = function () {
+    return data;
+  };
+  return data;
+}
 function _workspace() {
   const data = _interopRequireWildcard(require("@teambit/workspace"));
   _workspace = function () {
@@ -437,111 +444,125 @@ class MergingMain {
   }
   async updateWorkspaceJsoncWithDepsIfNeeded(allConfigMerge) {
     const allResults = allConfigMerge.map(c => c.getDepsResolverResult());
-    const allDeps = {};
-    const allDepsSources = {}; // for logging/debugging purposes
 
+    // aggregate all dependencies that can be updated (not conflicting)
+    const nonConflictDeps = {};
+    const nonConflictSources = {}; // for logging/debugging purposes
     allConfigMerge.forEach(configMerge => {
       var _configMerge$getDepsR;
       const mergedConfig = (_configMerge$getDepsR = configMerge.getDepsResolverResult()) === null || _configMerge$getDepsR === void 0 ? void 0 : _configMerge$getDepsR.mergedConfig;
       if (!mergedConfig || mergedConfig === '-') return;
-      const policy = mergedConfig.policy || {};
+      const mergedConfigPolicy = mergedConfig.policy || {};
       _constants().DEPENDENCIES_FIELDS.forEach(depField => {
-        if (!policy[depField]) return;
-        policy[depField].forEach(pkg => {
+        if (!mergedConfigPolicy[depField]) return;
+        mergedConfigPolicy[depField].forEach(pkg => {
           if (pkg.force) return; // we only care about auto-detected dependencies
-          if (allDeps[pkg.name]) {
-            if (!allDeps[pkg.name].includes(pkg.version)) allDeps[pkg.name].push(pkg.version);
-            allDepsSources[pkg.name].push(configMerge.compIdStr);
+          if (nonConflictDeps[pkg.name]) {
+            if (!nonConflictDeps[pkg.name].includes(pkg.version)) nonConflictDeps[pkg.name].push(pkg.version);
+            nonConflictSources[pkg.name].push(configMerge.compIdStr);
             return;
           }
-          allDeps[pkg.name] = [pkg.version];
-          allDepsSources[pkg.name] = [configMerge.compIdStr];
+          nonConflictDeps[pkg.name] = [pkg.version];
+          nonConflictSources[pkg.name] = [configMerge.compIdStr];
         });
       });
     });
-    const allConflictDeps = {};
-    const conflictDepsSources = {}; // for logging/debugging purposes
 
+    // aggregate all dependencies that have conflicts
+    const conflictDeps = {};
+    const conflictDepsSources = {}; // for logging/debugging purposes
     allConfigMerge.forEach(configMerge => {
       var _configMerge$getDepsR2;
-      const policy = (_configMerge$getDepsR2 = configMerge.getDepsResolverResult()) === null || _configMerge$getDepsR2 === void 0 ? void 0 : _configMerge$getDepsR2.conflict;
-      if (!policy) return;
+      const mergedConfigConflict = (_configMerge$getDepsR2 = configMerge.getDepsResolverResult()) === null || _configMerge$getDepsR2 === void 0 ? void 0 : _configMerge$getDepsR2.conflict;
+      if (!mergedConfigConflict) return;
       _constants().DEPENDENCIES_FIELDS.forEach(depField => {
-        if (!policy[depField]) return;
-        policy[depField].forEach(pkg => {
+        if (!mergedConfigConflict[depField]) return;
+        mergedConfigConflict[depField].forEach(pkg => {
           if (pkg.force) return; // we only care about auto-detected dependencies
-          if (allConflictDeps[pkg.name]) {
-            if (!allConflictDeps[pkg.name].includes(pkg.version)) allConflictDeps[pkg.name].push(pkg.version);
+          if (conflictDeps[pkg.name]) {
+            if (!conflictDeps[pkg.name].includes(pkg.version)) conflictDeps[pkg.name].push(pkg.version);
             conflictDepsSources[pkg.name].push(configMerge.compIdStr);
             return;
           }
-          allConflictDeps[pkg.name] = [pkg.version];
+          conflictDeps[pkg.name] = [pkg.version];
           conflictDepsSources[pkg.name] = [configMerge.compIdStr];
         });
       });
     });
-    const allPackages = Object.keys(allDeps);
-    const allConflictedPackages = Object.keys(allConflictDeps);
-    if (!allPackages.length && !allConflictedPackages.length) return {};
+    const notConflictedPackages = Object.keys(nonConflictDeps);
+    const conflictedPackages = Object.keys(conflictDeps);
+    if (!notConflictedPackages.length && !conflictedPackages.length) return {};
     const workspaceConfig = this.config.workspaceConfig;
     if (!workspaceConfig) throw new Error(`updateWorkspaceJsoncWithDepsIfNeeded unable to get workspace config`);
     const depResolver = workspaceConfig.extensions.findCoreExtension(_dependencyResolver().DependencyResolverAspect.id);
     const policy = depResolver === null || depResolver === void 0 ? void 0 : depResolver.config.policy;
-    if (!policy) return {};
+    if (!policy) {
+      return {};
+    }
+
+    // calculate the workspace.json updates
     const workspaceJsonUpdates = {};
-    const WS_DEPS_FIELDS = ['dependencies', 'peerDependencies'];
-    const workspaceJsonConflicts = {
-      dependencies: [],
-      peerDependencies: []
-    };
-    allPackages.forEach(pkgName => {
-      if (allDeps[pkgName].length > 1) {
+    notConflictedPackages.forEach(pkgName => {
+      if (nonConflictDeps[pkgName].length > 1) {
         // we only want the deps that the other lane has them in the workspace.json and that all comps use the same dep.
         return;
       }
       _constants().DEPENDENCIES_FIELDS.forEach(depField => {
         var _policy$depField;
-        if (!((_policy$depField = policy[depField]) !== null && _policy$depField !== void 0 && _policy$depField[pkgName])) return;
+        if (!((_policy$depField = policy[depField]) !== null && _policy$depField !== void 0 && _policy$depField[pkgName])) return; // doesn't exists in the workspace.json
         const currentVer = policy[depField][pkgName];
-        const newVer = allDeps[pkgName][0];
+        const newVer = nonConflictDeps[pkgName][0];
         if (currentVer === newVer) return;
         workspaceJsonUpdates[pkgName] = [currentVer, newVer];
         policy[depField][pkgName] = newVer;
-        this.logger.debug(`update workspace.jsonc: ${pkgName} from ${currentVer} to ${newVer}. Triggered by: ${allDepsSources[pkgName].join(', ')}`);
+        this.logger.debug(`update workspace.jsonc: ${pkgName} from ${currentVer} to ${newVer}. Triggered by: ${nonConflictSources[pkgName].join(', ')}`);
       });
     });
-    allConflictedPackages.forEach(pkgName => {
-      if (allConflictDeps[pkgName].length > 1) {
+
+    // calculate the workspace.json conflicts
+    const WS_DEPS_FIELDS = ['dependencies', 'peerDependencies'];
+    const workspaceJsonConflicts = {
+      dependencies: [],
+      peerDependencies: []
+    };
+    const conflictPackagesToRemoveFromConfigMerge = [];
+    conflictedPackages.forEach(pkgName => {
+      if (conflictDeps[pkgName].length > 1) {
         // we only want the deps that the other lane has them in the workspace.json and that all comps use the same dep.
         return;
       }
-      const conflict = allConflictDeps[pkgName][0];
-      const [, currentVal, otherVal] = conflict.split('::');
+      const conflictRaw = conflictDeps[pkgName][0];
+      const [, currentVal, otherVal] = conflictRaw.split('::');
       WS_DEPS_FIELDS.forEach(depField => {
         var _policy$depField2;
         if (!((_policy$depField2 = policy[depField]) !== null && _policy$depField2 !== void 0 && _policy$depField2[pkgName])) return;
         const currentVerInWsJson = policy[depField][pkgName];
         if (!currentVerInWsJson) return;
         // the version is coming from the workspace.jsonc
+        conflictPackagesToRemoveFromConfigMerge.push(pkgName);
+        if (_semver().default.satisfies(otherVal, currentVerInWsJson)) {
+          // the other version is compatible with the current version in the workspace.json
+          return;
+        }
         workspaceJsonConflicts[depField].push({
           name: pkgName,
-          version: conflict.replace(currentVal, currentVerInWsJson),
+          version: conflictRaw.replace(currentVal, currentVerInWsJson),
           force: false
         });
+        conflictPackagesToRemoveFromConfigMerge.push(pkgName);
         this.logger.debug(`conflict workspace.jsonc: ${pkgName} current: ${currentVerInWsJson}, other: ${otherVal}. Triggered by: ${conflictDepsSources[pkgName].join(', ')}`);
       });
     });
     WS_DEPS_FIELDS.forEach(depField => {
       if ((0, _lodash().isEmpty)(workspaceJsonConflicts[depField])) delete workspaceJsonConflicts[depField];
     });
-    if (Object.keys(workspaceJsonConflicts).length) {
-      const conflictedPkgs = Object.keys(workspaceJsonConflicts).map(depField => workspaceJsonConflicts[depField].map(d => d.name)).flat();
+    if (conflictPackagesToRemoveFromConfigMerge.length) {
       allResults.forEach(result => {
         if (result !== null && result !== void 0 && result.conflict) {
           _constants().DEPENDENCIES_FIELDS.forEach(depField => {
             var _result$conflict, _result$conflict2;
             if (!((_result$conflict = result.conflict) !== null && _result$conflict !== void 0 && _result$conflict[depField])) return;
-            result.conflict[depField] = (_result$conflict2 = result.conflict) === null || _result$conflict2 === void 0 ? void 0 : _result$conflict2[depField].filter(dep => !conflictedPkgs.includes(dep.name));
+            result.conflict[depField] = (_result$conflict2 = result.conflict) === null || _result$conflict2 === void 0 ? void 0 : _result$conflict2[depField].filter(dep => !conflictPackagesToRemoveFromConfigMerge.includes(dep.name));
             if (!result.conflict[depField].length) delete result.conflict[depField];
           });
           if ((0, _lodash().isEmpty)(result.conflict)) result.conflict = undefined;
@@ -789,8 +810,7 @@ class MergingMain {
       currentId,
       modelComponent
     } = mergeProps;
-    const consumer = this.workspace.consumer;
-    const repo = consumer.scope.objects;
+    const repo = this.consumer.scope.objects;
     if (!divergeData) throw new Error(`getDivergedMergeStatus, divergeData is missing for ${id.toString()}`);
     if (!currentComponent) throw new Error(`getDivergedMergeStatus, currentComponent is missing for ${id.toString()}`);
     const baseSnap = divergeData.commonSnapBeforeDiverge; // must be set when isTrueMerge
@@ -809,7 +829,7 @@ other:   ${otherLaneHead.toString()}`);
     const configMerger = new (_configMerger().ConfigMerger)(id.toStringWithoutVersion(), workspaceIds, otherLane, currentComponent.extensions, baseComponent.extensions, otherComponent.extensions, currentLabel, otherLabel, this.logger);
     const configMergeResult = configMerger.merge();
     const mergeResults = await (0, _threeWayMerge().default)({
-      consumer,
+      consumer: this.consumer,
       otherComponent,
       otherLabel,
       currentComponent,

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

@@ -1 +1 @@
-{"version":3,"names":["MergingMain","constructor","workspace","install","snapping","checkout","logger","componentWriter","importer","config","consumer","merge","ids","mergeStrategy","abort","resolve","noSnap","message","build","skipDependencyInstallation","OutsideWorkspaceError","mergeResults","resolveMerge","abortMerge","bitIds","getComponentsToMerge","mergeComponentsFromRemote","onDestroy","snapMessage","currentLaneId","getCurrentLaneId","currentLaneObject","getCurrentLaneObject","allComponentsStatus","getAllComponentsStatus","failedComponents","filter","c","unmergedMessage","unmergedLegitimately","length","failureMsgs","map","failedComponent","chalk","bold","id","toString","red","join","BitError","mergeSnaps","laneId","localLane","tag","componentWithConflict","find","component","hasConflicts","getMergeStrategyInteractive","componentStatus","failureMessage","unchangedLegitimately","succeededComponents","componentsResults","mapSeries","currentComponent","resolvedUnrelated","configMergeResult","modelComponent","scope","getModelComponent","updatedLaneId","isDefault","LaneId","from","name","applyVersion","remoteHead","getRef","version","allConfigMerge","compact","workspaceDepsUpdates","workspaceDepsConflicts","updateWorkspaceJsoncWithDepsIfNeeded","generateConfigMergeConflictFileForAll","objects","add","persist","unmergedComponents","write","writeBitMap","componentsHasConfigMergeConflicts","some","leftUnresolvedConflicts","undefined","dedupe","updateExisting","import","err","error","consoleError","getSnapOrTagResults","idsToTag","results","tagAllLaneComponent","taggedComponents","autoTaggedResults","snappedComponents","autoSnappedResults","snapResolvedComponents","mergeSnapResults","mergeSnapError","bitMapSnapshot","bitMap","takeSnapshot","restoreFromSnapshot","components","configMergeFile","getConflictMergeFile","workspaceConflict","ConfigMergeResult","DependencyResolverAspect","conflict","unshift","forEach","configMerge","generateMergeConflictFile","addConflict","compIdStr","hasConflict","allResults","getDepsResolverResult","allDeps","allDepsSources","mergedConfig","policy","DEPENDENCIES_FIELDS","depField","pkg","force","includes","push","allConflictDeps","conflictDepsSources","allPackages","Object","keys","allConflictedPackages","workspaceConfig","Error","depResolver","extensions","findCoreExtension","workspaceJsonUpdates","WS_DEPS_FIELDS","workspaceJsonConflicts","dependencies","peerDependencies","pkgName","currentVer","newVer","debug","currentVal","otherVal","split","currentVerInWsJson","replace","isEmpty","conflictedPkgs","d","flat","result","dep","getMergeStatus","currentLane","otherLane","options","importObjectsFromMainIfExist","toBitIds","toVersionLatest","componentStatusBeforeMergeAttempt","getComponentStatusBeforeMergeAttempt","toImport","compStatus","divergeData","versionsToImport","snapsOnTargetOnly","commonSnapBeforeDiverge","v","changeVersion","scopeImporter","importManyIfMissingWithoutDeps","BitIds","fromArray","lane","compStatusNotNeedMerge","mergeProps","compStatusNeedMerge","getComponentsStatusNeedMerge","tmp","Tmp","componentsStatus","Promise","all","getComponentMergeStatus","clear","returnUnmerged","msg","getModelComponentIfExist","unmerged","getEntry","toStringWithoutVersion","repo","otherLaneHead","existingBitMapId","getBitIdIfExist","ignoreVersion","componentOnOther","loadVersion","isRemoved","getCurrentId","idOnLane","getComponent","head","getHeadAsTagIfExist","currentId","getDivergeData","targetHead","throws","componentFromModel","getCurrentComponent","loadComponent","getConsumerComponent","removed","isModified","componentModificationStatus","getComponentStatusById","modified","baseComponent","ignoreConfigChanges","isComponentSourceCodeModified","isComponentModified","mainHead","NoCommonSnap","resolveUnrelated","hasResolvedFromMain","hashToCompare","divergeDataFromMain","sourceHead","hasResolvedLocally","getHeadRegardlessOfLane","hasResolvedRemotely","versionToSaveInLane","resolvedRef","strategy","isDiverged","isSourceAhead","isTargetAhead","componentMergeStatusBeforeMergeAttempt","baseSnap","otherComponent","currentLaneName","toLaneId","otherLaneName","DEFAULT_LANE","currentLabel","otherLabel","workspaceIds","listIds","configMerger","ConfigMerger","threeWayMerge","filesStatus","unmergedComponent","remote","handleResolveUnrelated","addComponent","unrelated","addEntry","markAllFilesAsUnchanged","files","file","pathNormalizeToLinux","relative","FileStatus","unchanged","MergeOptions","ours","remoteId","idToLoad","theirs","legacyComponent","loadComponentFromModelImportIfNeeded","updated","modifiedStatus","modifiedFiles","applyModifiedVersion","manyComponentsWriterOpts","writeConfig","writeMany","writtenPath","successfullyMergedConfig","getSuccessfullyMergedConfig","manual","unmergedPaths","f","filePath","setHead","markVersionAsLocal","values","getIdsForUnmerged","reset","removeComponent","fullName","abortedComponents","snap","legacyBitIds","_legacy","resolvedComponents","localLaneObject","bitId","remoteScopeName","remoteLaneId","remoteLanes","laneIdStr","getComponents","r","BitId","tagMessage","unmodified","idsStr","componentIds","resolveMultipleComponentIds","entry","GeneralError","unresolvedComponents","u","ComponentID","fromLegacy","hasWildcard","componentsList","ComponentsList","listComponentsByIdsWithWildcard","getParsedId","provider","cli","loggerMain","compWriter","createLogger","MergingAspect","merging","register","MergeCmd","CLIAspect","WorkspaceAspect","SnappingAspect","CheckoutAspect","InstallAspect","LoggerAspect","ComponentWriterAspect","ImporterAspect","ConfigAspect","MainRuntime","addRuntime"],"sources":["merging.main.runtime.ts"],"sourcesContent":["import { CLIAspect, CLIMain, MainRuntime } from '@teambit/cli';\nimport WorkspaceAspect, { OutsideWorkspaceError, Workspace } from '@teambit/workspace';\nimport { Consumer } from '@teambit/legacy/dist/consumer';\nimport ComponentsList from '@teambit/legacy/dist/consumer/component/components-list';\nimport {\n  MergeStrategy,\n  FailedComponents,\n  FileStatus,\n  ApplyVersionResult,\n  getMergeStrategyInteractive,\n  MergeOptions,\n} from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport SnappingAspect, { SnappingMain, TagResults } from '@teambit/snapping';\nimport hasWildcard from '@teambit/legacy/dist/utils/string/has-wildcard';\nimport mapSeries from 'p-map-series';\nimport { BitId, BitIds } from '@teambit/legacy/dist/bit-id';\nimport { BitError } from '@teambit/bit-error';\nimport GeneralError from '@teambit/legacy/dist/error/general-error';\nimport { DEFAULT_LANE, LaneId } from '@teambit/lane-id';\nimport { AutoTagResult } from '@teambit/legacy/dist/scope/component-ops/auto-tag';\nimport { getDivergeData } from '@teambit/legacy/dist/scope/component-ops/get-diverge-data';\nimport { UnmergedComponent } from '@teambit/legacy/dist/scope/lanes/unmerged-components';\nimport { Lane, ModelComponent, Version } from '@teambit/legacy/dist/scope/models';\nimport { Ref } from '@teambit/legacy/dist/scope/objects';\nimport chalk from 'chalk';\nimport { ConfigAspect, ConfigMain } from '@teambit/config';\nimport { Tmp } from '@teambit/legacy/dist/scope/repositories';\nimport { pathNormalizeToLinux } from '@teambit/legacy/dist/utils';\nimport { ComponentWriterAspect, ComponentWriterMain } from '@teambit/component-writer';\nimport ConsumerComponent from '@teambit/legacy/dist/consumer/component/consumer-component';\nimport ImporterAspect, { ImporterMain } from '@teambit/importer';\nimport { Logger, LoggerAspect, LoggerMain } from '@teambit/logger';\nimport { compact, isEmpty } from 'lodash';\nimport { applyModifiedVersion } from '@teambit/legacy/dist/consumer/versions-ops/checkout-version';\nimport threeWayMerge, {\n  MergeResultsThreeWay,\n} from '@teambit/legacy/dist/consumer/versions-ops/merge-version/three-way-merge';\nimport { NoCommonSnap } from '@teambit/legacy/dist/scope/exceptions/no-common-snap';\nimport { DependencyResolverAspect, WorkspacePolicyConfigKeysNames } from '@teambit/dependency-resolver';\nimport { CheckoutAspect, CheckoutMain } from '@teambit/checkout';\nimport { ComponentID } from '@teambit/component-id';\nimport { DEPENDENCIES_FIELDS } from '@teambit/legacy/dist/constants';\nimport { SnapsDistance } from '@teambit/legacy/dist/scope/component-ops/snaps-distance';\nimport { InstallMain, InstallAspect } from '@teambit/install';\nimport { MergeCmd } from './merge-cmd';\nimport { MergingAspect } from './merging.aspect';\nimport { ConfigMerger } from './config-merger';\nimport { ConfigMergeResult } from './config-merge-result';\n\ntype ResolveUnrelatedData = { strategy: MergeStrategy; head: Ref };\ntype PkgEntry = { name: string; version: string; force: boolean };\n\nexport type WorkspaceDepsUpdates = { [pkgName: string]: [string, string] }; // from => to\nexport type WorkspaceDepsConflicts = Record<WorkspacePolicyConfigKeysNames, Array<{ name: string; version: string }>>; // the pkg value is in a format of CONFLICT::OURS::THEIRS\n\nexport type ComponentMergeStatus = {\n  currentComponent?: ConsumerComponent | null;\n  componentFromModel?: Version;\n  id: BitId;\n  unmergedMessage?: string;\n  unmergedLegitimately?: boolean; // failed to merge but for a legitimate reason, such as, up-to-date\n  mergeResults?: MergeResultsThreeWay | null;\n  divergeData?: SnapsDistance;\n  resolvedUnrelated?: ResolveUnrelatedData;\n  configMergeResult?: ConfigMergeResult;\n};\n\nexport type ComponentMergeStatusBeforeMergeAttempt = {\n  currentComponent?: ConsumerComponent | null;\n  componentFromModel?: Version;\n  id: BitId;\n  unmergedMessage?: string;\n  unmergedLegitimately?: boolean; // failed to merge but for a legitimate reason, such as, up-to-date\n  divergeData?: SnapsDistance;\n  resolvedUnrelated?: ResolveUnrelatedData;\n  mergeProps?: {\n    otherLaneHead: Ref;\n    currentId: BitId;\n    modelComponent: ModelComponent;\n  };\n};\n\nexport type ApplyVersionResults = {\n  components?: ApplyVersionResult[];\n  version?: string;\n  failedComponents?: FailedComponents[];\n  resolvedComponents?: ConsumerComponent[]; // relevant for bit merge --resolve\n  abortedComponents?: ApplyVersionResult[]; // relevant for bit merge --abort\n  mergeSnapResults?: { snappedComponents: ConsumerComponent[]; autoSnappedResults: AutoTagResult[] } | null;\n  mergeSnapError?: Error;\n  leftUnresolvedConflicts?: boolean;\n  verbose?: boolean;\n  newFromLane?: string[];\n  newFromLaneAdded?: boolean;\n  installationError?: Error; // in case the package manager failed, it won't throw, instead, it'll return error here\n  compilationError?: Error; // in case the compiler failed, it won't throw, instead, it'll return error here\n  workspaceDepsUpdates?: WorkspaceDepsUpdates; // in case workspace.jsonc has been updated with dependencies versions\n};\n\nexport class MergingMain {\n  private consumer: Consumer;\n  constructor(\n    private workspace: Workspace,\n    private install: InstallMain,\n    private snapping: SnappingMain,\n    private checkout: CheckoutMain,\n    private logger: Logger,\n    private componentWriter: ComponentWriterMain,\n    private importer: ImporterMain,\n    private config: ConfigMain\n  ) {\n    this.consumer = this.workspace?.consumer;\n  }\n\n  async merge(\n    ids: string[],\n    mergeStrategy: MergeStrategy,\n    abort: boolean,\n    resolve: boolean,\n    noSnap: boolean,\n    message: string,\n    build: boolean,\n    skipDependencyInstallation: boolean\n  ): Promise<ApplyVersionResults> {\n    if (!this.workspace) throw new OutsideWorkspaceError();\n    const consumer: Consumer = this.workspace.consumer;\n    let mergeResults;\n    if (resolve) {\n      mergeResults = await this.resolveMerge(ids, message, build);\n    } else if (abort) {\n      mergeResults = await this.abortMerge(ids);\n    } else {\n      const bitIds = this.getComponentsToMerge(consumer, ids);\n      // @todo: version could be the lane only or remote/lane\n      mergeResults = await this.mergeComponentsFromRemote(\n        consumer,\n        bitIds,\n        mergeStrategy,\n        noSnap,\n        message,\n        build,\n        skipDependencyInstallation\n      );\n    }\n    await consumer.onDestroy();\n    return mergeResults;\n  }\n\n  /**\n   * when user is on main, it merges the remote main components into local.\n   * when user is on a lane, it merges the remote lane components into the local lane.\n   */\n  async mergeComponentsFromRemote(\n    consumer: Consumer,\n    bitIds: BitId[],\n    mergeStrategy: MergeStrategy,\n    noSnap: boolean,\n    snapMessage: string,\n    build: boolean,\n    skipDependencyInstallation: boolean\n  ): Promise<ApplyVersionResults> {\n    const currentLaneId = consumer.getCurrentLaneId();\n    const currentLaneObject = await consumer.getCurrentLaneObject();\n    const allComponentsStatus = await this.getAllComponentsStatus(bitIds, currentLaneId, currentLaneObject);\n    const failedComponents = allComponentsStatus.filter((c) => c.unmergedMessage && !c.unmergedLegitimately);\n    if (failedComponents.length) {\n      const failureMsgs = failedComponents\n        .map(\n          (failedComponent) =>\n            `${chalk.bold(failedComponent.id.toString())} - ${chalk.red(failedComponent.unmergedMessage as string)}`\n        )\n        .join('\\n');\n      throw new BitError(`unable to merge due to the following failures:\\n${failureMsgs}`);\n    }\n\n    return this.mergeSnaps({\n      mergeStrategy,\n      allComponentsStatus,\n      laneId: currentLaneId,\n      localLane: currentLaneObject,\n      noSnap,\n      snapMessage,\n      build,\n      skipDependencyInstallation,\n    });\n  }\n\n  /**\n   * merge multiple components according to the \"allComponentsStatus\".\n   */\n  async mergeSnaps({\n    mergeStrategy,\n    allComponentsStatus,\n    laneId,\n    localLane,\n    noSnap,\n    tag,\n    snapMessage,\n    build,\n    skipDependencyInstallation,\n  }: {\n    mergeStrategy: MergeStrategy;\n    allComponentsStatus: ComponentMergeStatus[];\n    laneId: LaneId;\n    localLane: Lane | null;\n    noSnap: boolean;\n    tag?: boolean;\n    snapMessage: string;\n    build: boolean;\n    skipDependencyInstallation?: boolean;\n  }): Promise<ApplyVersionResults> {\n    const consumer = this.workspace.consumer;\n    const componentWithConflict = allComponentsStatus.find(\n      (component) => component.mergeResults && component.mergeResults.hasConflicts\n    );\n    if (componentWithConflict && !mergeStrategy) {\n      mergeStrategy = await getMergeStrategyInteractive();\n    }\n    const failedComponents: FailedComponents[] = allComponentsStatus\n      .filter((componentStatus) => componentStatus.unmergedMessage)\n      .map((componentStatus) => ({\n        id: componentStatus.id,\n        failureMessage: componentStatus.unmergedMessage as string,\n        unchangedLegitimately: componentStatus.unmergedLegitimately,\n      }));\n    const succeededComponents = allComponentsStatus.filter((componentStatus) => !componentStatus.unmergedMessage);\n    // do not use Promise.all for applyVersion. otherwise, it'll write all components in parallel,\n    // which can be an issue when some components are also dependencies of others\n    const componentsResults = await mapSeries(\n      succeededComponents,\n      async ({ currentComponent, id, mergeResults, resolvedUnrelated, configMergeResult }) => {\n        const modelComponent = await consumer.scope.getModelComponent(id);\n        const updatedLaneId = laneId.isDefault() ? LaneId.from(laneId.name, id.scope as string) : laneId;\n        return this.applyVersion({\n          currentComponent,\n          id,\n          mergeResults,\n          mergeStrategy,\n          remoteHead: modelComponent.getRef(id.version as string) as Ref,\n          laneId: updatedLaneId,\n          localLane,\n          resolvedUnrelated,\n          configMergeResult,\n        });\n      }\n    );\n\n    const allConfigMerge = compact(succeededComponents.map((c) => c.configMergeResult));\n\n    const { workspaceDepsUpdates, workspaceDepsConflicts } = await this.updateWorkspaceJsoncWithDepsIfNeeded(\n      allConfigMerge\n    );\n\n    await this.generateConfigMergeConflictFileForAll(allConfigMerge, workspaceDepsConflicts);\n\n    if (localLane) consumer.scope.objects.add(localLane);\n\n    await consumer.scope.objects.persist(); // persist anyway, if localLane is null it should save all main heads\n\n    await consumer.scope.objects.unmergedComponents.write();\n\n    await consumer.writeBitMap();\n\n    const componentsHasConfigMergeConflicts = allComponentsStatus.some((c) => c.configMergeResult?.hasConflicts());\n    const leftUnresolvedConflicts = componentWithConflict && mergeStrategy === 'manual';\n    if (!skipDependencyInstallation && !leftUnresolvedConflicts && !componentsHasConfigMergeConflicts) {\n      try {\n        await this.install.install(undefined, {\n          dedupe: true,\n          updateExisting: false,\n          import: false,\n        });\n      } catch (err: any) {\n        this.logger.error(`failed installing packages`, err);\n        this.logger.consoleError(`failed installing packages, see the log for full stacktrace. error: ${err.message}`);\n      }\n    }\n\n    const getSnapOrTagResults = async () => {\n      // if one of the component has conflict, don't snap-merge. otherwise, some of the components would be snap-merged\n      // and some not. besides the fact that it could by mistake tag dependent, it's a confusing state. better not snap.\n      if (noSnap || leftUnresolvedConflicts || componentsHasConfigMergeConflicts) {\n        return null;\n      }\n      if (tag) {\n        const idsToTag = allComponentsStatus.map((c) => c.id);\n        const results = await this.tagAllLaneComponent(idsToTag, snapMessage, build);\n        if (!results) return null;\n        const { taggedComponents, autoTaggedResults } = results;\n        return { snappedComponents: taggedComponents, autoSnappedResults: autoTaggedResults };\n      }\n      return this.snapResolvedComponents(consumer, snapMessage, build);\n    };\n    let mergeSnapResults: ApplyVersionResults['mergeSnapResults'] = null;\n    let mergeSnapError: Error | undefined;\n    const bitMapSnapshot = this.workspace.bitMap.takeSnapshot();\n    try {\n      mergeSnapResults = await getSnapOrTagResults();\n    } catch (err: any) {\n      mergeSnapError = err;\n      this.workspace.bitMap.restoreFromSnapshot(bitMapSnapshot);\n    }\n\n    return {\n      components: componentsResults,\n      failedComponents,\n      mergeSnapResults,\n      mergeSnapError,\n      leftUnresolvedConflicts,\n      workspaceDepsUpdates,\n    };\n  }\n\n  private async generateConfigMergeConflictFileForAll(\n    allConfigMerge: ConfigMergeResult[],\n    workspaceDepsConflicts?: WorkspaceDepsConflicts\n  ) {\n    const configMergeFile = this.workspace.getConflictMergeFile();\n    if (workspaceDepsConflicts) {\n      const workspaceConflict = new ConfigMergeResult('WORKSPACE', 'ours', 'theirs', [\n        {\n          id: DependencyResolverAspect.id,\n          conflict: workspaceDepsConflicts,\n        },\n      ]);\n      allConfigMerge.unshift(workspaceConflict);\n    }\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  private async updateWorkspaceJsoncWithDepsIfNeeded(\n    allConfigMerge: ConfigMergeResult[]\n  ): Promise<{ workspaceDepsUpdates?: WorkspaceDepsUpdates; workspaceDepsConflicts?: WorkspaceDepsConflicts }> {\n    const allResults = allConfigMerge.map((c) => c.getDepsResolverResult());\n    const allDeps: { [pkgName: string]: string[] } = {};\n    const allDepsSources: { [pkgName: string]: string[] } = {}; // for logging/debugging purposes\n\n    allConfigMerge.forEach((configMerge) => {\n      const mergedConfig = configMerge.getDepsResolverResult()?.mergedConfig;\n      if (!mergedConfig || mergedConfig === '-') return;\n      const policy = mergedConfig.policy || {};\n      DEPENDENCIES_FIELDS.forEach((depField) => {\n        if (!policy[depField]) return;\n        policy[depField].forEach((pkg: PkgEntry) => {\n          if (pkg.force) return; // we only care about auto-detected dependencies\n          if (allDeps[pkg.name]) {\n            if (!allDeps[pkg.name].includes(pkg.version)) allDeps[pkg.name].push(pkg.version);\n            allDepsSources[pkg.name].push(configMerge.compIdStr);\n            return;\n          }\n          allDeps[pkg.name] = [pkg.version];\n          allDepsSources[pkg.name] = [configMerge.compIdStr];\n        });\n      });\n    });\n\n    const allConflictDeps: { [pkgName: string]: string[] } = {};\n    const conflictDepsSources: { [pkgName: string]: string[] } = {}; // for logging/debugging purposes\n\n    allConfigMerge.forEach((configMerge) => {\n      const policy = configMerge.getDepsResolverResult()?.conflict;\n      if (!policy) return;\n      DEPENDENCIES_FIELDS.forEach((depField) => {\n        if (!policy[depField]) return;\n        policy[depField].forEach((pkg: PkgEntry) => {\n          if (pkg.force) return; // we only care about auto-detected dependencies\n          if (allConflictDeps[pkg.name]) {\n            if (!allConflictDeps[pkg.name].includes(pkg.version)) allConflictDeps[pkg.name].push(pkg.version);\n            conflictDepsSources[pkg.name].push(configMerge.compIdStr);\n            return;\n          }\n          allConflictDeps[pkg.name] = [pkg.version];\n          conflictDepsSources[pkg.name] = [configMerge.compIdStr];\n        });\n      });\n    });\n\n    const allPackages = Object.keys(allDeps);\n    const allConflictedPackages = Object.keys(allConflictDeps);\n    if (!allPackages.length && !allConflictedPackages.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) return {};\n    const workspaceJsonUpdates = {};\n    const WS_DEPS_FIELDS = ['dependencies', 'peerDependencies'];\n    const workspaceJsonConflicts = { dependencies: [], peerDependencies: [] };\n    allPackages.forEach((pkgName) => {\n      if (allDeps[pkgName].length > 1) {\n        // we only want the deps that the other lane has them in the workspace.json and that all comps use the same dep.\n        return;\n      }\n      DEPENDENCIES_FIELDS.forEach((depField) => {\n        if (!policy[depField]?.[pkgName]) return;\n        const currentVer = policy[depField][pkgName];\n        const newVer = allDeps[pkgName][0];\n        if (currentVer === newVer) return;\n        workspaceJsonUpdates[pkgName] = [currentVer, newVer];\n        policy[depField][pkgName] = newVer;\n        this.logger.debug(\n          `update workspace.jsonc: ${pkgName} from ${currentVer} to ${newVer}. Triggered by: ${allDepsSources[\n            pkgName\n          ].join(', ')}`\n        );\n      });\n    });\n\n    allConflictedPackages.forEach((pkgName) => {\n      if (allConflictDeps[pkgName].length > 1) {\n        // we only want the deps that the other lane has them in the workspace.json and that all comps use the same dep.\n        return;\n      }\n      const conflict = allConflictDeps[pkgName][0];\n      const [, currentVal, otherVal] = conflict.split('::');\n\n      WS_DEPS_FIELDS.forEach((depField) => {\n        if (!policy[depField]?.[pkgName]) return;\n        const currentVerInWsJson = policy[depField][pkgName];\n        if (!currentVerInWsJson) return;\n        // the version is coming from the workspace.jsonc\n        workspaceJsonConflicts[depField].push({\n          name: pkgName,\n          version: conflict.replace(currentVal, currentVerInWsJson),\n          force: false,\n        });\n        this.logger.debug(\n          `conflict workspace.jsonc: ${pkgName} current: ${currentVerInWsJson}, other: ${otherVal}. Triggered by: ${conflictDepsSources[\n            pkgName\n          ].join(', ')}`\n        );\n      });\n    });\n    WS_DEPS_FIELDS.forEach((depField) => {\n      if (isEmpty(workspaceJsonConflicts[depField])) delete workspaceJsonConflicts[depField];\n    });\n\n    if (Object.keys(workspaceJsonConflicts).length) {\n      const conflictedPkgs = Object.keys(workspaceJsonConflicts)\n        .map((depField) => workspaceJsonConflicts[depField].map((d) => d.name))\n        .flat();\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((dep) => !conflictedPkgs.includes(dep.name));\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();\n    }\n\n    this.logger.debug('final workspace.jsonc updates', workspaceJsonUpdates);\n    this.logger.debug('final workspace.jsonc conflicts', workspaceJsonConflicts);\n\n    return {\n      workspaceDepsUpdates: Object.keys(workspaceJsonUpdates).length ? workspaceJsonUpdates : undefined,\n      workspaceDepsConflicts: Object.keys(workspaceJsonConflicts).length ? workspaceJsonConflicts : undefined,\n    };\n  }\n\n  /**\n   * this function gets called from two different commands:\n   * 1. \"bit merge <ids...>\", when merging a component from a remote to the local.\n   * in this case, the remote and local are on the same lane or both on main.\n   * 2. \"bit lane merge\", when merging from one lane to another.\n   */\n  async getMergeStatus(\n    bitIds: BitId[], // the id.version is the version we want to merge to the current component\n    currentLane: Lane | null, // currently checked out lane. if on main, then it's null.\n    otherLane?: Lane | null, // the lane we want to merged to our lane. (null if it's \"main\").\n    options?: { resolveUnrelated?: MergeStrategy; ignoreConfigChanges?: boolean }\n  ): Promise<ComponentMergeStatus[]> {\n    if (!currentLane && otherLane) {\n      await this.importer.importObjectsFromMainIfExist(otherLane.toBitIds().toVersionLatest());\n    }\n    const componentStatusBeforeMergeAttempt = await mapSeries(bitIds, (id) =>\n      this.getComponentStatusBeforeMergeAttempt(id, currentLane, options)\n    );\n    const toImport = componentStatusBeforeMergeAttempt\n      .map((compStatus) => {\n        if (!compStatus.divergeData) return [];\n        const versionsToImport = compact([\n          ...compStatus.divergeData.snapsOnTargetOnly,\n          compStatus.divergeData.commonSnapBeforeDiverge,\n        ]);\n        return versionsToImport.map((v) => compStatus.id.changeVersion(v.toString()));\n      })\n      .flat();\n\n    await this.consumer.scope.scopeImporter.importManyIfMissingWithoutDeps({\n      ids: BitIds.fromArray(toImport),\n      lane: otherLane || undefined,\n    });\n\n    const compStatusNotNeedMerge = componentStatusBeforeMergeAttempt.filter(\n      (c) => !c.mergeProps\n    ) as ComponentMergeStatus[];\n    const compStatusNeedMerge = componentStatusBeforeMergeAttempt.filter((c) => c.mergeProps);\n\n    const getComponentsStatusNeedMerge = async (): Promise<ComponentMergeStatus[]> => {\n      const tmp = new Tmp(this.consumer.scope);\n      try {\n        const componentsStatus = await Promise.all(\n          compStatusNeedMerge.map((compStatus) =>\n            this.getComponentMergeStatus(currentLane, otherLane || undefined, compStatus)\n          )\n        );\n        await tmp.clear();\n        return componentsStatus;\n      } catch (err: any) {\n        await tmp.clear();\n        throw err;\n      }\n    };\n    const results = await getComponentsStatusNeedMerge();\n\n    results.push(...compStatusNotNeedMerge);\n    return results;\n  }\n\n  private async getComponentStatusBeforeMergeAttempt(\n    id: BitId, // the id.version is the version we want to merge to the current component\n    localLane: Lane | null, // currently checked out lane. if on main, then it's null.\n    options?: { resolveUnrelated?: MergeStrategy; ignoreConfigChanges?: boolean }\n  ): Promise<ComponentMergeStatusBeforeMergeAttempt> {\n    const consumer = this.workspace.consumer;\n    const componentStatus: ComponentMergeStatus = { id };\n    const returnUnmerged = (msg: string, unmergedLegitimately = false) => {\n      componentStatus.unmergedMessage = msg;\n      componentStatus.unmergedLegitimately = unmergedLegitimately;\n      return componentStatus;\n    };\n    const modelComponent = await consumer.scope.getModelComponentIfExist(id);\n    if (!modelComponent) {\n      return returnUnmerged(\n        `component ${id.toString()} is on the lane/main but its objects were not found, please re-import the lane`\n      );\n    }\n    const unmerged = consumer.scope.objects.unmergedComponents.getEntry(id.name);\n    if (unmerged) {\n      return returnUnmerged(\n        `component ${id.toStringWithoutVersion()} is in during-merge state a previous merge, please snap/tag it first (or use bit merge --resolve/--abort)`\n      );\n    }\n    const repo = consumer.scope.objects;\n    const version = id.version as string;\n    const otherLaneHead = modelComponent.getRef(version);\n    const existingBitMapId = consumer.bitMap.getBitIdIfExist(id, { ignoreVersion: true });\n    const componentOnOther: Version = await modelComponent.loadVersion(version, consumer.scope.objects);\n    if (componentOnOther.isRemoved()) {\n      return returnUnmerged(`component has been removed`, true);\n    }\n    const getCurrentId = () => {\n      if (existingBitMapId) return existingBitMapId;\n      if (localLane) {\n        const idOnLane = localLane.getComponent(id);\n        if (!idOnLane) return null;\n        return idOnLane.id.changeVersion(idOnLane.head.toString());\n      }\n      // it's on main\n      const head = modelComponent.getHeadAsTagIfExist();\n      if (head) {\n        return id.changeVersion(head);\n      }\n      return null;\n    };\n    const currentId = getCurrentId();\n    if (!currentId) {\n      const divergeData = await getDivergeData({ repo, modelComponent, targetHead: otherLaneHead, throws: false });\n      return { currentComponent: null, componentFromModel: componentOnOther, id, divergeData };\n    }\n    const getCurrentComponent = () => {\n      if (existingBitMapId) return consumer.loadComponent(existingBitMapId);\n      return consumer.scope.getConsumerComponent(currentId);\n    };\n    const currentComponent = await getCurrentComponent();\n    if (currentComponent.removed) {\n      return returnUnmerged(`component has been removed`, true);\n    }\n    const isModified = async () => {\n      const componentModificationStatus = await consumer.getComponentStatusById(currentComponent.id);\n      if (!componentModificationStatus.modified) return false;\n      if (!existingBitMapId) return false;\n      const baseComponent = await modelComponent.loadVersion(\n        existingBitMapId.version as string,\n        consumer.scope.objects\n      );\n      return options?.ignoreConfigChanges\n        ? consumer.isComponentSourceCodeModified(baseComponent, currentComponent)\n        : true;\n    };\n\n    const isComponentModified = await isModified();\n\n    if (isComponentModified) {\n      return returnUnmerged(`component is modified, please snap/tag it first`);\n    }\n    if (!otherLaneHead) {\n      throw new Error(`merging: unable finding a hash for the version ${version} of ${id.toString()}`);\n    }\n    const divergeData = await getDivergeData({\n      repo,\n      modelComponent,\n      targetHead: otherLaneHead,\n      throws: false,\n    });\n    if (divergeData.err) {\n      const mainHead = modelComponent.head;\n      if (divergeData.err instanceof NoCommonSnap && options?.resolveUnrelated && mainHead) {\n        const hasResolvedFromMain = async (hashToCompare: Ref | null) => {\n          const divergeDataFromMain = await getDivergeData({\n            repo,\n            modelComponent,\n            sourceHead: hashToCompare,\n            targetHead: mainHead,\n            throws: false,\n          });\n          if (!divergeDataFromMain.err) return true;\n          return !(divergeDataFromMain.err instanceof NoCommonSnap);\n        };\n        const hasResolvedLocally = await hasResolvedFromMain(modelComponent.getHeadRegardlessOfLane() as Ref);\n        const hasResolvedRemotely = await hasResolvedFromMain(otherLaneHead);\n        if (!hasResolvedLocally && !hasResolvedRemotely) {\n          return returnUnmerged(\n            `unable to traverse ${currentComponent.id.toString()} history. the main-head ${mainHead.toString()} doesn't appear in both lanes, it was probably created in each lane separately`\n          );\n        }\n        const versionToSaveInLane = hasResolvedLocally ? currentComponent.id.version : id.version;\n        const resolvedRef = modelComponent.getRef(versionToSaveInLane as string);\n        if (!resolvedRef) throw new Error(`unable to get ref of \"${versionToSaveInLane}\" for \"${id.toString()}\"`);\n        if (options?.resolveUnrelated === 'theirs') {\n          // just override with the model data\n          return {\n            currentComponent,\n            componentFromModel: componentOnOther,\n            id,\n            divergeData,\n            resolvedUnrelated: { strategy: 'theirs', head: resolvedRef },\n          };\n        }\n        if (options?.resolveUnrelated === 'ours') {\n          return {\n            currentComponent,\n            id,\n            divergeData,\n            resolvedUnrelated: { strategy: 'ours', head: resolvedRef },\n          };\n        }\n        throw new Error(\n          `unsupported strategy \"${options?.resolveUnrelated}\" of resolve-unrelated. supported strategies are: [ours, theirs]`\n        );\n      }\n      return returnUnmerged(\n        `unable to traverse ${currentComponent.id.toString()} history. error: ${divergeData.err.message}`\n      );\n    }\n    if (!divergeData.isDiverged()) {\n      if (divergeData.isSourceAhead()) {\n        // do nothing!\n        return returnUnmerged(`component ${currentComponent.id.toString()} is ahead, nothing to merge`, true);\n      }\n      if (divergeData.isTargetAhead()) {\n        // just override with the model data\n        return {\n          currentComponent,\n          componentFromModel: componentOnOther,\n          id,\n          divergeData,\n        };\n      }\n      // we know that localHead and remoteHead are set, so if none of them is ahead they must be equal\n      return returnUnmerged(`component ${currentComponent.id.toString()} is already merged`, true);\n    }\n\n    // it's diverged and needs merge operation\n    const mergeProps = {\n      otherLaneHead,\n      currentId,\n      modelComponent,\n    };\n    return { currentComponent, id, divergeData, mergeProps };\n  }\n\n  private async getComponentMergeStatus(\n    localLane: Lane | null, // currently checked out lane. if on main, then it's null.\n    otherLane: Lane | undefined, // the lane name we want to merged to our lane. (can be also \"main\").\n    componentMergeStatusBeforeMergeAttempt: ComponentMergeStatusBeforeMergeAttempt\n  ) {\n    const { id, divergeData, currentComponent, mergeProps } = componentMergeStatusBeforeMergeAttempt;\n    if (!mergeProps) throw new Error(`getDivergedMergeStatus, mergeProps is missing for ${id.toString()}`);\n    const { otherLaneHead, currentId, modelComponent } = mergeProps;\n    const consumer = this.workspace.consumer;\n    const repo = consumer.scope.objects;\n    if (!divergeData) throw new Error(`getDivergedMergeStatus, divergeData is missing for ${id.toString()}`);\n    if (!currentComponent) throw new Error(`getDivergedMergeStatus, currentComponent is missing for ${id.toString()}`);\n\n    const baseSnap = divergeData.commonSnapBeforeDiverge as Ref; // must be set when isTrueMerge\n    this.logger.debug(`merging snaps details:\nid:      ${id.toStringWithoutVersion()}\nbase:    ${baseSnap.toString()}\ncurrent: ${currentId.version}\nother:   ${otherLaneHead.toString()}`);\n    const baseComponent: Version = await modelComponent.loadVersion(baseSnap.toString(), repo);\n    const otherComponent: Version = await modelComponent.loadVersion(otherLaneHead.toString(), repo);\n\n    const currentLaneName = localLane?.toLaneId().toString() || 'main';\n    const otherLaneName = otherLane ? otherLane.toLaneId().toString() : DEFAULT_LANE;\n    const currentLabel = `${currentId.version} (${currentLaneName === otherLaneName ? 'current' : currentLaneName})`;\n    const otherLabel = `${otherLaneHead.toString()} (${\n      otherLaneName === currentLaneName ? 'incoming' : otherLaneName\n    })`;\n    const workspaceIds = await this.workspace.listIds();\n    const configMerger = new ConfigMerger(\n      id.toStringWithoutVersion(),\n      workspaceIds,\n      otherLane,\n      currentComponent.extensions,\n      baseComponent.extensions,\n      otherComponent.extensions,\n      currentLabel,\n      otherLabel,\n      this.logger\n    );\n    const configMergeResult = configMerger.merge();\n\n    const mergeResults = await threeWayMerge({\n      consumer,\n      otherComponent,\n      otherLabel,\n      currentComponent,\n      currentLabel,\n      baseComponent,\n    });\n    return { currentComponent, id, mergeResults, divergeData, configMergeResult };\n  }\n\n  private async applyVersion({\n    currentComponent,\n    id,\n    mergeResults,\n    mergeStrategy,\n    remoteHead,\n    laneId,\n    localLane,\n    resolvedUnrelated,\n    configMergeResult,\n  }: {\n    currentComponent: ConsumerComponent | null | undefined;\n    id: BitId;\n    mergeResults: MergeResultsThreeWay | null | undefined;\n    mergeStrategy: MergeStrategy;\n    remoteHead: Ref;\n    laneId: LaneId;\n    localLane: Lane | null;\n    resolvedUnrelated?: ResolveUnrelatedData;\n    configMergeResult?: ConfigMergeResult;\n  }): Promise<ApplyVersionResult> {\n    const consumer = this.workspace.consumer;\n    let filesStatus = {};\n    const unmergedComponent: UnmergedComponent = {\n      // @ts-ignore\n      id: { name: id.name, scope: id.scope },\n      head: remoteHead,\n      remote: laneId.scope, // @todo: remove. it has been deprecated around 0.0.832\n      lane: laneId.name, // @todo: remove. it has been deprecated around 0.0.832\n      laneId,\n    };\n    id = currentComponent ? currentComponent.id : id;\n\n    const modelComponent = await consumer.scope.getModelComponent(id);\n    const handleResolveUnrelated = () => {\n      if (!currentComponent) throw new Error('currentComponent must be defined when resolvedUnrelated');\n      if (!localLane) throw new Error('localLane must be defined when resolvedUnrelated');\n      if (!resolvedUnrelated?.head) throw new Error('resolvedUnrelated must have head prop');\n      localLane.addComponent({ id, head: resolvedUnrelated.head });\n      unmergedComponent.laneId = localLane.toLaneId();\n      unmergedComponent.head = resolvedUnrelated.head;\n      unmergedComponent.unrelated = true;\n      consumer.scope.objects.unmergedComponents.addEntry(unmergedComponent);\n      return { id, filesStatus };\n    };\n\n    const markAllFilesAsUnchanged = () => {\n      if (!currentComponent) throw new Error(`applyVersion expect to get currentComponent for ${id.toString()}`);\n      currentComponent.files.forEach((file) => {\n        filesStatus[pathNormalizeToLinux(file.relative)] = FileStatus.unchanged;\n      });\n    };\n    if (mergeResults && mergeResults.hasConflicts && mergeStrategy === MergeOptions.ours) {\n      markAllFilesAsUnchanged();\n      consumer.scope.objects.unmergedComponents.addEntry(unmergedComponent);\n      return { id, filesStatus };\n    }\n    if (resolvedUnrelated?.strategy === 'ours') {\n      markAllFilesAsUnchanged();\n      return handleResolveUnrelated();\n    }\n    const remoteId = id.changeVersion(remoteHead.toString());\n    const idToLoad = !mergeResults || mergeStrategy === MergeOptions.theirs ? remoteId : id;\n    const legacyComponent = await consumer.loadComponentFromModelImportIfNeeded(idToLoad);\n    if (mergeResults && mergeStrategy === MergeOptions.theirs) {\n      // in this case, we don't want to update .bitmap with the version of the remote. we want to keep the same version\n      legacyComponent.version = id.version;\n    }\n    const files = legacyComponent.files;\n    files.forEach((file) => {\n      // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n      filesStatus[pathNormalizeToLinux(file.relative)] = FileStatus.updated;\n    });\n\n    if (mergeResults) {\n      // update files according to the merge results\n      const { filesStatus: modifiedStatus, modifiedFiles } = applyModifiedVersion(files, mergeResults, mergeStrategy);\n      legacyComponent.files = modifiedFiles;\n      filesStatus = { ...filesStatus, ...modifiedStatus };\n    }\n\n    const manyComponentsWriterOpts = {\n      consumer,\n      components: [legacyComponent],\n      skipDependencyInstallation: true,\n      writeConfig: false, // @todo: should write if config exists before, needs to figure out how to do it.\n    };\n    await this.componentWriter.writeMany(manyComponentsWriterOpts);\n\n    if (configMergeResult) {\n      if (!legacyComponent.writtenPath) {\n        throw new Error(`component.writtenPath is missing for ${id.toString()}`);\n      }\n      const successfullyMergedConfig = configMergeResult.getSuccessfullyMergedConfig();\n      if (successfullyMergedConfig) {\n        unmergedComponent.mergedConfig = successfullyMergedConfig;\n        // no need to `unmergedComponents.addEntry` here. it'll be added in the next lines inside `if (mergeResults)`.\n        // because if `configMergeResult` is set, `mergeResults` must be set as well. both happen on diverge.\n      }\n    }\n\n    // if mergeResults, the head snap is going to be updated on a later phase when snapping with two parents\n    // otherwise, update the head of the current lane or main\n    if (mergeResults) {\n      if (mergeResults.hasConflicts && mergeStrategy === MergeOptions.manual) {\n        unmergedComponent.unmergedPaths = mergeResults.modifiedFiles.filter((f) => f.conflict).map((f) => f.filePath);\n      }\n      consumer.scope.objects.unmergedComponents.addEntry(unmergedComponent);\n    } else if (localLane) {\n      if (resolvedUnrelated) {\n        // must be \"theirs\"\n        return handleResolveUnrelated();\n      }\n      localLane.addComponent({ id, head: remoteHead });\n    } else {\n      // this is main\n      modelComponent.setHead(remoteHead);\n      // mark it as local, otherwise, when importing this component from a remote, it'll override it.\n      modelComponent.markVersionAsLocal(remoteHead.toString());\n      consumer.scope.objects.add(modelComponent);\n    }\n\n    return { id, filesStatus };\n  }\n\n  private async abortMerge(values: string[]): Promise<ApplyVersionResults> {\n    const consumer = this.workspace.consumer;\n    const ids = await this.getIdsForUnmerged(values);\n    const results = await this.checkout.checkout({ ids, reset: true });\n    ids.forEach((id) => consumer.scope.objects.unmergedComponents.removeComponent(id.fullName));\n    await consumer.scope.objects.unmergedComponents.write();\n    return { abortedComponents: results.components };\n  }\n\n  private async resolveMerge(values: string[], snapMessage: string, build: boolean): Promise<ApplyVersionResults> {\n    const ids = await this.getIdsForUnmerged(values);\n    // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n    const { snappedComponents } = await this.snapping.snap({\n      legacyBitIds: BitIds.fromArray(ids.map((id) => id._legacy)),\n      build,\n      message: snapMessage,\n    });\n    return { resolvedComponents: snappedComponents };\n  }\n\n  private async getAllComponentsStatus(\n    bitIds: BitId[],\n    laneId: LaneId,\n    localLaneObject: Lane | null\n  ): Promise<ComponentMergeStatus[]> {\n    const ids = await Promise.all(\n      bitIds.map(async (bitId) => {\n        const remoteScopeName = laneId.isDefault() ? bitId.scope : laneId.scope;\n        const remoteLaneId = LaneId.from(laneId.name, remoteScopeName as string);\n        const remoteHead = await this.consumer.scope.objects.remoteLanes.getRef(remoteLaneId, bitId);\n        const laneIdStr = remoteLaneId.toString();\n        if (!remoteHead) {\n          throw new BitError(`unable to find a remote head of \"${bitId.toStringWithoutVersion()}\" in \"${laneIdStr}\"`);\n        }\n        return bitId.changeVersion(remoteHead.toString());\n      })\n    );\n\n    return this.getMergeStatus(ids, localLaneObject, localLaneObject);\n  }\n\n  private async snapResolvedComponents(\n    consumer: Consumer,\n    snapMessage: string,\n    build: boolean\n  ): Promise<null | { snappedComponents: ConsumerComponent[]; autoSnappedResults: AutoTagResult[] }> {\n    const unmergedComponents = consumer.scope.objects.unmergedComponents.getComponents();\n    this.logger.debug(`merge-snaps, snapResolvedComponents, total ${unmergedComponents.length.toString()} components`);\n    if (!unmergedComponents.length) return null;\n    const ids = BitIds.fromArray(unmergedComponents.map((r) => new BitId(r.id)));\n    return this.snapping.snap({\n      legacyBitIds: ids,\n      build,\n      message: snapMessage,\n    });\n  }\n\n  private async tagAllLaneComponent(idsToTag: BitId[], tagMessage: string, build: boolean): Promise<TagResults | null> {\n    const ids = idsToTag.map((id) => {\n      return id.toStringWithoutVersion();\n    });\n    this.logger.debug(`merge-snaps, tagResolvedComponents, total ${idsToTag.length.toString()} components`);\n    return this.snapping.tag({\n      ids,\n      build,\n      message: tagMessage,\n      unmodified: true,\n    });\n  }\n\n  private async getIdsForUnmerged(idsStr?: string[]): Promise<ComponentID[]> {\n    if (idsStr && idsStr.length) {\n      const componentIds = await this.workspace.resolveMultipleComponentIds(idsStr);\n      componentIds.forEach((id) => {\n        const entry = this.workspace.consumer.scope.objects.unmergedComponents.getEntry(id.fullName);\n        if (!entry) {\n          throw new GeneralError(`unable to merge-resolve ${id.toString()}, it is not marked as unresolved`);\n        }\n      });\n      return componentIds;\n    }\n    const unresolvedComponents = this.workspace.consumer.scope.objects.unmergedComponents.getComponents();\n    if (!unresolvedComponents.length) throw new GeneralError(`all components are resolved already, nothing to do`);\n    return unresolvedComponents.map((u) => ComponentID.fromLegacy(new BitId(u.id)));\n  }\n\n  private getComponentsToMerge(consumer: Consumer, ids: string[]): BitId[] {\n    if (hasWildcard(ids)) {\n      const componentsList = new ComponentsList(consumer);\n      return componentsList.listComponentsByIdsWithWildcard(ids);\n    }\n    return ids.map((id) => consumer.getParsedId(id));\n  }\n\n  static slots = [];\n  static dependencies = [\n    CLIAspect,\n    WorkspaceAspect,\n    SnappingAspect,\n    CheckoutAspect,\n    InstallAspect,\n    LoggerAspect,\n    ComponentWriterAspect,\n    ImporterAspect,\n    ConfigAspect,\n  ];\n  static runtime = MainRuntime;\n  static async provider([cli, workspace, snapping, checkout, install, loggerMain, compWriter, importer, config]: [\n    CLIMain,\n    Workspace,\n    SnappingMain,\n    CheckoutMain,\n    InstallMain,\n    LoggerMain,\n    ComponentWriterMain,\n    ImporterMain,\n    ConfigMain\n  ]) {\n    const logger = loggerMain.createLogger(MergingAspect.id);\n    const merging = new MergingMain(workspace, install, snapping, checkout, logger, compWriter, importer, config);\n    cli.register(new MergeCmd(merging));\n    return merging;\n  }\n}\n\nMergingAspect.addRuntime(MergingMain);\n"],"mappings":"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"}
+{"version":3,"names":["MergingMain","constructor","workspace","install","snapping","checkout","logger","componentWriter","importer","config","consumer","merge","ids","mergeStrategy","abort","resolve","noSnap","message","build","skipDependencyInstallation","OutsideWorkspaceError","mergeResults","resolveMerge","abortMerge","bitIds","getComponentsToMerge","mergeComponentsFromRemote","onDestroy","snapMessage","currentLaneId","getCurrentLaneId","currentLaneObject","getCurrentLaneObject","allComponentsStatus","getAllComponentsStatus","failedComponents","filter","c","unmergedMessage","unmergedLegitimately","length","failureMsgs","map","failedComponent","chalk","bold","id","toString","red","join","BitError","mergeSnaps","laneId","localLane","tag","componentWithConflict","find","component","hasConflicts","getMergeStrategyInteractive","componentStatus","failureMessage","unchangedLegitimately","succeededComponents","componentsResults","mapSeries","currentComponent","resolvedUnrelated","configMergeResult","modelComponent","scope","getModelComponent","updatedLaneId","isDefault","LaneId","from","name","applyVersion","remoteHead","getRef","version","allConfigMerge","compact","workspaceDepsUpdates","workspaceDepsConflicts","updateWorkspaceJsoncWithDepsIfNeeded","generateConfigMergeConflictFileForAll","objects","add","persist","unmergedComponents","write","writeBitMap","componentsHasConfigMergeConflicts","some","leftUnresolvedConflicts","undefined","dedupe","updateExisting","import","err","error","consoleError","getSnapOrTagResults","idsToTag","results","tagAllLaneComponent","taggedComponents","autoTaggedResults","snappedComponents","autoSnappedResults","snapResolvedComponents","mergeSnapResults","mergeSnapError","bitMapSnapshot","bitMap","takeSnapshot","restoreFromSnapshot","components","configMergeFile","getConflictMergeFile","workspaceConflict","ConfigMergeResult","DependencyResolverAspect","conflict","unshift","forEach","configMerge","generateMergeConflictFile","addConflict","compIdStr","hasConflict","allResults","getDepsResolverResult","nonConflictDeps","nonConflictSources","mergedConfig","mergedConfigPolicy","policy","DEPENDENCIES_FIELDS","depField","pkg","force","includes","push","conflictDeps","conflictDepsSources","mergedConfigConflict","notConflictedPackages","Object","keys","conflictedPackages","workspaceConfig","Error","depResolver","extensions","findCoreExtension","workspaceJsonUpdates","pkgName","currentVer","newVer","debug","WS_DEPS_FIELDS","workspaceJsonConflicts","dependencies","peerDependencies","conflictPackagesToRemoveFromConfigMerge","conflictRaw","currentVal","otherVal","split","currentVerInWsJson","semver","satisfies","replace","isEmpty","result","dep","getMergeStatus","currentLane","otherLane","options","importObjectsFromMainIfExist","toBitIds","toVersionLatest","componentStatusBeforeMergeAttempt","getComponentStatusBeforeMergeAttempt","toImport","compStatus","divergeData","versionsToImport","snapsOnTargetOnly","commonSnapBeforeDiverge","v","changeVersion","flat","scopeImporter","importManyIfMissingWithoutDeps","BitIds","fromArray","lane","compStatusNotNeedMerge","mergeProps","compStatusNeedMerge","getComponentsStatusNeedMerge","tmp","Tmp","componentsStatus","Promise","all","getComponentMergeStatus","clear","returnUnmerged","msg","getModelComponentIfExist","unmerged","getEntry","toStringWithoutVersion","repo","otherLaneHead","existingBitMapId","getBitIdIfExist","ignoreVersion","componentOnOther","loadVersion","isRemoved","getCurrentId","idOnLane","getComponent","head","getHeadAsTagIfExist","currentId","getDivergeData","targetHead","throws","componentFromModel","getCurrentComponent","loadComponent","getConsumerComponent","removed","isModified","componentModificationStatus","getComponentStatusById","modified","baseComponent","ignoreConfigChanges","isComponentSourceCodeModified","isComponentModified","mainHead","NoCommonSnap","resolveUnrelated","hasResolvedFromMain","hashToCompare","divergeDataFromMain","sourceHead","hasResolvedLocally","getHeadRegardlessOfLane","hasResolvedRemotely","versionToSaveInLane","resolvedRef","strategy","isDiverged","isSourceAhead","isTargetAhead","componentMergeStatusBeforeMergeAttempt","baseSnap","otherComponent","currentLaneName","toLaneId","otherLaneName","DEFAULT_LANE","currentLabel","otherLabel","workspaceIds","listIds","configMerger","ConfigMerger","threeWayMerge","filesStatus","unmergedComponent","remote","handleResolveUnrelated","addComponent","unrelated","addEntry","markAllFilesAsUnchanged","files","file","pathNormalizeToLinux","relative","FileStatus","unchanged","MergeOptions","ours","remoteId","idToLoad","theirs","legacyComponent","loadComponentFromModelImportIfNeeded","updated","modifiedStatus","modifiedFiles","applyModifiedVersion","manyComponentsWriterOpts","writeConfig","writeMany","writtenPath","successfullyMergedConfig","getSuccessfullyMergedConfig","manual","unmergedPaths","f","filePath","setHead","markVersionAsLocal","values","getIdsForUnmerged","reset","removeComponent","fullName","abortedComponents","snap","legacyBitIds","_legacy","resolvedComponents","localLaneObject","bitId","remoteScopeName","remoteLaneId","remoteLanes","laneIdStr","getComponents","r","BitId","tagMessage","unmodified","idsStr","componentIds","resolveMultipleComponentIds","entry","GeneralError","unresolvedComponents","u","ComponentID","fromLegacy","hasWildcard","componentsList","ComponentsList","listComponentsByIdsWithWildcard","getParsedId","provider","cli","loggerMain","compWriter","createLogger","MergingAspect","merging","register","MergeCmd","CLIAspect","WorkspaceAspect","SnappingAspect","CheckoutAspect","InstallAspect","LoggerAspect","ComponentWriterAspect","ImporterAspect","ConfigAspect","MainRuntime","addRuntime"],"sources":["merging.main.runtime.ts"],"sourcesContent":["import { CLIAspect, CLIMain, MainRuntime } from '@teambit/cli';\nimport semver from 'semver';\nimport WorkspaceAspect, { OutsideWorkspaceError, Workspace } from '@teambit/workspace';\nimport { Consumer } from '@teambit/legacy/dist/consumer';\nimport ComponentsList from '@teambit/legacy/dist/consumer/component/components-list';\nimport {\n  MergeStrategy,\n  FailedComponents,\n  FileStatus,\n  ApplyVersionResult,\n  getMergeStrategyInteractive,\n  MergeOptions,\n} from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport SnappingAspect, { SnappingMain, TagResults } from '@teambit/snapping';\nimport hasWildcard from '@teambit/legacy/dist/utils/string/has-wildcard';\nimport mapSeries from 'p-map-series';\nimport { BitId, BitIds } from '@teambit/legacy/dist/bit-id';\nimport { BitError } from '@teambit/bit-error';\nimport GeneralError from '@teambit/legacy/dist/error/general-error';\nimport { DEFAULT_LANE, LaneId } from '@teambit/lane-id';\nimport { AutoTagResult } from '@teambit/legacy/dist/scope/component-ops/auto-tag';\nimport { getDivergeData } from '@teambit/legacy/dist/scope/component-ops/get-diverge-data';\nimport { UnmergedComponent } from '@teambit/legacy/dist/scope/lanes/unmerged-components';\nimport { Lane, ModelComponent, Version } from '@teambit/legacy/dist/scope/models';\nimport { Ref } from '@teambit/legacy/dist/scope/objects';\nimport chalk from 'chalk';\nimport { ConfigAspect, ConfigMain } from '@teambit/config';\nimport { Tmp } from '@teambit/legacy/dist/scope/repositories';\nimport { pathNormalizeToLinux } from '@teambit/legacy/dist/utils';\nimport { ComponentWriterAspect, ComponentWriterMain } from '@teambit/component-writer';\nimport ConsumerComponent from '@teambit/legacy/dist/consumer/component/consumer-component';\nimport ImporterAspect, { ImporterMain } from '@teambit/importer';\nimport { Logger, LoggerAspect, LoggerMain } from '@teambit/logger';\nimport { compact, isEmpty } from 'lodash';\nimport { applyModifiedVersion } from '@teambit/legacy/dist/consumer/versions-ops/checkout-version';\nimport threeWayMerge, {\n  MergeResultsThreeWay,\n} from '@teambit/legacy/dist/consumer/versions-ops/merge-version/three-way-merge';\nimport { NoCommonSnap } from '@teambit/legacy/dist/scope/exceptions/no-common-snap';\nimport { DependencyResolverAspect, WorkspacePolicyConfigKeysNames } from '@teambit/dependency-resolver';\nimport { CheckoutAspect, CheckoutMain } from '@teambit/checkout';\nimport { ComponentID } from '@teambit/component-id';\nimport { DEPENDENCIES_FIELDS } from '@teambit/legacy/dist/constants';\nimport { SnapsDistance } from '@teambit/legacy/dist/scope/component-ops/snaps-distance';\nimport { InstallMain, InstallAspect } from '@teambit/install';\nimport { MergeCmd } from './merge-cmd';\nimport { MergingAspect } from './merging.aspect';\nimport { ConfigMerger } from './config-merger';\nimport { ConfigMergeResult } from './config-merge-result';\n\ntype ResolveUnrelatedData = { strategy: MergeStrategy; head: Ref };\ntype PkgEntry = { name: string; version: string; force: boolean };\n\nexport type WorkspaceDepsUpdates = { [pkgName: string]: [string, string] }; // from => to\nexport type WorkspaceDepsConflicts = Record<WorkspacePolicyConfigKeysNames, Array<{ name: string; version: string }>>; // the pkg value is in a format of CONFLICT::OURS::THEIRS\n\nexport type ComponentMergeStatus = {\n  currentComponent?: ConsumerComponent | null;\n  componentFromModel?: Version;\n  id: BitId;\n  unmergedMessage?: string;\n  unmergedLegitimately?: boolean; // failed to merge but for a legitimate reason, such as, up-to-date\n  mergeResults?: MergeResultsThreeWay | null;\n  divergeData?: SnapsDistance;\n  resolvedUnrelated?: ResolveUnrelatedData;\n  configMergeResult?: ConfigMergeResult;\n};\n\nexport type ComponentMergeStatusBeforeMergeAttempt = {\n  currentComponent?: ConsumerComponent | null;\n  componentFromModel?: Version;\n  id: BitId;\n  unmergedMessage?: string;\n  unmergedLegitimately?: boolean; // failed to merge but for a legitimate reason, such as, up-to-date\n  divergeData?: SnapsDistance;\n  resolvedUnrelated?: ResolveUnrelatedData;\n  mergeProps?: {\n    otherLaneHead: Ref;\n    currentId: BitId;\n    modelComponent: ModelComponent;\n  };\n};\n\nexport type ApplyVersionResults = {\n  components?: ApplyVersionResult[];\n  version?: string;\n  failedComponents?: FailedComponents[];\n  resolvedComponents?: ConsumerComponent[]; // relevant for bit merge --resolve\n  abortedComponents?: ApplyVersionResult[]; // relevant for bit merge --abort\n  mergeSnapResults?: { snappedComponents: ConsumerComponent[]; autoSnappedResults: AutoTagResult[] } | null;\n  mergeSnapError?: Error;\n  leftUnresolvedConflicts?: boolean;\n  verbose?: boolean;\n  newFromLane?: string[];\n  newFromLaneAdded?: boolean;\n  installationError?: Error; // in case the package manager failed, it won't throw, instead, it'll return error here\n  compilationError?: Error; // in case the compiler failed, it won't throw, instead, it'll return error here\n  workspaceDepsUpdates?: WorkspaceDepsUpdates; // in case workspace.jsonc has been updated with dependencies versions\n};\n\nexport class MergingMain {\n  private consumer: Consumer;\n  constructor(\n    private workspace: Workspace,\n    private install: InstallMain,\n    private snapping: SnappingMain,\n    private checkout: CheckoutMain,\n    private logger: Logger,\n    private componentWriter: ComponentWriterMain,\n    private importer: ImporterMain,\n    private config: ConfigMain\n  ) {\n    this.consumer = this.workspace?.consumer;\n  }\n\n  async merge(\n    ids: string[],\n    mergeStrategy: MergeStrategy,\n    abort: boolean,\n    resolve: boolean,\n    noSnap: boolean,\n    message: string,\n    build: boolean,\n    skipDependencyInstallation: boolean\n  ): Promise<ApplyVersionResults> {\n    if (!this.workspace) throw new OutsideWorkspaceError();\n    const consumer: Consumer = this.workspace.consumer;\n    let mergeResults;\n    if (resolve) {\n      mergeResults = await this.resolveMerge(ids, message, build);\n    } else if (abort) {\n      mergeResults = await this.abortMerge(ids);\n    } else {\n      const bitIds = this.getComponentsToMerge(consumer, ids);\n      // @todo: version could be the lane only or remote/lane\n      mergeResults = await this.mergeComponentsFromRemote(\n        consumer,\n        bitIds,\n        mergeStrategy,\n        noSnap,\n        message,\n        build,\n        skipDependencyInstallation\n      );\n    }\n    await consumer.onDestroy();\n    return mergeResults;\n  }\n\n  /**\n   * when user is on main, it merges the remote main components into local.\n   * when user is on a lane, it merges the remote lane components into the local lane.\n   */\n  async mergeComponentsFromRemote(\n    consumer: Consumer,\n    bitIds: BitId[],\n    mergeStrategy: MergeStrategy,\n    noSnap: boolean,\n    snapMessage: string,\n    build: boolean,\n    skipDependencyInstallation: boolean\n  ): Promise<ApplyVersionResults> {\n    const currentLaneId = consumer.getCurrentLaneId();\n    const currentLaneObject = await consumer.getCurrentLaneObject();\n    const allComponentsStatus = await this.getAllComponentsStatus(bitIds, currentLaneId, currentLaneObject);\n    const failedComponents = allComponentsStatus.filter((c) => c.unmergedMessage && !c.unmergedLegitimately);\n    if (failedComponents.length) {\n      const failureMsgs = failedComponents\n        .map(\n          (failedComponent) =>\n            `${chalk.bold(failedComponent.id.toString())} - ${chalk.red(failedComponent.unmergedMessage as string)}`\n        )\n        .join('\\n');\n      throw new BitError(`unable to merge due to the following failures:\\n${failureMsgs}`);\n    }\n\n    return this.mergeSnaps({\n      mergeStrategy,\n      allComponentsStatus,\n      laneId: currentLaneId,\n      localLane: currentLaneObject,\n      noSnap,\n      snapMessage,\n      build,\n      skipDependencyInstallation,\n    });\n  }\n\n  /**\n   * merge multiple components according to the \"allComponentsStatus\".\n   */\n  async mergeSnaps({\n    mergeStrategy,\n    allComponentsStatus,\n    laneId,\n    localLane,\n    noSnap,\n    tag,\n    snapMessage,\n    build,\n    skipDependencyInstallation,\n  }: {\n    mergeStrategy: MergeStrategy;\n    allComponentsStatus: ComponentMergeStatus[];\n    laneId: LaneId;\n    localLane: Lane | null;\n    noSnap: boolean;\n    tag?: boolean;\n    snapMessage: string;\n    build: boolean;\n    skipDependencyInstallation?: boolean;\n  }): Promise<ApplyVersionResults> {\n    const consumer = this.workspace.consumer;\n    const componentWithConflict = allComponentsStatus.find(\n      (component) => component.mergeResults && component.mergeResults.hasConflicts\n    );\n    if (componentWithConflict && !mergeStrategy) {\n      mergeStrategy = await getMergeStrategyInteractive();\n    }\n    const failedComponents: FailedComponents[] = allComponentsStatus\n      .filter((componentStatus) => componentStatus.unmergedMessage)\n      .map((componentStatus) => ({\n        id: componentStatus.id,\n        failureMessage: componentStatus.unmergedMessage as string,\n        unchangedLegitimately: componentStatus.unmergedLegitimately,\n      }));\n    const succeededComponents = allComponentsStatus.filter((componentStatus) => !componentStatus.unmergedMessage);\n    // do not use Promise.all for applyVersion. otherwise, it'll write all components in parallel,\n    // which can be an issue when some components are also dependencies of others\n    const componentsResults = await mapSeries(\n      succeededComponents,\n      async ({ currentComponent, id, mergeResults, resolvedUnrelated, configMergeResult }) => {\n        const modelComponent = await consumer.scope.getModelComponent(id);\n        const updatedLaneId = laneId.isDefault() ? LaneId.from(laneId.name, id.scope as string) : laneId;\n        return this.applyVersion({\n          currentComponent,\n          id,\n          mergeResults,\n          mergeStrategy,\n          remoteHead: modelComponent.getRef(id.version as string) as Ref,\n          laneId: updatedLaneId,\n          localLane,\n          resolvedUnrelated,\n          configMergeResult,\n        });\n      }\n    );\n\n    const allConfigMerge = compact(succeededComponents.map((c) => c.configMergeResult));\n\n    const { workspaceDepsUpdates, workspaceDepsConflicts } = await this.updateWorkspaceJsoncWithDepsIfNeeded(\n      allConfigMerge\n    );\n\n    await this.generateConfigMergeConflictFileForAll(allConfigMerge, workspaceDepsConflicts);\n\n    if (localLane) consumer.scope.objects.add(localLane);\n\n    await consumer.scope.objects.persist(); // persist anyway, if localLane is null it should save all main heads\n\n    await consumer.scope.objects.unmergedComponents.write();\n\n    await consumer.writeBitMap();\n\n    const componentsHasConfigMergeConflicts = allComponentsStatus.some((c) => c.configMergeResult?.hasConflicts());\n    const leftUnresolvedConflicts = componentWithConflict && mergeStrategy === 'manual';\n    if (!skipDependencyInstallation && !leftUnresolvedConflicts && !componentsHasConfigMergeConflicts) {\n      try {\n        await this.install.install(undefined, {\n          dedupe: true,\n          updateExisting: false,\n          import: false,\n        });\n      } catch (err: any) {\n        this.logger.error(`failed installing packages`, err);\n        this.logger.consoleError(`failed installing packages, see the log for full stacktrace. error: ${err.message}`);\n      }\n    }\n\n    const getSnapOrTagResults = async () => {\n      // if one of the component has conflict, don't snap-merge. otherwise, some of the components would be snap-merged\n      // and some not. besides the fact that it could by mistake tag dependent, it's a confusing state. better not snap.\n      if (noSnap || leftUnresolvedConflicts || componentsHasConfigMergeConflicts) {\n        return null;\n      }\n      if (tag) {\n        const idsToTag = allComponentsStatus.map((c) => c.id);\n        const results = await this.tagAllLaneComponent(idsToTag, snapMessage, build);\n        if (!results) return null;\n        const { taggedComponents, autoTaggedResults } = results;\n        return { snappedComponents: taggedComponents, autoSnappedResults: autoTaggedResults };\n      }\n      return this.snapResolvedComponents(consumer, snapMessage, build);\n    };\n    let mergeSnapResults: ApplyVersionResults['mergeSnapResults'] = null;\n    let mergeSnapError: Error | undefined;\n    const bitMapSnapshot = this.workspace.bitMap.takeSnapshot();\n    try {\n      mergeSnapResults = await getSnapOrTagResults();\n    } catch (err: any) {\n      mergeSnapError = err;\n      this.workspace.bitMap.restoreFromSnapshot(bitMapSnapshot);\n    }\n\n    return {\n      components: componentsResults,\n      failedComponents,\n      mergeSnapResults,\n      mergeSnapError,\n      leftUnresolvedConflicts,\n      workspaceDepsUpdates,\n    };\n  }\n\n  private async generateConfigMergeConflictFileForAll(\n    allConfigMerge: ConfigMergeResult[],\n    workspaceDepsConflicts?: WorkspaceDepsConflicts\n  ) {\n    const configMergeFile = this.workspace.getConflictMergeFile();\n    if (workspaceDepsConflicts) {\n      const workspaceConflict = new ConfigMergeResult('WORKSPACE', 'ours', 'theirs', [\n        {\n          id: DependencyResolverAspect.id,\n          conflict: workspaceDepsConflicts,\n        },\n      ]);\n      allConfigMerge.unshift(workspaceConflict);\n    }\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  private async updateWorkspaceJsoncWithDepsIfNeeded(\n    allConfigMerge: ConfigMergeResult[]\n  ): Promise<{ workspaceDepsUpdates?: WorkspaceDepsUpdates; workspaceDepsConflicts?: WorkspaceDepsConflicts }> {\n    const allResults = allConfigMerge.map((c) => c.getDepsResolverResult());\n\n    // aggregate all dependencies that can be updated (not conflicting)\n    const nonConflictDeps: { [pkgName: string]: string[] } = {};\n    const nonConflictSources: { [pkgName: string]: string[] } = {}; // for logging/debugging purposes\n    allConfigMerge.forEach((configMerge) => {\n      const mergedConfig = configMerge.getDepsResolverResult()?.mergedConfig;\n      if (!mergedConfig || mergedConfig === '-') return;\n      const mergedConfigPolicy = mergedConfig.policy || {};\n      DEPENDENCIES_FIELDS.forEach((depField) => {\n        if (!mergedConfigPolicy[depField]) return;\n        mergedConfigPolicy[depField].forEach((pkg: PkgEntry) => {\n          if (pkg.force) return; // we only care about auto-detected dependencies\n          if (nonConflictDeps[pkg.name]) {\n            if (!nonConflictDeps[pkg.name].includes(pkg.version)) nonConflictDeps[pkg.name].push(pkg.version);\n            nonConflictSources[pkg.name].push(configMerge.compIdStr);\n            return;\n          }\n          nonConflictDeps[pkg.name] = [pkg.version];\n          nonConflictSources[pkg.name] = [configMerge.compIdStr];\n        });\n      });\n    });\n\n    // aggregate all dependencies that have conflicts\n    const conflictDeps: { [pkgName: string]: string[] } = {};\n    const conflictDepsSources: { [pkgName: string]: string[] } = {}; // for logging/debugging purposes\n    allConfigMerge.forEach((configMerge) => {\n      const mergedConfigConflict = configMerge.getDepsResolverResult()?.conflict;\n      if (!mergedConfigConflict) return;\n      DEPENDENCIES_FIELDS.forEach((depField) => {\n        if (!mergedConfigConflict[depField]) return;\n        mergedConfigConflict[depField].forEach((pkg: PkgEntry) => {\n          if (pkg.force) return; // we only care about auto-detected dependencies\n          if (conflictDeps[pkg.name]) {\n            if (!conflictDeps[pkg.name].includes(pkg.version)) conflictDeps[pkg.name].push(pkg.version);\n            conflictDepsSources[pkg.name].push(configMerge.compIdStr);\n            return;\n          }\n          conflictDeps[pkg.name] = [pkg.version];\n          conflictDepsSources[pkg.name] = [configMerge.compIdStr];\n        });\n      });\n    });\n\n    const notConflictedPackages = Object.keys(nonConflictDeps);\n    const conflictedPackages = Object.keys(conflictDeps);\n    if (!notConflictedPackages.length && !conflictedPackages.length) return {};\n\n    const workspaceConfig = this.config.workspaceConfig;\n    if (!workspaceConfig) throw new Error(`updateWorkspaceJsoncWithDepsIfNeeded unable to get workspace config`);\n    const depResolver = workspaceConfig.extensions.findCoreExtension(DependencyResolverAspect.id);\n    const policy = depResolver?.config.policy;\n    if (!policy) {\n      return {};\n    }\n\n    // calculate the workspace.json updates\n    const workspaceJsonUpdates = {};\n    notConflictedPackages.forEach((pkgName) => {\n      if (nonConflictDeps[pkgName].length > 1) {\n        // we only want the deps that the other lane has them in the workspace.json and that all comps use the same dep.\n        return;\n      }\n      DEPENDENCIES_FIELDS.forEach((depField) => {\n        if (!policy[depField]?.[pkgName]) return; // doesn't exists in the workspace.json\n        const currentVer = policy[depField][pkgName];\n        const newVer = nonConflictDeps[pkgName][0];\n        if (currentVer === newVer) return;\n        workspaceJsonUpdates[pkgName] = [currentVer, newVer];\n        policy[depField][pkgName] = newVer;\n        this.logger.debug(\n          `update workspace.jsonc: ${pkgName} from ${currentVer} to ${newVer}. Triggered by: ${nonConflictSources[\n            pkgName\n          ].join(', ')}`\n        );\n      });\n    });\n\n    // calculate the workspace.json conflicts\n    const WS_DEPS_FIELDS = ['dependencies', 'peerDependencies'];\n    const workspaceJsonConflicts = { dependencies: [], peerDependencies: [] };\n    const conflictPackagesToRemoveFromConfigMerge: string[] = [];\n    conflictedPackages.forEach((pkgName) => {\n      if (conflictDeps[pkgName].length > 1) {\n        // we only want the deps that the other lane has them in the workspace.json and that all comps use the same dep.\n        return;\n      }\n      const conflictRaw = conflictDeps[pkgName][0];\n      const [, currentVal, otherVal] = conflictRaw.split('::');\n\n      WS_DEPS_FIELDS.forEach((depField) => {\n        if (!policy[depField]?.[pkgName]) return;\n        const currentVerInWsJson = policy[depField][pkgName];\n        if (!currentVerInWsJson) return;\n        // the version is coming from the workspace.jsonc\n        conflictPackagesToRemoveFromConfigMerge.push(pkgName);\n        if (semver.satisfies(otherVal, currentVerInWsJson)) {\n          // the other version is compatible with the current version in the workspace.json\n          return;\n        }\n        workspaceJsonConflicts[depField].push({\n          name: pkgName,\n          version: conflictRaw.replace(currentVal, currentVerInWsJson),\n          force: false,\n        });\n        conflictPackagesToRemoveFromConfigMerge.push(pkgName);\n        this.logger.debug(\n          `conflict workspace.jsonc: ${pkgName} current: ${currentVerInWsJson}, other: ${otherVal}. Triggered by: ${conflictDepsSources[\n            pkgName\n          ].join(', ')}`\n        );\n      });\n    });\n    WS_DEPS_FIELDS.forEach((depField) => {\n      if (isEmpty(workspaceJsonConflicts[depField])) delete workspaceJsonConflicts[depField];\n    });\n\n    if (conflictPackagesToRemoveFromConfigMerge.length) {\n      allResults.forEach((result) => {\n        if (result?.conflict) {\n          DEPENDENCIES_FIELDS.forEach((depField) => {\n            if (!result.conflict?.[depField]) return;\n            result.conflict[depField] = result.conflict?.[depField].filter(\n              (dep) => !conflictPackagesToRemoveFromConfigMerge.includes(dep.name)\n            );\n            if (!result.conflict[depField].length) delete result.conflict[depField];\n          });\n          if (isEmpty(result.conflict)) result.conflict = undefined;\n        }\n      });\n    }\n\n    if (Object.keys(workspaceJsonUpdates).length) {\n      await workspaceConfig.write();\n    }\n\n    this.logger.debug('final workspace.jsonc updates', workspaceJsonUpdates);\n    this.logger.debug('final workspace.jsonc conflicts', workspaceJsonConflicts);\n\n    return {\n      workspaceDepsUpdates: Object.keys(workspaceJsonUpdates).length ? workspaceJsonUpdates : undefined,\n      workspaceDepsConflicts: Object.keys(workspaceJsonConflicts).length ? workspaceJsonConflicts : undefined,\n    };\n  }\n\n  /**\n   * this function gets called from two different commands:\n   * 1. \"bit merge <ids...>\", when merging a component from a remote to the local.\n   * in this case, the remote and local are on the same lane or both on main.\n   * 2. \"bit lane merge\", when merging from one lane to another.\n   */\n  async getMergeStatus(\n    bitIds: BitId[], // the id.version is the version we want to merge to the current component\n    currentLane: Lane | null, // currently checked out lane. if on main, then it's null.\n    otherLane?: Lane | null, // the lane we want to merged to our lane. (null if it's \"main\").\n    options?: { resolveUnrelated?: MergeStrategy; ignoreConfigChanges?: boolean }\n  ): Promise<ComponentMergeStatus[]> {\n    if (!currentLane && otherLane) {\n      await this.importer.importObjectsFromMainIfExist(otherLane.toBitIds().toVersionLatest());\n    }\n    const componentStatusBeforeMergeAttempt = await mapSeries(bitIds, (id) =>\n      this.getComponentStatusBeforeMergeAttempt(id, currentLane, options)\n    );\n    const toImport = componentStatusBeforeMergeAttempt\n      .map((compStatus) => {\n        if (!compStatus.divergeData) return [];\n        const versionsToImport = compact([\n          ...compStatus.divergeData.snapsOnTargetOnly,\n          compStatus.divergeData.commonSnapBeforeDiverge,\n        ]);\n        return versionsToImport.map((v) => compStatus.id.changeVersion(v.toString()));\n      })\n      .flat();\n\n    await this.consumer.scope.scopeImporter.importManyIfMissingWithoutDeps({\n      ids: BitIds.fromArray(toImport),\n      lane: otherLane || undefined,\n    });\n\n    const compStatusNotNeedMerge = componentStatusBeforeMergeAttempt.filter(\n      (c) => !c.mergeProps\n    ) as ComponentMergeStatus[];\n    const compStatusNeedMerge = componentStatusBeforeMergeAttempt.filter((c) => c.mergeProps);\n\n    const getComponentsStatusNeedMerge = async (): Promise<ComponentMergeStatus[]> => {\n      const tmp = new Tmp(this.consumer.scope);\n      try {\n        const componentsStatus = await Promise.all(\n          compStatusNeedMerge.map((compStatus) =>\n            this.getComponentMergeStatus(currentLane, otherLane || undefined, compStatus)\n          )\n        );\n        await tmp.clear();\n        return componentsStatus;\n      } catch (err: any) {\n        await tmp.clear();\n        throw err;\n      }\n    };\n    const results = await getComponentsStatusNeedMerge();\n\n    results.push(...compStatusNotNeedMerge);\n    return results;\n  }\n\n  private async getComponentStatusBeforeMergeAttempt(\n    id: BitId, // the id.version is the version we want to merge to the current component\n    localLane: Lane | null, // currently checked out lane. if on main, then it's null.\n    options?: { resolveUnrelated?: MergeStrategy; ignoreConfigChanges?: boolean }\n  ): Promise<ComponentMergeStatusBeforeMergeAttempt> {\n    const consumer = this.workspace.consumer;\n    const componentStatus: ComponentMergeStatus = { id };\n    const returnUnmerged = (msg: string, unmergedLegitimately = false) => {\n      componentStatus.unmergedMessage = msg;\n      componentStatus.unmergedLegitimately = unmergedLegitimately;\n      return componentStatus;\n    };\n    const modelComponent = await consumer.scope.getModelComponentIfExist(id);\n    if (!modelComponent) {\n      return returnUnmerged(\n        `component ${id.toString()} is on the lane/main but its objects were not found, please re-import the lane`\n      );\n    }\n    const unmerged = consumer.scope.objects.unmergedComponents.getEntry(id.name);\n    if (unmerged) {\n      return returnUnmerged(\n        `component ${id.toStringWithoutVersion()} is in during-merge state a previous merge, please snap/tag it first (or use bit merge --resolve/--abort)`\n      );\n    }\n    const repo = consumer.scope.objects;\n    const version = id.version as string;\n    const otherLaneHead = modelComponent.getRef(version);\n    const existingBitMapId = consumer.bitMap.getBitIdIfExist(id, { ignoreVersion: true });\n    const componentOnOther: Version = await modelComponent.loadVersion(version, consumer.scope.objects);\n    if (componentOnOther.isRemoved()) {\n      return returnUnmerged(`component has been removed`, true);\n    }\n    const getCurrentId = () => {\n      if (existingBitMapId) return existingBitMapId;\n      if (localLane) {\n        const idOnLane = localLane.getComponent(id);\n        if (!idOnLane) return null;\n        return idOnLane.id.changeVersion(idOnLane.head.toString());\n      }\n      // it's on main\n      const head = modelComponent.getHeadAsTagIfExist();\n      if (head) {\n        return id.changeVersion(head);\n      }\n      return null;\n    };\n    const currentId = getCurrentId();\n    if (!currentId) {\n      const divergeData = await getDivergeData({ repo, modelComponent, targetHead: otherLaneHead, throws: false });\n      return { currentComponent: null, componentFromModel: componentOnOther, id, divergeData };\n    }\n    const getCurrentComponent = () => {\n      if (existingBitMapId) return consumer.loadComponent(existingBitMapId);\n      return consumer.scope.getConsumerComponent(currentId);\n    };\n    const currentComponent = await getCurrentComponent();\n    if (currentComponent.removed) {\n      return returnUnmerged(`component has been removed`, true);\n    }\n    const isModified = async () => {\n      const componentModificationStatus = await consumer.getComponentStatusById(currentComponent.id);\n      if (!componentModificationStatus.modified) return false;\n      if (!existingBitMapId) return false;\n      const baseComponent = await modelComponent.loadVersion(\n        existingBitMapId.version as string,\n        consumer.scope.objects\n      );\n      return options?.ignoreConfigChanges\n        ? consumer.isComponentSourceCodeModified(baseComponent, currentComponent)\n        : true;\n    };\n\n    const isComponentModified = await isModified();\n\n    if (isComponentModified) {\n      return returnUnmerged(`component is modified, please snap/tag it first`);\n    }\n    if (!otherLaneHead) {\n      throw new Error(`merging: unable finding a hash for the version ${version} of ${id.toString()}`);\n    }\n    const divergeData = await getDivergeData({\n      repo,\n      modelComponent,\n      targetHead: otherLaneHead,\n      throws: false,\n    });\n    if (divergeData.err) {\n      const mainHead = modelComponent.head;\n      if (divergeData.err instanceof NoCommonSnap && options?.resolveUnrelated && mainHead) {\n        const hasResolvedFromMain = async (hashToCompare: Ref | null) => {\n          const divergeDataFromMain = await getDivergeData({\n            repo,\n            modelComponent,\n            sourceHead: hashToCompare,\n            targetHead: mainHead,\n            throws: false,\n          });\n          if (!divergeDataFromMain.err) return true;\n          return !(divergeDataFromMain.err instanceof NoCommonSnap);\n        };\n        const hasResolvedLocally = await hasResolvedFromMain(modelComponent.getHeadRegardlessOfLane() as Ref);\n        const hasResolvedRemotely = await hasResolvedFromMain(otherLaneHead);\n        if (!hasResolvedLocally && !hasResolvedRemotely) {\n          return returnUnmerged(\n            `unable to traverse ${currentComponent.id.toString()} history. the main-head ${mainHead.toString()} doesn't appear in both lanes, it was probably created in each lane separately`\n          );\n        }\n        const versionToSaveInLane = hasResolvedLocally ? currentComponent.id.version : id.version;\n        const resolvedRef = modelComponent.getRef(versionToSaveInLane as string);\n        if (!resolvedRef) throw new Error(`unable to get ref of \"${versionToSaveInLane}\" for \"${id.toString()}\"`);\n        if (options?.resolveUnrelated === 'theirs') {\n          // just override with the model data\n          return {\n            currentComponent,\n            componentFromModel: componentOnOther,\n            id,\n            divergeData,\n            resolvedUnrelated: { strategy: 'theirs', head: resolvedRef },\n          };\n        }\n        if (options?.resolveUnrelated === 'ours') {\n          return {\n            currentComponent,\n            id,\n            divergeData,\n            resolvedUnrelated: { strategy: 'ours', head: resolvedRef },\n          };\n        }\n        throw new Error(\n          `unsupported strategy \"${options?.resolveUnrelated}\" of resolve-unrelated. supported strategies are: [ours, theirs]`\n        );\n      }\n      return returnUnmerged(\n        `unable to traverse ${currentComponent.id.toString()} history. error: ${divergeData.err.message}`\n      );\n    }\n    if (!divergeData.isDiverged()) {\n      if (divergeData.isSourceAhead()) {\n        // do nothing!\n        return returnUnmerged(`component ${currentComponent.id.toString()} is ahead, nothing to merge`, true);\n      }\n      if (divergeData.isTargetAhead()) {\n        // just override with the model data\n        return {\n          currentComponent,\n          componentFromModel: componentOnOther,\n          id,\n          divergeData,\n        };\n      }\n      // we know that localHead and remoteHead are set, so if none of them is ahead they must be equal\n      return returnUnmerged(`component ${currentComponent.id.toString()} is already merged`, true);\n    }\n\n    // it's diverged and needs merge operation\n    const mergeProps = {\n      otherLaneHead,\n      currentId,\n      modelComponent,\n    };\n    return { currentComponent, id, divergeData, mergeProps };\n  }\n\n  private async getComponentMergeStatus(\n    localLane: Lane | null, // currently checked out lane. if on main, then it's null.\n    otherLane: Lane | undefined, // the lane name we want to merged to our lane. (can be also \"main\").\n    componentMergeStatusBeforeMergeAttempt: ComponentMergeStatusBeforeMergeAttempt\n  ) {\n    const { id, divergeData, currentComponent, mergeProps } = componentMergeStatusBeforeMergeAttempt;\n    if (!mergeProps) throw new Error(`getDivergedMergeStatus, mergeProps is missing for ${id.toString()}`);\n    const { otherLaneHead, currentId, modelComponent } = mergeProps;\n    const repo = this.consumer.scope.objects;\n    if (!divergeData) throw new Error(`getDivergedMergeStatus, divergeData is missing for ${id.toString()}`);\n    if (!currentComponent) throw new Error(`getDivergedMergeStatus, currentComponent is missing for ${id.toString()}`);\n\n    const baseSnap = divergeData.commonSnapBeforeDiverge as Ref; // must be set when isTrueMerge\n    this.logger.debug(`merging snaps details:\nid:      ${id.toStringWithoutVersion()}\nbase:    ${baseSnap.toString()}\ncurrent: ${currentId.version}\nother:   ${otherLaneHead.toString()}`);\n    const baseComponent: Version = await modelComponent.loadVersion(baseSnap.toString(), repo);\n    const otherComponent: Version = await modelComponent.loadVersion(otherLaneHead.toString(), repo);\n\n    const currentLaneName = localLane?.toLaneId().toString() || 'main';\n    const otherLaneName = otherLane ? otherLane.toLaneId().toString() : DEFAULT_LANE;\n    const currentLabel = `${currentId.version} (${currentLaneName === otherLaneName ? 'current' : currentLaneName})`;\n    const otherLabel = `${otherLaneHead.toString()} (${\n      otherLaneName === currentLaneName ? 'incoming' : otherLaneName\n    })`;\n    const workspaceIds = await this.workspace.listIds();\n    const configMerger = new ConfigMerger(\n      id.toStringWithoutVersion(),\n      workspaceIds,\n      otherLane,\n      currentComponent.extensions,\n      baseComponent.extensions,\n      otherComponent.extensions,\n      currentLabel,\n      otherLabel,\n      this.logger\n    );\n    const configMergeResult = configMerger.merge();\n\n    const mergeResults = await threeWayMerge({\n      consumer: this.consumer,\n      otherComponent,\n      otherLabel,\n      currentComponent,\n      currentLabel,\n      baseComponent,\n    });\n    return { currentComponent, id, mergeResults, divergeData, configMergeResult };\n  }\n\n  private async applyVersion({\n    currentComponent,\n    id,\n    mergeResults,\n    mergeStrategy,\n    remoteHead,\n    laneId,\n    localLane,\n    resolvedUnrelated,\n    configMergeResult,\n  }: {\n    currentComponent: ConsumerComponent | null | undefined;\n    id: BitId;\n    mergeResults: MergeResultsThreeWay | null | undefined;\n    mergeStrategy: MergeStrategy;\n    remoteHead: Ref;\n    laneId: LaneId;\n    localLane: Lane | null;\n    resolvedUnrelated?: ResolveUnrelatedData;\n    configMergeResult?: ConfigMergeResult;\n  }): Promise<ApplyVersionResult> {\n    const consumer = this.workspace.consumer;\n    let filesStatus = {};\n    const unmergedComponent: UnmergedComponent = {\n      // @ts-ignore\n      id: { name: id.name, scope: id.scope },\n      head: remoteHead,\n      remote: laneId.scope, // @todo: remove. it has been deprecated around 0.0.832\n      lane: laneId.name, // @todo: remove. it has been deprecated around 0.0.832\n      laneId,\n    };\n    id = currentComponent ? currentComponent.id : id;\n\n    const modelComponent = await consumer.scope.getModelComponent(id);\n    const handleResolveUnrelated = () => {\n      if (!currentComponent) throw new Error('currentComponent must be defined when resolvedUnrelated');\n      if (!localLane) throw new Error('localLane must be defined when resolvedUnrelated');\n      if (!resolvedUnrelated?.head) throw new Error('resolvedUnrelated must have head prop');\n      localLane.addComponent({ id, head: resolvedUnrelated.head });\n      unmergedComponent.laneId = localLane.toLaneId();\n      unmergedComponent.head = resolvedUnrelated.head;\n      unmergedComponent.unrelated = true;\n      consumer.scope.objects.unmergedComponents.addEntry(unmergedComponent);\n      return { id, filesStatus };\n    };\n\n    const markAllFilesAsUnchanged = () => {\n      if (!currentComponent) throw new Error(`applyVersion expect to get currentComponent for ${id.toString()}`);\n      currentComponent.files.forEach((file) => {\n        filesStatus[pathNormalizeToLinux(file.relative)] = FileStatus.unchanged;\n      });\n    };\n    if (mergeResults && mergeResults.hasConflicts && mergeStrategy === MergeOptions.ours) {\n      markAllFilesAsUnchanged();\n      consumer.scope.objects.unmergedComponents.addEntry(unmergedComponent);\n      return { id, filesStatus };\n    }\n    if (resolvedUnrelated?.strategy === 'ours') {\n      markAllFilesAsUnchanged();\n      return handleResolveUnrelated();\n    }\n    const remoteId = id.changeVersion(remoteHead.toString());\n    const idToLoad = !mergeResults || mergeStrategy === MergeOptions.theirs ? remoteId : id;\n    const legacyComponent = await consumer.loadComponentFromModelImportIfNeeded(idToLoad);\n    if (mergeResults && mergeStrategy === MergeOptions.theirs) {\n      // in this case, we don't want to update .bitmap with the version of the remote. we want to keep the same version\n      legacyComponent.version = id.version;\n    }\n    const files = legacyComponent.files;\n    files.forEach((file) => {\n      // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n      filesStatus[pathNormalizeToLinux(file.relative)] = FileStatus.updated;\n    });\n\n    if (mergeResults) {\n      // update files according to the merge results\n      const { filesStatus: modifiedStatus, modifiedFiles } = applyModifiedVersion(files, mergeResults, mergeStrategy);\n      legacyComponent.files = modifiedFiles;\n      filesStatus = { ...filesStatus, ...modifiedStatus };\n    }\n\n    const manyComponentsWriterOpts = {\n      consumer,\n      components: [legacyComponent],\n      skipDependencyInstallation: true,\n      writeConfig: false, // @todo: should write if config exists before, needs to figure out how to do it.\n    };\n    await this.componentWriter.writeMany(manyComponentsWriterOpts);\n\n    if (configMergeResult) {\n      if (!legacyComponent.writtenPath) {\n        throw new Error(`component.writtenPath is missing for ${id.toString()}`);\n      }\n      const successfullyMergedConfig = configMergeResult.getSuccessfullyMergedConfig();\n      if (successfullyMergedConfig) {\n        unmergedComponent.mergedConfig = successfullyMergedConfig;\n        // no need to `unmergedComponents.addEntry` here. it'll be added in the next lines inside `if (mergeResults)`.\n        // because if `configMergeResult` is set, `mergeResults` must be set as well. both happen on diverge.\n      }\n    }\n\n    // if mergeResults, the head snap is going to be updated on a later phase when snapping with two parents\n    // otherwise, update the head of the current lane or main\n    if (mergeResults) {\n      if (mergeResults.hasConflicts && mergeStrategy === MergeOptions.manual) {\n        unmergedComponent.unmergedPaths = mergeResults.modifiedFiles.filter((f) => f.conflict).map((f) => f.filePath);\n      }\n      consumer.scope.objects.unmergedComponents.addEntry(unmergedComponent);\n    } else if (localLane) {\n      if (resolvedUnrelated) {\n        // must be \"theirs\"\n        return handleResolveUnrelated();\n      }\n      localLane.addComponent({ id, head: remoteHead });\n    } else {\n      // this is main\n      modelComponent.setHead(remoteHead);\n      // mark it as local, otherwise, when importing this component from a remote, it'll override it.\n      modelComponent.markVersionAsLocal(remoteHead.toString());\n      consumer.scope.objects.add(modelComponent);\n    }\n\n    return { id, filesStatus };\n  }\n\n  private async abortMerge(values: string[]): Promise<ApplyVersionResults> {\n    const consumer = this.workspace.consumer;\n    const ids = await this.getIdsForUnmerged(values);\n    const results = await this.checkout.checkout({ ids, reset: true });\n    ids.forEach((id) => consumer.scope.objects.unmergedComponents.removeComponent(id.fullName));\n    await consumer.scope.objects.unmergedComponents.write();\n    return { abortedComponents: results.components };\n  }\n\n  private async resolveMerge(values: string[], snapMessage: string, build: boolean): Promise<ApplyVersionResults> {\n    const ids = await this.getIdsForUnmerged(values);\n    // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n    const { snappedComponents } = await this.snapping.snap({\n      legacyBitIds: BitIds.fromArray(ids.map((id) => id._legacy)),\n      build,\n      message: snapMessage,\n    });\n    return { resolvedComponents: snappedComponents };\n  }\n\n  private async getAllComponentsStatus(\n    bitIds: BitId[],\n    laneId: LaneId,\n    localLaneObject: Lane | null\n  ): Promise<ComponentMergeStatus[]> {\n    const ids = await Promise.all(\n      bitIds.map(async (bitId) => {\n        const remoteScopeName = laneId.isDefault() ? bitId.scope : laneId.scope;\n        const remoteLaneId = LaneId.from(laneId.name, remoteScopeName as string);\n        const remoteHead = await this.consumer.scope.objects.remoteLanes.getRef(remoteLaneId, bitId);\n        const laneIdStr = remoteLaneId.toString();\n        if (!remoteHead) {\n          throw new BitError(`unable to find a remote head of \"${bitId.toStringWithoutVersion()}\" in \"${laneIdStr}\"`);\n        }\n        return bitId.changeVersion(remoteHead.toString());\n      })\n    );\n\n    return this.getMergeStatus(ids, localLaneObject, localLaneObject);\n  }\n\n  private async snapResolvedComponents(\n    consumer: Consumer,\n    snapMessage: string,\n    build: boolean\n  ): Promise<null | { snappedComponents: ConsumerComponent[]; autoSnappedResults: AutoTagResult[] }> {\n    const unmergedComponents = consumer.scope.objects.unmergedComponents.getComponents();\n    this.logger.debug(`merge-snaps, snapResolvedComponents, total ${unmergedComponents.length.toString()} components`);\n    if (!unmergedComponents.length) return null;\n    const ids = BitIds.fromArray(unmergedComponents.map((r) => new BitId(r.id)));\n    return this.snapping.snap({\n      legacyBitIds: ids,\n      build,\n      message: snapMessage,\n    });\n  }\n\n  private async tagAllLaneComponent(idsToTag: BitId[], tagMessage: string, build: boolean): Promise<TagResults | null> {\n    const ids = idsToTag.map((id) => {\n      return id.toStringWithoutVersion();\n    });\n    this.logger.debug(`merge-snaps, tagResolvedComponents, total ${idsToTag.length.toString()} components`);\n    return this.snapping.tag({\n      ids,\n      build,\n      message: tagMessage,\n      unmodified: true,\n    });\n  }\n\n  private async getIdsForUnmerged(idsStr?: string[]): Promise<ComponentID[]> {\n    if (idsStr && idsStr.length) {\n      const componentIds = await this.workspace.resolveMultipleComponentIds(idsStr);\n      componentIds.forEach((id) => {\n        const entry = this.workspace.consumer.scope.objects.unmergedComponents.getEntry(id.fullName);\n        if (!entry) {\n          throw new GeneralError(`unable to merge-resolve ${id.toString()}, it is not marked as unresolved`);\n        }\n      });\n      return componentIds;\n    }\n    const unresolvedComponents = this.workspace.consumer.scope.objects.unmergedComponents.getComponents();\n    if (!unresolvedComponents.length) throw new GeneralError(`all components are resolved already, nothing to do`);\n    return unresolvedComponents.map((u) => ComponentID.fromLegacy(new BitId(u.id)));\n  }\n\n  private getComponentsToMerge(consumer: Consumer, ids: string[]): BitId[] {\n    if (hasWildcard(ids)) {\n      const componentsList = new ComponentsList(consumer);\n      return componentsList.listComponentsByIdsWithWildcard(ids);\n    }\n    return ids.map((id) => consumer.getParsedId(id));\n  }\n\n  static slots = [];\n  static dependencies = [\n    CLIAspect,\n    WorkspaceAspect,\n    SnappingAspect,\n    CheckoutAspect,\n    InstallAspect,\n    LoggerAspect,\n    ComponentWriterAspect,\n    ImporterAspect,\n    ConfigAspect,\n  ];\n  static runtime = MainRuntime;\n  static async provider([cli, workspace, snapping, checkout, install, loggerMain, compWriter, importer, config]: [\n    CLIMain,\n    Workspace,\n    SnappingMain,\n    CheckoutMain,\n    InstallMain,\n    LoggerMain,\n    ComponentWriterMain,\n    ImporterMain,\n    ConfigMain\n  ]) {\n    const logger = loggerMain.createLogger(MergingAspect.id);\n    const merging = new MergingMain(workspace, install, snapping, checkout, logger, compWriter, importer, config);\n    cli.register(new MergeCmd(merging));\n    return merging;\n  }\n}\n\nMergingAspect.addRuntime(MergingMain);\n"],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AACA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AACA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AAEA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AACA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AAQA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AACA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AACA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AACA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AACA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AACA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AACA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AAEA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AAIA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AACA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AACA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AACA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AACA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AAEA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AACA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AACA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AACA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AACA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AAGA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AACA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AACA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AACA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AACA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AAEA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AACA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AACA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AACA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AACA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AAA0D;AAAA;AAAA;AAAA;AAoDnD,MAAMA,WAAW,CAAC;EAEvBC,WAAW,CACDC,SAAoB,EACpBC,OAAoB,EACpBC,QAAsB,EACtBC,QAAsB,EACtBC,MAAc,EACdC,eAAoC,EACpCC,QAAsB,EACtBC,MAAkB,EAC1B;IAAA;IAAA,KARQP,SAAoB,GAApBA,SAAoB;IAAA,KACpBC,OAAoB,GAApBA,OAAoB;IAAA,KACpBC,QAAsB,GAAtBA,QAAsB;IAAA,KACtBC,QAAsB,GAAtBA,QAAsB;IAAA,KACtBC,MAAc,GAAdA,MAAc;IAAA,KACdC,eAAoC,GAApCA,eAAoC;IAAA,KACpCC,QAAsB,GAAtBA,QAAsB;IAAA,KACtBC,MAAkB,GAAlBA,MAAkB;IAAA;IAE1B,IAAI,CAACC,QAAQ,sBAAG,IAAI,CAACR,SAAS,oDAAd,gBAAgBQ,QAAQ;EAC1C;EAEA,MAAMC,KAAK,CACTC,GAAa,EACbC,aAA4B,EAC5BC,KAAc,EACdC,OAAgB,EAChBC,MAAe,EACfC,OAAe,EACfC,KAAc,EACdC,0BAAmC,EACL;IAC9B,IAAI,CAAC,IAAI,CAACjB,SAAS,EAAE,MAAM,KAAIkB,kCAAqB,GAAE;IACtD,MAAMV,QAAkB,GAAG,IAAI,CAACR,SAAS,CAACQ,QAAQ;IAClD,IAAIW,YAAY;IAChB,IAAIN,OAAO,EAAE;MACXM,YAAY,GAAG,MAAM,IAAI,CAACC,YAAY,CAACV,GAAG,EAAEK,OAAO,EAAEC,KAAK,CAAC;IAC7D,CAAC,MAAM,IAAIJ,KAAK,EAAE;MAChBO,YAAY,GAAG,MAAM,IAAI,CAACE,UAAU,CAACX,GAAG,CAAC;IAC3C,CAAC,MAAM;MACL,MAAMY,MAAM,GAAG,IAAI,CAACC,oBAAoB,CAACf,QAAQ,EAAEE,GAAG,CAAC;MACvD;MACAS,YAAY,GAAG,MAAM,IAAI,CAACK,yBAAyB,CACjDhB,QAAQ,EACRc,MAAM,EACNX,aAAa,EACbG,MAAM,EACNC,OAAO,EACPC,KAAK,EACLC,0BAA0B,CAC3B;IACH;IACA,MAAMT,QAAQ,CAACiB,SAAS,EAAE;IAC1B,OAAON,YAAY;EACrB;;EAEA;AACF;AACA;AACA;EACE,MAAMK,yBAAyB,CAC7BhB,QAAkB,EAClBc,MAAe,EACfX,aAA4B,EAC5BG,MAAe,EACfY,WAAmB,EACnBV,KAAc,EACdC,0BAAmC,EACL;IAC9B,MAAMU,aAAa,GAAGnB,QAAQ,CAACoB,gBAAgB,EAAE;IACjD,MAAMC,iBAAiB,GAAG,MAAMrB,QAAQ,CAACsB,oBAAoB,EAAE;IAC/D,MAAMC,mBAAmB,GAAG,MAAM,IAAI,CAACC,sBAAsB,CAACV,MAAM,EAAEK,aAAa,EAAEE,iBAAiB,CAAC;IACvG,MAAMI,gBAAgB,GAAGF,mBAAmB,CAACG,MAAM,CAAEC,CAAC,IAAKA,CAAC,CAACC,eAAe,IAAI,CAACD,CAAC,CAACE,oBAAoB,CAAC;IACxG,IAAIJ,gBAAgB,CAACK,MAAM,EAAE;MAC3B,MAAMC,WAAW,GAAGN,gBAAgB,CACjCO,GAAG,CACDC,eAAe,IACb,GAAEC,gBAAK,CAACC,IAAI,CAACF,eAAe,CAACG,EAAE,CAACC,QAAQ,EAAE,CAAE,MAAKH,gBAAK,CAACI,GAAG,CAACL,eAAe,CAACL,eAAe,CAAY,EAAC,CAC3G,CACAW,IAAI,CAAC,IAAI,CAAC;MACb,MAAM,KAAIC,oBAAQ,EAAE,mDAAkDT,WAAY,EAAC,CAAC;IACtF;IAEA,OAAO,IAAI,CAACU,UAAU,CAAC;MACrBtC,aAAa;MACboB,mBAAmB;MACnBmB,MAAM,EAAEvB,aAAa;MACrBwB,SAAS,EAAEtB,iBAAiB;MAC5Bf,MAAM;MACNY,WAAW;MACXV,KAAK;MACLC;IACF,CAAC,CAAC;EACJ;;EAEA;AACF;AACA;EACE,MAAMgC,UAAU,CAAC;IACftC,aAAa;IACboB,mBAAmB;IACnBmB,MAAM;IACNC,SAAS;IACTrC,MAAM;IACNsC,GAAG;IACH1B,WAAW;IACXV,KAAK;IACLC;EAWF,CAAC,EAAgC;IAC/B,MAAMT,QAAQ,GAAG,IAAI,CAACR,SAAS,CAACQ,QAAQ;IACxC,MAAM6C,qBAAqB,GAAGtB,mBAAmB,CAACuB,IAAI,CACnDC,SAAS,IAAKA,SAAS,CAACpC,YAAY,IAAIoC,SAAS,CAACpC,YAAY,CAACqC,YAAY,CAC7E;IACD,IAAIH,qBAAqB,IAAI,CAAC1C,aAAa,EAAE;MAC3CA,aAAa,GAAG,MAAM,IAAA8C,2CAA2B,GAAE;IACrD;IACA,MAAMxB,gBAAoC,GAAGF,mBAAmB,CAC7DG,MAAM,CAAEwB,eAAe,IAAKA,eAAe,CAACtB,eAAe,CAAC,CAC5DI,GAAG,CAAEkB,eAAe,KAAM;MACzBd,EAAE,EAAEc,eAAe,CAACd,EAAE;MACtBe,cAAc,EAAED,eAAe,CAACtB,eAAyB;MACzDwB,qBAAqB,EAAEF,eAAe,CAACrB;IACzC,CAAC,CAAC,CAAC;IACL,MAAMwB,mBAAmB,GAAG9B,mBAAmB,CAACG,MAAM,CAAEwB,eAAe,IAAK,CAACA,eAAe,CAACtB,eAAe,CAAC;IAC7G;IACA;IACA,MAAM0B,iBAAiB,GAAG,MAAM,IAAAC,qBAAS,EACvCF,mBAAmB,EACnB,OAAO;MAAEG,gBAAgB;MAAEpB,EAAE;MAAEzB,YAAY;MAAE8C,iBAAiB;MAAEC;IAAkB,CAAC,KAAK;MACtF,MAAMC,cAAc,GAAG,MAAM3D,QAAQ,CAAC4D,KAAK,CAACC,iBAAiB,CAACzB,EAAE,CAAC;MACjE,MAAM0B,aAAa,GAAGpB,MAAM,CAACqB,SAAS,EAAE,GAAGC,gBAAM,CAACC,IAAI,CAACvB,MAAM,CAACwB,IAAI,EAAE9B,EAAE,CAACwB,KAAK,CAAW,GAAGlB,MAAM;MAChG,OAAO,IAAI,CAACyB,YAAY,CAAC;QACvBX,gBAAgB;QAChBpB,EAAE;QACFzB,YAAY;QACZR,aAAa;QACbiE,UAAU,EAAET,cAAc,CAACU,MAAM,CAACjC,EAAE,CAACkC,OAAO,CAAkB;QAC9D5B,MAAM,EAAEoB,aAAa;QACrBnB,SAAS;QACTc,iBAAiB;QACjBC;MACF,CAAC,CAAC;IACJ,CAAC,CACF;IAED,MAAMa,cAAc,GAAG,IAAAC,iBAAO,EAACnB,mBAAmB,CAACrB,GAAG,CAAEL,CAAC,IAAKA,CAAC,CAAC+B,iBAAiB,CAAC,CAAC;IAEnF,MAAM;MAAEe,oBAAoB;MAAEC;IAAuB,CAAC,GAAG,MAAM,IAAI,CAACC,oCAAoC,CACtGJ,cAAc,CACf;IAED,MAAM,IAAI,CAACK,qCAAqC,CAACL,cAAc,EAAEG,sBAAsB,CAAC;IAExF,IAAI/B,SAAS,EAAE3C,QAAQ,CAAC4D,KAAK,CAACiB,OAAO,CAACC,GAAG,CAACnC,SAAS,CAAC;IAEpD,MAAM3C,QAAQ,CAAC4D,KAAK,CAACiB,OAAO,CAACE,OAAO,EAAE,CAAC,CAAC;;IAExC,MAAM/E,QAAQ,CAAC4D,KAAK,CAACiB,OAAO,CAACG,kBAAkB,CAACC,KAAK,EAAE;IAEvD,MAAMjF,QAAQ,CAACkF,WAAW,EAAE;IAE5B,MAAMC,iCAAiC,GAAG5D,mBAAmB,CAAC6D,IAAI,CAAEzD,CAAC;MAAA;MAAA,+BAAKA,CAAC,CAAC+B,iBAAiB,yDAAnB,qBAAqBV,YAAY,EAAE;IAAA,EAAC;IAC9G,MAAMqC,uBAAuB,GAAGxC,qBAAqB,IAAI1C,aAAa,KAAK,QAAQ;IACnF,IAAI,CAACM,0BAA0B,IAAI,CAAC4E,uBAAuB,IAAI,CAACF,iCAAiC,EAAE;MACjG,IAAI;QACF,MAAM,IAAI,CAAC1F,OAAO,CAACA,OAAO,CAAC6F,SAAS,EAAE;UACpCC,MAAM,EAAE,IAAI;UACZC,cAAc,EAAE,KAAK;UACrBC,MAAM,EAAE;QACV,CAAC,CAAC;MACJ,CAAC,CAAC,OAAOC,GAAQ,EAAE;QACjB,IAAI,CAAC9F,MAAM,CAAC+F,KAAK,CAAE,4BAA2B,EAAED,GAAG,CAAC;QACpD,IAAI,CAAC9F,MAAM,CAACgG,YAAY,CAAE,uEAAsEF,GAAG,CAACnF,OAAQ,EAAC,CAAC;MAChH;IACF;IAEA,MAAMsF,mBAAmB,GAAG,YAAY;MACtC;MACA;MACA,IAAIvF,MAAM,IAAI+E,uBAAuB,IAAIF,iCAAiC,EAAE;QAC1E,OAAO,IAAI;MACb;MACA,IAAIvC,GAAG,EAAE;QACP,MAAMkD,QAAQ,GAAGvE,mBAAmB,CAACS,GAAG,CAAEL,CAAC,IAAKA,CAAC,CAACS,EAAE,CAAC;QACrD,MAAM2D,OAAO,GAAG,MAAM,IAAI,CAACC,mBAAmB,CAACF,QAAQ,EAAE5E,WAAW,EAAEV,KAAK,CAAC;QAC5E,IAAI,CAACuF,OAAO,EAAE,OAAO,IAAI;QACzB,MAAM;UAAEE,gBAAgB;UAAEC;QAAkB,CAAC,GAAGH,OAAO;QACvD,OAAO;UAAEI,iBAAiB,EAAEF,gBAAgB;UAAEG,kBAAkB,EAAEF;QAAkB,CAAC;MACvF;MACA,OAAO,IAAI,CAACG,sBAAsB,CAACrG,QAAQ,EAAEkB,WAAW,EAAEV,KAAK,CAAC;IAClE,CAAC;IACD,IAAI8F,gBAAyD,GAAG,IAAI;IACpE,IAAIC,cAAiC;IACrC,MAAMC,cAAc,GAAG,IAAI,CAAChH,SAAS,CAACiH,MAAM,CAACC,YAAY,EAAE;IAC3D,IAAI;MACFJ,gBAAgB,GAAG,MAAMT,mBAAmB,EAAE;IAChD,CAAC,CAAC,OAAOH,GAAQ,EAAE;MACjBa,cAAc,GAAGb,GAAG;MACpB,IAAI,CAAClG,SAAS,CAACiH,MAAM,CAACE,mBAAmB,CAACH,cAAc,CAAC;IAC3D;IAEA,OAAO;MACLI,UAAU,EAAEtD,iBAAiB;MAC7B7B,gBAAgB;MAChB6E,gBAAgB;MAChBC,cAAc;MACdlB,uBAAuB;MACvBZ;IACF,CAAC;EACH;EAEA,MAAcG,qCAAqC,CACjDL,cAAmC,EACnCG,sBAA+C,EAC/C;IACA,MAAMmC,eAAe,GAAG,IAAI,CAACrH,SAAS,CAACsH,oBAAoB,EAAE;IAC7D,IAAIpC,sBAAsB,EAAE;MAC1B,MAAMqC,iBAAiB,GAAG,KAAIC,sCAAiB,EAAC,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,CAC7E;QACE5E,EAAE,EAAE6E,8CAAwB,CAAC7E,EAAE;QAC/B8E,QAAQ,EAAExC;MACZ,CAAC,CACF,CAAC;MACFH,cAAc,CAAC4C,OAAO,CAACJ,iBAAiB,CAAC;IAC3C;IACAxC,cAAc,CAAC6C,OAAO,CAAEC,WAAW,IAAK;MACtC,MAAMH,QAAQ,GAAGG,WAAW,CAACC,yBAAyB,EAAE;MACxD,IAAI,CAACJ,QAAQ,EAAE;MACfL,eAAe,CAACU,WAAW,CAACF,WAAW,CAACG,SAAS,EAAEN,QAAQ,CAAC;IAC9D,CAAC,CAAC;IACF,IAAIL,eAAe,CAACY,WAAW,EAAE,EAAE;MACjC,MAAMZ,eAAe,CAAC5B,KAAK,EAAE;IAC/B;EACF;EAEA,MAAcN,oCAAoC,CAChDJ,cAAmC,EACwE;IAC3G,MAAMmD,UAAU,GAAGnD,cAAc,CAACvC,GAAG,CAAEL,CAAC,IAAKA,CAAC,CAACgG,qBAAqB,EAAE,CAAC;;IAEvE;IACA,MAAMC,eAAgD,GAAG,CAAC,CAAC;IAC3D,MAAMC,kBAAmD,GAAG,CAAC,CAAC,CAAC,CAAC;IAChEtD,cAAc,CAAC6C,OAAO,CAAEC,WAAW,IAAK;MAAA;MACtC,MAAMS,YAAY,4BAAGT,WAAW,CAACM,qBAAqB,EAAE,0DAAnC,sBAAqCG,YAAY;MACtE,IAAI,CAACA,YAAY,IAAIA,YAAY,KAAK,GAAG,EAAE;MAC3C,MAAMC,kBAAkB,GAAGD,YAAY,CAACE,MAAM,IAAI,CAAC,CAAC;MACpDC,gCAAmB,CAACb,OAAO,CAAEc,QAAQ,IAAK;QACxC,IAAI,CAACH,kBAAkB,CAACG,QAAQ,CAAC,EAAE;QACnCH,kBAAkB,CAACG,QAAQ,CAAC,CAACd,OAAO,CAAEe,GAAa,IAAK;UACtD,IAAIA,GAAG,CAACC,KAAK,EAAE,OAAO,CAAC;UACvB,IAAIR,eAAe,CAACO,GAAG,CAACjE,IAAI,CAAC,EAAE;YAC7B,IAAI,CAAC0D,eAAe,CAACO,GAAG,CAACjE,IAAI,CAAC,CAACmE,QAAQ,CAACF,GAAG,CAAC7D,OAAO,CAAC,EAAEsD,eAAe,CAACO,GAAG,CAACjE,IAAI,CAAC,CAACoE,IAAI,CAACH,GAAG,CAAC7D,OAAO,CAAC;YACjGuD,kBAAkB,CAACM,GAAG,CAACjE,IAAI,CAAC,CAACoE,IAAI,CAACjB,WAAW,CAACG,SAAS,CAAC;YACxD;UACF;UACAI,eAAe,CAACO,GAAG,CAACjE,IAAI,CAAC,GAAG,CAACiE,GAAG,CAAC7D,OAAO,CAAC;UACzCuD,kBAAkB,CAACM,GAAG,CAACjE,IAAI,CAAC,GAAG,CAACmD,WAAW,CAACG,SAAS,CAAC;QACxD,CAAC,CAAC;MACJ,CAAC,CAAC;IACJ,CAAC,CAAC;;IAEF;IACA,MAAMe,YAA6C,GAAG,CAAC,CAAC;IACxD,MAAMC,mBAAoD,GAAG,CAAC,CAAC,CAAC,CAAC;IACjEjE,cAAc,CAAC6C,OAAO,CAAEC,WAAW,IAAK;MAAA;MACtC,MAAMoB,oBAAoB,6BAAGpB,WAAW,CAACM,qBAAqB,EAAE,2DAAnC,uBAAqCT,QAAQ;MAC1E,IAAI,CAACuB,oBAAoB,EAAE;MAC3BR,gCAAmB,CAACb,OAAO,CAAEc,QAAQ,IAAK;QACxC,IAAI,CAACO,oBAAoB,CAACP,QAAQ,CAAC,EAAE;QACrCO,oBAAoB,CAACP,QAAQ,CAAC,CAACd,OAAO,CAAEe,GAAa,IAAK;UACxD,IAAIA,GAAG,CAACC,KAAK,EAAE,OAAO,CAAC;UACvB,IAAIG,YAAY,CAACJ,GAAG,CAACjE,IAAI,CAAC,EAAE;YAC1B,IAAI,CAACqE,YAAY,CAACJ,GAAG,CAACjE,IAAI,CAAC,CAACmE,QAAQ,CAACF,GAAG,CAAC7D,OAAO,CAAC,EAAEiE,YAAY,CAACJ,GAAG,CAACjE,IAAI,CAAC,CAACoE,IAAI,CAACH,GAAG,CAAC7D,OAAO,CAAC;YAC3FkE,mBAAmB,CAACL,GAAG,CAACjE,IAAI,CAAC,CAACoE,IAAI,CAACjB,WAAW,CAACG,SAAS,CAAC;YACzD;UACF;UACAe,YAAY,CAACJ,GAAG,CAACjE,IAAI,CAAC,GAAG,CAACiE,GAAG,CAAC7D,OAAO,CAAC;UACtCkE,mBAAmB,CAACL,GAAG,CAACjE,IAAI,CAAC,GAAG,CAACmD,WAAW,CAACG,SAAS,CAAC;QACzD,CAAC,CAAC;MACJ,CAAC,CAAC;IACJ,CAAC,CAAC;IAEF,MAAMkB,qBAAqB,GAAGC,MAAM,CAACC,IAAI,CAAChB,eAAe,CAAC;IAC1D,MAAMiB,kBAAkB,GAAGF,MAAM,CAACC,IAAI,CAACL,YAAY,CAAC;IACpD,IAAI,CAACG,qBAAqB,CAAC5G,MAAM,IAAI,CAAC+G,kBAAkB,CAAC/G,MAAM,EAAE,OAAO,CAAC,CAAC;IAE1E,MAAMgH,eAAe,GAAG,IAAI,CAAC/I,MAAM,CAAC+I,eAAe;IACnD,IAAI,CAACA,eAAe,EAAE,MAAM,IAAIC,KAAK,CAAE,qEAAoE,CAAC;IAC5G,MAAMC,WAAW,GAAGF,eAAe,CAACG,UAAU,CAACC,iBAAiB,CAACjC,8CAAwB,CAAC7E,EAAE,CAAC;IAC7F,MAAM4F,MAAM,GAAGgB,WAAW,aAAXA,WAAW,uBAAXA,WAAW,CAAEjJ,MAAM,CAACiI,MAAM;IACzC,IAAI,CAACA,MAAM,EAAE;MACX,OAAO,CAAC,CAAC;IACX;;IAEA;IACA,MAAMmB,oBAAoB,GAAG,CAAC,CAAC;IAC/BT,qBAAqB,CAACtB,OAAO,CAAEgC,OAAO,IAAK;MACzC,IAAIxB,eAAe,CAACwB,OAAO,CAAC,CAACtH,MAAM,GAAG,CAAC,EAAE;QACvC;QACA;MACF;MACAmG,gCAAmB,CAACb,OAAO,CAAEc,QAAQ,IAAK;QAAA;QACxC,IAAI,sBAACF,MAAM,CAACE,QAAQ,CAAC,6CAAhB,iBAAmBkB,OAAO,CAAC,GAAE,OAAO,CAAC;QAC1C,MAAMC,UAAU,GAAGrB,MAAM,CAACE,QAAQ,CAAC,CAACkB,OAAO,CAAC;QAC5C,MAAME,MAAM,GAAG1B,eAAe,CAACwB,OAAO,CAAC,CAAC,CAAC,CAAC;QAC1C,IAAIC,UAAU,KAAKC,MAAM,EAAE;QAC3BH,oBAAoB,CAACC,OAAO,CAAC,GAAG,CAACC,UAAU,EAAEC,MAAM,CAAC;QACpDtB,MAAM,CAACE,QAAQ,CAAC,CAACkB,OAAO,CAAC,GAAGE,MAAM;QAClC,IAAI,CAAC1J,MAAM,CAAC2J,KAAK,CACd,2BAA0BH,OAAQ,SAAQC,UAAW,OAAMC,MAAO,mBAAkBzB,kBAAkB,CACrGuB,OAAO,CACR,CAAC7G,IAAI,CAAC,IAAI,CAAE,EAAC,CACf;MACH,CAAC,CAAC;IACJ,CAAC,CAAC;;IAEF;IACA,MAAMiH,cAAc,GAAG,CAAC,cAAc,EAAE,kBAAkB,CAAC;IAC3D,MAAMC,sBAAsB,GAAG;MAAEC,YAAY,EAAE,EAAE;MAAEC,gBAAgB,EAAE;IAAG,CAAC;IACzE,MAAMC,uCAAiD,GAAG,EAAE;IAC5Df,kBAAkB,CAACzB,OAAO,CAAEgC,OAAO,IAAK;MACtC,IAAIb,YAAY,CAACa,OAAO,CAAC,CAACtH,MAAM,GAAG,CAAC,EAAE;QACpC;QACA;MACF;MACA,MAAM+H,WAAW,GAAGtB,YAAY,CAACa,OAAO,CAAC,CAAC,CAAC,CAAC;MAC5C,MAAM,GAAGU,UAAU,EAAEC,QAAQ,CAAC,GAAGF,WAAW,CAACG,KAAK,CAAC,IAAI,CAAC;MAExDR,cAAc,CAACpC,OAAO,CAAEc,QAAQ,IAAK;QAAA;QACnC,IAAI,uBAACF,MAAM,CAACE,QAAQ,CAAC,8CAAhB,kBAAmBkB,OAAO,CAAC,GAAE;QAClC,MAAMa,kBAAkB,GAAGjC,MAAM,CAACE,QAAQ,CAAC,CAACkB,OAAO,CAAC;QACpD,IAAI,CAACa,kBAAkB,EAAE;QACzB;QACAL,uCAAuC,CAACtB,IAAI,CAACc,OAAO,CAAC;QACrD,IAAIc,iBAAM,CAACC,SAAS,CAACJ,QAAQ,EAAEE,kBAAkB,CAAC,EAAE;UAClD;UACA;QACF;QACAR,sBAAsB,CAACvB,QAAQ,CAAC,CAACI,IAAI,CAAC;UACpCpE,IAAI,EAAEkF,OAAO;UACb9E,OAAO,EAAEuF,WAAW,CAACO,OAAO,CAACN,UAAU,EAAEG,kBAAkB,CAAC;UAC5D7B,KAAK,EAAE;QACT,CAAC,CAAC;QACFwB,uCAAuC,CAACtB,IAAI,CAACc,OAAO,CAAC;QACrD,IAAI,CAACxJ,MAAM,CAAC2J,KAAK,CACd,6BAA4BH,OAAQ,aAAYa,kBAAmB,YAAWF,QAAS,mBAAkBvB,mBAAmB,CAC3HY,OAAO,CACR,CAAC7G,IAAI,CAAC,IAAI,CAAE,EAAC,CACf;MACH,CAAC,CAAC;IACJ,CAAC,CAAC;IACFiH,cAAc,CAACpC,OAAO,CAAEc,QAAQ,IAAK;MACnC,IAAI,IAAAmC,iBAAO,EAACZ,sBAAsB,CAACvB,QAAQ,CAAC,CAAC,EAAE,OAAOuB,sBAAsB,CAACvB,QAAQ,CAAC;IACxF,CAAC,CAAC;IAEF,IAAI0B,uCAAuC,CAAC9H,MAAM,EAAE;MAClD4F,UAAU,CAACN,OAAO,CAAEkD,MAAM,IAAK;QAC7B,IAAIA,MAAM,aAANA,MAAM,eAANA,MAAM,CAAEpD,QAAQ,EAAE;UACpBe,gCAAmB,CAACb,OAAO,CAAEc,QAAQ,IAAK;YAAA;YACxC,IAAI,sBAACoC,MAAM,CAACpD,QAAQ,6CAAf,iBAAkBgB,QAAQ,CAAC,GAAE;YAClCoC,MAAM,CAACpD,QAAQ,CAACgB,QAAQ,CAAC,wBAAGoC,MAAM,CAACpD,QAAQ,sDAAf,kBAAkBgB,QAAQ,CAAC,CAACxG,MAAM,CAC3D6I,GAAG,IAAK,CAACX,uCAAuC,CAACvB,QAAQ,CAACkC,GAAG,CAACrG,IAAI,CAAC,CACrE;YACD,IAAI,CAACoG,MAAM,CAACpD,QAAQ,CAACgB,QAAQ,CAAC,CAACpG,MAAM,EAAE,OAAOwI,MAAM,CAACpD,QAAQ,CAACgB,QAAQ,CAAC;UACzE,CAAC,CAAC;UACF,IAAI,IAAAmC,iBAAO,EAACC,MAAM,CAACpD,QAAQ,CAAC,EAAEoD,MAAM,CAACpD,QAAQ,GAAG5B,SAAS;QAC3D;MACF,CAAC,CAAC;IACJ;IAEA,IAAIqD,MAAM,CAACC,IAAI,CAACO,oBAAoB,CAAC,CAACrH,MAAM,EAAE;MAC5C,MAAMgH,eAAe,CAAC7D,KAAK,EAAE;IAC/B;IAEA,IAAI,CAACrF,MAAM,CAAC2J,KAAK,CAAC,+BAA+B,EAAEJ,oBAAoB,CAAC;IACxE,IAAI,CAACvJ,MAAM,CAAC2J,KAAK,CAAC,iCAAiC,EAAEE,sBAAsB,CAAC;IAE5E,OAAO;MACLhF,oBAAoB,EAAEkE,MAAM,CAACC,IAAI,CAACO,oBAAoB,CAAC,CAACrH,MAAM,GAAGqH,oBAAoB,GAAG7D,SAAS;MACjGZ,sBAAsB,EAAEiE,MAAM,CAACC,IAAI,CAACa,sBAAsB,CAAC,CAAC3H,MAAM,GAAG2H,sBAAsB,GAAGnE;IAChG,CAAC;EACH;;EAEA;AACF;AACA;AACA;AACA;AACA;EACE,MAAMkF,cAAc,CAClB1J,MAAe;EAAE;EACjB2J,WAAwB;EAAE;EAC1BC,SAAuB;EAAE;EACzBC,OAA6E,EAC5C;IACjC,IAAI,CAACF,WAAW,IAAIC,SAAS,EAAE;MAC7B,MAAM,IAAI,CAAC5K,QAAQ,CAAC8K,4BAA4B,CAACF,SAAS,CAACG,QAAQ,EAAE,CAACC,eAAe,EAAE,CAAC;IAC1F;IACA,MAAMC,iCAAiC,GAAG,MAAM,IAAAxH,qBAAS,EAACzC,MAAM,EAAGsB,EAAE,IACnE,IAAI,CAAC4I,oCAAoC,CAAC5I,EAAE,EAAEqI,WAAW,EAAEE,OAAO,CAAC,CACpE;IACD,MAAMM,QAAQ,GAAGF,iCAAiC,CAC/C/I,GAAG,CAAEkJ,UAAU,IAAK;MACnB,IAAI,CAACA,UAAU,CAACC,WAAW,EAAE,OAAO,EAAE;MACtC,MAAMC,gBAAgB,GAAG,IAAA5G,iBAAO,EAAC,CAC/B,GAAG0G,UAAU,CAACC,WAAW,CAACE,iBAAiB,EAC3CH,UAAU,CAACC,WAAW,CAACG,uBAAuB,CAC/C,CAAC;MACF,OAAOF,gBAAgB,CAACpJ,GAAG,CAAEuJ,CAAC,IAAKL,UAAU,CAAC9I,EAAE,CAACoJ,aAAa,CAACD,CAAC,CAAClJ,QAAQ,EAAE,CAAC,CAAC;IAC/E,CAAC,CAAC,CACDoJ,IAAI,EAAE;IAET,MAAM,IAAI,CAACzL,QAAQ,CAAC4D,KAAK,CAAC8H,aAAa,CAACC,8BAA8B,CAAC;MACrEzL,GAAG,EAAE0L,eAAM,CAACC,SAAS,CAACZ,QAAQ,CAAC;MAC/Ba,IAAI,EAAEpB,SAAS,IAAIpF;IACrB,CAAC,CAAC;IAEF,MAAMyG,sBAAsB,GAAGhB,iCAAiC,CAACrJ,MAAM,CACpEC,CAAC,IAAK,CAACA,CAAC,CAACqK,UAAU,CACK;IAC3B,MAAMC,mBAAmB,GAAGlB,iCAAiC,CAACrJ,MAAM,CAAEC,CAAC,IAAKA,CAAC,CAACqK,UAAU,CAAC;IAEzF,MAAME,4BAA4B,GAAG,YAA6C;MAChF,MAAMC,GAAG,GAAG,KAAIC,mBAAG,EAAC,IAAI,CAACpM,QAAQ,CAAC4D,KAAK,CAAC;MACxC,IAAI;QACF,MAAMyI,gBAAgB,GAAG,MAAMC,OAAO,CAACC,GAAG,CACxCN,mBAAmB,CAACjK,GAAG,CAAEkJ,UAAU,IACjC,IAAI,CAACsB,uBAAuB,CAAC/B,WAAW,EAAEC,SAAS,IAAIpF,SAAS,EAAE4F,UAAU,CAAC,CAC9E,CACF;QACD,MAAMiB,GAAG,CAACM,KAAK,EAAE;QACjB,OAAOJ,gBAAgB;MACzB,CAAC,CAAC,OAAO3G,GAAQ,EAAE;QACjB,MAAMyG,GAAG,CAACM,KAAK,EAAE;QACjB,MAAM/G,GAAG;MACX;IACF,CAAC;IACD,MAAMK,OAAO,GAAG,MAAMmG,4BAA4B,EAAE;IAEpDnG,OAAO,CAACuC,IAAI,CAAC,GAAGyD,sBAAsB,CAAC;IACvC,OAAOhG,OAAO;EAChB;EAEA,MAAciF,oCAAoC,CAChD5I,EAAS;EAAE;EACXO,SAAsB;EAAE;EACxBgI,OAA6E,EAC5B;IACjD,MAAM3K,QAAQ,GAAG,IAAI,CAACR,SAAS,CAACQ,QAAQ;IACxC,MAAMkD,eAAqC,GAAG;MAAEd;IAAG,CAAC;IACpD,MAAMsK,cAAc,GAAG,CAACC,GAAW,EAAE9K,oBAAoB,GAAG,KAAK,KAAK;MACpEqB,eAAe,CAACtB,eAAe,GAAG+K,GAAG;MACrCzJ,eAAe,CAACrB,oBAAoB,GAAGA,oBAAoB;MAC3D,OAAOqB,eAAe;IACxB,CAAC;IACD,MAAMS,cAAc,GAAG,MAAM3D,QAAQ,CAAC4D,KAAK,CAACgJ,wBAAwB,CAACxK,EAAE,CAAC;IACxE,IAAI,CAACuB,cAAc,EAAE;MACnB,OAAO+I,cAAc,CAClB,aAAYtK,EAAE,CAACC,QAAQ,EAAG,gFAA+E,CAC3G;IACH;IACA,MAAMwK,QAAQ,GAAG7M,QAAQ,CAAC4D,KAAK,CAACiB,OAAO,CAACG,kBAAkB,CAAC8H,QAAQ,CAAC1K,EAAE,CAAC8B,IAAI,CAAC;IAC5E,IAAI2I,QAAQ,EAAE;MACZ,OAAOH,cAAc,CAClB,aAAYtK,EAAE,CAAC2K,sBAAsB,EAAG,2GAA0G,CACpJ;IACH;IACA,MAAMC,IAAI,GAAGhN,QAAQ,CAAC4D,KAAK,CAACiB,OAAO;IACnC,MAAMP,OAAO,GAAGlC,EAAE,CAACkC,OAAiB;IACpC,MAAM2I,aAAa,GAAGtJ,cAAc,CAACU,MAAM,CAACC,OAAO,CAAC;IACpD,MAAM4I,gBAAgB,GAAGlN,QAAQ,CAACyG,MAAM,CAAC0G,eAAe,CAAC/K,EAAE,EAAE;MAAEgL,aAAa,EAAE;IAAK,CAAC,CAAC;IACrF,MAAMC,gBAAyB,GAAG,MAAM1J,cAAc,CAAC2J,WAAW,CAAChJ,OAAO,EAAEtE,QAAQ,CAAC4D,KAAK,CAACiB,OAAO,CAAC;IACnG,IAAIwI,gBAAgB,CAACE,SAAS,EAAE,EAAE;MAChC,OAAOb,cAAc,CAAE,4BAA2B,EAAE,IAAI,CAAC;IAC3D;IACA,MAAMc,YAAY,GAAG,MAAM;MACzB,IAAIN,gBAAgB,EAAE,OAAOA,gBAAgB;MAC7C,IAAIvK,SAAS,EAAE;QACb,MAAM8K,QAAQ,GAAG9K,SAAS,CAAC+K,YAAY,CAACtL,EAAE,CAAC;QAC3C,IAAI,CAACqL,QAAQ,EAAE,OAAO,IAAI;QAC1B,OAAOA,QAAQ,CAACrL,EAAE,CAACoJ,aAAa,CAACiC,QAAQ,CAACE,IAAI,CAACtL,QAAQ,EAAE,CAAC;MAC5D;MACA;MACA,MAAMsL,IAAI,GAAGhK,cAAc,CAACiK,mBAAmB,EAAE;MACjD,IAAID,IAAI,EAAE;QACR,OAAOvL,EAAE,CAACoJ,aAAa,CAACmC,IAAI,CAAC;MAC/B;MACA,OAAO,IAAI;IACb,CAAC;IACD,MAAME,SAAS,GAAGL,YAAY,EAAE;IAChC,IAAI,CAACK,SAAS,EAAE;MACd,MAAM1C,WAAW,GAAG,MAAM,IAAA2C,gCAAc,EAAC;QAAEd,IAAI;QAAErJ,cAAc;QAAEoK,UAAU,EAAEd,aAAa;QAAEe,MAAM,EAAE;MAAM,CAAC,CAAC;MAC5G,OAAO;QAAExK,gBAAgB,EAAE,IAAI;QAAEyK,kBAAkB,EAAEZ,gBAAgB;QAAEjL,EAAE;QAAE+I;MAAY,CAAC;IAC1F;IACA,MAAM+C,mBAAmB,GAAG,MAAM;MAChC,IAAIhB,gBAAgB,EAAE,OAAOlN,QAAQ,CAACmO,aAAa,CAACjB,gBAAgB,CAAC;MACrE,OAAOlN,QAAQ,CAAC4D,KAAK,CAACwK,oBAAoB,CAACP,SAAS,CAAC;IACvD,CAAC;IACD,MAAMrK,gBAAgB,GAAG,MAAM0K,mBAAmB,EAAE;IACpD,IAAI1K,gBAAgB,CAAC6K,OAAO,EAAE;MAC5B,OAAO3B,cAAc,CAAE,4BAA2B,EAAE,IAAI,CAAC;IAC3D;IACA,MAAM4B,UAAU,GAAG,YAAY;MAC7B,MAAMC,2BAA2B,GAAG,MAAMvO,QAAQ,CAACwO,sBAAsB,CAAChL,gBAAgB,CAACpB,EAAE,CAAC;MAC9F,IAAI,CAACmM,2BAA2B,CAACE,QAAQ,EAAE,OAAO,KAAK;MACvD,IAAI,CAACvB,gBAAgB,EAAE,OAAO,KAAK;MACnC,MAAMwB,aAAa,GAAG,MAAM/K,cAAc,CAAC2J,WAAW,CACpDJ,gBAAgB,CAAC5I,OAAO,EACxBtE,QAAQ,CAAC4D,KAAK,CAACiB,OAAO,CACvB;MACD,OAAO8F,OAAO,aAAPA,OAAO,eAAPA,OAAO,CAAEgE,mBAAmB,GAC/B3O,QAAQ,CAAC4O,6BAA6B,CAACF,aAAa,EAAElL,gBAAgB,CAAC,GACvE,IAAI;IACV,CAAC;IAED,MAAMqL,mBAAmB,GAAG,MAAMP,UAAU,EAAE;IAE9C,IAAIO,mBAAmB,EAAE;MACvB,OAAOnC,cAAc,CAAE,iDAAgD,CAAC;IAC1E;IACA,IAAI,CAACO,aAAa,EAAE;MAClB,MAAM,IAAIlE,KAAK,CAAE,kDAAiDzE,OAAQ,OAAMlC,EAAE,CAACC,QAAQ,EAAG,EAAC,CAAC;IAClG;IACA,MAAM8I,WAAW,GAAG,MAAM,IAAA2C,gCAAc,EAAC;MACvCd,IAAI;MACJrJ,cAAc;MACdoK,UAAU,EAAEd,aAAa;MACzBe,MAAM,EAAE;IACV,CAAC,CAAC;IACF,IAAI7C,WAAW,CAACzF,GAAG,EAAE;MACnB,MAAMoJ,QAAQ,GAAGnL,cAAc,CAACgK,IAAI;MACpC,IAAIxC,WAAW,CAACzF,GAAG,YAAYqJ,4BAAY,IAAIpE,OAAO,aAAPA,OAAO,eAAPA,OAAO,CAAEqE,gBAAgB,IAAIF,QAAQ,EAAE;QACpF,MAAMG,mBAAmB,GAAG,MAAOC,aAAyB,IAAK;UAC/D,MAAMC,mBAAmB,GAAG,MAAM,IAAArB,gCAAc,EAAC;YAC/Cd,IAAI;YACJrJ,cAAc;YACdyL,UAAU,EAAEF,aAAa;YACzBnB,UAAU,EAAEe,QAAQ;YACpBd,MAAM,EAAE;UACV,CAAC,CAAC;UACF,IAAI,CAACmB,mBAAmB,CAACzJ,GAAG,EAAE,OAAO,IAAI;UACzC,OAAO,EAAEyJ,mBAAmB,CAACzJ,GAAG,YAAYqJ,4BAAY,CAAC;QAC3D,CAAC;QACD,MAAMM,kBAAkB,GAAG,MAAMJ,mBAAmB,CAACtL,cAAc,CAAC2L,uBAAuB,EAAE,CAAQ;QACrG,MAAMC,mBAAmB,GAAG,MAAMN,mBAAmB,CAAChC,aAAa,CAAC;QACpE,IAAI,CAACoC,kBAAkB,IAAI,CAACE,mBAAmB,EAAE;UAC/C,OAAO7C,cAAc,CAClB,sBAAqBlJ,gBAAgB,CAACpB,EAAE,CAACC,QAAQ,EAAG,2BAA0ByM,QAAQ,CAACzM,QAAQ,EAAG,gFAA+E,CACnL;QACH;QACA,MAAMmN,mBAAmB,GAAGH,kBAAkB,GAAG7L,gBAAgB,CAACpB,EAAE,CAACkC,OAAO,GAAGlC,EAAE,CAACkC,OAAO;QACzF,MAAMmL,WAAW,GAAG9L,cAAc,CAACU,MAAM,CAACmL,mBAAmB,CAAW;QACxE,IAAI,CAACC,WAAW,EAAE,MAAM,IAAI1G,KAAK,CAAE,yBAAwByG,mBAAoB,UAASpN,EAAE,CAACC,QAAQ,EAAG,GAAE,CAAC;QACzG,IAAI,CAAAsI,OAAO,aAAPA,OAAO,uBAAPA,OAAO,CAAEqE,gBAAgB,MAAK,QAAQ,EAAE;UAC1C;UACA,OAAO;YACLxL,gBAAgB;YAChByK,kBAAkB,EAAEZ,gBAAgB;YACpCjL,EAAE;YACF+I,WAAW;YACX1H,iBAAiB,EAAE;cAAEiM,QAAQ,EAAE,QAAQ;cAAE/B,IAAI,EAAE8B;YAAY;UAC7D,CAAC;QACH;QACA,IAAI,CAAA9E,OAAO,aAAPA,OAAO,uBAAPA,OAAO,CAAEqE,gBAAgB,MAAK,MAAM,EAAE;UACxC,OAAO;YACLxL,gBAAgB;YAChBpB,EAAE;YACF+I,WAAW;YACX1H,iBAAiB,EAAE;cAAEiM,QAAQ,EAAE,MAAM;cAAE/B,IAAI,EAAE8B;YAAY;UAC3D,CAAC;QACH;QACA,MAAM,IAAI1G,KAAK,CACZ,yBAAwB4B,OAAO,aAAPA,OAAO,uBAAPA,OAAO,CAAEqE,gBAAiB,kEAAiE,CACrH;MACH;MACA,OAAOtC,cAAc,CAClB,sBAAqBlJ,gBAAgB,CAACpB,EAAE,CAACC,QAAQ,EAAG,oBAAmB8I,WAAW,CAACzF,GAAG,CAACnF,OAAQ,EAAC,CAClG;IACH;IACA,IAAI,CAAC4K,WAAW,CAACwE,UAAU,EAAE,EAAE;MAC7B,IAAIxE,WAAW,CAACyE,aAAa,EAAE,EAAE;QAC/B;QACA,OAAOlD,cAAc,CAAE,aAAYlJ,gBAAgB,CAACpB,EAAE,CAACC,QAAQ,EAAG,6BAA4B,EAAE,IAAI,CAAC;MACvG;MACA,IAAI8I,WAAW,CAAC0E,aAAa,EAAE,EAAE;QAC/B;QACA,OAAO;UACLrM,gBAAgB;UAChByK,kBAAkB,EAAEZ,gBAAgB;UACpCjL,EAAE;UACF+I;QACF,CAAC;MACH;MACA;MACA,OAAOuB,cAAc,CAAE,aAAYlJ,gBAAgB,CAACpB,EAAE,CAACC,QAAQ,EAAG,oBAAmB,EAAE,IAAI,CAAC;IAC9F;;IAEA;IACA,MAAM2J,UAAU,GAAG;MACjBiB,aAAa;MACbY,SAAS;MACTlK;IACF,CAAC;IACD,OAAO;MAAEH,gBAAgB;MAAEpB,EAAE;MAAE+I,WAAW;MAAEa;IAAW,CAAC;EAC1D;EAEA,MAAcQ,uBAAuB,CACnC7J,SAAsB;EAAE;EACxB+H,SAA2B;EAAE;EAC7BoF,sCAA8E,EAC9E;IACA,MAAM;MAAE1N,EAAE;MAAE+I,WAAW;MAAE3H,gBAAgB;MAAEwI;IAAW,CAAC,GAAG8D,sCAAsC;IAChG,IAAI,CAAC9D,UAAU,EAAE,MAAM,IAAIjD,KAAK,CAAE,qDAAoD3G,EAAE,CAACC,QAAQ,EAAG,EAAC,CAAC;IACtG,MAAM;MAAE4K,aAAa;MAAEY,SAAS;MAAElK;IAAe,CAAC,GAAGqI,UAAU;IAC/D,MAAMgB,IAAI,GAAG,IAAI,CAAChN,QAAQ,CAAC4D,KAAK,CAACiB,OAAO;IACxC,IAAI,CAACsG,WAAW,EAAE,MAAM,IAAIpC,KAAK,CAAE,sDAAqD3G,EAAE,CAACC,QAAQ,EAAG,EAAC,CAAC;IACxG,IAAI,CAACmB,gBAAgB,EAAE,MAAM,IAAIuF,KAAK,CAAE,2DAA0D3G,EAAE,CAACC,QAAQ,EAAG,EAAC,CAAC;IAElH,MAAM0N,QAAQ,GAAG5E,WAAW,CAACG,uBAA8B,CAAC,CAAC;IAC7D,IAAI,CAAC1L,MAAM,CAAC2J,KAAK,CAAE;AACvB,WAAWnH,EAAE,CAAC2K,sBAAsB,EAAG;AACvC,WAAWgD,QAAQ,CAAC1N,QAAQ,EAAG;AAC/B,WAAWwL,SAAS,CAACvJ,OAAQ;AAC7B,WAAW2I,aAAa,CAAC5K,QAAQ,EAAG,EAAC,CAAC;IAClC,MAAMqM,aAAsB,GAAG,MAAM/K,cAAc,CAAC2J,WAAW,CAACyC,QAAQ,CAAC1N,QAAQ,EAAE,EAAE2K,IAAI,CAAC;IAC1F,MAAMgD,cAAuB,GAAG,MAAMrM,cAAc,CAAC2J,WAAW,CAACL,aAAa,CAAC5K,QAAQ,EAAE,EAAE2K,IAAI,CAAC;IAEhG,MAAMiD,eAAe,GAAG,CAAAtN,SAAS,aAATA,SAAS,uBAATA,SAAS,CAAEuN,QAAQ,EAAE,CAAC7N,QAAQ,EAAE,KAAI,MAAM;IAClE,MAAM8N,aAAa,GAAGzF,SAAS,GAAGA,SAAS,CAACwF,QAAQ,EAAE,CAAC7N,QAAQ,EAAE,GAAG+N,sBAAY;IAChF,MAAMC,YAAY,GAAI,GAAExC,SAAS,CAACvJ,OAAQ,KAAI2L,eAAe,KAAKE,aAAa,GAAG,SAAS,GAAGF,eAAgB,GAAE;IAChH,MAAMK,UAAU,GAAI,GAAErD,aAAa,CAAC5K,QAAQ,EAAG,KAC7C8N,aAAa,KAAKF,eAAe,GAAG,UAAU,GAAGE,aAClD,GAAE;IACH,MAAMI,YAAY,GAAG,MAAM,IAAI,CAAC/Q,SAAS,CAACgR,OAAO,EAAE;IACnD,MAAMC,YAAY,GAAG,KAAIC,4BAAY,EACnCtO,EAAE,CAAC2K,sBAAsB,EAAE,EAC3BwD,YAAY,EACZ7F,SAAS,EACTlH,gBAAgB,CAACyF,UAAU,EAC3ByF,aAAa,CAACzF,UAAU,EACxB+G,cAAc,CAAC/G,UAAU,EACzBoH,YAAY,EACZC,UAAU,EACV,IAAI,CAAC1Q,MAAM,CACZ;IACD,MAAM8D,iBAAiB,GAAG+M,YAAY,CAACxQ,KAAK,EAAE;IAE9C,MAAMU,YAAY,GAAG,MAAM,IAAAgQ,wBAAa,EAAC;MACvC3Q,QAAQ,EAAE,IAAI,CAACA,QAAQ;MACvBgQ,cAAc;MACdM,UAAU;MACV9M,gBAAgB;MAChB6M,YAAY;MACZ3B;IACF,CAAC,CAAC;IACF,OAAO;MAAElL,gBAAgB;MAAEpB,EAAE;MAAEzB,YAAY;MAAEwK,WAAW;MAAEzH;IAAkB,CAAC;EAC/E;EAEA,MAAcS,YAAY,CAAC;IACzBX,gBAAgB;IAChBpB,EAAE;IACFzB,YAAY;IACZR,aAAa;IACbiE,UAAU;IACV1B,MAAM;IACNC,SAAS;IACTc,iBAAiB;IACjBC;EAWF,CAAC,EAA+B;IAC9B,MAAM1D,QAAQ,GAAG,IAAI,CAACR,SAAS,CAACQ,QAAQ;IACxC,IAAI4Q,WAAW,GAAG,CAAC,CAAC;IACpB,MAAMC,iBAAoC,GAAG;MAC3C;MACAzO,EAAE,EAAE;QAAE8B,IAAI,EAAE9B,EAAE,CAAC8B,IAAI;QAAEN,KAAK,EAAExB,EAAE,CAACwB;MAAM,CAAC;MACtC+J,IAAI,EAAEvJ,UAAU;MAChB0M,MAAM,EAAEpO,MAAM,CAACkB,KAAK;MAAE;MACtBkI,IAAI,EAAEpJ,MAAM,CAACwB,IAAI;MAAE;MACnBxB;IACF,CAAC;IACDN,EAAE,GAAGoB,gBAAgB,GAAGA,gBAAgB,CAACpB,EAAE,GAAGA,EAAE;IAEhD,MAAMuB,cAAc,GAAG,MAAM3D,QAAQ,CAAC4D,KAAK,CAACC,iBAAiB,CAACzB,EAAE,CAAC;IACjE,MAAM2O,sBAAsB,GAAG,MAAM;MACnC,IAAI,CAACvN,gBAAgB,EAAE,MAAM,IAAIuF,KAAK,CAAC,yDAAyD,CAAC;MACjG,IAAI,CAACpG,SAAS,EAAE,MAAM,IAAIoG,KAAK,CAAC,kDAAkD,CAAC;MACnF,IAAI,EAACtF,iBAAiB,aAAjBA,iBAAiB,eAAjBA,iBAAiB,CAAEkK,IAAI,GAAE,MAAM,IAAI5E,KAAK,CAAC,uCAAuC,CAAC;MACtFpG,SAAS,CAACqO,YAAY,CAAC;QAAE5O,EAAE;QAAEuL,IAAI,EAAElK,iBAAiB,CAACkK;MAAK,CAAC,CAAC;MAC5DkD,iBAAiB,CAACnO,MAAM,GAAGC,SAAS,CAACuN,QAAQ,EAAE;MAC/CW,iBAAiB,CAAClD,IAAI,GAAGlK,iBAAiB,CAACkK,IAAI;MAC/CkD,iBAAiB,CAACI,SAAS,GAAG,IAAI;MAClCjR,QAAQ,CAAC4D,KAAK,CAACiB,OAAO,CAACG,kBAAkB,CAACkM,QAAQ,CAACL,iBAAiB,CAAC;MACrE,OAAO;QAAEzO,EAAE;QAAEwO;MAAY,CAAC;IAC5B,CAAC;IAED,MAAMO,uBAAuB,GAAG,MAAM;MACpC,IAAI,CAAC3N,gBAAgB,EAAE,MAAM,IAAIuF,KAAK,CAAE,mDAAkD3G,EAAE,CAACC,QAAQ,EAAG,EAAC,CAAC;MAC1GmB,gBAAgB,CAAC4N,KAAK,CAAChK,OAAO,CAAEiK,IAAI,IAAK;QACvCT,WAAW,CAAC,IAAAU,6BAAoB,EAACD,IAAI,CAACE,QAAQ,CAAC,CAAC,GAAGC,0BAAU,CAACC,SAAS;MACzE,CAAC,CAAC;IACJ,CAAC;IACD,IAAI9Q,YAAY,IAAIA,YAAY,CAACqC,YAAY,IAAI7C,aAAa,KAAKuR,4BAAY,CAACC,IAAI,EAAE;MACpFR,uBAAuB,EAAE;MACzBnR,QAAQ,CAAC4D,KAAK,CAACiB,OAAO,CAACG,kBAAkB,CAACkM,QAAQ,CAACL,iBAAiB,CAAC;MACrE,OAAO;QAAEzO,EAAE;QAAEwO;MAAY,CAAC;IAC5B;IACA,IAAI,CAAAnN,iBAAiB,aAAjBA,iBAAiB,uBAAjBA,iBAAiB,CAAEiM,QAAQ,MAAK,MAAM,EAAE;MAC1CyB,uBAAuB,EAAE;MACzB,OAAOJ,sBAAsB,EAAE;IACjC;IACA,MAAMa,QAAQ,GAAGxP,EAAE,CAACoJ,aAAa,CAACpH,UAAU,CAAC/B,QAAQ,EAAE,CAAC;IACxD,MAAMwP,QAAQ,GAAG,CAAClR,YAAY,IAAIR,aAAa,KAAKuR,4BAAY,CAACI,MAAM,GAAGF,QAAQ,GAAGxP,EAAE;IACvF,MAAM2P,eAAe,GAAG,MAAM/R,QAAQ,CAACgS,oCAAoC,CAACH,QAAQ,CAAC;IACrF,IAAIlR,YAAY,IAAIR,aAAa,KAAKuR,4BAAY,CAACI,MAAM,EAAE;MACzD;MACAC,eAAe,CAACzN,OAAO,GAAGlC,EAAE,CAACkC,OAAO;IACtC;IACA,MAAM8M,KAAK,GAAGW,eAAe,CAACX,KAAK;IACnCA,KAAK,CAAChK,OAAO,CAAEiK,IAAI,IAAK;MACtB;MACAT,WAAW,CAAC,IAAAU,6BAAoB,EAACD,IAAI,CAACE,QAAQ,CAAC,CAAC,GAAGC,0BAAU,CAACS,OAAO;IACvE,CAAC,CAAC;IAEF,IAAItR,YAAY,EAAE;MAChB;MACA,MAAM;QAAEiQ,WAAW,EAAEsB,cAAc;QAAEC;MAAc,CAAC,GAAG,IAAAC,uCAAoB,EAAChB,KAAK,EAAEzQ,YAAY,EAAER,aAAa,CAAC;MAC/G4R,eAAe,CAACX,KAAK,GAAGe,aAAa;MACrCvB,WAAW,mCAAQA,WAAW,GAAKsB,cAAc,CAAE;IACrD;IAEA,MAAMG,wBAAwB,GAAG;MAC/BrS,QAAQ;MACR4G,UAAU,EAAE,CAACmL,eAAe,CAAC;MAC7BtR,0BAA0B,EAAE,IAAI;MAChC6R,WAAW,EAAE,KAAK,CAAE;IACtB,CAAC;;IACD,MAAM,IAAI,CAACzS,eAAe,CAAC0S,SAAS,CAACF,wBAAwB,CAAC;IAE9D,IAAI3O,iBAAiB,EAAE;MACrB,IAAI,CAACqO,eAAe,CAACS,WAAW,EAAE;QAChC,MAAM,IAAIzJ,KAAK,CAAE,wCAAuC3G,EAAE,CAACC,QAAQ,EAAG,EAAC,CAAC;MAC1E;MACA,MAAMoQ,wBAAwB,GAAG/O,iBAAiB,CAACgP,2BAA2B,EAAE;MAChF,IAAID,wBAAwB,EAAE;QAC5B5B,iBAAiB,CAAC/I,YAAY,GAAG2K,wBAAwB;QACzD;QACA;MACF;IACF;;IAEA;IACA;IACA,IAAI9R,YAAY,EAAE;MAChB,IAAIA,YAAY,CAACqC,YAAY,IAAI7C,aAAa,KAAKuR,4BAAY,CAACiB,MAAM,EAAE;QACtE9B,iBAAiB,CAAC+B,aAAa,GAAGjS,YAAY,CAACwR,aAAa,CAACzQ,MAAM,CAAEmR,CAAC,IAAKA,CAAC,CAAC3L,QAAQ,CAAC,CAAClF,GAAG,CAAE6Q,CAAC,IAAKA,CAAC,CAACC,QAAQ,CAAC;MAC/G;MACA9S,QAAQ,CAAC4D,KAAK,CAACiB,OAAO,CAACG,kBAAkB,CAACkM,QAAQ,CAACL,iBAAiB,CAAC;IACvE,CAAC,MAAM,IAAIlO,SAAS,EAAE;MACpB,IAAIc,iBAAiB,EAAE;QACrB;QACA,OAAOsN,sBAAsB,EAAE;MACjC;MACApO,SAAS,CAACqO,YAAY,CAAC;QAAE5O,EAAE;QAAEuL,IAAI,EAAEvJ;MAAW,CAAC,CAAC;IAClD,CAAC,MAAM;MACL;MACAT,cAAc,CAACoP,OAAO,CAAC3O,UAAU,CAAC;MAClC;MACAT,cAAc,CAACqP,kBAAkB,CAAC5O,UAAU,CAAC/B,QAAQ,EAAE,CAAC;MACxDrC,QAAQ,CAAC4D,KAAK,CAACiB,OAAO,CAACC,GAAG,CAACnB,cAAc,CAAC;IAC5C;IAEA,OAAO;MAAEvB,EAAE;MAAEwO;IAAY,CAAC;EAC5B;EAEA,MAAc/P,UAAU,CAACoS,MAAgB,EAAgC;IACvE,MAAMjT,QAAQ,GAAG,IAAI,CAACR,SAAS,CAACQ,QAAQ;IACxC,MAAME,GAAG,GAAG,MAAM,IAAI,CAACgT,iBAAiB,CAACD,MAAM,CAAC;IAChD,MAAMlN,OAAO,GAAG,MAAM,IAAI,CAACpG,QAAQ,CAACA,QAAQ,CAAC;MAAEO,GAAG;MAAEiT,KAAK,EAAE;IAAK,CAAC,CAAC;IAClEjT,GAAG,CAACkH,OAAO,CAAEhF,EAAE,IAAKpC,QAAQ,CAAC4D,KAAK,CAACiB,OAAO,CAACG,kBAAkB,CAACoO,eAAe,CAAChR,EAAE,CAACiR,QAAQ,CAAC,CAAC;IAC3F,MAAMrT,QAAQ,CAAC4D,KAAK,CAACiB,OAAO,CAACG,kBAAkB,CAACC,KAAK,EAAE;IACvD,OAAO;MAAEqO,iBAAiB,EAAEvN,OAAO,CAACa;IAAW,CAAC;EAClD;EAEA,MAAchG,YAAY,CAACqS,MAAgB,EAAE/R,WAAmB,EAAEV,KAAc,EAAgC;IAC9G,MAAMN,GAAG,GAAG,MAAM,IAAI,CAACgT,iBAAiB,CAACD,MAAM,CAAC;IAChD;IACA,MAAM;MAAE9M;IAAkB,CAAC,GAAG,MAAM,IAAI,CAACzG,QAAQ,CAAC6T,IAAI,CAAC;MACrDC,YAAY,EAAE5H,eAAM,CAACC,SAAS,CAAC3L,GAAG,CAAC8B,GAAG,CAAEI,EAAE,IAAKA,EAAE,CAACqR,OAAO,CAAC,CAAC;MAC3DjT,KAAK;MACLD,OAAO,EAAEW;IACX,CAAC,CAAC;IACF,OAAO;MAAEwS,kBAAkB,EAAEvN;IAAkB,CAAC;EAClD;EAEA,MAAc3E,sBAAsB,CAClCV,MAAe,EACf4B,MAAc,EACdiR,eAA4B,EACK;IACjC,MAAMzT,GAAG,GAAG,MAAMoM,OAAO,CAACC,GAAG,CAC3BzL,MAAM,CAACkB,GAAG,CAAC,MAAO4R,KAAK,IAAK;MAC1B,MAAMC,eAAe,GAAGnR,MAAM,CAACqB,SAAS,EAAE,GAAG6P,KAAK,CAAChQ,KAAK,GAAGlB,MAAM,CAACkB,KAAK;MACvE,MAAMkQ,YAAY,GAAG9P,gBAAM,CAACC,IAAI,CAACvB,MAAM,CAACwB,IAAI,EAAE2P,eAAe,CAAW;MACxE,MAAMzP,UAAU,GAAG,MAAM,IAAI,CAACpE,QAAQ,CAAC4D,KAAK,CAACiB,OAAO,CAACkP,WAAW,CAAC1P,MAAM,CAACyP,YAAY,EAAEF,KAAK,CAAC;MAC5F,MAAMI,SAAS,GAAGF,YAAY,CAACzR,QAAQ,EAAE;MACzC,IAAI,CAAC+B,UAAU,EAAE;QACf,MAAM,KAAI5B,oBAAQ,EAAE,oCAAmCoR,KAAK,CAAC7G,sBAAsB,EAAG,SAAQiH,SAAU,GAAE,CAAC;MAC7G;MACA,OAAOJ,KAAK,CAACpI,aAAa,CAACpH,UAAU,CAAC/B,QAAQ,EAAE,CAAC;IACnD,CAAC,CAAC,CACH;IAED,OAAO,IAAI,CAACmI,cAAc,CAACtK,GAAG,EAAEyT,eAAe,EAAEA,eAAe,CAAC;EACnE;EAEA,MAActN,sBAAsB,CAClCrG,QAAkB,EAClBkB,WAAmB,EACnBV,KAAc,EACmF;IACjG,MAAMwE,kBAAkB,GAAGhF,QAAQ,CAAC4D,KAAK,CAACiB,OAAO,CAACG,kBAAkB,CAACiP,aAAa,EAAE;IACpF,IAAI,CAACrU,MAAM,CAAC2J,KAAK,CAAE,8CAA6CvE,kBAAkB,CAAClD,MAAM,CAACO,QAAQ,EAAG,aAAY,CAAC;IAClH,IAAI,CAAC2C,kBAAkB,CAAClD,MAAM,EAAE,OAAO,IAAI;IAC3C,MAAM5B,GAAG,GAAG0L,eAAM,CAACC,SAAS,CAAC7G,kBAAkB,CAAChD,GAAG,CAAEkS,CAAC,IAAK,KAAIC,cAAK,EAACD,CAAC,CAAC9R,EAAE,CAAC,CAAC,CAAC;IAC5E,OAAO,IAAI,CAAC1C,QAAQ,CAAC6T,IAAI,CAAC;MACxBC,YAAY,EAAEtT,GAAG;MACjBM,KAAK;MACLD,OAAO,EAAEW;IACX,CAAC,CAAC;EACJ;EAEA,MAAc8E,mBAAmB,CAACF,QAAiB,EAAEsO,UAAkB,EAAE5T,KAAc,EAA8B;IACnH,MAAMN,GAAG,GAAG4F,QAAQ,CAAC9D,GAAG,CAAEI,EAAE,IAAK;MAC/B,OAAOA,EAAE,CAAC2K,sBAAsB,EAAE;IACpC,CAAC,CAAC;IACF,IAAI,CAACnN,MAAM,CAAC2J,KAAK,CAAE,6CAA4CzD,QAAQ,CAAChE,MAAM,CAACO,QAAQ,EAAG,aAAY,CAAC;IACvG,OAAO,IAAI,CAAC3C,QAAQ,CAACkD,GAAG,CAAC;MACvB1C,GAAG;MACHM,KAAK;MACLD,OAAO,EAAE6T,UAAU;MACnBC,UAAU,EAAE;IACd,CAAC,CAAC;EACJ;EAEA,MAAcnB,iBAAiB,CAACoB,MAAiB,EAA0B;IACzE,IAAIA,MAAM,IAAIA,MAAM,CAACxS,MAAM,EAAE;MAC3B,MAAMyS,YAAY,GAAG,MAAM,IAAI,CAAC/U,SAAS,CAACgV,2BAA2B,CAACF,MAAM,CAAC;MAC7EC,YAAY,CAACnN,OAAO,CAAEhF,EAAE,IAAK;QAC3B,MAAMqS,KAAK,GAAG,IAAI,CAACjV,SAAS,CAACQ,QAAQ,CAAC4D,KAAK,CAACiB,OAAO,CAACG,kBAAkB,CAAC8H,QAAQ,CAAC1K,EAAE,CAACiR,QAAQ,CAAC;QAC5F,IAAI,CAACoB,KAAK,EAAE;UACV,MAAM,KAAIC,uBAAY,EAAE,2BAA0BtS,EAAE,CAACC,QAAQ,EAAG,kCAAiC,CAAC;QACpG;MACF,CAAC,CAAC;MACF,OAAOkS,YAAY;IACrB;IACA,MAAMI,oBAAoB,GAAG,IAAI,CAACnV,SAAS,CAACQ,QAAQ,CAAC4D,KAAK,CAACiB,OAAO,CAACG,kBAAkB,CAACiP,aAAa,EAAE;IACrG,IAAI,CAACU,oBAAoB,CAAC7S,MAAM,EAAE,MAAM,KAAI4S,uBAAY,EAAE,oDAAmD,CAAC;IAC9G,OAAOC,oBAAoB,CAAC3S,GAAG,CAAE4S,CAAC,IAAKC,0BAAW,CAACC,UAAU,CAAC,KAAIX,cAAK,EAACS,CAAC,CAACxS,EAAE,CAAC,CAAC,CAAC;EACjF;EAEQrB,oBAAoB,CAACf,QAAkB,EAAEE,GAAa,EAAW;IACvE,IAAI,IAAA6U,sBAAW,EAAC7U,GAAG,CAAC,EAAE;MACpB,MAAM8U,cAAc,GAAG,KAAIC,yBAAc,EAACjV,QAAQ,CAAC;MACnD,OAAOgV,cAAc,CAACE,+BAA+B,CAAChV,GAAG,CAAC;IAC5D;IACA,OAAOA,GAAG,CAAC8B,GAAG,CAAEI,EAAE,IAAKpC,QAAQ,CAACmV,WAAW,CAAC/S,EAAE,CAAC,CAAC;EAClD;EAeA,aAAagT,QAAQ,CAAC,CAACC,GAAG,EAAE7V,SAAS,EAAEE,QAAQ,EAAEC,QAAQ,EAAEF,OAAO,EAAE6V,UAAU,EAAEC,UAAU,EAAEzV,QAAQ,EAAEC,MAAM,CAU3G,EAAE;IACD,MAAMH,MAAM,GAAG0V,UAAU,CAACE,YAAY,CAACC,wBAAa,CAACrT,EAAE,CAAC;IACxD,MAAMsT,OAAO,GAAG,IAAIpW,WAAW,CAACE,SAAS,EAAEC,OAAO,EAAEC,QAAQ,EAAEC,QAAQ,EAAEC,MAAM,EAAE2V,UAAU,EAAEzV,QAAQ,EAAEC,MAAM,CAAC;IAC7GsV,GAAG,CAACM,QAAQ,CAAC,KAAIC,oBAAQ,EAACF,OAAO,CAAC,CAAC;IACnC,OAAOA,OAAO;EAChB;AACF;AAAC;AAAA,gCA94BYpW,WAAW,WAi3BP,EAAE;AAAA,gCAj3BNA,WAAW,kBAk3BA,CACpBuW,gBAAS,EACTC,oBAAe,EACfC,mBAAc,EACdC,0BAAc,EACdC,wBAAa,EACbC,sBAAY,EACZC,wCAAqB,EACrBC,mBAAc,EACdC,sBAAY,CACb;AAAA,gCA53BU/W,WAAW,aA63BLgX,kBAAW;AAmB9Bb,wBAAa,CAACc,UAAU,CAACjX,WAAW,CAAC"}

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@teambit/merging",
-  "version": "0.0.361",
+  "version": "0.0.363",
   "homepage": "https://bit.cloud/teambit/component/merging",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.component",
     "name": "merging",
-    "version": "0.0.361"
+    "version": "0.0.363"
   },
   "dependencies": {
     "lodash": "4.17.21",
@@ -17,20 +17,20 @@
     "@babel/runtime": "7.20.0",
     "@teambit/component-id": "0.0.427",
     "@teambit/harmony": "0.4.6",
-    "@teambit/dependency-resolver": "0.0.1046",
+    "@teambit/dependency-resolver": "0.0.1048",
     "@teambit/component-version": "0.0.408",
-    "@teambit/envs": "0.0.1046",
-    "@teambit/logger": "0.0.797",
+    "@teambit/envs": "0.0.1048",
+    "@teambit/logger": "0.0.798",
     "@teambit/bit-error": "0.0.402",
-    "@teambit/cli": "0.0.704",
-    "@teambit/checkout": "0.0.215",
-    "@teambit/component-writer": "0.0.82",
-    "@teambit/config": "0.0.717",
-    "@teambit/importer": "0.0.475",
-    "@teambit/install": "0.0.156",
-    "@teambit/lane-id": "0.0.221",
-    "@teambit/snapping": "0.0.361",
-    "@teambit/workspace": "0.0.1046"
+    "@teambit/cli": "0.0.705",
+    "@teambit/checkout": "0.0.217",
+    "@teambit/component-writer": "0.0.84",
+    "@teambit/config": "0.0.718",
+    "@teambit/importer": "0.0.477",
+    "@teambit/install": "0.0.158",
+    "@teambit/lane-id": "0.0.222",
+    "@teambit/snapping": "0.0.363",
+    "@teambit/workspace": "0.0.1048"
   },
   "devDependencies": {
     "@types/lodash": "4.14.165",
@@ -44,7 +44,7 @@
     "@types/testing-library__jest-dom": "5.9.5"
   },
   "peerDependencies": {
-    "@teambit/legacy": "1.0.483",
+    "@teambit/legacy": "1.0.484",
     "react": "^16.8.0 || ^17.0.0",
     "react-dom": "^16.8.0 || ^17.0.0"
   },