@teambit/workspace 0.0.984 → 0.0.985

package/dist/aspects-merger.d.ts

@@ -1,5 +1,6 @@
 import { Harmony } from '@teambit/harmony';
 import { Component, ComponentID } from '@teambit/component';
+import { BitId } from '@teambit/legacy-bit-id';
 import { ExtensionDataList } from '@teambit/legacy/dist/consumer/config/extension-data';
 import { ExtensionsOrigin, Workspace } from './workspace';
 import { MergeConflictFile } from './merge-conflict-file';
@@ -9,7 +10,9 @@ export declare class AspectsMerger {
     private consumer;
     private warnedAboutMisconfiguredEnvs;
     readonly mergeConflictFile: MergeConflictFile;
+    private mergeConfigDepsResolverDataCache;
     constructor(workspace: Workspace, harmony: Harmony);
+    getDepsDataOfMergeConfig(id: BitId): Record<string, any>;
     /**
      * Calculate the component config based on:
      * the config property in the .bitmap file
@@ -27,6 +30,13 @@ export declare class AspectsMerger {
         }>;
         errors?: Error[];
     }>;
+    /**
+     * from the merge-config we get the dep-resolver policy as an array, because it needs to support "force" prop.
+     * however, when we save the config, we want to save it as an object, so we need split the data into two:
+     * 1. force: true, which gets saved into the config.
+     * 2. force: false, which gets saved into the data.dependencies later on. see the LegacyDependencyResolver.registerOnComponentAutoDetectOverridesGetter hook
+     */
+    private removeAutoDepsFromConfig;
     private getUnmergedData;
     private warnAboutMisconfiguredEnv;
     private filterEnvsFromExtensionsIfNeeded;

package/dist/aspects-merger.js

@@ -22,6 +22,13 @@ function _envs() {
   };
   return data;
 }
