@teambit/merging 0.0.267 → 0.0.268

package/dist/config-merger.d.ts

@@ -34,7 +34,6 @@ export declare type MergeStrategyResult = {
 export declare class ConfigMerger {
     private compIdStr;
     private workspaceIds;
-    private otherLane;
     private currentAspects;
     private baseAspects;
     private otherAspects;

package/dist/config-merger.js

@@ -21,6 +21,13 @@ function _semver() {
   };
   return data;
 }
+function _componentVersion() {
+  const data = require("@teambit/component-version");
+  _componentVersion = function () {
+    return data;
+  };
+  return data;
+}
 function _dependencyResolver() {
   const data = require("@teambit/dependency-resolver");
   _dependencyResolver = function () {
@@ -78,7 +85,6 @@ class ConfigMerger {
   constructor(compIdStr, workspaceIds, otherLane, currentAspects, baseAspects, otherAspects, currentLabel, otherLabel) {
     this.compIdStr = compIdStr;
     this.workspaceIds = workspaceIds;
-    this.otherLane = otherLane;
     this.currentAspects = currentAspects;
     this.baseAspects = baseAspects;
     this.otherAspects = otherAspects;
@@ -125,9 +131,14 @@ class ConfigMerger {
       if (this.handledExtIds.includes(id)) return null;
       this.handledExtIds.push(id);
       if (otherExt.extensionId && otherExt.extensionId.hasVersion()) {
+        // if (this.compIdStr === 'teambit.dot-cloud/community-cloud') console.log('current', this.currentAspects);
         // avoid using the id from the other lane if it exits in the workspace. prefer the id from the workspace.
         const idFromWorkspace = this.getIdFromWorkspace(otherExt.extensionId.toStringWithoutVersion());
-        if (idFromWorkspace) id = idFromWorkspace._legacy.toString();
+        if (idFromWorkspace) {
+          const existingExt = this.currentAspects.findExtension(otherExt.extensionId.toStringWithoutVersion(), true);
+          if (existingExt) return null; // the aspect is set currently, no need to add it again.
+          id = idFromWorkspace._legacy.toString();
+        }
       }
       const baseExt = this.baseAspects.findExtension(id, true);
       if (baseExt) {
@@ -327,12 +338,12 @@ ${'>'.repeat(7)} ${this.otherLabel}
     const otherPolicy = this.getPolicy(otherConfig);
     const baseConfig = baseExt ? this.getConfig(baseExt) : undefined;
     const basePolicy = baseConfig ? this.getPolicy(baseConfig) : undefined;
-    const getAutoDeps = ext => {
+    const getAllDeps = ext => {
       var _ext$findCoreExtensio, _ext$findCoreExtensio2;
       const data = (_ext$findCoreExtensio = ext.findCoreExtension(_dependencyResolver().DependencyResolverAspect.id)) === null || _ext$findCoreExtensio === void 0 ? void 0 : _ext$findCoreExtensio.data.dependencies;
       if (!data) return [];
       const policy = ((_ext$findCoreExtensio2 = ext.findCoreExtension(_dependencyResolver().DependencyResolverAspect.id)) === null || _ext$findCoreExtensio2 === void 0 ? void 0 : _ext$findCoreExtensio2.data.policy) || [];
-      return data.filter(d => d.source === 'auto').map(d => {
+      return data.map(d => {
         const idWithoutVersion = d.__type === 'package' ? d.id : d.id.split('@')[0];
         const existingPolicy = policy.find(p => p.dependencyId === idWithoutVersion);
         const getPolicyVer = () => {
@@ -348,15 +359,34 @@ ${'>'.repeat(7)} ${this.otherLabel}
         });
       });
     };
-    const currentData = getAutoDeps(this.currentAspects);
+    const getDataPolicy = ext => {
+      var _ext$findCoreExtensio3;
+      return ((_ext$findCoreExtensio3 = ext.findCoreExtension(_dependencyResolver().DependencyResolverAspect.id)) === null || _ext$findCoreExtensio3 === void 0 ? void 0 : _ext$findCoreExtensio3.data.policy) || [];
+    };
+    const getAutoDeps = ext => {
+      const allDeps = getAllDeps(ext);
+      return allDeps.filter(d => d.source === 'auto');
+    };
+    const currentAutoData = getAutoDeps(this.currentAspects);
+    const currentAllData = getAllDeps(this.currentAspects);
+    const currentDataPolicy = getDataPolicy(this.currentAspects);
     const otherData = getAutoDeps(this.otherAspects);
-    const currentAndOtherData = (0, _lodash().uniqBy)(currentData.concat(otherData), d => d.id);
+    const currentAndOtherData = (0, _lodash().uniqBy)(currentAutoData.concat(otherData), d => d.id);
     const currentAndOtherComponentsData = currentAndOtherData.filter(c => c.__type === 'component');
     const baseData = getAutoDeps(this.baseAspects);
     const getCompIdStrByPkgNameFromData = pkgName => {
       const found = currentAndOtherComponentsData.find(d => d.packageName === pkgName);
       return found === null || found === void 0 ? void 0 : found.id;
     };
+    const getFromCurrentDataByPackageName = pkgName => {
+      return currentAllData.find(d => {
+        if (d.__type === 'package') return d.id === pkgName;
+        return d.packageName === pkgName;
+      });
+    };
+    const getFromCurrentDataPolicyByPackageName = pkgName => {
+      return currentDataPolicy.find(d => d.dependencyId === pkgName);
+    };
     const mergedPolicy = {
       dependencies: [],
       devDependencies: [],
@@ -367,7 +397,6 @@ ${'>'.repeat(7)} ${this.otherLabel}
       devDependencies: [],
       peerDependencies: []
     };
-    let isMerged = false;
     let hasConflict = false;
     const conflictIndicator = 'CONFLICT::';
     const lifecycleToDepType = {
@@ -382,13 +411,24 @@ ${'>'.repeat(7)} ${this.otherLabel}
           // no need to add if the id exists in the workspace (regardless the version)
           return;
         }
+        const fromCurrentData = getFromCurrentDataByPackageName(dep.dependencyId);
+        if (fromCurrentData && !dep.force) {
+          if (fromCurrentData.version === dep.value.version) return;
+          if (!(0, _componentVersion().isHash)(fromCurrentData.version) && !(0, _componentVersion().isHash)(dep.value.version) && _semver().default.satisfies(fromCurrentData.version, dep.value.version)) {
+            return;
+          }
+        }
+        const fromCurrentDataPolicy = getFromCurrentDataPolicyByPackageName(dep.dependencyId);
+        if (fromCurrentDataPolicy && fromCurrentDataPolicy.value.version === dep.value.version) {
+          // that's a bug. if it's in the data.policy, it should be in data.dependencies.
+          return;
+        }
         const depType = lifecycleToDepType[dep.lifecycleType];
         mergedPolicy[depType].push({
           name: dep.dependencyId,
           version: dep.value.version,
           force: dep.force
         });
-        isMerged = true;
       };
       if (this.areConfigsEqual(currentConfig, otherConfig)) {
         return;
@@ -407,7 +447,6 @@ ${'>'.repeat(7)} ${this.otherLabel}
             addVariantPolicyEntryToPolicy(dep);
           });
         }
-        isMerged = true;
         return;
       }
 
@@ -476,7 +515,6 @@ ${'>'.repeat(7)} ${this.otherLabel}
         version: dep.policy || dep.version,
         force: false
       });
-      isMerged = true;
     };
 
     // uncomment to debug
@@ -486,12 +524,13 @@ ${'>'.repeat(7)} ${this.otherLabel}
     // console.log('otherData', baseData.length, '\n', baseData.map((d) => `${d.__type} ${d.id} ${d.version}`).join('\n'));
     // console.log('** END **\n\n');
 
+    // eslint-disable-next-line complexity
     currentAndOtherData.forEach(depData => {
       if (this.isEnv(depData.id)) {
         // ignore the envs
         return;
       }
-      const currentDep = currentData.find(d => d.id === depData.id);
+      const currentDep = currentAllData.find(d => d.id === depData.id);
       const otherDep = otherData.find(d => d.id === depData.id);
       if (!otherDep) {
         return;
@@ -501,6 +540,14 @@ ${'>'.repeat(7)} ${this.otherLabel}
         addSerializedDepToPolicy(otherDep);
         return;
       }
+      if (currentDep.policy && otherDep.policy && (0, _dependencyResolver().isRange)(currentDep.policy, currentDep.id) && (0, _dependencyResolver().isRange)(otherDep.policy, otherDep.id)) {
+        if (_semver().default.satisfies(currentDep.version, otherDep.policy)) {
+          return;
+        }
+        if (_semver().default.satisfies(otherDep.version, currentDep.policy)) {
+          return;
+        }
+      }
       const currentId = currentDep.id;
       const currentVer = currentDep.policy || currentDep.version;
       const otherVer = otherDep.policy || otherDep.version;
@@ -516,25 +563,35 @@ ${'>'.repeat(7)} ${this.otherLabel}
         // dependencies that exist in the workspace, should be ignored. they'll be resolved later to the version in the ws.
         return;
       }
+      const depType = lifecycleToDepType[currentDep.lifecycle];
+      if (hasConfigForDep(depType, currentDep.id)) {
+        return; // there is already config for it.
+      }
+
       if (baseVer && baseVer === currentVer) {
         addSerializedDepToPolicy(otherDep);
         return;
       }
       // either no baseVal, or baseVal is also different from both: other and local. that's probably a conflict.
-      const depType = lifecycleToDepType[currentDep.lifecycle];
-      if (hasConfigForDep(depType, currentDep.id)) {
-        return; // there is already config for it.
-      }
+
+      // @todo: this should be the correct way to check satisfies. currently, it doesn't work correctly because there is no policy
       // try to resolve according to semver
-      if (currentDep.policy && otherDep.policy && (0, _dependencyResolver().isRange)(currentDep.policy, currentDep.id) && (0, _dependencyResolver().isRange)(otherDep.policy, otherDep.id)) {
-        if (_semver().default.satisfies(currentDep.version, otherDep.policy)) {
-          return;
-        }
-        if (_semver().default.satisfies(otherDep.version, currentDep.policy)) {
-          addSerializedDepToPolicy(otherDep);
-          return;
-        }
-      }
+      // if (
+      //   currentDep.policy &&
+      //   otherDep.policy &&
+      //   isRange(currentDep.policy, currentDep.id) &&
+      //   isRange(otherDep.policy, otherDep.id)
+      // ) {
+      //   if (this.compIdStr.includes('teambit.dot-graph/ui/graph!')) console.log('DATA working on ', depData.id, 'POLICY');
+      //   if (semver.satisfies(currentDep.version, otherDep.policy)) {
+      //     return;
+      //   }
+      //   if (semver.satisfies(otherDep.version, currentDep.policy)) {
+      //     if (this.compIdStr.includes('teambit.dot-graph/ui/graph!')) console.log('DATA working on ', depData.id, 'FINAL');
+      //     addSerializedDepToPolicy(otherDep);
+      //     return;
+      //   }
+      // }
       hasConflict = true;
       conflictedPolicy[depType].push({
         name: getDepIdAsPkgName(currentDep),
@@ -565,7 +622,7 @@ ${'>'.repeat(7)} ${this.otherLabel}`;
       conflictLines.unshift(`"${params.id}": {`);
       conflictStr = conflictLines.join('\n');
     }
-    const config = isMerged ? {
+    const config = Object.keys(mergedPolicy).length ? {
       policy: mergedPolicy
     } : undefined;
     return {

package/dist/config-merger.js.map

@@ -1 +1 @@
-{"version":3,"names":["ConfigMerger","constructor","compIdStr","workspaceIds","otherLane","currentAspects","baseAspects","otherAspects","currentLabel","otherLabel","otherLaneIdsStr","components","map","c","id","toStringWithoutVersion","merge","populateEnvs","results","currentExt","stringId","handledExtIds","includes","push","baseExt","findExtension","otherExt","mergePerStrategy","basicConflictGenerator","currentConfig","getConfig","otherConfig","otherAspectsNotHandledResults","extensionId","hasVersion","idFromWorkspace","getIdFromWorkspace","_legacy","toString","mergedConfig","envResult","envStrategy","ConfigMergeResult","compact","getEnvId","ext","envsAspect","findCoreExtension","EnvsAspect","Error","env","config","data","currentEnv","otherEnv","baseEnv","undefined","currentEnvAspect","version","otherEnvAspect","baseEnvAspect","mergeStrategyParams","baseConfig","isIdInWorkspace","basicConfigMerge","areConfigsEqual","configA","configB","JSON","stringify","depResolverResult","depResolverStrategy","mergeStrategyConfigParams","conflict","repeat","formatConfig","conf","confStr","confStrSplit","split","shift","pop","join","params","DependencyResolverAspect","currentPolicy","getPolicy","otherPolicy","basePolicy","getAutoDeps","dependencies","policy","filter","d","source","idWithoutVersion","__type","existingPolicy","find","p","dependencyId","getPolicyVer","value","semver","valid","startsWith","currentData","otherData","currentAndOtherData","uniqBy","concat","currentAndOtherComponentsData","baseData","getCompIdStrByPkgNameFromData","pkgName","found","packageName","mergedPolicy","devDependencies","peerDependencies","conflictedPolicy","isMerged","hasConflict","conflictIndicator","lifecycleToDepType","runtime","dev","peer","handleConfigMerge","addVariantPolicyEntryToPolicy","dep","depType","lifecycleType","name","force","length","forEach","currentAndOtherConfig","currentDep","otherDep","baseDep","currentVer","otherVer","baseVer","hasConfigForDep","depName","getDepIdAsPkgName","addSerializedDepToPolicy","lifecycle","depData","isEnv","currentId","isRange","satisfies","conflictStr","mergedConfigSplit","conflictLines","line","currentVal","otherVal","unshift","Boolean","rawConfig","omit","VariantPolicy","fromConfigObject","entries"],"sources":["config-merger.ts"],"sourcesContent":["import { ComponentID } from '@teambit/component-id';\nimport semver from 'semver';\nimport {\n  DependencyResolverAspect,\n  isRange,\n  SerializedDependency,\n  VariantPolicy,\n  VariantPolicyEntry,\n} from '@teambit/dependency-resolver';\nimport { 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\ntype GenericConfigOrRemoved = Record<string, any> | '-';\n\ntype EnvData = { id: string; version?: string; config?: GenericConfigOrRemoved };\n\ntype SerializedDependencyWithPolicy = SerializedDependency & { policy?: string; packageName?: string };\n\nexport type MergeStrategyResult = {\n  id: string;\n  mergedConfig?: GenericConfigOrRemoved;\n  conflict?: string;\n};\ntype MergeStrategyParamsWithRemoved = {\n  id: string;\n  currentConfig: GenericConfigOrRemoved;\n  otherConfig: GenericConfigOrRemoved;\n  baseConfig?: GenericConfigOrRemoved;\n};\ntype MergeStrategyParams = {\n  id: string;\n  currentExt: ExtensionDataEntry;\n  otherExt: ExtensionDataEntry;\n  baseExt?: ExtensionDataEntry;\n};\n\n/**\n * perform 3-way merge of component configuration (aspects).\n * normally this is needed when merging one lane into another. the component may have different aspects config in each lane.\n * the baseAspects are the aspects of the component in the diversion point (the common ancestor of the two lanes).\n * the currentAspects are the aspects of the component in the current lane.\n * the otherAspects are the aspects of the component in the other lane. this is the lane we merge into the current lane.\n *\n * the basic merging strategy is a simple comparison between the aspect-configs, if they're different, we have a conflict.\n * we have two special cases:\n *\n * 1. dependency-resolver: we do a deeper check for the policy, we compare each dependency separately. also, we take\n * into account not only the config, but also the data. this is needed because some dependencies are automatically\n * added by Bit (from the import statements in the code) and they're not in the config. the final config has the deps\n * from both sources, the config and the data. The way we know to differentiate between them is by the \"force\" prop.\n * the config has always force: true.\n *\n * 2. envs: if we don't treat it specially, the user will need to make the change not only in the envs aspect, but also\n * in the deps-resolver (because the env is added as a devDependency) and also in the aspect itself (because\n * teambit.envs/env has only the id and not the version). to make it simpler, we ignore the envs in the deps-resolver\n * we ignore the individual aspect that is the env itself. we only show teambit.envs/env and we put the env id and\n * version. later, when the component is loaded, we split the id and the version and put them in the correct places.\n * see workspace.componentExtension / adjustEnvsOnConfigMerge for more details.\n */\nexport class ConfigMerger {\n  private currentEnv: EnvData;\n  private otherEnv: EnvData;\n  private baseEnv?: EnvData;\n  private handledExtIds: string[] = [];\n  private otherLaneIdsStr: string[];\n  constructor(\n    private compIdStr: string,\n    private workspaceIds: ComponentID[],\n    private otherLane: Lane | undefined,\n    private currentAspects: ExtensionDataList,\n    private baseAspects: ExtensionDataList,\n    private otherAspects: ExtensionDataList,\n    private currentLabel: string,\n    private otherLabel: string\n  ) {\n    this.otherLaneIdsStr = otherLane?.components.map((c) => c.id.toStringWithoutVersion()) || [];\n  }\n\n  merge(): ConfigMergeResult {\n    this.populateEnvs();\n    const results = this.currentAspects.map((currentExt) => {\n      const id = currentExt.stringId;\n      if (this.handledExtIds.includes(id)) return null;\n      this.handledExtIds.push(id);\n      const baseExt = this.baseAspects.findExtension(id, true);\n      const otherExt = this.otherAspects.findExtension(id, true);\n      if (otherExt) {\n        // try to 3-way-merge\n        return this.mergePerStrategy({ id, currentExt, otherExt, baseExt });\n      }\n      // exist in current but not in other\n      if (baseExt) {\n        // was removed on other\n        return this.basicConflictGenerator({ id, currentConfig: this.getConfig(currentExt), otherConfig: '-' });\n      }\n      // exist in current but not in other and base, so it got created on current. nothing to do.\n      return null;\n    });\n    const otherAspectsNotHandledResults = this.otherAspects.map((otherExt) => {\n      let id = otherExt.stringId;\n      if (this.handledExtIds.includes(id)) return null;\n      this.handledExtIds.push(id);\n      if (otherExt.extensionId && otherExt.extensionId.hasVersion()) {\n        // avoid using the id from the other lane if it exits in the workspace. prefer the id from the workspace.\n        const idFromWorkspace = this.getIdFromWorkspace(otherExt.extensionId.toStringWithoutVersion());\n        if (idFromWorkspace) id = idFromWorkspace._legacy.toString();\n      }\n      const baseExt = this.baseAspects.findExtension(id, true);\n      if (baseExt) {\n        // was removed on current\n        return this.basicConflictGenerator({ id, currentConfig: '-', otherConfig: this.getConfig(otherExt) });\n      }\n      // exist in other but not in current and base, so it got created on other.\n      return { id, mergedConfig: this.getConfig(otherExt) };\n    });\n    const envResult = [this.envStrategy()] || [];\n    return new ConfigMergeResult(this.compIdStr, compact([...results, ...otherAspectsNotHandledResults, ...envResult]));\n  }\n\n  private populateEnvs() {\n    // populate ids\n    const getEnvId = (ext: ExtensionDataList) => {\n      const envsAspect = ext.findCoreExtension(EnvsAspect.id);\n      if (!envsAspect) throw new Error(`unable to find ${EnvsAspect.id} aspect for ${this.compIdStr}`);\n      const env = envsAspect.config.env || envsAspect.data.id;\n      if (!env)\n        throw new Error(`unable to find env for ${this.compIdStr}, the config and data of ${EnvsAspect.id} are empty}`);\n      return env;\n    };\n    const currentEnv = getEnvId(this.currentAspects);\n    this.currentEnv = { id: currentEnv };\n    const otherEnv = getEnvId(this.otherAspects);\n    this.otherEnv = { id: otherEnv };\n    const baseEnv = this.baseAspects ? getEnvId(this.baseAspects) : undefined;\n    if (baseEnv) this.baseEnv = { id: baseEnv };\n\n    // populate version\n    const currentEnvAspect = this.currentAspects.findExtension(currentEnv, true);\n    if (currentEnvAspect) {\n      this.handledExtIds.push(currentEnvAspect.stringId);\n      this.currentEnv.version = currentEnvAspect.extensionId?.version;\n      this.currentEnv.config = this.getConfig(currentEnvAspect);\n    }\n    const otherEnvAspect = this.otherAspects.findExtension(otherEnv, true);\n    if (otherEnvAspect) {\n      this.handledExtIds.push(otherEnvAspect.stringId);\n      this.otherEnv.version = otherEnvAspect.extensionId?.version;\n      this.otherEnv.config = this.getConfig(otherEnvAspect);\n    }\n    if (this.baseEnv) {\n      const baseEnvAspect = this.baseAspects.findExtension(baseEnv, true);\n      if (baseEnvAspect) {\n        this.baseEnv.version = baseEnvAspect.extensionId?.version;\n        this.baseEnv.config = this.getConfig(baseEnvAspect);\n      }\n    }\n  }\n\n  private envStrategy(): MergeStrategyResult | null {\n    const mergeStrategyParams: MergeStrategyParamsWithRemoved = {\n      id: EnvsAspect.id,\n      currentConfig: {\n        env: this.currentEnv.version ? `${this.currentEnv.id}@${this.currentEnv.version}` : this.currentEnv.id,\n      },\n      otherConfig: { env: this.otherEnv.version ? `${this.otherEnv.id}@${this.otherEnv.version}` : this.otherEnv.id },\n    };\n    if (this.baseEnv) {\n      mergeStrategyParams.baseConfig = {\n        env: this.baseEnv?.version ? `${this.baseEnv.id}@${this.baseEnv.version}` : this.baseEnv?.id,\n      };\n    }\n    if (this.currentEnv.id === this.otherEnv.id && this.currentEnv.version === this.otherEnv.version) {\n      return null;\n    }\n    if (this.isIdInWorkspace(this.currentEnv.id)) {\n      // the env currently used is part of the workspace, that's what the user needs. don't try to resolve anything.\n      return null;\n    }\n    return this.basicConfigMerge(mergeStrategyParams);\n  }\n\n  private areConfigsEqual(configA: GenericConfigOrRemoved, configB: GenericConfigOrRemoved) {\n    return JSON.stringify(configA) === JSON.stringify(configB);\n  }\n\n  private mergePerStrategy(mergeStrategyParams: MergeStrategyParams): MergeStrategyResult | null {\n    const { id, currentExt, otherExt, baseExt } = mergeStrategyParams;\n    const depResolverResult = this.depResolverStrategy(mergeStrategyParams);\n    if (depResolverResult) {\n      // 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    const mergeStrategyConfigParams = { id, currentConfig, otherConfig, baseConfig };\n    return this.basicConflictGenerator(mergeStrategyConfigParams);\n  }\n\n  private basicConflictGenerator({\n    id,\n    currentConfig,\n    otherConfig,\n  }: MergeStrategyParamsWithRemoved): MergeStrategyResult {\n    // uncomment to debug\n    // console.log('basicConflictGenerator', this.compIdStr, id, 'currentConfig', currentConfig, 'otherConfig', otherConfig);\n    let conflict: string;\n    if (currentConfig === '-') {\n      conflict = `${'<'.repeat(7)} ${this.currentLabel}\n\"${id}\": \"-\"\n=======\n\"${id}\": ${JSON.stringify(otherConfig, undefined, 2)}\n${'>'.repeat(7)} ${this.otherLabel}`;\n    } else if (otherConfig === '-') {\n      conflict = `${'<'.repeat(7)} ${this.currentLabel}\n\"${id}\": ${JSON.stringify(currentConfig, undefined, 2)}\n=======\n\"${id}\": \"-\"\n${'>'.repeat(7)} ${this.otherLabel}`;\n    } else {\n      const formatConfig = (conf: GenericConfigOrRemoved) => {\n        const confStr = JSON.stringify(conf, undefined, 2);\n        const confStrSplit = confStr.split('\\n');\n        confStrSplit.shift(); // remove first {\n        confStrSplit.pop(); // remove last }\n        return confStrSplit.join('\\n');\n      };\n      conflict = `\"${id}\": {\n${'<'.repeat(7)} ${this.currentLabel}\n${formatConfig(currentConfig)}\n=======\n${formatConfig(otherConfig)}\n${'>'.repeat(7)} ${this.otherLabel}\n}`;\n    }\n\n    return { id, conflict };\n  }\n\n  private depResolverStrategy(params: MergeStrategyParams): MergeStrategyResult | undefined {\n    if (params.id !== DependencyResolverAspect.id) return undefined;\n    const { currentExt, otherExt, baseExt } = params;\n\n    const currentConfig = this.getConfig(currentExt);\n    const currentPolicy = this.getPolicy(currentConfig);\n    const otherConfig = this.getConfig(otherExt);\n    const otherPolicy = this.getPolicy(otherConfig);\n\n    const baseConfig = baseExt ? this.getConfig(baseExt) : undefined;\n    const basePolicy = baseConfig ? this.getPolicy(baseConfig) : undefined;\n\n    const getAutoDeps = (ext: ExtensionDataList): SerializedDependencyWithPolicy[] => {\n      const data = ext.findCoreExtension(DependencyResolverAspect.id)?.data.dependencies;\n      if (!data) return [];\n      const policy = ext.findCoreExtension(DependencyResolverAspect.id)?.data.policy || [];\n      return data\n        .filter((d) => d.source === 'auto')\n        .map((d) => {\n          const idWithoutVersion = d.__type === 'package' ? d.id : d.id.split('@')[0];\n          const existingPolicy = policy.find((p) => p.dependencyId === idWithoutVersion);\n          const getPolicyVer = () => {\n            if (d.__type === 'package') return undefined; // for packages, the policy is already the version\n            if (existingPolicy) return existingPolicy.value.version; // currently it's missing, will be implemented by @Gilad\n            if (!semver.valid(d.version)) return d.version; // could be a hash\n            // default to `^` or ~ if starts with zero, until we save the policy from the workspace during tag/snap.\n            return d.version.startsWith('0.') ? `~${d.version}` : `^${d.version}`;\n          };\n          return {\n            ...d,\n            id: idWithoutVersion,\n            policy: getPolicyVer(),\n          };\n        });\n    };\n\n    const currentData = getAutoDeps(this.currentAspects);\n    const otherData = getAutoDeps(this.otherAspects);\n    const currentAndOtherData = uniqBy(currentData.concat(otherData), (d) => d.id);\n    const 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 mergedPolicy = {\n      dependencies: [],\n      devDependencies: [],\n      peerDependencies: [],\n    };\n    const conflictedPolicy = {\n      dependencies: [],\n      devDependencies: [],\n      peerDependencies: [],\n    };\n    let isMerged = false;\n    let hasConflict = false;\n    const conflictIndicator = 'CONFLICT::';\n    const lifecycleToDepType = {\n      runtime: 'dependencies',\n      dev: 'devDependencies',\n      peer: 'peerDependencies',\n    };\n    const handleConfigMerge = () => {\n      const addVariantPolicyEntryToPolicy = (dep: VariantPolicyEntry) => {\n        const 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 depType = lifecycleToDepType[dep.lifecycleType];\n        mergedPolicy[depType].push({\n          name: dep.dependencyId,\n          version: dep.value.version,\n          force: dep.force,\n        });\n        isMerged = true;\n      };\n\n      if (this.areConfigsEqual(currentConfig, otherConfig)) {\n        return;\n      }\n      if (baseConfig && this.areConfigsEqual(baseConfig, otherConfig)) {\n        // was changed on current\n        return;\n      }\n      if (currentConfig === '-' || otherConfig === '-') {\n        throw new Error('not implemented. Is it possible to have it as minus?');\n      }\n      if (baseConfig && this.areConfigsEqual(baseConfig, currentConfig)) {\n        // was changed on other\n        if (otherPolicy.length) {\n          otherPolicy.forEach((dep) => {\n            addVariantPolicyEntryToPolicy(dep);\n          });\n        }\n        isMerged = true;\n        return;\n      }\n\n      // either no baseConfig, or baseConfig is also different from both: other and local. that's a conflict.\n      if (!currentConfig.policy && !otherConfig.policy) return;\n      const currentAndOtherConfig = uniqBy(currentPolicy.concat(otherPolicy), (d) => d.dependencyId);\n      currentAndOtherConfig.forEach((dep) => {\n        const depType = lifecycleToDepType[dep.lifecycleType];\n        const currentDep = currentPolicy.find((d) => d.dependencyId === dep.dependencyId);\n        const otherDep = otherPolicy.find((d) => d.dependencyId === dep.dependencyId);\n        const baseDep = basePolicy?.find((d) => d.dependencyId === dep.dependencyId);\n\n        if (!otherDep) {\n          return;\n        }\n        if (!currentDep) {\n          // only on other\n          addVariantPolicyEntryToPolicy(otherDep);\n          return;\n        }\n        const currentVer = currentDep.value.version;\n        const otherVer = otherDep.value.version;\n        if (currentVer === otherVer) {\n          return;\n        }\n        const baseVer = baseDep?.value.version;\n        if (baseVer && baseVer === otherVer) {\n          return;\n        }\n        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      isMerged = true;\n    };\n\n    // uncomment to debug\n    // console.log('\\n\\n**************', this.compIdStr, '**************');\n    // console.log('currentData', currentData.length, '\\n', currentData.map((d) => `${d.__type} ${d.id} ${d.version}`).join('\\n'));\n    // console.log('otherData', otherData.length, '\\n', otherData.map((d) => `${d.__type} ${d.id} ${d.version}`).join('\\n'));\n    // console.log('otherData', baseData.length, '\\n', baseData.map((d) => `${d.__type} ${d.id} ${d.version}`).join('\\n'));\n    // console.log('** END **\\n\\n');\n\n    currentAndOtherData.forEach((depData) => {\n      if (this.isEnv(depData.id)) {\n        // ignore the envs\n        return;\n      }\n      const currentDep = currentData.find((d) => d.id === depData.id);\n      const otherDep = otherData.find((d) => d.id === depData.id);\n      if (!otherDep) {\n        return;\n      }\n      if (!currentDep) {\n        // only on other\n        addSerializedDepToPolicy(otherDep);\n        return;\n      }\n      const currentId = currentDep.id;\n      const currentVer = currentDep.policy || currentDep.version;\n      const otherVer = otherDep.policy || otherDep.version;\n      if (currentVer === otherVer) {\n        return;\n      }\n      const baseDep = baseData.find((d) => d.id === currentId);\n      const baseVer = baseDep?.policy || baseDep?.version;\n      if (baseVer && baseVer === otherVer) {\n        return;\n      }\n      if (currentDep.__type === 'component' && this.isIdInWorkspace(currentId)) {\n        // dependencies that exist in the workspace, should be ignored. they'll be resolved later to the version in the ws.\n        return;\n      }\n      if (baseVer && baseVer === currentVer) {\n        addSerializedDepToPolicy(otherDep);\n        return;\n      }\n      // either no baseVal, or baseVal is also different from both: other and local. that's probably a conflict.\n      const depType = lifecycleToDepType[currentDep.lifecycle];\n      if (hasConfigForDep(depType, currentDep.id)) {\n        return; // there is already config for it.\n      }\n      // try to resolve according to semver\n      if (\n        currentDep.policy &&\n        otherDep.policy &&\n        isRange(currentDep.policy, currentDep.id) &&\n        isRange(otherDep.policy, otherDep.id)\n      ) {\n        if (semver.satisfies(currentDep.version, otherDep.policy)) {\n          return;\n        }\n        if (semver.satisfies(otherDep.version, currentDep.policy)) {\n          addSerializedDepToPolicy(otherDep);\n          return;\n        }\n      }\n      hasConflict = true;\n      conflictedPolicy[depType].push({\n        name: getDepIdAsPkgName(currentDep),\n        version: `${conflictIndicator}${currentVer}::${otherVer}::`,\n        force: false,\n      });\n    });\n\n    ['dependencies', 'devDependencies', 'peerDependencies'].forEach((depType) => {\n      if (!mergedPolicy[depType].length) delete mergedPolicy[depType];\n      if (!conflictedPolicy[depType].length) delete conflictedPolicy[depType];\n    });\n\n    let conflictStr: string | undefined;\n    if (hasConflict) {\n      const mergedConfigSplit = JSON.stringify({ policy: conflictedPolicy }, undefined, 2).split('\\n');\n      const conflictLines = mergedConfigSplit.map((line) => {\n        if (!line.includes(conflictIndicator)) return line;\n        const [, currentVal, otherVal] = line.split('::');\n        return `${'<'.repeat(7)} ${this.currentLabel}\n        \"version\": \"${currentVal}\",\n=======\n        \"version\": \"${otherVal}\",\n${'>'.repeat(7)} ${this.otherLabel}`;\n      });\n      // replace the first line with line with the id\n      conflictLines.shift();\n      conflictLines.unshift(`\"${params.id}\": {`);\n      conflictStr = conflictLines.join('\\n');\n    }\n    const config = isMerged ? { policy: mergedPolicy } : undefined;\n\n    return { id: params.id, mergedConfig: config, conflict: conflictStr };\n  }\n\n  private isIdInWorkspace(id: string): boolean {\n    return Boolean(this.getIdFromWorkspace(id)) || 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":["ConfigMerger","constructor","compIdStr","workspaceIds","otherLane","currentAspects","baseAspects","otherAspects","currentLabel","otherLabel","otherLaneIdsStr","components","map","c","id","toStringWithoutVersion","merge","populateEnvs","results","currentExt","stringId","handledExtIds","includes","push","baseExt","findExtension","otherExt","mergePerStrategy","basicConflictGenerator","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","mergeStrategyConfigParams","conflict","repeat","formatConfig","conf","confStr","confStrSplit","split","shift","pop","join","params","DependencyResolverAspect","currentPolicy","getPolicy","otherPolicy","basePolicy","getAllDeps","dependencies","policy","d","idWithoutVersion","__type","existingPolicy","find","p","dependencyId","getPolicyVer","value","semver","valid","startsWith","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","conflictIndicator","lifecycleToDepType","runtime","dev","peer","handleConfigMerge","addVariantPolicyEntryToPolicy","dep","fromCurrentData","force","isHash","satisfies","fromCurrentDataPolicy","depType","lifecycleType","name","length","forEach","currentAndOtherConfig","currentDep","otherDep","baseDep","currentVer","otherVer","baseVer","hasConfigForDep","depName","getDepIdAsPkgName","addSerializedDepToPolicy","lifecycle","depData","isEnv","isRange","currentId","conflictStr","mergedConfigSplit","conflictLines","line","currentVal","otherVal","unshift","Object","keys","Boolean","rawConfig","omit","VariantPolicy","fromConfigObject","entries"],"sources":["config-merger.ts"],"sourcesContent":["import { ComponentID } from '@teambit/component-id';\nimport semver from 'semver';\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\ntype GenericConfigOrRemoved = Record<string, any> | '-';\n\ntype EnvData = { id: string; version?: string; config?: GenericConfigOrRemoved };\n\ntype SerializedDependencyWithPolicy = SerializedDependency & { policy?: string; packageName?: string };\n\nexport type MergeStrategyResult = {\n  id: string;\n  mergedConfig?: GenericConfigOrRemoved;\n  conflict?: string;\n};\ntype MergeStrategyParamsWithRemoved = {\n  id: string;\n  currentConfig: GenericConfigOrRemoved;\n  otherConfig: GenericConfigOrRemoved;\n  baseConfig?: GenericConfigOrRemoved;\n};\ntype MergeStrategyParams = {\n  id: string;\n  currentExt: ExtensionDataEntry;\n  otherExt: ExtensionDataEntry;\n  baseExt?: ExtensionDataEntry;\n};\n\n/**\n * perform 3-way merge of component configuration (aspects).\n * normally this is needed when merging one lane into another. the component may have different aspects config in each lane.\n * the baseAspects are the aspects of the component in the diversion point (the common ancestor of the two lanes).\n * the currentAspects are the aspects of the component in the current lane.\n * the otherAspects are the aspects of the component in the other lane. this is the lane we merge into the current lane.\n *\n * the basic merging strategy is a simple comparison between the aspect-configs, if they're different, we have a conflict.\n * we have two special cases:\n *\n * 1. dependency-resolver: we do a deeper check for the policy, we compare each dependency separately. also, we take\n * into account not only the config, but also the data. this is needed because some dependencies are automatically\n * added by Bit (from the import statements in the code) and they're not in the config. the final config has the deps\n * from both sources, the config and the data. The way we know to differentiate between them is by the \"force\" prop.\n * the config has always force: true.\n *\n * 2. envs: if we don't treat it specially, the user will need to make the change not only in the envs aspect, but also\n * in the deps-resolver (because the env is added as a devDependency) and also in the aspect itself (because\n * teambit.envs/env has only the id and not the version). to make it simpler, we ignore the envs in the deps-resolver\n * we ignore the individual aspect that is the env itself. we only show teambit.envs/env and we put the env id and\n * version. later, when the component is loaded, we split the id and the version and put them in the correct places.\n * see workspace.componentExtension / adjustEnvsOnConfigMerge for more details.\n */\nexport class ConfigMerger {\n  private currentEnv: EnvData;\n  private otherEnv: EnvData;\n  private baseEnv?: EnvData;\n  private handledExtIds: string[] = [];\n  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  ) {\n    this.otherLaneIdsStr = otherLane?.components.map((c) => c.id.toStringWithoutVersion()) || [];\n  }\n\n  merge(): ConfigMergeResult {\n    this.populateEnvs();\n    const results = this.currentAspects.map((currentExt) => {\n      const id = currentExt.stringId;\n      if (this.handledExtIds.includes(id)) return null;\n      this.handledExtIds.push(id);\n      const baseExt = this.baseAspects.findExtension(id, true);\n      const otherExt = this.otherAspects.findExtension(id, true);\n      if (otherExt) {\n        // try to 3-way-merge\n        return this.mergePerStrategy({ id, currentExt, otherExt, baseExt });\n      }\n      // exist in current but not in other\n      if (baseExt) {\n        // was removed on other\n        return this.basicConflictGenerator({ id, currentConfig: this.getConfig(currentExt), otherConfig: '-' });\n      }\n      // exist in current but not in other and base, so it got created on current. nothing to do.\n      return null;\n    });\n    const otherAspectsNotHandledResults = this.otherAspects.map((otherExt) => {\n      let id = otherExt.stringId;\n      if (this.handledExtIds.includes(id)) return null;\n      this.handledExtIds.push(id);\n      if (otherExt.extensionId && otherExt.extensionId.hasVersion()) {\n        // if (this.compIdStr === 'teambit.dot-cloud/community-cloud') console.log('current', this.currentAspects);\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 this.basicConflictGenerator({ id, currentConfig: '-', otherConfig: this.getConfig(otherExt) });\n      }\n      // exist in other but not in current and base, so it got created on other.\n      return { id, mergedConfig: this.getConfig(otherExt) };\n    });\n    const envResult = [this.envStrategy()] || [];\n    return new ConfigMergeResult(this.compIdStr, compact([...results, ...otherAspectsNotHandledResults, ...envResult]));\n  }\n\n  private populateEnvs() {\n    // populate ids\n    const getEnvId = (ext: ExtensionDataList) => {\n      const envsAspect = ext.findCoreExtension(EnvsAspect.id);\n      if (!envsAspect) throw new Error(`unable to find ${EnvsAspect.id} aspect for ${this.compIdStr}`);\n      const env = envsAspect.config.env || envsAspect.data.id;\n      if (!env)\n        throw new Error(`unable to find env for ${this.compIdStr}, the config and data of ${EnvsAspect.id} are empty}`);\n      return env;\n    };\n    const currentEnv = getEnvId(this.currentAspects);\n    this.currentEnv = { id: currentEnv };\n    const otherEnv = getEnvId(this.otherAspects);\n    this.otherEnv = { id: otherEnv };\n    const baseEnv = this.baseAspects ? getEnvId(this.baseAspects) : undefined;\n    if (baseEnv) this.baseEnv = { id: baseEnv };\n\n    // populate version\n    const currentEnvAspect = this.currentAspects.findExtension(currentEnv, true);\n    if (currentEnvAspect) {\n      this.handledExtIds.push(currentEnvAspect.stringId);\n      this.currentEnv.version = currentEnvAspect.extensionId?.version;\n      this.currentEnv.config = this.getConfig(currentEnvAspect);\n    }\n    const otherEnvAspect = this.otherAspects.findExtension(otherEnv, true);\n    if (otherEnvAspect) {\n      this.handledExtIds.push(otherEnvAspect.stringId);\n      this.otherEnv.version = otherEnvAspect.extensionId?.version;\n      this.otherEnv.config = this.getConfig(otherEnvAspect);\n    }\n    if (this.baseEnv) {\n      const baseEnvAspect = this.baseAspects.findExtension(baseEnv, true);\n      if (baseEnvAspect) {\n        this.baseEnv.version = baseEnvAspect.extensionId?.version;\n        this.baseEnv.config = this.getConfig(baseEnvAspect);\n      }\n    }\n  }\n\n  private envStrategy(): MergeStrategyResult | null {\n    const mergeStrategyParams: MergeStrategyParamsWithRemoved = {\n      id: EnvsAspect.id,\n      currentConfig: {\n        env: this.currentEnv.version ? `${this.currentEnv.id}@${this.currentEnv.version}` : this.currentEnv.id,\n      },\n      otherConfig: { env: this.otherEnv.version ? `${this.otherEnv.id}@${this.otherEnv.version}` : this.otherEnv.id },\n    };\n    if (this.baseEnv) {\n      mergeStrategyParams.baseConfig = {\n        env: this.baseEnv?.version ? `${this.baseEnv.id}@${this.baseEnv.version}` : this.baseEnv?.id,\n      };\n    }\n    if (this.currentEnv.id === this.otherEnv.id && this.currentEnv.version === this.otherEnv.version) {\n      return null;\n    }\n    if (this.isIdInWorkspace(this.currentEnv.id)) {\n      // the env currently used is part of the workspace, that's what the user needs. don't try to resolve anything.\n      return null;\n    }\n    return this.basicConfigMerge(mergeStrategyParams);\n  }\n\n  private areConfigsEqual(configA: GenericConfigOrRemoved, configB: GenericConfigOrRemoved) {\n    return JSON.stringify(configA) === JSON.stringify(configB);\n  }\n\n  private mergePerStrategy(mergeStrategyParams: MergeStrategyParams): MergeStrategyResult | null {\n    const { id, currentExt, otherExt, baseExt } = mergeStrategyParams;\n    const depResolverResult = this.depResolverStrategy(mergeStrategyParams);\n    if (depResolverResult) {\n      // 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    const mergeStrategyConfigParams = { id, currentConfig, otherConfig, baseConfig };\n    return this.basicConflictGenerator(mergeStrategyConfigParams);\n  }\n\n  private basicConflictGenerator({\n    id,\n    currentConfig,\n    otherConfig,\n  }: MergeStrategyParamsWithRemoved): MergeStrategyResult {\n    // uncomment to debug\n    // console.log('basicConflictGenerator', this.compIdStr, id, 'currentConfig', currentConfig, 'otherConfig', otherConfig);\n    let conflict: string;\n    if (currentConfig === '-') {\n      conflict = `${'<'.repeat(7)} ${this.currentLabel}\n\"${id}\": \"-\"\n=======\n\"${id}\": ${JSON.stringify(otherConfig, undefined, 2)}\n${'>'.repeat(7)} ${this.otherLabel}`;\n    } else if (otherConfig === '-') {\n      conflict = `${'<'.repeat(7)} ${this.currentLabel}\n\"${id}\": ${JSON.stringify(currentConfig, undefined, 2)}\n=======\n\"${id}\": \"-\"\n${'>'.repeat(7)} ${this.otherLabel}`;\n    } else {\n      const formatConfig = (conf: GenericConfigOrRemoved) => {\n        const confStr = JSON.stringify(conf, undefined, 2);\n        const confStrSplit = confStr.split('\\n');\n        confStrSplit.shift(); // remove first {\n        confStrSplit.pop(); // remove last }\n        return confStrSplit.join('\\n');\n      };\n      conflict = `\"${id}\": {\n${'<'.repeat(7)} ${this.currentLabel}\n${formatConfig(currentConfig)}\n=======\n${formatConfig(otherConfig)}\n${'>'.repeat(7)} ${this.otherLabel}\n}`;\n    }\n\n    return { id, conflict };\n  }\n\n  private depResolverStrategy(params: MergeStrategyParams): MergeStrategyResult | undefined {\n    if (params.id !== DependencyResolverAspect.id) return undefined;\n    const { currentExt, otherExt, baseExt } = params;\n\n    const currentConfig = this.getConfig(currentExt);\n    const currentPolicy = this.getPolicy(currentConfig);\n    const otherConfig = this.getConfig(otherExt);\n    const otherPolicy = this.getPolicy(otherConfig);\n\n    const baseConfig = baseExt ? this.getConfig(baseExt) : undefined;\n    const basePolicy = baseConfig ? this.getPolicy(baseConfig) : undefined;\n\n    const 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          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 conflictIndicator = 'CONFLICT::';\n    const lifecycleToDepType = {\n      runtime: 'dependencies',\n      dev: 'devDependencies',\n      peer: 'peerDependencies',\n    };\n    const handleConfigMerge = () => {\n      const addVariantPolicyEntryToPolicy = (dep: VariantPolicyEntry) => {\n        const 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    // uncomment to debug\n    // console.log('\\n\\n**************', this.compIdStr, '**************');\n    // console.log('currentData', currentData.length, '\\n', currentData.map((d) => `${d.__type} ${d.id} ${d.version}`).join('\\n'));\n    // console.log('otherData', otherData.length, '\\n', otherData.map((d) => `${d.__type} ${d.id} ${d.version}`).join('\\n'));\n    // console.log('otherData', baseData.length, '\\n', baseData.map((d) => `${d.__type} ${d.id} ${d.version}`).join('\\n'));\n    // console.log('** END **\\n\\n');\n\n    // eslint-disable-next-line complexity\n    currentAndOtherData.forEach((depData) => {\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      if (!otherDep) {\n        return;\n      }\n      if (!currentDep) {\n        // only on other\n        addSerializedDepToPolicy(otherDep);\n        return;\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      const currentId = currentDep.id;\n      const currentVer = currentDep.policy || currentDep.version;\n      const otherVer = otherDep.policy || otherDep.version;\n      if (currentVer === otherVer) {\n        return;\n      }\n      const baseDep = baseData.find((d) => d.id === currentId);\n      const baseVer = baseDep?.policy || baseDep?.version;\n      if (baseVer && baseVer === otherVer) {\n        return;\n      }\n      if (currentDep.__type === 'component' && this.isIdInWorkspace(currentId)) {\n        // dependencies that exist in the workspace, should be ignored. they'll be resolved later to the version in the ws.\n        return;\n      }\n      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      // either no baseVal, or baseVal is also different from both: other and local. that's probably a conflict.\n\n      // @todo: this should be the correct way to check satisfies. currently, it doesn't work correctly because there is no policy\n      // try to resolve according to semver\n      // if (\n      //   currentDep.policy &&\n      //   otherDep.policy &&\n      //   isRange(currentDep.policy, currentDep.id) &&\n      //   isRange(otherDep.policy, otherDep.id)\n      // ) {\n      //   if (this.compIdStr.includes('teambit.dot-graph/ui/graph!')) console.log('DATA working on ', depData.id, 'POLICY');\n      //   if (semver.satisfies(currentDep.version, otherDep.policy)) {\n      //     return;\n      //   }\n      //   if (semver.satisfies(otherDep.version, currentDep.policy)) {\n      //     if (this.compIdStr.includes('teambit.dot-graph/ui/graph!')) console.log('DATA working on ', depData.id, 'FINAL');\n      //     addSerializedDepToPolicy(otherDep);\n      //     return;\n      //   }\n      // }\n      hasConflict = true;\n      conflictedPolicy[depType].push({\n        name: getDepIdAsPkgName(currentDep),\n        version: `${conflictIndicator}${currentVer}::${otherVer}::`,\n        force: false,\n      });\n    });\n\n    ['dependencies', 'devDependencies', 'peerDependencies'].forEach((depType) => {\n      if (!mergedPolicy[depType].length) delete mergedPolicy[depType];\n      if (!conflictedPolicy[depType].length) delete conflictedPolicy[depType];\n    });\n\n    let conflictStr: string | undefined;\n    if (hasConflict) {\n      const mergedConfigSplit = JSON.stringify({ policy: conflictedPolicy }, undefined, 2).split('\\n');\n      const conflictLines = mergedConfigSplit.map((line) => {\n        if (!line.includes(conflictIndicator)) return line;\n        const [, currentVal, otherVal] = line.split('::');\n        return `${'<'.repeat(7)} ${this.currentLabel}\n        \"version\": \"${currentVal}\",\n=======\n        \"version\": \"${otherVal}\",\n${'>'.repeat(7)} ${this.otherLabel}`;\n      });\n      // replace the first line with line with the id\n      conflictLines.shift();\n      conflictLines.unshift(`\"${params.id}\": {`);\n      conflictStr = conflictLines.join('\\n');\n    }\n    const config = Object.keys(mergedPolicy).length ? { policy: mergedPolicy } : undefined;\n\n    return { id: params.id, mergedConfig: config, conflict: conflictStr };\n  }\n\n  private isIdInWorkspace(id: string): boolean {\n    return Boolean(this.getIdFromWorkspace(id)) || 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;AACA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AACA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AAQA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AAEA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AACA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AAA0D;AAAA;AA0B1D;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,MAAMA,YAAY,CAAC;EAMxBC,WAAW,CACDC,SAAiB,EACjBC,YAA2B,EACnCC,SAA2B,EACnBC,cAAiC,EACjCC,WAA8B,EAC9BC,YAA+B,EAC/BC,YAAoB,EACpBC,UAAkB,EAC1B;IAAA,KARQP,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;IAAA;IAAA;IAAA,uDAVM,EAAE;IAAA;IAYlC,IAAI,CAACC,eAAe,GAAG,CAAAN,SAAS,aAATA,SAAS,uBAATA,SAAS,CAAEO,UAAU,CAACC,GAAG,CAAEC,CAAC,IAAKA,CAAC,CAACC,EAAE,CAACC,sBAAsB,EAAE,CAAC,KAAI,EAAE;EAC9F;EAEAC,KAAK,GAAsB;IACzB,IAAI,CAACC,YAAY,EAAE;IACnB,MAAMC,OAAO,GAAG,IAAI,CAACb,cAAc,CAACO,GAAG,CAAEO,UAAU,IAAK;MACtD,MAAML,EAAE,GAAGK,UAAU,CAACC,QAAQ;MAC9B,IAAI,IAAI,CAACC,aAAa,CAACC,QAAQ,CAACR,EAAE,CAAC,EAAE,OAAO,IAAI;MAChD,IAAI,CAACO,aAAa,CAACE,IAAI,CAACT,EAAE,CAAC;MAC3B,MAAMU,OAAO,GAAG,IAAI,CAAClB,WAAW,CAACmB,aAAa,CAACX,EAAE,EAAE,IAAI,CAAC;MACxD,MAAMY,QAAQ,GAAG,IAAI,CAACnB,YAAY,CAACkB,aAAa,CAACX,EAAE,EAAE,IAAI,CAAC;MAC1D,IAAIY,QAAQ,EAAE;QACZ;QACA,OAAO,IAAI,CAACC,gBAAgB,CAAC;UAAEb,EAAE;UAAEK,UAAU;UAAEO,QAAQ;UAAEF;QAAQ,CAAC,CAAC;MACrE;MACA;MACA,IAAIA,OAAO,EAAE;QACX;QACA,OAAO,IAAI,CAACI,sBAAsB,CAAC;UAAEd,EAAE;UAAEe,aAAa,EAAE,IAAI,CAACC,SAAS,CAACX,UAAU,CAAC;UAAEY,WAAW,EAAE;QAAI,CAAC,CAAC;MACzG;MACA;MACA,OAAO,IAAI;IACb,CAAC,CAAC;IACF,MAAMC,6BAA6B,GAAG,IAAI,CAACzB,YAAY,CAACK,GAAG,CAAEc,QAAQ,IAAK;MACxE,IAAIZ,EAAE,GAAGY,QAAQ,CAACN,QAAQ;MAC1B,IAAI,IAAI,CAACC,aAAa,CAACC,QAAQ,CAACR,EAAE,CAAC,EAAE,OAAO,IAAI;MAChD,IAAI,CAACO,aAAa,CAACE,IAAI,CAACT,EAAE,CAAC;MAC3B,IAAIY,QAAQ,CAACO,WAAW,IAAIP,QAAQ,CAACO,WAAW,CAACC,UAAU,EAAE,EAAE;QAC7D;QACA;QACA,MAAMC,eAAe,GAAG,IAAI,CAACC,kBAAkB,CAACV,QAAQ,CAACO,WAAW,CAAClB,sBAAsB,EAAE,CAAC;QAC9F,IAAIoB,eAAe,EAAE;UACnB,MAAME,WAAW,GAAG,IAAI,CAAChC,cAAc,CAACoB,aAAa,CAACC,QAAQ,CAACO,WAAW,CAAClB,sBAAsB,EAAE,EAAE,IAAI,CAAC;UAC1G,IAAIsB,WAAW,EAAE,OAAO,IAAI,CAAC,CAAC;UAC9BvB,EAAE,GAAGqB,eAAe,CAACG,OAAO,CAACC,QAAQ,EAAE;QACzC;MACF;MACA,MAAMf,OAAO,GAAG,IAAI,CAAClB,WAAW,CAACmB,aAAa,CAACX,EAAE,EAAE,IAAI,CAAC;MACxD,IAAIU,OAAO,EAAE;QACX;QACA,OAAO,IAAI,CAACI,sBAAsB,CAAC;UAAEd,EAAE;UAAEe,aAAa,EAAE,GAAG;UAAEE,WAAW,EAAE,IAAI,CAACD,SAAS,CAACJ,QAAQ;QAAE,CAAC,CAAC;MACvG;MACA;MACA,OAAO;QAAEZ,EAAE;QAAE0B,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,OAAO,KAAIC,sCAAiB,EAAC,IAAI,CAACzC,SAAS,EAAE,IAAA0C,iBAAO,EAAC,CAAC,GAAG1B,OAAO,EAAE,GAAGc,6BAA6B,EAAE,GAAGS,SAAS,CAAC,CAAC,CAAC;EACrH;EAEQxB,YAAY,GAAG;IACrB;IACA,MAAM4B,QAAQ,GAAIC,GAAsB,IAAK;MAC3C,MAAMC,UAAU,GAAGD,GAAG,CAACE,iBAAiB,CAACC,kBAAU,CAACnC,EAAE,CAAC;MACvD,IAAI,CAACiC,UAAU,EAAE,MAAM,IAAIG,KAAK,CAAE,kBAAiBD,kBAAU,CAACnC,EAAG,eAAc,IAAI,CAACZ,SAAU,EAAC,CAAC;MAChG,MAAMiD,GAAG,GAAGJ,UAAU,CAACK,MAAM,CAACD,GAAG,IAAIJ,UAAU,CAACM,IAAI,CAACvC,EAAE;MACvD,IAAI,CAACqC,GAAG,EACN,MAAM,IAAID,KAAK,CAAE,0BAAyB,IAAI,CAAChD,SAAU,4BAA2B+C,kBAAU,CAACnC,EAAG,aAAY,CAAC;MACjH,OAAOqC,GAAG;IACZ,CAAC;IACD,MAAMG,UAAU,GAAGT,QAAQ,CAAC,IAAI,CAACxC,cAAc,CAAC;IAChD,IAAI,CAACiD,UAAU,GAAG;MAAExC,EAAE,EAAEwC;IAAW,CAAC;IACpC,MAAMC,QAAQ,GAAGV,QAAQ,CAAC,IAAI,CAACtC,YAAY,CAAC;IAC5C,IAAI,CAACgD,QAAQ,GAAG;MAAEzC,EAAE,EAAEyC;IAAS,CAAC;IAChC,MAAMC,OAAO,GAAG,IAAI,CAAClD,WAAW,GAAGuC,QAAQ,CAAC,IAAI,CAACvC,WAAW,CAAC,GAAGmD,SAAS;IACzE,IAAID,OAAO,EAAE,IAAI,CAACA,OAAO,GAAG;MAAE1C,EAAE,EAAE0C;IAAQ,CAAC;;IAE3C;IACA,MAAME,gBAAgB,GAAG,IAAI,CAACrD,cAAc,CAACoB,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,CAACrD,YAAY,CAACkB,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,CAACvD,WAAW,CAACmB,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;MAC1DhD,EAAE,EAAEmC,kBAAU,CAACnC,EAAE;MACjBe,aAAa,EAAE;QACbsB,GAAG,EAAE,IAAI,CAACG,UAAU,CAACK,OAAO,GAAI,GAAE,IAAI,CAACL,UAAU,CAACxC,EAAG,IAAG,IAAI,CAACwC,UAAU,CAACK,OAAQ,EAAC,GAAG,IAAI,CAACL,UAAU,CAACxC;MACtG,CAAC;MACDiB,WAAW,EAAE;QAAEoB,GAAG,EAAE,IAAI,CAACI,QAAQ,CAACI,OAAO,GAAI,GAAE,IAAI,CAACJ,QAAQ,CAACzC,EAAG,IAAG,IAAI,CAACyC,QAAQ,CAACI,OAAQ,EAAC,GAAG,IAAI,CAACJ,QAAQ,CAACzC;MAAG;IAChH,CAAC;IACD,IAAI,IAAI,CAAC0C,OAAO,EAAE;MAAA;MAChBM,mBAAmB,CAACC,UAAU,GAAG;QAC/BZ,GAAG,EAAE,qBAAI,CAACK,OAAO,0CAAZ,cAAcG,OAAO,GAAI,GAAE,IAAI,CAACH,OAAO,CAAC1C,EAAG,IAAG,IAAI,CAAC0C,OAAO,CAACG,OAAQ,EAAC,qBAAG,IAAI,CAACH,OAAO,mDAAZ,eAAc1C;MAC5F,CAAC;IACH;IACA,IAAI,IAAI,CAACwC,UAAU,CAACxC,EAAE,KAAK,IAAI,CAACyC,QAAQ,CAACzC,EAAE,IAAI,IAAI,CAACwC,UAAU,CAACK,OAAO,KAAK,IAAI,CAACJ,QAAQ,CAACI,OAAO,EAAE;MAChG,OAAO,IAAI;IACb;IACA,IAAI,IAAI,CAACK,eAAe,CAAC,IAAI,CAACV,UAAU,CAACxC,EAAE,CAAC,EAAE;MAC5C;MACA,OAAO,IAAI;IACb;IACA,OAAO,IAAI,CAACmD,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;MAAEhD,EAAE;MAAEK,UAAU;MAAEO,QAAQ;MAAEF;IAAQ,CAAC,GAAGsC,mBAAmB;IACjE,MAAMS,iBAAiB,GAAG,IAAI,CAACC,mBAAmB,CAACV,mBAAmB,CAAC;IACvE,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;MAAEnD,EAAE;MAAEe,aAAa;MAAEE,WAAW;MAAEgC;IAAW,CAAC,CAAC;EAC9E;EAEQE,gBAAgB,CAACH,mBAAmD,EAAE;IAC5E,MAAM;MAAEhD,EAAE;MAAEe,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;QAAEf,EAAE;QAAE0B,YAAY,EAAET;MAAY,CAAC;IAC1C;IACA;IACA,MAAM0C,yBAAyB,GAAG;MAAE3D,EAAE;MAAEe,aAAa;MAAEE,WAAW;MAAEgC;IAAW,CAAC;IAChF,OAAO,IAAI,CAACnC,sBAAsB,CAAC6C,yBAAyB,CAAC;EAC/D;EAEQ7C,sBAAsB,CAAC;IAC7Bd,EAAE;IACFe,aAAa;IACbE;EAC8B,CAAC,EAAuB;IACtD;IACA;IACA,IAAI2C,QAAgB;IACpB,IAAI7C,aAAa,KAAK,GAAG,EAAE;MACzB6C,QAAQ,GAAI,GAAE,GAAG,CAACC,MAAM,CAAC,CAAC,CAAE,IAAG,IAAI,CAACnE,YAAa;AACvD,GAAGM,EAAG;AACN;AACA,GAAGA,EAAG,MAAKuD,IAAI,CAACC,SAAS,CAACvC,WAAW,EAAE0B,SAAS,EAAE,CAAC,CAAE;AACrD,EAAE,GAAG,CAACkB,MAAM,CAAC,CAAC,CAAE,IAAG,IAAI,CAAClE,UAAW,EAAC;IAChC,CAAC,MAAM,IAAIsB,WAAW,KAAK,GAAG,EAAE;MAC9B2C,QAAQ,GAAI,GAAE,GAAG,CAACC,MAAM,CAAC,CAAC,CAAE,IAAG,IAAI,CAACnE,YAAa;AACvD,GAAGM,EAAG,MAAKuD,IAAI,CAACC,SAAS,CAACzC,aAAa,EAAE4B,SAAS,EAAE,CAAC,CAAE;AACvD;AACA,GAAG3C,EAAG;AACN,EAAE,GAAG,CAAC6D,MAAM,CAAC,CAAC,CAAE,IAAG,IAAI,CAAClE,UAAW,EAAC;IAChC,CAAC,MAAM;MACL,MAAMmE,YAAY,GAAIC,IAA4B,IAAK;QACrD,MAAMC,OAAO,GAAGT,IAAI,CAACC,SAAS,CAACO,IAAI,EAAEpB,SAAS,EAAE,CAAC,CAAC;QAClD,MAAMsB,YAAY,GAAGD,OAAO,CAACE,KAAK,CAAC,IAAI,CAAC;QACxCD,YAAY,CAACE,KAAK,EAAE,CAAC,CAAC;QACtBF,YAAY,CAACG,GAAG,EAAE,CAAC,CAAC;QACpB,OAAOH,YAAY,CAACI,IAAI,CAAC,IAAI,CAAC;MAChC,CAAC;MACDT,QAAQ,GAAI,IAAG5D,EAAG;AACxB,EAAE,GAAG,CAAC6D,MAAM,CAAC,CAAC,CAAE,IAAG,IAAI,CAACnE,YAAa;AACrC,EAAEoE,YAAY,CAAC/C,aAAa,CAAE;AAC9B;AACA,EAAE+C,YAAY,CAAC7C,WAAW,CAAE;AAC5B,EAAE,GAAG,CAAC4C,MAAM,CAAC,CAAC,CAAE,IAAG,IAAI,CAAClE,UAAW;AACnC,EAAE;IACE;IAEA,OAAO;MAAEK,EAAE;MAAE4D;IAAS,CAAC;EACzB;EAEQF,mBAAmB,CAACY,MAA2B,EAAmC;IACxF,IAAIA,MAAM,CAACtE,EAAE,KAAKuE,8CAAwB,CAACvE,EAAE,EAAE,OAAO2C,SAAS;IAC/D,MAAM;MAAEtC,UAAU;MAAEO,QAAQ;MAAEF;IAAQ,CAAC,GAAG4D,MAAM;IAEhD,MAAMvD,aAAa,GAAG,IAAI,CAACC,SAAS,CAACX,UAAU,CAAC;IAChD,MAAMmE,aAAa,GAAG,IAAI,CAACC,SAAS,CAAC1D,aAAa,CAAC;IACnD,MAAME,WAAW,GAAG,IAAI,CAACD,SAAS,CAACJ,QAAQ,CAAC;IAC5C,MAAM8D,WAAW,GAAG,IAAI,CAACD,SAAS,CAACxD,WAAW,CAAC;IAE/C,MAAMgC,UAAU,GAAGvC,OAAO,GAAG,IAAI,CAACM,SAAS,CAACN,OAAO,CAAC,GAAGiC,SAAS;IAChE,MAAMgC,UAAU,GAAG1B,UAAU,GAAG,IAAI,CAACwB,SAAS,CAACxB,UAAU,CAAC,GAAGN,SAAS;IAEtE,MAAMiC,UAAU,GAAI5C,GAAsB,IAAuC;MAAA;MAC/E,MAAMO,IAAI,4BAAGP,GAAG,CAACE,iBAAiB,CAACqC,8CAAwB,CAACvE,EAAE,CAAC,0DAAlD,sBAAoDuC,IAAI,CAACsC,YAAY;MAClF,IAAI,CAACtC,IAAI,EAAE,OAAO,EAAE;MACpB,MAAMuC,MAAM,GAAG,2BAAA9C,GAAG,CAACE,iBAAiB,CAACqC,8CAAwB,CAACvE,EAAE,CAAC,2DAAlD,uBAAoDuC,IAAI,CAACuC,MAAM,KAAI,EAAE;MACpF,OAAOvC,IAAI,CAACzC,GAAG,CAAEiF,CAAC,IAAK;QACrB,MAAMC,gBAAgB,GAAGD,CAAC,CAACE,MAAM,KAAK,SAAS,GAAGF,CAAC,CAAC/E,EAAE,GAAG+E,CAAC,CAAC/E,EAAE,CAACkE,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QAC3E,MAAMgB,cAAc,GAAGJ,MAAM,CAACK,IAAI,CAAEC,CAAC,IAAKA,CAAC,CAACC,YAAY,KAAKL,gBAAgB,CAAC;QAC9E,MAAMM,YAAY,GAAG,MAAM;UACzB,IAAIP,CAAC,CAACE,MAAM,KAAK,SAAS,EAAE,OAAOtC,SAAS,CAAC,CAAC;UAC9C,IAAIuC,cAAc,EAAE,OAAOA,cAAc,CAACK,KAAK,CAAC1C,OAAO,CAAC,CAAC;UACzD,IAAI,CAAC2C,iBAAM,CAACC,KAAK,CAACV,CAAC,CAAClC,OAAO,CAAC,EAAE,OAAOkC,CAAC,CAAClC,OAAO,CAAC,CAAC;UAChD;UACA,OAAOkC,CAAC,CAAClC,OAAO,CAAC6C,UAAU,CAAC,IAAI,CAAC,GAAI,IAAGX,CAAC,CAAClC,OAAQ,EAAC,GAAI,IAAGkC,CAAC,CAAClC,OAAQ,EAAC;QACvE,CAAC;QACD,uCACKkC,CAAC;UACJ/E,EAAE,EAAEgF,gBAAgB;UACpBF,MAAM,EAAEQ,YAAY;QAAE;MAE1B,CAAC,CAAC;IACJ,CAAC;IACD,MAAMK,aAAa,GAAI3D,GAAsB,IAA2B;MAAA;MACtE,OAAO,2BAAAA,GAAG,CAACE,iBAAiB,CAACqC,8CAAwB,CAACvE,EAAE,CAAC,2DAAlD,uBAAoDuC,IAAI,CAACuC,MAAM,KAAI,EAAE;IAC9E,CAAC;IAED,MAAMc,WAAW,GAAI5D,GAAsB,IAAuC;MAChF,MAAM6D,OAAO,GAAGjB,UAAU,CAAC5C,GAAG,CAAC;MAC/B,OAAO6D,OAAO,CAACC,MAAM,CAAEf,CAAC,IAAKA,CAAC,CAACgB,MAAM,KAAK,MAAM,CAAC;IACnD,CAAC;IAED,MAAMC,eAAe,GAAGJ,WAAW,CAAC,IAAI,CAACrG,cAAc,CAAC;IACxD,MAAM0G,cAAc,GAAGrB,UAAU,CAAC,IAAI,CAACrF,cAAc,CAAC;IACtD,MAAM2G,iBAAiB,GAAGP,aAAa,CAAC,IAAI,CAACpG,cAAc,CAAC;IAC5D,MAAM4G,SAAS,GAAGP,WAAW,CAAC,IAAI,CAACnG,YAAY,CAAC;IAChD,MAAM2G,mBAAmB,GAAG,IAAAC,gBAAM,EAACL,eAAe,CAACM,MAAM,CAACH,SAAS,CAAC,EAAGpB,CAAC,IAAKA,CAAC,CAAC/E,EAAE,CAAC;IAClF,MAAMuG,6BAA6B,GAAGH,mBAAmB,CAACN,MAAM,CAAE/F,CAAC,IAAKA,CAAC,CAACkF,MAAM,KAAK,WAAW,CAAC;IACjG,MAAMuB,QAAQ,GAAGZ,WAAW,CAAC,IAAI,CAACpG,WAAW,CAAC;IAE9C,MAAMiH,6BAA6B,GAAIC,OAAe,IAAyB;MAC7E,MAAMC,KAAK,GAAGJ,6BAA6B,CAACpB,IAAI,CAAEJ,CAAC,IAAKA,CAAC,CAAC6B,WAAW,KAAKF,OAAO,CAAC;MAClF,OAAOC,KAAK,aAALA,KAAK,uBAALA,KAAK,CAAE3G,EAAE;IAClB,CAAC;IAED,MAAM6G,+BAA+B,GAAIH,OAAe,IAAK;MAC3D,OAAOT,cAAc,CAACd,IAAI,CAAEJ,CAAC,IAAK;QAChC,IAAIA,CAAC,CAACE,MAAM,KAAK,SAAS,EAAE,OAAOF,CAAC,CAAC/E,EAAE,KAAK0G,OAAO;QACnD,OAAO3B,CAAC,CAAC6B,WAAW,KAAKF,OAAO;MAClC,CAAC,CAAC;IACJ,CAAC;IAED,MAAMI,qCAAqC,GAAIJ,OAAe,IAAK;MACjE,OAAOR,iBAAiB,CAACf,IAAI,CAAEJ,CAAC,IAAKA,CAAC,CAACM,YAAY,KAAKqB,OAAO,CAAC;IAClE,CAAC;IAED,MAAMK,YAAY,GAAG;MACnBlC,YAAY,EAAE,EAAE;MAChBmC,eAAe,EAAE,EAAE;MACnBC,gBAAgB,EAAE;IACpB,CAAC;IACD,MAAMC,gBAAgB,GAAG;MACvBrC,YAAY,EAAE,EAAE;MAChBmC,eAAe,EAAE,EAAE;MACnBC,gBAAgB,EAAE;IACpB,CAAC;IACD,IAAIE,WAAW,GAAG,KAAK;IACvB,MAAMC,iBAAiB,GAAG,YAAY;IACtC,MAAMC,kBAAkB,GAAG;MACzBC,OAAO,EAAE,cAAc;MACvBC,GAAG,EAAE,iBAAiB;MACtBC,IAAI,EAAE;IACR,CAAC;IACD,MAAMC,iBAAiB,GAAG,MAAM;MAC9B,MAAMC,6BAA6B,GAAIC,GAAuB,IAAK;QACjE,MAAMvI,SAAS,GAAGqH,6BAA6B,CAACkB,GAAG,CAACtC,YAAY,CAAC;QACjE,IAAIjG,SAAS,IAAI,IAAI,CAAC8D,eAAe,CAAC9D,SAAS,CAAC,EAAE;UAChD;UACA;QACF;QACA,MAAMwI,eAAe,GAAGf,+BAA+B,CAACc,GAAG,CAACtC,YAAY,CAAC;QACzE,IAAIuC,eAAe,IAAI,CAACD,GAAG,CAACE,KAAK,EAAE;UACjC,IAAID,eAAe,CAAC/E,OAAO,KAAK8E,GAAG,CAACpC,KAAK,CAAC1C,OAAO,EAAE;UACnD,IACE,CAAC,IAAAiF,0BAAM,EAACF,eAAe,CAAC/E,OAAO,CAAC,IAChC,CAAC,IAAAiF,0BAAM,EAACH,GAAG,CAACpC,KAAK,CAAC1C,OAAO,CAAC,IAC1B2C,iBAAM,CAACuC,SAAS,CAACH,eAAe,CAAC/E,OAAO,EAAE8E,GAAG,CAACpC,KAAK,CAAC1C,OAAO,CAAC,EAC5D;YACA;UACF;QACF;QACA,MAAMmF,qBAAqB,GAAGlB,qCAAqC,CAACa,GAAG,CAACtC,YAAY,CAAC;QACrF,IAAI2C,qBAAqB,IAAIA,qBAAqB,CAACzC,KAAK,CAAC1C,OAAO,KAAK8E,GAAG,CAACpC,KAAK,CAAC1C,OAAO,EAAE;UACtF;UACA;QACF;QACA,MAAMoF,OAAO,GAAGZ,kBAAkB,CAACM,GAAG,CAACO,aAAa,CAAC;QACrDnB,YAAY,CAACkB,OAAO,CAAC,CAACxH,IAAI,CAAC;UACzB0H,IAAI,EAAER,GAAG,CAACtC,YAAY;UACtBxC,OAAO,EAAE8E,GAAG,CAACpC,KAAK,CAAC1C,OAAO;UAC1BgF,KAAK,EAAEF,GAAG,CAACE;QACb,CAAC,CAAC;MACJ,CAAC;MAED,IAAI,IAAI,CAACzE,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,IAAI2D,WAAW,CAAC0D,MAAM,EAAE;UACtB1D,WAAW,CAAC2D,OAAO,CAAEV,GAAG,IAAK;YAC3BD,6BAA6B,CAACC,GAAG,CAAC;UACpC,CAAC,CAAC;QACJ;QACA;MACF;;MAEA;MACA,IAAI,CAAC5G,aAAa,CAAC+D,MAAM,IAAI,CAAC7D,WAAW,CAAC6D,MAAM,EAAE;MAClD,MAAMwD,qBAAqB,GAAG,IAAAjC,gBAAM,EAAC7B,aAAa,CAAC8B,MAAM,CAAC5B,WAAW,CAAC,EAAGK,CAAC,IAAKA,CAAC,CAACM,YAAY,CAAC;MAC9FiD,qBAAqB,CAACD,OAAO,CAAEV,GAAG,IAAK;QACrC,MAAMM,OAAO,GAAGZ,kBAAkB,CAACM,GAAG,CAACO,aAAa,CAAC;QACrD,MAAMK,UAAU,GAAG/D,aAAa,CAACW,IAAI,CAAEJ,CAAC,IAAKA,CAAC,CAACM,YAAY,KAAKsC,GAAG,CAACtC,YAAY,CAAC;QACjF,MAAMmD,QAAQ,GAAG9D,WAAW,CAACS,IAAI,CAAEJ,CAAC,IAAKA,CAAC,CAACM,YAAY,KAAKsC,GAAG,CAACtC,YAAY,CAAC;QAC7E,MAAMoD,OAAO,GAAG9D,UAAU,aAAVA,UAAU,uBAAVA,UAAU,CAAEQ,IAAI,CAAEJ,CAAC,IAAKA,CAAC,CAACM,YAAY,KAAKsC,GAAG,CAACtC,YAAY,CAAC;QAE5E,IAAI,CAACmD,QAAQ,EAAE;UACb;QACF;QACA,IAAI,CAACD,UAAU,EAAE;UACf;UACAb,6BAA6B,CAACc,QAAQ,CAAC;UACvC;QACF;QACA,MAAME,UAAU,GAAGH,UAAU,CAAChD,KAAK,CAAC1C,OAAO;QAC3C,MAAM8F,QAAQ,GAAGH,QAAQ,CAACjD,KAAK,CAAC1C,OAAO;QACvC,IAAI6F,UAAU,KAAKC,QAAQ,EAAE;UAC3B;QACF;QACA,MAAMC,OAAO,GAAGH,OAAO,aAAPA,OAAO,uBAAPA,OAAO,CAAElD,KAAK,CAAC1C,OAAO;QACtC,IAAI+F,OAAO,IAAIA,OAAO,KAAKD,QAAQ,EAAE;UACnC;QACF;QACA,IAAIC,OAAO,IAAIA,OAAO,KAAKF,UAAU,EAAE;UACrChB,6BAA6B,CAACc,QAAQ,CAAC;UACvC;QACF;QACA,MAAMpJ,SAAS,GAAGqH,6BAA6B,CAACkB,GAAG,CAACtC,YAAY,CAAC;QACjE,IAAIjG,SAAS,IAAI,IAAI,CAAC8D,eAAe,CAAC9D,SAAS,CAAC,EAAE;UAChD;UACA;QACF;QAEA+H,WAAW,GAAG,IAAI;QAClBD,gBAAgB,CAACe,OAAO,CAAC,CAACxH,IAAI,CAAC;UAC7B0H,IAAI,EAAEI,UAAU,CAAClD,YAAY;UAC7BxC,OAAO,EAAG,GAAEuE,iBAAkB,GAAEsB,UAAW,KAAIC,QAAS,IAAG;UAC3Dd,KAAK,EAAEU,UAAU,CAACV;QACpB,CAAC,CAAC;MACJ,CAAC,CAAC;IACJ,CAAC;IAEDJ,iBAAiB,EAAE;IAEnB,MAAMoB,eAAe,GAAG,CAACZ,OAAe,EAAEa,OAAe,KAAK/B,YAAY,CAACkB,OAAO,CAAC,CAAC9C,IAAI,CAAEJ,CAAC,IAAKA,CAAC,CAACoD,IAAI,KAAKW,OAAO,CAAC;IACnH,MAAMC,iBAAiB,GAAIpB,GAAmC,IAAK;MACjE,IAAIA,GAAG,CAAC1C,MAAM,KAAK,WAAW,EAAE;QAC9B,OAAO0C,GAAG,CAAC3H,EAAE;MACf;MACA;MACA,OAAO2H,GAAG,CAACf,WAAW;IACxB,CAAC;IAED,MAAMoC,wBAAwB,GAAIrB,GAAmC,IAAK;MACxE,MAAMM,OAAO,GAAGZ,kBAAkB,CAACM,GAAG,CAACsB,SAAS,CAAC;MACjD,IAAItB,GAAG,CAAC1C,MAAM,KAAK,WAAW,IAAI,IAAI,CAAC/B,eAAe,CAACyE,GAAG,CAAC3H,EAAE,CAAC,EAAE;QAC9D;MACF;MACA,IAAI6I,eAAe,CAACZ,OAAO,EAAEN,GAAG,CAAC3H,EAAE,CAAC,EAAE;QACpC,OAAO,CAAC;MACV;;MACA+G,YAAY,CAACkB,OAAO,CAAC,CAACxH,IAAI,CAAC;QACzB0H,IAAI,EAAEY,iBAAiB,CAACpB,GAAG,CAAC;QAC5B9E,OAAO,EAAE8E,GAAG,CAAC7C,MAAM,IAAI6C,GAAG,CAAC9E,OAAO;QAClCgF,KAAK,EAAE;MACT,CAAC,CAAC;IACJ,CAAC;;IAED;IACA;IACA;IACA;IACA;IACA;;IAEA;IACAzB,mBAAmB,CAACiC,OAAO,CAAEa,OAAO,IAAK;MACvC,IAAI,IAAI,CAACC,KAAK,CAACD,OAAO,CAAClJ,EAAE,CAAC,EAAE;QAC1B;QACA;MACF;MACA,MAAMuI,UAAU,GAAGtC,cAAc,CAACd,IAAI,CAAEJ,CAAC,IAAKA,CAAC,CAAC/E,EAAE,KAAKkJ,OAAO,CAAClJ,EAAE,CAAC;MAClE,MAAMwI,QAAQ,GAAGrC,SAAS,CAAChB,IAAI,CAAEJ,CAAC,IAAKA,CAAC,CAAC/E,EAAE,KAAKkJ,OAAO,CAAClJ,EAAE,CAAC;MAC3D,IAAI,CAACwI,QAAQ,EAAE;QACb;MACF;MACA,IAAI,CAACD,UAAU,EAAE;QACf;QACAS,wBAAwB,CAACR,QAAQ,CAAC;QAClC;MACF;MACA,IACED,UAAU,CAACzD,MAAM,IACjB0D,QAAQ,CAAC1D,MAAM,IACf,IAAAsE,6BAAO,EAACb,UAAU,CAACzD,MAAM,EAAEyD,UAAU,CAACvI,EAAE,CAAC,IACzC,IAAAoJ,6BAAO,EAACZ,QAAQ,CAAC1D,MAAM,EAAE0D,QAAQ,CAACxI,EAAE,CAAC,EACrC;QACA,IAAIwF,iBAAM,CAACuC,SAAS,CAACQ,UAAU,CAAC1F,OAAO,EAAE2F,QAAQ,CAAC1D,MAAM,CAAC,EAAE;UACzD;QACF;QACA,IAAIU,iBAAM,CAACuC,SAAS,CAACS,QAAQ,CAAC3F,OAAO,EAAE0F,UAAU,CAACzD,MAAM,CAAC,EAAE;UACzD;QACF;MACF;MACA,MAAMuE,SAAS,GAAGd,UAAU,CAACvI,EAAE;MAC/B,MAAM0I,UAAU,GAAGH,UAAU,CAACzD,MAAM,IAAIyD,UAAU,CAAC1F,OAAO;MAC1D,MAAM8F,QAAQ,GAAGH,QAAQ,CAAC1D,MAAM,IAAI0D,QAAQ,CAAC3F,OAAO;MACpD,IAAI6F,UAAU,KAAKC,QAAQ,EAAE;QAC3B;MACF;MACA,MAAMF,OAAO,GAAGjC,QAAQ,CAACrB,IAAI,CAAEJ,CAAC,IAAKA,CAAC,CAAC/E,EAAE,KAAKqJ,SAAS,CAAC;MACxD,MAAMT,OAAO,GAAG,CAAAH,OAAO,aAAPA,OAAO,uBAAPA,OAAO,CAAE3D,MAAM,MAAI2D,OAAO,aAAPA,OAAO,uBAAPA,OAAO,CAAE5F,OAAO;MACnD,IAAI+F,OAAO,IAAIA,OAAO,KAAKD,QAAQ,EAAE;QACnC;MACF;MACA,IAAIJ,UAAU,CAACtD,MAAM,KAAK,WAAW,IAAI,IAAI,CAAC/B,eAAe,CAACmG,SAAS,CAAC,EAAE;QACxE;QACA;MACF;MACA,MAAMpB,OAAO,GAAGZ,kBAAkB,CAACkB,UAAU,CAACU,SAAS,CAAC;MACxD,IAAIJ,eAAe,CAACZ,OAAO,EAAEM,UAAU,CAACvI,EAAE,CAAC,EAAE;QAC3C,OAAO,CAAC;MACV;;MACA,IAAI4I,OAAO,IAAIA,OAAO,KAAKF,UAAU,EAAE;QACrCM,wBAAwB,CAACR,QAAQ,CAAC;QAClC;MACF;MACA;;MAEA;MACA;MACA;MACA;MACA;MACA;MACA;MACA;MACA;MACA;MACA;MACA;MACA;MACA;MACA;MACA;MACA;MACA;MACArB,WAAW,GAAG,IAAI;MAClBD,gBAAgB,CAACe,OAAO,CAAC,CAACxH,IAAI,CAAC;QAC7B0H,IAAI,EAAEY,iBAAiB,CAACR,UAAU,CAAC;QACnC1F,OAAO,EAAG,GAAEuE,iBAAkB,GAAEsB,UAAW,KAAIC,QAAS,IAAG;QAC3Dd,KAAK,EAAE;MACT,CAAC,CAAC;IACJ,CAAC,CAAC;IAEF,CAAC,cAAc,EAAE,iBAAiB,EAAE,kBAAkB,CAAC,CAACQ,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,IAAIqB,WAA+B;IACnC,IAAInC,WAAW,EAAE;MACf,MAAMoC,iBAAiB,GAAGhG,IAAI,CAACC,SAAS,CAAC;QAAEsB,MAAM,EAAEoC;MAAiB,CAAC,EAAEvE,SAAS,EAAE,CAAC,CAAC,CAACuB,KAAK,CAAC,IAAI,CAAC;MAChG,MAAMsF,aAAa,GAAGD,iBAAiB,CAACzJ,GAAG,CAAE2J,IAAI,IAAK;QACpD,IAAI,CAACA,IAAI,CAACjJ,QAAQ,CAAC4G,iBAAiB,CAAC,EAAE,OAAOqC,IAAI;QAClD,MAAM,GAAGC,UAAU,EAAEC,QAAQ,CAAC,GAAGF,IAAI,CAACvF,KAAK,CAAC,IAAI,CAAC;QACjD,OAAQ,GAAE,GAAG,CAACL,MAAM,CAAC,CAAC,CAAE,IAAG,IAAI,CAACnE,YAAa;AACrD,sBAAsBgK,UAAW;AACjC;AACA,sBAAsBC,QAAS;AAC/B,EAAE,GAAG,CAAC9F,MAAM,CAAC,CAAC,CAAE,IAAG,IAAI,CAAClE,UAAW,EAAC;MAC9B,CAAC,CAAC;MACF;MACA6J,aAAa,CAACrF,KAAK,EAAE;MACrBqF,aAAa,CAACI,OAAO,CAAE,IAAGtF,MAAM,CAACtE,EAAG,MAAK,CAAC;MAC1CsJ,WAAW,GAAGE,aAAa,CAACnF,IAAI,CAAC,IAAI,CAAC;IACxC;IACA,MAAM/B,MAAM,GAAGuH,MAAM,CAACC,IAAI,CAAC/C,YAAY,CAAC,CAACqB,MAAM,GAAG;MAAEtD,MAAM,EAAEiC;IAAa,CAAC,GAAGpE,SAAS;IAEtF,OAAO;MAAE3C,EAAE,EAAEsE,MAAM,CAACtE,EAAE;MAAE0B,YAAY,EAAEY,MAAM;MAAEsB,QAAQ,EAAE0F;IAAY,CAAC;EACvE;EAEQpG,eAAe,CAAClD,EAAU,EAAW;IAC3C,OAAO+J,OAAO,CAAC,IAAI,CAACzI,kBAAkB,CAACtB,EAAE,CAAC,CAAC,IAAI,IAAI,CAACJ,eAAe,CAACY,QAAQ,CAACR,EAAE,CAAC;EAClF;EAEQsB,kBAAkB,CAACtB,EAAU,EAA2B;IAC9D,OAAO,IAAI,CAACX,YAAY,CAAC8F,IAAI,CAAEpF,CAAC,IAAKA,CAAC,CAACE,sBAAsB,EAAE,KAAKD,EAAE,CAAC;EACzE;EAEQmJ,KAAK,CAACnJ,EAAU,EAAE;IACxB,OAAOA,EAAE,KAAK,IAAI,CAACwC,UAAU,CAACxC,EAAE,IAAIA,EAAE,KAAK,IAAI,CAACyC,QAAQ,CAACzC,EAAE;EAC7D;EAEQgB,SAAS,CAACgB,GAAuB,EAA0B;IACjE,IAAIA,GAAG,CAACgI,SAAS,KAAK,GAAG,EAAE,OAAOhI,GAAG,CAACgI,SAAS;IAC/C,OAAO,IAAAC,cAAI,EAACjI,GAAG,CAACgI,SAAS,EAAE,CAAC,YAAY,CAAC,CAAC;EAC5C;EAEQvF,SAAS,CAACnC,MAAM,EAAwB;IAC9C,IAAI,CAACA,MAAM,CAACwC,MAAM,EAAE,OAAO,EAAE;IAC7B,OAAOoF,mCAAa,CAACC,gBAAgB,CAAC7H,MAAM,CAACwC,MAAM,CAAC,CAACsF,OAAO;EAC9D;AACF;AAAC"}

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@teambit/merging",
-  "version": "0.0.267",
+  "version": "0.0.268",
   "homepage": "https://bit.dev/teambit/component/merging",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.component",
     "name": "merging",
-    "version": "0.0.267"
+    "version": "0.0.268"
   },
   "dependencies": {
     "lodash": "4.17.21",
@@ -17,18 +17,19 @@
     "ramda": "0.27.1",
     "core-js": "^3.0.0",
     "@babel/runtime": "7.20.0",
+    "@teambit/component-version": "0.0.406",
     "@teambit/harmony": "0.4.6",
     "@teambit/component-id": "0.0.425",
-    "@teambit/dependency-resolver": "0.0.952",
-    "@teambit/envs": "0.0.952",
+    "@teambit/dependency-resolver": "0.0.953",
+    "@teambit/envs": "0.0.953",
     "@teambit/bit-error": "0.0.402",
     "@teambit/cli": "0.0.638",
-    "@teambit/checkout": "0.0.121",
+    "@teambit/checkout": "0.0.122",
     "@teambit/install": "0.0.86",
     "@teambit/lane-id": "0.0.156",
     "@teambit/logger": "0.0.731",
-    "@teambit/snapping": "0.0.267",
-    "@teambit/workspace": "0.0.952"
+    "@teambit/snapping": "0.0.268",
+    "@teambit/workspace": "0.0.953"
   },
   "devDependencies": {
     "chai": "4.3.0",