@teambit/workspace 0.0.956 → 0.0.957

package/dist/workspace.js

@@ -319,9 +319,9 @@ function _buildGraphIdsFromFs() {
   };
   return data;
 }
-function _mergeConfigConflict() {
-  const data = require("./exceptions/merge-config-conflict");
-  _mergeConfigConflict = function () {
+function _aspectsMerger() {
+  const data = require("./aspects-merger");
+  _aspectsMerger = function () {
     return data;
   };
   return data;
@@ -343,7 +343,7 @@ const DEFAULT_VENDOR_DIR = 'vendor';
  */
 class Workspace {
   // cache loaded components
-  // cache env-ids that have been errored about not having "env" type
+
   constructor(
   /**
    * private pubsub.
@@ -404,7 +404,7 @@ class Workspace {
     (0, _defineProperty2().default)(this, "bitMap", void 0);
     (0, _defineProperty2().default)(this, "_cachedListIds", void 0);
     (0, _defineProperty2().default)(this, "componentLoadedSelfAsAspects", void 0);
-    (0, _defineProperty2().default)(this, "warnedAboutMisconfiguredEnvs", []);
+    (0, _defineProperty2().default)(this, "aspectsMerger", void 0);
     (0, _defineProperty2().default)(this, "watcher", new (_watcher().Watcher)(this, this.pubsub));
     this.componentLoadedSelfAsAspects = (0, _cacheFactory().createInMemoryCache)({
       maxSize: (0, _inMemoryCache().getMaxSizeForComponents)()
@@ -421,8 +421,9 @@ class Workspace {
       promise: true,
       maxAge: 60 * 1000 // 1 min
     });
-  }
 
+    this.aspectsMerger = new (_aspectsMerger().AspectsMerger)(this, this.harmony);
+  }
   validateConfig() {
     if (this.consumer.isLegacy) return;
     if ((0, _lodash().isEmpty)(this.config)) throw new (_bitError().BitError)(`fatal: workspace config is empty. probably one of bit files is missing. consider running "bit init"`);
@@ -1215,160 +1216,8 @@ the following envs are used in this workspace: ${availableEnvs.join(', ')}`);
    * defaults extensions from workspace config
    * extensions from the model.
    */
-  // eslint-disable-next-line complexity
   async componentExtensions(componentId, componentFromScope, excludeOrigins = []) {
-    var _componentFromScope$c, _componentConfigFile$, _variantConfig$propag, _wsDefaultExtensions;
-    // TODO: consider caching this result
-    let configFileExtensions;
-    let variantsExtensions;
-    let wsDefaultExtensions;
-    const mergeFromScope = true;
-    const errors = [];
-    const bitMapEntry = this.consumer.bitMap.getComponentIfExist(componentId._legacy);
-    const bitMapExtensions = bitMapEntry === null || bitMapEntry === void 0 ? void 0 : bitMapEntry.config;
-    let configMergeFile;
-    try {
-      configMergeFile = await this.getConfigMergeFile(componentId);
-    } catch (err) {
-      if (!(err instanceof _mergeConfigConflict().MergeConfigConflict)) {
-        throw err;
-      }
-      this.logger.error(`unable to parse the config file for ${componentId.toString()} due to conflicts`);
-      errors.push(err);
-    }
-    const adjustEnvsOnConfigMerge = conf => {
-      var _conf$EnvsAspect$id;
-      const env = (_conf$EnvsAspect$id = conf[_envs().EnvsAspect.id]) === null || _conf$EnvsAspect$id === void 0 ? void 0 : _conf$EnvsAspect$id.env;
-      if (!env) return;
-      const [id] = env.split('@');
-      conf[_envs().EnvsAspect.id] = {
-        env: id
-      };
-      conf[env] = {};
-    };
-    const unmergedData = this.getUnmergedData(componentId);
-    const unmergedDataMergeConf = unmergedData === null || unmergedData === void 0 ? void 0 : unmergedData.mergedConfig;
-    const getMergeConfigCombined = () => {
-      if (!configMergeFile && !unmergedDataMergeConf) return undefined;
-      if (!configMergeFile) return unmergedDataMergeConf;
-      if (!unmergedDataMergeConf) return configMergeFile;
-      return (0, _lodash().mergeWith)(configMergeFile, unmergedDataMergeConf, (objValue, srcValue) => {
-        if (Array.isArray(objValue)) {
-          // critical for dependencyResolver.policy.*dependencies. otherwise, it will override the array
-          return objValue.concat(srcValue);
-        }
-        return undefined;
-      });
-    };
-    const mergeConfigCombined = getMergeConfigCombined();
-    adjustEnvsOnConfigMerge(mergeConfigCombined || {});
-    const configMergeExtensions = mergeConfigCombined ? _extensionData().ExtensionDataList.fromConfigObject(mergeConfigCombined) : undefined;
-    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)();
-    const [specific, nonSpecific] = (0, _lodash().partition)(scopeExtensions, entry => entry.config[AspectSpecificField] === true);
-    const scopeExtensionsNonSpecific = new (_extensionData().ExtensionDataList)(...nonSpecific);
-    const scopeExtensionsSpecific = new (_extensionData().ExtensionDataList)(...specific);
-    const componentConfigFile = await this.componentConfigFile(componentId);
-    if (componentConfigFile) {
-      configFileExtensions = componentConfigFile.aspects.toLegacy();
-    }
-    const relativeComponentDir = this.componentDir(componentId, {
-      ignoreVersion: true
-    }, {
-      relative: true
-    });
-    const variantConfig = this.variants.byRootDirAndName(relativeComponentDir, componentId.fullName);
-    if (variantConfig) {
-      variantsExtensions = variantConfig.extensions.clone();
-      // Do not merge from scope when there is specific variant (which is not *) that match the component
-      // if (variantConfig.maxSpecificity > 0) {
-      //   mergeFromScope = false;
-      // }
-    }
-
-    const isVendor = this.isVendorComponentByComponentDir(relativeComponentDir);
-    if (!isVendor) {
-      wsDefaultExtensions = this.getDefaultExtensions();
-    }
-    // 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
-    // in the case the same extension pushed twice, the former takes precedence (opposite of Object.assign)
-    const extensionsToMerge = [];
-    let envWasFoundPreviously = false;
-    const removedExtensionIds = [];
-    const addExtensionsToMerge = async (extensions, origin, extraData) => {
-      if (!extensions.length) {
-        return;
-      }
-      removedExtensionIds.push(...extensions.filter(extData => extData.isRemoved).map(extData => extData.stringId));
-      const extsWithoutRemoved = extensions.filterRemovedExtensions();
-      const selfInMergedExtensions = extsWithoutRemoved.findExtension(componentId._legacy.toStringWithoutScopeAndVersion(), true, true);
-      const extsWithoutSelf = selfInMergedExtensions !== null && selfInMergedExtensions !== void 0 && selfInMergedExtensions.extensionId ? extsWithoutRemoved.remove(selfInMergedExtensions.extensionId) : extsWithoutRemoved;
-      const {
-        extensionDataListFiltered,
-        envIsCurrentlySet
-      } = await this.filterEnvsFromExtensionsIfNeeded(extsWithoutSelf, envWasFoundPreviously, origin);
-      if (envIsCurrentlySet) {
-        await this.warnAboutMisconfiguredEnv(componentId, extensions);
-        envWasFoundPreviously = true;
-      }
-      extensionsToMerge.push({
-        origin,
-        extensions: extensionDataListFiltered,
-        extraData
-      });
-    };
-    const setDataListAsSpecific = extensions => {
-      extensions.forEach(dataEntry => dataEntry.config[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');
-    }
-    if (configFileExtensions && !excludeOrigins.includes('ComponentJsonFile')) {
-      setDataListAsSpecific(configFileExtensions);
-      await addExtensionsToMerge(configFileExtensions, 'ComponentJsonFile');
-    }
-    if (!excludeOrigins.includes('ModelSpecific')) {
-      await addExtensionsToMerge(_extensionData().ExtensionDataList.fromArray(scopeExtensionsSpecific), 'ModelSpecific');
-    }
-    let continuePropagating = (_componentConfigFile$ = componentConfigFile === null || componentConfigFile === void 0 ? void 0 : componentConfigFile.propagate) !== null && _componentConfigFile$ !== void 0 ? _componentConfigFile$ : true;
-    if (variantsExtensions && continuePropagating && !excludeOrigins.includes('WorkspaceVariants')) {
-      const appliedRules = variantConfig === null || variantConfig === void 0 ? void 0 : variantConfig.sortedMatches.map(({
-        pattern,
-        specificity
-      }) => ({
-        pattern,
-        specificity
-      }));
-      await addExtensionsToMerge(variantsExtensions, 'WorkspaceVariants', {
-        appliedRules
-      });
-    }
-    continuePropagating = continuePropagating && ((_variantConfig$propag = variantConfig === null || variantConfig === void 0 ? void 0 : variantConfig.propagate) !== null && _variantConfig$propag !== void 0 ? _variantConfig$propag : true);
-    // Do not apply default extensions on the default extensions (it will create infinite loop when loading them)
-    const isDefaultExtension = (_wsDefaultExtensions = wsDefaultExtensions) === null || _wsDefaultExtensions === void 0 ? void 0 : _wsDefaultExtensions.findExtension(componentId.toString(), true, true);
-    if (wsDefaultExtensions && continuePropagating && !isDefaultExtension && !excludeOrigins.includes('WorkspaceDefault')) {
-      await addExtensionsToMerge(wsDefaultExtensions, 'WorkspaceDefault');
-    }
-    if (mergeFromScope && continuePropagating && !excludeOrigins.includes('ModelNonSpecific')) {
-      await addExtensionsToMerge(scopeExtensionsNonSpecific, 'ModelNonSpecific');
-    }
-
-    // It's important to do this resolution before the merge, otherwise we have issues with extensions
-    // coming from scope with local scope name, as opposed to the same extension comes from the workspace with default scope name
-    await Promise.all(extensionsToMerge.map(list => this.resolveExtensionListIds(list.extensions)));
-    const afterMerge = _extensionData().ExtensionDataList.mergeConfigs(extensionsToMerge.map(ext => ext.extensions));
-    await this.loadExtensions(afterMerge, componentId);
-    const withoutRemoved = afterMerge.filter(extData => !removedExtensionIds.includes(extData.stringId));
-    const extensions = _extensionData().ExtensionDataList.fromArray(withoutRemoved);
-    return {
-      extensions,
-      beforeMerge: extensionsToMerge,
-      errors
-    };
+    return this.aspectsMerger.merge(componentId, componentFromScope, excludeOrigins);
   }
   getConfigMergeFilePath(componentId) {
     const compDir = this.componentDir(componentId, {
@@ -1381,23 +1230,6 @@ the following envs are used in this workspace: ${availableEnvs.join(', ')}`);
     const bitIds = unmergedComps.map(u => new (_legacyBitId().BitId)(u.id));
     return this.resolveMultipleComponentIds(bitIds);
   }
-  async getConfigMergeFile(componentId) {
-    const configMergePath = this.getConfigMergeFilePath(componentId);
-    let fileContent;
-    try {
-      fileContent = await _fsExtra().default.readFile(configMergePath, 'utf-8');
-    } catch (err) {
-      if (err.code === 'ENOENT') {
-        return undefined;
-      }
-      throw err;
-    }
-    try {
-      return JSON.parse(fileContent);
-    } catch (err) {
-      throw new (_mergeConfigConflict().MergeConfigConflict)(configMergePath);
-    }
-  }
   async getUnmergedComponent(componentId) {
     const unmerged = this.scope.legacyScope.objects.unmergedComponents.getEntry(componentId._legacy.name);
     if (unmerged !== null && unmerged !== void 0 && unmerged.head) {
@@ -1405,32 +1237,6 @@ the following envs are used in this workspace: ${availableEnvs.join(', ')}`);
     }
     return undefined;
   }
-  getUnmergedData(componentId) {
-    return this.scope.legacyScope.objects.unmergedComponents.getEntry(componentId._legacy.name);
-  }
-  async warnAboutMisconfiguredEnv(componentId, extensionDataList) {
-    if (!(await this.hasId(componentId))) {
-      // if this is a dependency and not belong to the workspace, don't show the warning
-      return;
-    }
-    const envAspect = extensionDataList.findExtension(_envs().EnvsAspect.id);
-    const envFromEnvsAspect = envAspect === null || envAspect === void 0 ? void 0 : envAspect.config.env;
-    if (!envFromEnvsAspect) return;
-    if (this.envs.getCoreEnvsIds().includes(envFromEnvsAspect)) return;
-    if (this.warnedAboutMisconfiguredEnvs.includes(envFromEnvsAspect)) return;
-    let env;
-    try {
-      const envId = await this.resolveComponentId(envFromEnvsAspect);
-      env = await this.get(envId);
-    } catch (err) {
-      return; // unable to get the component for some reason. don't sweat it. forget about the warning
-    }
-
-    if (!this.envs.isUsingEnvEnv(env)) {
-      this.warnedAboutMisconfiguredEnvs.push(envFromEnvsAspect);
-      this.logger.consoleWarning(`env "${envFromEnvsAspect}" is not of type env. (correct the env's type, or component config with "bit env set ${envFromEnvsAspect} teambit.envs/env")`);
-    }
-  }
   async isModified(component) {
     const head = component.head;
     if (!head) {
@@ -1442,41 +1248,6 @@ the following envs are used in this workspace: ${availableEnvs.join(', ')}`);
     const componentStatus = await this.consumer.getComponentStatusById(component.id._legacy);
     return componentStatus.modified === true;
   }
-  async filterEnvsFromExtensionsIfNeeded(extensionDataList, envWasFoundPreviously, origin) {
-    const envAspect = extensionDataList.findExtension(_envs().EnvsAspect.id);
-    const envFromEnvsAspect = (envAspect === null || envAspect === void 0 ? void 0 : envAspect.config.env) || (envAspect === null || envAspect === void 0 ? void 0 : envAspect.data.id);
-    if (envWasFoundPreviously && envAspect) {
-      const nonEnvs = extensionDataList.filter(e => {
-        var _e$extensionId;
-        // normally the env-id inside the envs aspect doesn't have a version, but the aspect itself has a version.
-        if (e.stringId === envFromEnvsAspect || ((_e$extensionId = e.extensionId) === null || _e$extensionId === void 0 ? void 0 : _e$extensionId.toStringWithoutVersion()) === envFromEnvsAspect) return false;
-        return true;
-      });
-      // still, aspect env may have other data other then config.env.
-      delete envAspect.config.env;
-      return {
-        extensionDataListFiltered: new (_extensionData().ExtensionDataList)(...nonEnvs),
-        envIsCurrentlySet: true
-      };
-    }
-    if (envFromEnvsAspect && (origin === 'ModelNonSpecific' || origin === 'ModelSpecific')) {
-      // if env was found, search for this env in the workspace and if found, replace the env-id with the one from the workspace
-      const envAspectExt = extensionDataList.find(e => {
-        var _e$extensionId2;
-        return ((_e$extensionId2 = e.extensionId) === null || _e$extensionId2 === void 0 ? void 0 : _e$extensionId2.toStringWithoutVersion()) === envFromEnvsAspect;
-      });
-      const ids = await this.listIds();
-      const envAspectId = envAspectExt === null || envAspectExt === void 0 ? void 0 : envAspectExt.extensionId;
-      const found = envAspectId && ids.find(id => id._legacy.isEqualWithoutVersion(envAspectId));
-      if (found) {
-        envAspectExt.extensionId = found._legacy;
-      }
-    }
-    return {
-      extensionDataListFiltered: extensionDataList,
-      envIsCurrentlySet: Boolean(envFromEnvsAspect)
-    };
-  }
   async triggerOnPreWatch(componentIds, watchOpts) {
     const components = await this.getMany(componentIds);
     const preWatchFunctions = this.onPreWatchSlot.values();
@@ -1559,30 +1330,13 @@ the following envs are used in this workspace: ${availableEnvs.join(', ')}`);
     var _this$bitMap$getBitma;
     const componentConfigFile = await this.componentConfigFile(id);
     if (componentConfigFile) {
-      var _componentConfigFile$2;
-      return (_componentConfigFile$2 = componentConfigFile.aspects.get(aspectId)) === null || _componentConfigFile$2 === void 0 ? void 0 : _componentConfigFile$2.config;
+      var _componentConfigFile$;
+      return (_componentConfigFile$ = componentConfigFile.aspects.get(aspectId)) === null || _componentConfigFile$ === void 0 ? void 0 : _componentConfigFile$.config;
     }
     return (_this$bitMap$getBitma = this.bitMap.getBitmapEntry(id, {
       ignoreVersion: true
     }).config) === null || _this$bitMap$getBitma === void 0 ? void 0 : _this$bitMap$getBitma[aspectId];
   }
-
-  /**
-   * This will mutate the entries with extensionId prop to have resolved legacy id
-   * This should be worked on the extension data list not the new aspect list
-   * @param extensionList
-   */
-  async resolveExtensionListIds(extensionList) {
-    const promises = extensionList.map(async entry => {
-      if (entry.extensionId) {
-        const id = await this.resolveComponentId(entry.extensionId);
-        entry.extensionId = id._legacy;
-      }
-      return entry;
-    });
-    await Promise.all(promises);
-    return extensionList;
-  }
   isVendorComponentByComponentDir(relativeComponentDir) {
     var _this$config$vendor;
     const vendorDir = ((_this$config$vendor = this.config.vendor) === null || _this$config$vendor === void 0 ? void 0 : _this$config$vendor.directory) || DEFAULT_VENDOR_DIR;
@@ -1841,27 +1595,6 @@ needed-for: ${neededFor || '<unknown>'}`);
     };
   }
 
-  /**
-   * Load all unloaded extensions from a list
-   * @param extensions list of extensions with config to load
-   */
-  async loadExtensions(extensions, originatedFrom, throwOnError = false) {
-    const extensionsIdsP = extensions.map(async extensionEntry => {
-      // Core extension
-      if (!extensionEntry.extensionId) {
-        return extensionEntry.stringId;
-      }
-      const id = await this.resolveComponentId(extensionEntry.extensionId);
-      // return this.resolveComponentId(extensionEntry.extensionId);
-      return id.toString();
-    });
-    const extensionsIds = await Promise.all(extensionsIdsP);
-    const loadedExtensions = this.harmony.extensionsIds;
-    const extensionsToLoad = (0, _lodash().difference)(extensionsIds, loadedExtensions);
-    if (!extensionsToLoad.length) return;
-    await this.loadAspects(extensionsToLoad, throwOnError, originatedFrom === null || originatedFrom === void 0 ? void 0 : originatedFrom.toString());
-  }
-
   /**
    * Provides a cache folder, unique per key.
    * Return value may be undefined, if workspace folder is unconventional (bare-scope, no node_modules, etc)
@@ -2209,6 +1942,73 @@ your workspace.jsonc has this component-id set. you might want to remove/change
       unchanged
     };
   }
+  async updateEnvForComponents(envIdStr, pattern) {
+    const allWsComps = await this.list();
+    const allWsIds = await this.listIds();
+    const isInWs = envId => allWsIds.find(id => id.isEqual(envId, {
+      ignoreVersion: true
+    }));
+    const allEnvs = await this.envs.createEnvironment(allWsComps);
+    const getEnvWithVersion = async envId => {
+      if (envId.hasVersion()) return envId;
+      try {
+        const fromRemote = await this.scope.getRemoteComponent(envId);
+        return envId.changeVersion(fromRemote.id.version);
+      } catch (err) {
+        throw new (_bitError().BitError)(`unable to find ${envIdStr} in the remote`);
+      }
+    };
+    const getEnvs = async () => {
+      if (envIdStr) {
+        const envCompId = await this.resolveComponentId(envIdStr);
+        if (isInWs(envCompId)) {
+          throw new (_bitError().BitError)(`error: unable to update the env ${envCompId.toString()}, it's already part of the workspace, as such, it's always using the workspace version`);
+        }
+        const envWithVer = await getEnvWithVersion(envCompId);
+        return [envWithVer];
+      }
+      // get all non-local envs.
+      const allEnvsIds = allEnvs.runtimeEnvs.map(env => env.id);
+      const allEnvsCompIds = await this.resolveMultipleComponentIds(allEnvsIds);
+      // also check the envId has version, otherwise, it's a core env.
+      const nonLocalEnvs = allEnvsCompIds.filter(envId => !isInWs(envId) && envId.hasVersion());
+      if (!nonLocalEnvs.length) {
+        throw new (_bitError().BitError)(`error: unable to update envs ${allEnvsIds.map(e => e.toString()).join(', ')}, they're already part of the workspace`);
+      }
+      const envsWithVersions = await (0, _pMapSeries().default)(nonLocalEnvs, envId => getEnvWithVersion(envId.changeVersion(undefined)));
+      return envsWithVersions;
+    };
+    const envsWithVerToUpdate = await getEnvs();
+    const compIdsToUpdate = pattern ? await this.idsByPattern(pattern) : allWsIds;
+    const compsToUpdate = await this.getMany(compIdsToUpdate);
+    const alreadyUpToDate = [];
+    const updated = {};
+    await Promise.all(compsToUpdate.map(async comp => {
+      var _envToUpdate$toString;
+      const compEnvs = (0, _lodash().compact)(envsWithVerToUpdate.map(envId => comp.state.aspects.get(envId.toStringWithoutVersion())));
+      if (!compEnvs.length) return;
+      const compEnv = compEnvs[0]; // should not be more than one
+      const envToUpdate = envsWithVerToUpdate.find(e => e.isEqual(compEnv.id, {
+        ignoreVersion: true
+      }));
+      if (!envToUpdate) throw new Error(`unable to find ${compEnv.id.toString()} in the envs to update`);
+      if (compEnv.id.version === envToUpdate.version) {
+        // nothing to update
+        alreadyUpToDate.push(comp.id);
+        return;
+      }
+      // don't mark with minus if not exist in .bitmap. it's not needed. when the component is loaded, the
+      // merge-operation of the aspects removes duplicate aspect-id with different versions.
+      await this.removeSpecificComponentConfig(comp.id, compEnv.id.toString(), false);
+      await this.addSpecificComponentConfig(comp.id, envToUpdate.toString(), compEnv.config);
+      (updated[_envToUpdate$toString = envToUpdate.toString()] || (updated[_envToUpdate$toString] = [])).push(comp.id);
+    }));
+    await this.bitMap.write();
+    return {
+      updated,
+      alreadyUpToDate
+    };
+  }
 }
 
 /**