+function _dependencyResolver() {
+  const data = require("@teambit/dependency-resolver");
+  _dependencyResolver = function () {
+    return data;
+  };
+  return data;
+}
 function _extensionData() {
   const data = require("@teambit/legacy/dist/consumer/config/extension-data");
   _extensionData = function () {
@@ -66,9 +73,13 @@ class AspectsMerger {
     (0, _defineProperty2().default)(this, "consumer", void 0);
     (0, _defineProperty2().default)(this, "warnedAboutMisconfiguredEnvs", []);
     (0, _defineProperty2().default)(this, "mergeConflictFile", void 0);
+    (0, _defineProperty2().default)(this, "mergeConfigDepsResolverDataCache", {});
     this.consumer = workspace.consumer;
     this.mergeConflictFile = new (_mergeConflictFile().MergeConflictFile)(workspace.path);
   }
+  getDepsDataOfMergeConfig(id) {
+    return this.mergeConfigDepsResolverDataCache[id.toString()];
+  }
 
   /**
    * Calculate the component config based on:
@@ -126,7 +137,10 @@ class AspectsMerger {
     const mergeConfigCombined = getMergeConfigCombined();
     adjustEnvsOnConfigMerge(mergeConfigCombined || {});
     const configMergeExtensions = mergeConfigCombined ? _extensionData().ExtensionDataList.fromConfigObject(mergeConfigCombined) : undefined;
+    this.removeAutoDepsFromConfig(componentId, configMergeExtensions);
     const scopeExtensions = (componentFromScope === null || componentFromScope === void 0 ? void 0 : (_componentFromScope$c = componentFromScope.config) === null || _componentFromScope$c === void 0 ? void 0 : _componentFromScope$c.extensions) || new (_extensionData().ExtensionDataList)();
+    // backward compatibility. previously, it was saved as an array into the model (when there was merge-config)
+    this.removeAutoDepsFromConfig(componentId, scopeExtensions);
     const [specific, nonSpecific] = (0, _lodash().partition)(scopeExtensions, entry => entry.config[_workspace().AspectSpecificField] === true);
     const scopeExtensionsNonSpecific = new (_extensionData().ExtensionDataList)(...nonSpecific);
     const scopeExtensionsSpecific = new (_extensionData().ExtensionDataList)(...specific);
@@ -177,14 +191,17 @@ class AspectsMerger {
     const setDataListAsSpecific = extensions => {
       extensions.forEach(dataEntry => dataEntry.config[_workspace().AspectSpecificField] = true);
     };
-    if (configMergeExtensions && !excludeOrigins.includes('ConfigMerge')) {
-      await addExtensionsToMerge(_extensionData().ExtensionDataList.fromArray(configMergeExtensions), 'ConfigMerge');
-    }
     if (bitMapExtensions && !excludeOrigins.includes('BitmapFile')) {
       const extensionDataList = _extensionData().ExtensionDataList.fromConfigObject(bitMapExtensions);
       setDataListAsSpecific(extensionDataList);
       await addExtensionsToMerge(extensionDataList, 'BitmapFile');
     }
+    // config-merge is after the .bitmap. because normally if you have config set in .bitmap, you won't
+    // be able to lane-merge. (unless you specify --ignore-config-changes).
+    // so, if there is config in .bitmap, it probably happened after lane-merge.
+    if (configMergeExtensions && !excludeOrigins.includes('ConfigMerge')) {
+      await addExtensionsToMerge(_extensionData().ExtensionDataList.fromArray(configMergeExtensions), 'ConfigMerge');
+    }
     if (configFileExtensions && !excludeOrigins.includes('ComponentJsonFile')) {
       setDataListAsSpecific(configFileExtensions);
       await addExtensionsToMerge(configFileExtensions, 'ComponentJsonFile');
@@ -228,6 +245,40 @@ class AspectsMerger {
       errors
     };
   }
+
+  /**
+   * from the merge-config we get the dep-resolver policy as an array, because it needs to support "force" prop.
+   * however, when we save the config, we want to save it as an object, so we need split the data into two:
+   * 1. force: true, which gets saved into the config.
+   * 2. force: false, which gets saved into the data.dependencies later on. see the LegacyDependencyResolver.registerOnComponentAutoDetectOverridesGetter hook
+   */
+  removeAutoDepsFromConfig(componentId, conf) {
+    var _conf$findCoreExtensi;
+    if (!conf) return;
+    const policy = (_conf$findCoreExtensi = conf.findCoreExtension(_dependencyResolver().DependencyResolverAspect.id)) === null || _conf$findCoreExtensi === void 0 ? void 0 : _conf$findCoreExtensi.config.policy;
+    if (!policy) return;
+    const mergeConfigObj = {};
+    ['dependencies', 'devDependencies', 'peerDependencies'].forEach(key => {
+      if (!policy[key]) return;
+      // this is only relevant when it is saved as an array. otherwise, it's always force: true.
+      if (!Array.isArray(policy[key])) return;
+      mergeConfigObj[key] = policy[key].filter(dep => !dep.force);
+      policy[key] = policy[key].filter(dep => dep.force);
+      if (!policy[key].length) {
+        delete policy[key];
+        return;
+      }
+      // convert to object
+      policy[key] = policy[key].reduce((acc, current) => {
+        acc[current.name] = current.version;
+        return acc;
+      }, {});
+    });
+    if (!this.mergeConfigDepsResolverDataCache[componentId.toString()]) {
+      this.mergeConfigDepsResolverDataCache[componentId.toString()] = {};
+    }
+    this.mergeConfigDepsResolverDataCache[componentId.toString()] = (0, _lodash().merge)(this.mergeConfigDepsResolverDataCache[componentId.toString()], mergeConfigObj);
+  }
   getUnmergedData(componentId) {
     return this.workspace.scope.legacyScope.objects.unmergedComponents.getEntry(componentId._legacy.name);
   }

package/dist/aspects-merger.js.map

@@ -1 +1 @@
-{"version":3,"names":["AspectsMerger","constructor","workspace","harmony","consumer","mergeConflictFile","MergeConflictFile","path","merge","componentId","componentFromScope","excludeOrigins","configFileExtensions","variantsExtensions","wsDefaultExtensions","mergeFromScope","errors","bitMapEntry","bitMap","getComponentIfExist","_legacy","bitMapExtensions","config","configMerge","getConflictParsed","toStringWithoutVersion","err","MergeConfigConflict","logger","error","toString","push","adjustEnvsOnConfigMerge","conf","env","EnvsAspect","id","split","unmergedData","getUnmergedData","unmergedDataMergeConf","mergedConfig","getMergeConfigCombined","undefined","mergeWith","objValue","srcValue","Array","isArray","concat","mergeConfigCombined","configMergeExtensions","ExtensionDataList","fromConfigObject","scopeExtensions","extensions","specific","nonSpecific","partition","entry","AspectSpecificField","scopeExtensionsNonSpecific","scopeExtensionsSpecific","componentConfigFile","aspects","toLegacy","relativeComponentDir","componentDir","ignoreVersion","relative","variantConfig","variants","byRootDirAndName","fullName","clone","extensionsToMerge","envWasFoundPreviously","removedExtensionIds","addExtensionsToMerge","origin","extraData","length","filter","extData","isRemoved","map","stringId","extsWithoutRemoved","filterRemovedExtensions","selfInMergedExtensions","findExtension","toStringWithoutScopeAndVersion","extsWithoutSelf","extensionId","remove","extensionDataListFiltered","envIsCurrentlySet","filterEnvsFromExtensionsIfNeeded","warnAboutMisconfiguredEnv","setDataListAsSpecific","forEach","dataEntry","includes","fromArray","extensionDataList","continuePropagating","propagate","appliedRules","sortedMatches","pattern","specificity","isDefaultExtension","Promise","all","list","resolveExtensionListIds","afterMerge","mergeConfigs","ext","loadExtensions","withoutRemoved","beforeMerge","scope","legacyScope","objects","unmergedComponents","getEntry","name","hasId","envAspect","envFromEnvsAspect","envs","getCoreEnvsIds","warnedAboutMisconfiguredEnvs","envId","resolveComponentId","get","isUsingEnvEnv","consoleWarning","data","nonEnvs","e","envAspectExt","find","ids","listIds","envAspectId","found","isEqualWithoutVersion","Boolean","originatedFrom","throwOnError","extensionsIdsP","extensionEntry","extensionsIds","loadedExtensions","extensionsToLoad","difference","loadAspects","extensionList","promises"],"sources":["aspects-merger.ts"],"sourcesContent":["import { Harmony } from '@teambit/harmony';\nimport { Component, ComponentID } from '@teambit/component';\nimport { UnmergedComponent } from '@teambit/legacy/dist/scope/lanes/unmerged-components';\nimport { EnvsAspect } from '@teambit/envs';\nimport { Consumer } from '@teambit/legacy/dist/consumer';\nimport { ExtensionDataList } from '@teambit/legacy/dist/consumer/config/extension-data';\nimport { partition, mergeWith, difference } from 'lodash';\nimport { MergeConfigConflict } from './exceptions/merge-config-conflict';\nimport { AspectSpecificField, ExtensionsOrigin, Workspace } from './workspace';\nimport { MergeConflictFile } from './merge-conflict-file';\n\nexport class AspectsMerger {\n  private consumer: Consumer;\n  private warnedAboutMisconfiguredEnvs: string[] = []; // cache env-ids that have been errored about not having \"env\" type\n  readonly mergeConflictFile: MergeConflictFile;\n  constructor(private workspace: Workspace, private harmony: Harmony) {\n    this.consumer = workspace.consumer;\n    this.mergeConflictFile = new MergeConflictFile(workspace.path);\n  }\n\n  /**\n   * Calculate the component config based on:\n   * the config property in the .bitmap file\n   * the component.json file in the component folder\n   * matching pattern in the variants config\n   * defaults extensions from workspace config\n   * extensions from the model.\n   */\n  // eslint-disable-next-line complexity\n  async merge(\n    componentId: ComponentID,\n    componentFromScope?: Component,\n    excludeOrigins: ExtensionsOrigin[] = []\n  ): Promise<{\n    extensions: ExtensionDataList;\n    beforeMerge: Array<{ extensions: ExtensionDataList; origin: ExtensionsOrigin; extraData: any }>; // useful for debugging\n    errors?: Error[];\n  }> {\n    // TODO: consider caching this result\n    let configFileExtensions: ExtensionDataList | undefined;\n    let variantsExtensions: ExtensionDataList | undefined;\n    let wsDefaultExtensions: ExtensionDataList | undefined;\n    const mergeFromScope = true;\n    const errors: Error[] = [];\n\n    const bitMapEntry = this.consumer.bitMap.getComponentIfExist(componentId._legacy);\n    const bitMapExtensions = bitMapEntry?.config;\n\n    let configMerge: Record<string, any> | undefined;\n    try {\n      configMerge = await this.mergeConflictFile.getConflictParsed(componentId.toStringWithoutVersion());\n    } catch (err) {\n      if (!(err instanceof MergeConfigConflict)) {\n        throw err;\n      }\n      this.workspace.logger.error(`unable to parse the config file for ${componentId.toString()} due to conflicts`);\n      errors.push(err);\n    }\n\n    const adjustEnvsOnConfigMerge = (conf: Record<string, any>) => {\n      const env = conf[EnvsAspect.id]?.env;\n      if (!env) return;\n      const [id] = env.split('@');\n      conf[EnvsAspect.id] = { env: id };\n      conf[env] = {};\n    };\n    const unmergedData = this.getUnmergedData(componentId);\n    const unmergedDataMergeConf = unmergedData?.mergedConfig;\n    const getMergeConfigCombined = () => {\n      if (!configMerge && !unmergedDataMergeConf) return undefined;\n      if (!configMerge) return unmergedDataMergeConf;\n      if (!unmergedDataMergeConf) return configMerge;\n\n      return mergeWith(configMerge, unmergedDataMergeConf, (objValue, srcValue) => {\n        if (Array.isArray(objValue)) {\n          // critical for dependencyResolver.policy.*dependencies. otherwise, it will override the array\n          return objValue.concat(srcValue);\n        }\n        return undefined;\n      });\n    };\n    const mergeConfigCombined = getMergeConfigCombined();\n    adjustEnvsOnConfigMerge(mergeConfigCombined || {});\n    const configMergeExtensions = mergeConfigCombined\n      ? ExtensionDataList.fromConfigObject(mergeConfigCombined)\n      : undefined;\n\n    const scopeExtensions = componentFromScope?.config?.extensions || new ExtensionDataList();\n    const [specific, nonSpecific] = partition(scopeExtensions, (entry) => entry.config[AspectSpecificField] === true);\n    const scopeExtensionsNonSpecific = new ExtensionDataList(...nonSpecific);\n    const scopeExtensionsSpecific = new ExtensionDataList(...specific);\n\n    const componentConfigFile = await this.workspace.componentConfigFile(componentId);\n    if (componentConfigFile) {\n      configFileExtensions = componentConfigFile.aspects.toLegacy();\n    }\n    const relativeComponentDir = this.workspace.componentDir(componentId, { ignoreVersion: true }, { relative: true });\n    const variantConfig = this.workspace.variants.byRootDirAndName(relativeComponentDir, componentId.fullName);\n    if (variantConfig) {\n      variantsExtensions = variantConfig.extensions.clone();\n      // Do not merge from scope when there is specific variant (which is not *) that match the component\n      // if (variantConfig.maxSpecificity > 0) {\n      //   mergeFromScope = false;\n      // }\n    }\n    // We don't stop on each step because we want to merge the default scope even if propagate=false but the default scope is not defined\n    // in the case the same extension pushed twice, the former takes precedence (opposite of Object.assign)\n    const extensionsToMerge: Array<{ origin: ExtensionsOrigin; extensions: ExtensionDataList; extraData: any }> = [];\n    let envWasFoundPreviously = false;\n    const removedExtensionIds: string[] = [];\n\n    const addExtensionsToMerge = async (extensions: ExtensionDataList, origin: ExtensionsOrigin, extraData?: any) => {\n      if (!extensions.length) {\n        return;\n      }\n      removedExtensionIds.push(...extensions.filter((extData) => extData.isRemoved).map((extData) => extData.stringId));\n      const extsWithoutRemoved = extensions.filterRemovedExtensions();\n      const selfInMergedExtensions = extsWithoutRemoved.findExtension(\n        componentId._legacy.toStringWithoutScopeAndVersion(),\n        true,\n        true\n      );\n      const extsWithoutSelf = selfInMergedExtensions?.extensionId\n        ? extsWithoutRemoved.remove(selfInMergedExtensions.extensionId)\n        : extsWithoutRemoved;\n      const { extensionDataListFiltered, envIsCurrentlySet } = await this.filterEnvsFromExtensionsIfNeeded(\n        extsWithoutSelf,\n        envWasFoundPreviously,\n        origin\n      );\n      if (envIsCurrentlySet) {\n        await this.warnAboutMisconfiguredEnv(componentId, extensions);\n        envWasFoundPreviously = true;\n      }\n\n      extensionsToMerge.push({ origin, extensions: extensionDataListFiltered, extraData });\n    };\n    const setDataListAsSpecific = (extensions: ExtensionDataList) => {\n      extensions.forEach((dataEntry) => (dataEntry.config[AspectSpecificField] = true));\n    };\n    if (configMergeExtensions && !excludeOrigins.includes('ConfigMerge')) {\n      await addExtensionsToMerge(ExtensionDataList.fromArray(configMergeExtensions), 'ConfigMerge');\n    }\n    if (bitMapExtensions && !excludeOrigins.includes('BitmapFile')) {\n      const extensionDataList = ExtensionDataList.fromConfigObject(bitMapExtensions);\n      setDataListAsSpecific(extensionDataList);\n      await addExtensionsToMerge(extensionDataList, 'BitmapFile');\n    }\n    if (configFileExtensions && !excludeOrigins.includes('ComponentJsonFile')) {\n      setDataListAsSpecific(configFileExtensions);\n      await addExtensionsToMerge(configFileExtensions, 'ComponentJsonFile');\n    }\n    if (!excludeOrigins.includes('ModelSpecific')) {\n      await addExtensionsToMerge(ExtensionDataList.fromArray(scopeExtensionsSpecific), 'ModelSpecific');\n    }\n    let continuePropagating = componentConfigFile?.propagate ?? true;\n    if (variantsExtensions && continuePropagating && !excludeOrigins.includes('WorkspaceVariants')) {\n      const appliedRules = variantConfig?.sortedMatches.map(({ pattern, specificity }) => ({ pattern, specificity }));\n      await addExtensionsToMerge(variantsExtensions, 'WorkspaceVariants', { appliedRules });\n    }\n    continuePropagating = continuePropagating && (variantConfig?.propagate ?? true);\n    // Do not apply default extensions on the default extensions (it will create infinite loop when loading them)\n    const isDefaultExtension = wsDefaultExtensions?.findExtension(componentId.toString(), true, true);\n    if (\n      wsDefaultExtensions &&\n      continuePropagating &&\n      !isDefaultExtension &&\n      !excludeOrigins.includes('WorkspaceDefault')\n    ) {\n      await addExtensionsToMerge(wsDefaultExtensions, 'WorkspaceDefault');\n    }\n    if (mergeFromScope && continuePropagating && !excludeOrigins.includes('ModelNonSpecific')) {\n      await addExtensionsToMerge(scopeExtensionsNonSpecific, 'ModelNonSpecific');\n    }\n\n    // It's important to do this resolution before the merge, otherwise we have issues with extensions\n    // coming from scope with local scope name, as opposed to the same extension comes from the workspace with default scope name\n    await Promise.all(extensionsToMerge.map((list) => this.resolveExtensionListIds(list.extensions)));\n    const afterMerge = ExtensionDataList.mergeConfigs(extensionsToMerge.map((ext) => ext.extensions));\n    await this.loadExtensions(afterMerge, componentId);\n    const withoutRemoved = afterMerge.filter((extData) => !removedExtensionIds.includes(extData.stringId));\n    const extensions = ExtensionDataList.fromArray(withoutRemoved);\n    return {\n      extensions,\n      beforeMerge: extensionsToMerge,\n      errors,\n    };\n  }\n\n  private getUnmergedData(componentId: ComponentID): UnmergedComponent | undefined {\n    return this.workspace.scope.legacyScope.objects.unmergedComponents.getEntry(componentId._legacy.name);\n  }\n\n  private async warnAboutMisconfiguredEnv(componentId: ComponentID, extensionDataList: ExtensionDataList) {\n    if (!(await this.workspace.hasId(componentId))) {\n      // if this is a dependency and not belong to the workspace, don't show the warning\n      return;\n    }\n    const envAspect = extensionDataList.findExtension(EnvsAspect.id);\n    const envFromEnvsAspect = envAspect?.config.env;\n    if (!envFromEnvsAspect) return;\n    if (this.workspace.envs.getCoreEnvsIds().includes(envFromEnvsAspect)) return;\n    if (this.warnedAboutMisconfiguredEnvs.includes(envFromEnvsAspect)) return;\n    let env: Component;\n    try {\n      const envId = await this.workspace.resolveComponentId(envFromEnvsAspect);\n      env = await this.workspace.get(envId);\n    } catch (err) {\n      return; // unable to get the component for some reason. don't sweat it. forget about the warning\n    }\n    if (!this.workspace.envs.isUsingEnvEnv(env)) {\n      this.warnedAboutMisconfiguredEnvs.push(envFromEnvsAspect);\n      this.workspace.logger.consoleWarning(\n        `env \"${envFromEnvsAspect}\" is not of type env. (correct the env's type, or component config with \"bit env set ${envFromEnvsAspect} teambit.envs/env\")`\n      );\n    }\n  }\n\n  private async filterEnvsFromExtensionsIfNeeded(\n    extensionDataList: ExtensionDataList,\n    envWasFoundPreviously: boolean,\n    origin: ExtensionsOrigin\n  ) {\n    const envAspect = extensionDataList.findExtension(EnvsAspect.id);\n    const envFromEnvsAspect: string | undefined = envAspect?.config.env || envAspect?.data.id;\n    if (envWasFoundPreviously && envAspect) {\n      const nonEnvs = extensionDataList.filter((e) => {\n        // normally the env-id inside the envs aspect doesn't have a version, but the aspect itself has a version.\n        if (e.stringId === envFromEnvsAspect || e.extensionId?.toStringWithoutVersion() === envFromEnvsAspect)\n          return false;\n        return true;\n      });\n      // still, aspect env may have other data other then config.env.\n      delete envAspect.config.env;\n      return { extensionDataListFiltered: new ExtensionDataList(...nonEnvs), envIsCurrentlySet: true };\n    }\n    if (envFromEnvsAspect && (origin === 'ModelNonSpecific' || origin === 'ModelSpecific')) {\n      // if env was found, search for this env in the workspace and if found, replace the env-id with the one from the workspace\n      const envAspectExt = extensionDataList.find((e) => e.extensionId?.toStringWithoutVersion() === envFromEnvsAspect);\n      const ids = await this.workspace.listIds();\n      const envAspectId = envAspectExt?.extensionId;\n      const found = envAspectId && ids.find((id) => id._legacy.isEqualWithoutVersion(envAspectId));\n      if (found) {\n        envAspectExt.extensionId = found._legacy;\n      }\n    }\n    return { extensionDataListFiltered: extensionDataList, envIsCurrentlySet: Boolean(envFromEnvsAspect) };\n  }\n\n  /**\n   * Load all unloaded extensions from a list\n   * @param extensions list of extensions with config to load\n   */\n  private async loadExtensions(\n    extensions: ExtensionDataList,\n    originatedFrom?: ComponentID,\n    throwOnError = false\n  ): Promise<void> {\n    const extensionsIdsP = extensions.map(async (extensionEntry) => {\n      // Core extension\n      if (!extensionEntry.extensionId) {\n        return extensionEntry.stringId as string;\n      }\n\n      const id = await this.workspace.resolveComponentId(extensionEntry.extensionId);\n      // return this.resolveComponentId(extensionEntry.extensionId);\n      return id.toString();\n    });\n    const extensionsIds: string[] = await Promise.all(extensionsIdsP);\n    const loadedExtensions = this.harmony.extensionsIds;\n    const extensionsToLoad = difference(extensionsIds, loadedExtensions);\n    if (!extensionsToLoad.length) return;\n    await this.workspace.loadAspects(extensionsToLoad, throwOnError, originatedFrom?.toString());\n  }\n\n  /**\n   * This will mutate the entries with extensionId prop to have resolved legacy id\n   * This should be worked on the extension data list not the new aspect list\n   * @param extensionList\n   */\n  private async resolveExtensionListIds(extensionList: ExtensionDataList): Promise<ExtensionDataList> {\n    const promises = extensionList.map(async (entry) => {\n      if (entry.extensionId) {\n        const id = await this.workspace.resolveComponentId(entry.extensionId);\n        entry.extensionId = id._legacy;\n      }\n\n      return entry;\n    });\n    await Promise.all(promises);\n    return extensionList;\n  }\n}\n"],"mappings":"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"}
+{"version":3,"names":["AspectsMerger","constructor","workspace","harmony","consumer","mergeConflictFile","MergeConflictFile","path","getDepsDataOfMergeConfig","id","mergeConfigDepsResolverDataCache","toString","merge","componentId","componentFromScope","excludeOrigins","configFileExtensions","variantsExtensions","wsDefaultExtensions","mergeFromScope","errors","bitMapEntry","bitMap","getComponentIfExist","_legacy","bitMapExtensions","config","configMerge","getConflictParsed","toStringWithoutVersion","err","MergeConfigConflict","logger","error","push","adjustEnvsOnConfigMerge","conf","env","EnvsAspect","split","unmergedData","getUnmergedData","unmergedDataMergeConf","mergedConfig","getMergeConfigCombined","undefined","mergeWith","objValue","srcValue","Array","isArray","concat","mergeConfigCombined","configMergeExtensions","ExtensionDataList","fromConfigObject","removeAutoDepsFromConfig","scopeExtensions","extensions","specific","nonSpecific","partition","entry","AspectSpecificField","scopeExtensionsNonSpecific","scopeExtensionsSpecific","componentConfigFile","aspects","toLegacy","relativeComponentDir","componentDir","ignoreVersion","relative","variantConfig","variants","byRootDirAndName","fullName","clone","extensionsToMerge","envWasFoundPreviously","removedExtensionIds","addExtensionsToMerge","origin","extraData","length","filter","extData","isRemoved","map","stringId","extsWithoutRemoved","filterRemovedExtensions","selfInMergedExtensions","findExtension","toStringWithoutScopeAndVersion","extsWithoutSelf","extensionId","remove","extensionDataListFiltered","envIsCurrentlySet","filterEnvsFromExtensionsIfNeeded","warnAboutMisconfiguredEnv","setDataListAsSpecific","forEach","dataEntry","includes","extensionDataList","fromArray","continuePropagating","propagate","appliedRules","sortedMatches","pattern","specificity","isDefaultExtension","Promise","all","list","resolveExtensionListIds","afterMerge","mergeConfigs","ext","loadExtensions","withoutRemoved","beforeMerge","policy","findCoreExtension","DependencyResolverAspect","mergeConfigObj","key","dep","force","reduce","acc","current","name","version","scope","legacyScope","objects","unmergedComponents","getEntry","hasId","envAspect","envFromEnvsAspect","envs","getCoreEnvsIds","warnedAboutMisconfiguredEnvs","envId","resolveComponentId","get","isUsingEnvEnv","consoleWarning","data","nonEnvs","e","envAspectExt","find","ids","listIds","envAspectId","found","isEqualWithoutVersion","Boolean","originatedFrom","throwOnError","extensionsIdsP","extensionEntry","extensionsIds","loadedExtensions","extensionsToLoad","difference","loadAspects","extensionList","promises"],"sources":["aspects-merger.ts"],"sourcesContent":["import { Harmony } from '@teambit/harmony';\nimport { Component, ComponentID } from '@teambit/component';\nimport { UnmergedComponent } from '@teambit/legacy/dist/scope/lanes/unmerged-components';\nimport { BitId } from '@teambit/legacy-bit-id';\nimport { EnvsAspect } from '@teambit/envs';\nimport { DependencyResolverAspect } from '@teambit/dependency-resolver';\nimport { Consumer } from '@teambit/legacy/dist/consumer';\nimport { ExtensionDataList } from '@teambit/legacy/dist/consumer/config/extension-data';\nimport { partition, mergeWith, difference, merge } from 'lodash';\nimport { MergeConfigConflict } from './exceptions/merge-config-conflict';\nimport { AspectSpecificField, ExtensionsOrigin, Workspace } from './workspace';\nimport { MergeConflictFile } from './merge-conflict-file';\n\nexport class AspectsMerger {\n  private consumer: Consumer;\n  private warnedAboutMisconfiguredEnvs: string[] = []; // cache env-ids that have been errored about not having \"env\" type\n  readonly mergeConflictFile: MergeConflictFile;\n  private mergeConfigDepsResolverDataCache: { [compIdStr: string]: Record<string, any> } = {};\n  constructor(private workspace: Workspace, private harmony: Harmony) {\n    this.consumer = workspace.consumer;\n    this.mergeConflictFile = new MergeConflictFile(workspace.path);\n  }\n\n  getDepsDataOfMergeConfig(id: BitId) {\n    return this.mergeConfigDepsResolverDataCache[id.toString()];\n  }\n\n  /**\n   * Calculate the component config based on:\n   * the config property in the .bitmap file\n   * the component.json file in the component folder\n   * matching pattern in the variants config\n   * defaults extensions from workspace config\n   * extensions from the model.\n   */\n  // eslint-disable-next-line complexity\n  async merge(\n    componentId: ComponentID,\n    componentFromScope?: Component,\n    excludeOrigins: ExtensionsOrigin[] = []\n  ): Promise<{\n    extensions: ExtensionDataList;\n    beforeMerge: Array<{ extensions: ExtensionDataList; origin: ExtensionsOrigin; extraData: any }>; // useful for debugging\n    errors?: Error[];\n  }> {\n    // TODO: consider caching this result\n    let configFileExtensions: ExtensionDataList | undefined;\n    let variantsExtensions: ExtensionDataList | undefined;\n    let wsDefaultExtensions: ExtensionDataList | undefined;\n    const mergeFromScope = true;\n    const errors: Error[] = [];\n\n    const bitMapEntry = this.consumer.bitMap.getComponentIfExist(componentId._legacy);\n    const bitMapExtensions = bitMapEntry?.config;\n\n    let configMerge: Record<string, any> | undefined;\n    try {\n      configMerge = await this.mergeConflictFile.getConflictParsed(componentId.toStringWithoutVersion());\n    } catch (err) {\n      if (!(err instanceof MergeConfigConflict)) {\n        throw err;\n      }\n      this.workspace.logger.error(`unable to parse the config file for ${componentId.toString()} due to conflicts`);\n      errors.push(err);\n    }\n\n    const adjustEnvsOnConfigMerge = (conf: Record<string, any>) => {\n      const env = conf[EnvsAspect.id]?.env;\n      if (!env) return;\n      const [id] = env.split('@');\n      conf[EnvsAspect.id] = { env: id };\n      conf[env] = {};\n    };\n\n    const unmergedData = this.getUnmergedData(componentId);\n    const unmergedDataMergeConf = unmergedData?.mergedConfig;\n    const getMergeConfigCombined = () => {\n      if (!configMerge && !unmergedDataMergeConf) return undefined;\n      if (!configMerge) return unmergedDataMergeConf;\n      if (!unmergedDataMergeConf) return configMerge;\n\n      return mergeWith(configMerge, unmergedDataMergeConf, (objValue, srcValue) => {\n        if (Array.isArray(objValue)) {\n          // critical for dependencyResolver.policy.*dependencies. otherwise, it will override the array\n          return objValue.concat(srcValue);\n        }\n        return undefined;\n      });\n    };\n    const mergeConfigCombined = getMergeConfigCombined();\n    adjustEnvsOnConfigMerge(mergeConfigCombined || {});\n\n    const configMergeExtensions = mergeConfigCombined\n      ? ExtensionDataList.fromConfigObject(mergeConfigCombined)\n      : undefined;\n\n    this.removeAutoDepsFromConfig(componentId, configMergeExtensions);\n    const scopeExtensions = componentFromScope?.config?.extensions || new ExtensionDataList();\n    // backward compatibility. previously, it was saved as an array into the model (when there was merge-config)\n    this.removeAutoDepsFromConfig(componentId, scopeExtensions);\n    const [specific, nonSpecific] = partition(scopeExtensions, (entry) => entry.config[AspectSpecificField] === true);\n    const scopeExtensionsNonSpecific = new ExtensionDataList(...nonSpecific);\n    const scopeExtensionsSpecific = new ExtensionDataList(...specific);\n\n    const componentConfigFile = await this.workspace.componentConfigFile(componentId);\n    if (componentConfigFile) {\n      configFileExtensions = componentConfigFile.aspects.toLegacy();\n    }\n    const relativeComponentDir = this.workspace.componentDir(componentId, { ignoreVersion: true }, { relative: true });\n    const variantConfig = this.workspace.variants.byRootDirAndName(relativeComponentDir, componentId.fullName);\n    if (variantConfig) {\n      variantsExtensions = variantConfig.extensions.clone();\n      // Do not merge from scope when there is specific variant (which is not *) that match the component\n      // if (variantConfig.maxSpecificity > 0) {\n      //   mergeFromScope = false;\n      // }\n    }\n    // We don't stop on each step because we want to merge the default scope even if propagate=false but the default scope is not defined\n    // in the case the same extension pushed twice, the former takes precedence (opposite of Object.assign)\n    const extensionsToMerge: Array<{ origin: ExtensionsOrigin; extensions: ExtensionDataList; extraData: any }> = [];\n    let envWasFoundPreviously = false;\n    const removedExtensionIds: string[] = [];\n\n    const addExtensionsToMerge = async (extensions: ExtensionDataList, origin: ExtensionsOrigin, extraData?: any) => {\n      if (!extensions.length) {\n        return;\n      }\n      removedExtensionIds.push(...extensions.filter((extData) => extData.isRemoved).map((extData) => extData.stringId));\n      const extsWithoutRemoved = extensions.filterRemovedExtensions();\n      const selfInMergedExtensions = extsWithoutRemoved.findExtension(\n        componentId._legacy.toStringWithoutScopeAndVersion(),\n        true,\n        true\n      );\n      const extsWithoutSelf = selfInMergedExtensions?.extensionId\n        ? extsWithoutRemoved.remove(selfInMergedExtensions.extensionId)\n        : extsWithoutRemoved;\n      const { extensionDataListFiltered, envIsCurrentlySet } = await this.filterEnvsFromExtensionsIfNeeded(\n        extsWithoutSelf,\n        envWasFoundPreviously,\n        origin\n      );\n      if (envIsCurrentlySet) {\n        await this.warnAboutMisconfiguredEnv(componentId, extensions);\n        envWasFoundPreviously = true;\n      }\n\n      extensionsToMerge.push({ origin, extensions: extensionDataListFiltered, extraData });\n    };\n    const setDataListAsSpecific = (extensions: ExtensionDataList) => {\n      extensions.forEach((dataEntry) => (dataEntry.config[AspectSpecificField] = true));\n    };\n    if (bitMapExtensions && !excludeOrigins.includes('BitmapFile')) {\n      const extensionDataList = ExtensionDataList.fromConfigObject(bitMapExtensions);\n      setDataListAsSpecific(extensionDataList);\n      await addExtensionsToMerge(extensionDataList, 'BitmapFile');\n    }\n    // config-merge is after the .bitmap. because normally if you have config set in .bitmap, you won't\n    // be able to lane-merge. (unless you specify --ignore-config-changes).\n    // so, if there is config in .bitmap, it probably happened after lane-merge.\n    if (configMergeExtensions && !excludeOrigins.includes('ConfigMerge')) {\n      await addExtensionsToMerge(ExtensionDataList.fromArray(configMergeExtensions), 'ConfigMerge');\n    }\n    if (configFileExtensions && !excludeOrigins.includes('ComponentJsonFile')) {\n      setDataListAsSpecific(configFileExtensions);\n      await addExtensionsToMerge(configFileExtensions, 'ComponentJsonFile');\n    }\n    if (!excludeOrigins.includes('ModelSpecific')) {\n      await addExtensionsToMerge(ExtensionDataList.fromArray(scopeExtensionsSpecific), 'ModelSpecific');\n    }\n    let continuePropagating = componentConfigFile?.propagate ?? true;\n    if (variantsExtensions && continuePropagating && !excludeOrigins.includes('WorkspaceVariants')) {\n      const appliedRules = variantConfig?.sortedMatches.map(({ pattern, specificity }) => ({ pattern, specificity }));\n      await addExtensionsToMerge(variantsExtensions, 'WorkspaceVariants', { appliedRules });\n    }\n    continuePropagating = continuePropagating && (variantConfig?.propagate ?? true);\n    // Do not apply default extensions on the default extensions (it will create infinite loop when loading them)\n    const isDefaultExtension = wsDefaultExtensions?.findExtension(componentId.toString(), true, true);\n    if (\n      wsDefaultExtensions &&\n      continuePropagating &&\n      !isDefaultExtension &&\n      !excludeOrigins.includes('WorkspaceDefault')\n    ) {\n      await addExtensionsToMerge(wsDefaultExtensions, 'WorkspaceDefault');\n    }\n    if (mergeFromScope && continuePropagating && !excludeOrigins.includes('ModelNonSpecific')) {\n      await addExtensionsToMerge(scopeExtensionsNonSpecific, 'ModelNonSpecific');\n    }\n\n    // It's important to do this resolution before the merge, otherwise we have issues with extensions\n    // coming from scope with local scope name, as opposed to the same extension comes from the workspace with default scope name\n    await Promise.all(extensionsToMerge.map((list) => this.resolveExtensionListIds(list.extensions)));\n    const afterMerge = ExtensionDataList.mergeConfigs(extensionsToMerge.map((ext) => ext.extensions));\n    await this.loadExtensions(afterMerge, componentId);\n    const withoutRemoved = afterMerge.filter((extData) => !removedExtensionIds.includes(extData.stringId));\n    const extensions = ExtensionDataList.fromArray(withoutRemoved);\n    return {\n      extensions,\n      beforeMerge: extensionsToMerge,\n      errors,\n    };\n  }\n\n  /**\n   * from the merge-config we get the dep-resolver policy as an array, because it needs to support \"force\" prop.\n   * however, when we save the config, we want to save it as an object, so we need split the data into two:\n   * 1. force: true, which gets saved into the config.\n   * 2. force: false, which gets saved into the data.dependencies later on. see the LegacyDependencyResolver.registerOnComponentAutoDetectOverridesGetter hook\n   */\n  private removeAutoDepsFromConfig(componentId: ComponentID, conf?: ExtensionDataList) {\n    if (!conf) return;\n    const policy = conf.findCoreExtension(DependencyResolverAspect.id)?.config.policy;\n    if (!policy) return;\n\n    const mergeConfigObj = {};\n    ['dependencies', 'devDependencies', 'peerDependencies'].forEach((key) => {\n      if (!policy[key]) return;\n      // this is only relevant when it is saved as an array. otherwise, it's always force: true.\n      if (!Array.isArray(policy[key])) return;\n\n      mergeConfigObj[key] = policy[key].filter((dep) => !dep.force);\n      policy[key] = policy[key].filter((dep) => dep.force);\n\n      if (!policy[key].length) {\n        delete policy[key];\n        return;\n      }\n      // convert to object\n      policy[key] = policy[key].reduce((acc, current) => {\n        acc[current.name] = current.version;\n        return acc;\n      }, {});\n    });\n\n    if (!this.mergeConfigDepsResolverDataCache[componentId.toString()]) {\n      this.mergeConfigDepsResolverDataCache[componentId.toString()] = {};\n    }\n    this.mergeConfigDepsResolverDataCache[componentId.toString()] = merge(\n      this.mergeConfigDepsResolverDataCache[componentId.toString()],\n      mergeConfigObj\n    );\n  }\n\n  private getUnmergedData(componentId: ComponentID): UnmergedComponent | undefined {\n    return this.workspace.scope.legacyScope.objects.unmergedComponents.getEntry(componentId._legacy.name);\n  }\n\n  private async warnAboutMisconfiguredEnv(componentId: ComponentID, extensionDataList: ExtensionDataList) {\n    if (!(await this.workspace.hasId(componentId))) {\n      // if this is a dependency and not belong to the workspace, don't show the warning\n      return;\n    }\n    const envAspect = extensionDataList.findExtension(EnvsAspect.id);\n    const envFromEnvsAspect = envAspect?.config.env;\n    if (!envFromEnvsAspect) return;\n    if (this.workspace.envs.getCoreEnvsIds().includes(envFromEnvsAspect)) return;\n    if (this.warnedAboutMisconfiguredEnvs.includes(envFromEnvsAspect)) return;\n    let env: Component;\n    try {\n      const envId = await this.workspace.resolveComponentId(envFromEnvsAspect);\n      env = await this.workspace.get(envId);\n    } catch (err) {\n      return; // unable to get the component for some reason. don't sweat it. forget about the warning\n    }\n    if (!this.workspace.envs.isUsingEnvEnv(env)) {\n      this.warnedAboutMisconfiguredEnvs.push(envFromEnvsAspect);\n      this.workspace.logger.consoleWarning(\n        `env \"${envFromEnvsAspect}\" is not of type env. (correct the env's type, or component config with \"bit env set ${envFromEnvsAspect} teambit.envs/env\")`\n      );\n    }\n  }\n\n  private async filterEnvsFromExtensionsIfNeeded(\n    extensionDataList: ExtensionDataList,\n    envWasFoundPreviously: boolean,\n    origin: ExtensionsOrigin\n  ) {\n    const envAspect = extensionDataList.findExtension(EnvsAspect.id);\n    const envFromEnvsAspect: string | undefined = envAspect?.config.env || envAspect?.data.id;\n    if (envWasFoundPreviously && envAspect) {\n      const nonEnvs = extensionDataList.filter((e) => {\n        // normally the env-id inside the envs aspect doesn't have a version, but the aspect itself has a version.\n        if (e.stringId === envFromEnvsAspect || e.extensionId?.toStringWithoutVersion() === envFromEnvsAspect)\n          return false;\n        return true;\n      });\n      // still, aspect env may have other data other then config.env.\n      delete envAspect.config.env;\n      return { extensionDataListFiltered: new ExtensionDataList(...nonEnvs), envIsCurrentlySet: true };\n    }\n    if (envFromEnvsAspect && (origin === 'ModelNonSpecific' || origin === 'ModelSpecific')) {\n      // if env was found, search for this env in the workspace and if found, replace the env-id with the one from the workspace\n      const envAspectExt = extensionDataList.find((e) => e.extensionId?.toStringWithoutVersion() === envFromEnvsAspect);\n      const ids = await this.workspace.listIds();\n      const envAspectId = envAspectExt?.extensionId;\n      const found = envAspectId && ids.find((id) => id._legacy.isEqualWithoutVersion(envAspectId));\n      if (found) {\n        envAspectExt.extensionId = found._legacy;\n      }\n    }\n    return { extensionDataListFiltered: extensionDataList, envIsCurrentlySet: Boolean(envFromEnvsAspect) };\n  }\n\n  /**\n   * Load all unloaded extensions from a list\n   * @param extensions list of extensions with config to load\n   */\n  private async loadExtensions(\n    extensions: ExtensionDataList,\n    originatedFrom?: ComponentID,\n    throwOnError = false\n  ): Promise<void> {\n    const extensionsIdsP = extensions.map(async (extensionEntry) => {\n      // Core extension\n      if (!extensionEntry.extensionId) {\n        return extensionEntry.stringId as string;\n      }\n\n      const id = await this.workspace.resolveComponentId(extensionEntry.extensionId);\n      // return this.resolveComponentId(extensionEntry.extensionId);\n      return id.toString();\n    });\n    const extensionsIds: string[] = await Promise.all(extensionsIdsP);\n    const loadedExtensions = this.harmony.extensionsIds;\n    const extensionsToLoad = difference(extensionsIds, loadedExtensions);\n    if (!extensionsToLoad.length) return;\n    await this.workspace.loadAspects(extensionsToLoad, throwOnError, originatedFrom?.toString());\n  }\n\n  /**\n   * This will mutate the entries with extensionId prop to have resolved legacy id\n   * This should be worked on the extension data list not the new aspect list\n   * @param extensionList\n   */\n  private async resolveExtensionListIds(extensionList: ExtensionDataList): Promise<ExtensionDataList> {\n    const promises = extensionList.map(async (entry) => {\n      if (entry.extensionId) {\n        const id = await this.workspace.resolveComponentId(entry.extensionId);\n        entry.extensionId = id._legacy;\n      }\n\n      return entry;\n    });\n    await Promise.all(promises);\n    return extensionList;\n  }\n}\n"],"mappings":"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"}

package/dist/{preview-1676345410142.js → preview-1676431915606.js}

@@ -1,5 +1,5 @@
-import * as compositions_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.workspace_workspace@0.0.984/dist/workspace.composition.js';
-import * as overview_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.workspace_workspace@0.0.984/dist/workspace.docs.mdx';
+import * as compositions_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.workspace_workspace@0.0.985/dist/workspace.composition.js';
+import * as overview_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.workspace_workspace@0.0.985/dist/workspace.docs.mdx';
 
 export const compositions = [compositions_0];
 export const overview = [overview_0];

package/dist/workspace.d.ts

@@ -337,6 +337,7 @@ export declare class Workspace implements ComponentFactory {
     }>;
     getConfigMergeFilePath(): string;
     getConflictMergeFile(): MergeConflictFile;
+    getDepsDataOfMergeConfig(id: BitId): Record<string, any> | undefined;
     listComponentsDuringMerge(): Promise<ComponentID[]>;
     getUnmergedComponent(componentId: ComponentID): Promise<Component | undefined>;
     isModified(component: Component): Promise<boolean>;

package/dist/workspace.js

@@ -1165,6 +1165,9 @@ the following envs are used in this workspace: ${availableEnvs.join(', ')}`);
   getConflictMergeFile() {
     return this.aspectsMerger.mergeConflictFile;
   }
+  getDepsDataOfMergeConfig(id) {
+    return this.aspectsMerger.getDepsDataOfMergeConfig(id);
+  }
   async listComponentsDuringMerge() {
     const unmergedComps = this.scope.legacyScope.objects.unmergedComponents.getComponents();
     const bitIds = unmergedComps.map(u => new (_legacyBitId().BitId)(u.id));