@teambit/install 1.0.394 → 1.0.396

package/dist/install.main.runtime.d.ts

@@ -114,6 +114,21 @@ export declare class InstallMain {
     private reloadNonLoadedEnvs;
     private reloadEnvs;
     private reloadAspects;
+    private reloadOneAspectsGroup;
+    /**
+     * This function groups the components to aspects to load into groups.
+     * The order of the groups is important, the first group should be loaded first.
+     * The order inside the group is not important.
+     * The groups are:
+     * 1. aspects definitions without components (this should be an empty group, if it's not, we should check why).
+     * 2. aspects which are not in the workspace but in the scope / node modules.
+     * 3. envs of aspects (which are also aspects)
+     * 4. other aspects (the rest)
+     * @param aspects
+     * @returns
+     */
+    private groupAspectsToLoad;
+    private regroupEnvsIdsFromTheList;
     private _getComponentsManifestsAndRootPolicy;
     /**
      * The function `tryWriteConfigFiles` attempts to write workspace config files, and if it fails, it logs an error

package/dist/install.main.runtime.js

@@ -625,6 +625,21 @@ class InstallMain {
     }
   }
   async reloadAspects(aspects) {
+    const groups = await this.groupAspectsToLoad(aspects);
+    // We need to make sure we load group by group and not in parallel
+    await (0, _pMapSeries().default)(groups, async group => {
+      await this.reloadOneAspectsGroup(group);
+    });
+  }
+  async reloadOneAspectsGroup(group) {
+    const aspects = group.aspects || [];
+    if (group.workspace && !group.envOfAspect) {
+      aspects.forEach(aspectDef => {
+        if (aspectDef.component?.id) {
+          this.workspace.clearComponentCache(aspectDef.component.id);
+        }
+      });
+    }
     const loadedPlugins = (0, _lodash().compact)(await Promise.all(aspects.map(aspectDef => {
       const localPath = aspectDef.aspectPath;
       const component = aspectDef.component;
@@ -639,6 +654,64 @@ class InstallMain {
       return runtime?.provider(undefined, undefined, undefined, this.harmony);
     }));
   }
+
+  /**
+   * This function groups the components to aspects to load into groups.
+   * The order of the groups is important, the first group should be loaded first.
+   * The order inside the group is not important.
+   * The groups are:
+   * 1. aspects definitions without components (this should be an empty group, if it's not, we should check why).
+   * 2. aspects which are not in the workspace but in the scope / node modules.
+   * 3. envs of aspects (which are also aspects)
+   * 4. other aspects (the rest)
+   * @param aspects
+   * @returns
+   */
+  async groupAspectsToLoad(aspects) {
+    const groups = (0, _lodash().groupBy)(aspects, aspectDef => {
+      if (!aspectDef.component) return 'no-comp';
+      if (!this.workspace.hasId(aspectDef.component.id)) return 'scope';
+      return 'workspace';
+    });
+    const workspaceSubGroups = await this.regroupEnvsIdsFromTheList(groups.workspace || []);
+    return [{
+      comps: false,
+      workspace: false,
+      aspects: groups.noComp || []
+    }, {
+      comps: true,
+      workspace: false,
+      aspects: groups.scope || []
+    }, {
+      comps: true,
+      workspace: true,
+      envOfAspect: true,
+      aspects: workspaceSubGroups.envOfAspect
+    }, {
+      comps: true,
+      workspace: true,
+      aspects: workspaceSubGroups.otherAspects
+    }];
+  }
+  async regroupEnvsIdsFromTheList(aspects) {
+    const envsOfAspects = new Set();
+    await Promise.all(aspects.map(async aspectDef => {
+      if (!aspectDef.component) return;
+      const envId = aspectDef.component ? await this.envs.calculateEnvId(aspectDef.component) : undefined;
+      if (envId) {
+        envsOfAspects.add(envId.toString());
+      }
+    }));
+    const groups = (0, _lodash().groupBy)(aspects, aspectDef => {
+      const id = aspectDef.component?.id.toString();
+      const idWithoutVersion = aspectDef.component?.id.toStringWithoutVersion();
+      if (id && envsOfAspects.has(id) || idWithoutVersion && envsOfAspects.has(idWithoutVersion)) {
+        return 'envOfAspect';
+      }
+      return 'otherAspects';
+    });
+    return groups;
+  }
   async _getComponentsManifestsAndRootPolicy(installer, options) {
     const mergedRootPolicy = await this.addConfiguredAspectsToWorkspacePolicy();
     await this.addConfiguredGeneratorEnvsToWorkspacePolicy(mergedRootPolicy);