@teambit/workspace 1.0.311 → 1.0.312

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@teambit/workspace",
-  "version": "1.0.311",
+  "version": "1.0.312",
   "homepage": "https://bit.cloud/teambit/workspace/workspace",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.workspace",
     "name": "workspace",
-    "version": "1.0.311"
+    "version": "1.0.312"
   },
   "dependencies": {
     "lodash": "4.17.21",
@@ -51,43 +51,43 @@
     "@teambit/scopes.scope-id": "0.0.7",
     "@teambit/workspace.ui.empty-workspace": "0.0.508",
     "@teambit/explorer.ui.component-card": "0.0.30",
-    "@teambit/component": "1.0.311",
-    "@teambit/dependency-resolver": "1.0.311",
-    "@teambit/envs": "1.0.311",
-    "@teambit/logger": "0.0.981",
-    "@teambit/scope": "1.0.311",
-    "@teambit/graph": "1.0.311",
-    "@teambit/cli": "0.0.888",
-    "@teambit/isolator": "1.0.311",
-    "@teambit/component-tree": "1.0.311",
+    "@teambit/component": "1.0.312",
+    "@teambit/dependency-resolver": "1.0.312",
+    "@teambit/envs": "1.0.312",
+    "@teambit/logger": "0.0.982",
+    "@teambit/scope": "1.0.312",
+    "@teambit/graph": "1.0.312",
+    "@teambit/cli": "0.0.889",
+    "@teambit/isolator": "1.0.312",
+    "@teambit/component-tree": "1.0.312",
     "@teambit/harmony.modules.resolved-component": "0.0.497",
-    "@teambit/watcher": "1.0.311",
-    "@teambit/aspect-loader": "1.0.311",
-    "@teambit/config": "0.0.1062",
-    "@teambit/global-config": "0.0.891",
+    "@teambit/watcher": "1.0.312",
+    "@teambit/aspect-loader": "1.0.312",
+    "@teambit/config": "0.0.1063",
+    "@teambit/global-config": "0.0.892",
     "@teambit/harmony.modules.requireable-component": "0.0.497",
     "@teambit/toolbox.modules.module-resolver": "0.0.7",
     "@teambit/workspace.modules.node-modules-linker": "0.0.174",
-    "@teambit/graphql": "1.0.311",
-    "@teambit/bundler": "1.0.311",
-    "@teambit/pubsub": "1.0.311",
-    "@teambit/ui": "1.0.311",
-    "@teambit/variants": "0.0.1155",
+    "@teambit/graphql": "1.0.312",
+    "@teambit/bundler": "1.0.312",
+    "@teambit/pubsub": "1.0.312",
+    "@teambit/ui": "1.0.312",
+    "@teambit/variants": "0.0.1156",
     "@teambit/component-issues": "0.0.149",
     "@teambit/workspace.modules.match-pattern": "0.0.505",
     "@teambit/component.ui.component-drawer": "0.0.401",
     "@teambit/lanes.hooks.use-lane-components": "0.0.264",
     "@teambit/lanes.hooks.use-lanes": "0.0.264",
     "@teambit/lanes.ui.models.lanes-model": "0.0.216",
-    "@teambit/command-bar": "1.0.311",
+    "@teambit/command-bar": "1.0.312",
     "@teambit/component.ui.component-filters.component-filter-context": "0.0.222",
     "@teambit/component.ui.component-filters.deprecate-filter": "0.0.220",
     "@teambit/component.ui.component-filters.env-filter": "0.0.230",
     "@teambit/component.ui.component-filters.show-main-filter": "0.0.213",
-    "@teambit/sidebar": "1.0.311",
+    "@teambit/sidebar": "1.0.312",
     "@teambit/ui-foundation.ui.react-router.slot-router": "0.0.509",
     "@teambit/component-descriptor": "0.0.421",
-    "@teambit/deprecation": "1.0.311",
+    "@teambit/deprecation": "1.0.312",
     "@teambit/ui-foundation.ui.buttons.collapser": "0.0.222",
     "@teambit/cloud.hooks.use-cloud-scopes": "0.0.3",
     "@teambit/design.ui.tooltip": "0.0.369",

package/workspace-component/workspace-component-loader.ts

@@ -41,6 +41,7 @@ type LoadGroupMetadata = {
   core?: boolean;
   aspects?: boolean;
   seeders?: boolean;
+  envs?: boolean;
 };
 
 type GetAndLoadSlotOpts = ComponentLoadOptions & LoadGroupMetadata;
@@ -92,7 +93,11 @@ export class WorkspaceComponentLoader {
    * Cache extension list for components. used by get many for perf improvements.
    * And to make sure we load extensions first.
    */
-  private componentsExtensionsCache: InMemoryCache<{ extensions: ExtensionDataList; errors: Error[] | undefined }>;
+  private componentsExtensionsCache: InMemoryCache<{
+    extensions: ExtensionDataList;
+    errors: Error[] | undefined;
+    envId: string | undefined;
+  }>;
 
   private componentLoadedSelfAsAspects: InMemoryCache<boolean>; // cache loaded components
   constructor(
@@ -171,13 +176,13 @@ export class WorkspaceComponentLoader {
     }
     const groupsRes = compact(
       await mapSeries(groupsToHandle, async (group, index) => {
-        const { scopeIds, workspaceIds, aspects, core, seeders } = group;
+        const { scopeIds, workspaceIds, aspects, core, seeders, envs } = group;
         const groupDesc = `getMany-${callId} group ${index + 1}/${groupsToHandle.length} - ${loadGroupToStr(group)}`;
         this.logger.profile(groupDesc);
         if (!workspaceIds.length && !scopeIds.length) {
           throw new Error('getAndLoadSlotOrdered - group has no ids to load');
         }
-        const res = await this.getAndLoadSlot(workspaceIds, scopeIds, { ...loadOpts, core, seeders, aspects });
+        const res = await this.getAndLoadSlot(workspaceIds, scopeIds, { ...loadOpts, core, seeders, aspects, envs });
         this.logger.profile(groupDesc);
         // We don't want to return components that were not asked originally (we do want to load them)
         if (!group.seeders) return undefined;
@@ -197,7 +202,9 @@ export class WorkspaceComponentLoader {
   }
 
   private async buildLoadGroups(workspaceScopeIdsMap: WorkspaceScopeIdsMap): Promise<Array<LoadGroup>> {
-    const allIds = [...workspaceScopeIdsMap.workspaceIds.values(), ...workspaceScopeIdsMap.scopeIds.values()];
+    const wsIds = Array.from(workspaceScopeIdsMap.workspaceIds.values());
+    const scopeIds = Array.from(workspaceScopeIdsMap.scopeIds.values());
+    const allIds = [...wsIds, ...scopeIds];
     const groupedByIsCoreEnvs = groupBy(allIds, (id) => {
       return this.envs.isCoreEnv(id.toStringWithoutVersion());
     });
@@ -219,9 +226,30 @@ export class WorkspaceComponentLoader {
     const allExtCompIds = Array.from(allExtIds.values());
     await this.populateScopeAndExtensionsCache(allExtCompIds || [], workspaceScopeIdsMap);
 
-    const allExtIdsStr = allExtCompIds.map((id) => id.toString());
+    // const allExtIdsStr = allExtCompIds.map((id) => id.toString());
+
+    const envsIdsOfWsComps = new Set<string>();
+    wsIds.forEach((id) => {
+      const idStr = id.toString();
+      const fromCache = this.componentsExtensionsCache.get(idStr);
+      if (!fromCache || !fromCache.extensions) {
+        return;
+      }
+      const envId = fromCache.envId;
+      if (envId) {
+        envsIdsOfWsComps.add(envId);
+      }
+    });
+
+    const groupedByIsEnvOfWsComps = groupBy(allExtCompIds, (id) => {
+      const idStr = id.toString();
+      const withoutVersion = idStr.split('@')[0];
+      return envsIdsOfWsComps.has(idStr) || envsIdsOfWsComps.has(withoutVersion);
+    });
+    const notEnvOfWsCompsStrs = (groupedByIsEnvOfWsComps.false || []).map((id) => id.toString());
+
     const groupedByIsExtOfAnother = groupBy(nonCoreEnvs, (id) => {
-      return allExtIdsStr.includes(id.toString());
+      return notEnvOfWsCompsStrs.includes(id.toString());
     });
     const extIdsFromTheList = (groupedByIsExtOfAnother.true || []).map((id) => id.toString());
     const extsNotFromTheList: ComponentID[] = [];
@@ -240,15 +268,17 @@ export class WorkspaceComponentLoader {
         core: false,
         aspects: true,
         seeders: true,
+        envs: false,
       };
     });
 
     const groupsToHandle = [
       // Always load first core envs
-      { ids: groupedByIsCoreEnvs.true || [], core: true, aspects: true, seeders: true },
-      { ids: extsNotFromTheList || [], core: false, aspects: true, seeders: false },
+      { ids: groupedByIsCoreEnvs.true || [], core: true, aspects: true, seeders: true, envs: true },
+      { ids: groupedByIsEnvOfWsComps.true || [], core: false, aspects: true, seeders: false, envs: true },
+      { ids: extsNotFromTheList || [], core: false, aspects: true, seeders: false, envs: false },
       ...layeredExtGroups,
-      { ids: groupedByIsExtOfAnother.false || [], core: false, aspects: false, seeders: true },
+      { ids: groupedByIsExtOfAnother.false || [], core: false, aspects: false, seeders: true, envs: false },
     ];
     const groupsByWsScope = groupsToHandle.map((group) => {
       if (!group.ids?.length) return undefined;
@@ -261,6 +291,7 @@ export class WorkspaceComponentLoader {
         core: group.core,
         aspects: group.aspects,
         seeders: group.seeders,
+        envs: group.envs,
       };
     });
     return compact(groupsByWsScope);
@@ -287,9 +318,10 @@ export class WorkspaceComponentLoader {
       loadOpts
     );
 
-    const components = workspaceComponents.concat(scopeComponents);
-
-    const allExtensions: ExtensionDataList[] = components.map((component) => {
+    // If we are here it means we are on workspace, in that case we don't want to load
+    // aspects of scope components as aspects only aspects of workspace components
+    // const components = workspaceComponents.concat(scopeComponents);
+    const allExtensions: ExtensionDataList[] = workspaceComponents.map((component) => {
       return component.state._consumer.extensions;
     });
 
@@ -392,10 +424,15 @@ export class WorkspaceComponentLoader {
       }
       if (!this.componentsExtensionsCache.has(idStr) && workspaceScopeIdsMap.workspaceIds.has(idStr)) {
         componentFromScope = componentFromScope || this.scopeComponentsCache.get(idStr);
-        const { extensions, errors } = await this.workspace.componentExtensions(id, componentFromScope, undefined, {
-          loadExtensions: false,
-        });
-        this.componentsExtensionsCache.set(idStr, { extensions, errors });
+        const { extensions, errors, envId } = await this.workspace.componentExtensions(
+          id,
+          componentFromScope,
+          undefined,
+          {
+            loadExtensions: false,
+          }
+        );
+        this.componentsExtensionsCache.set(idStr, { extensions, errors, envId });
       }
     });
   }
@@ -537,11 +574,14 @@ export class WorkspaceComponentLoader {
     // as when loading the next batch of components (next group) we won't have the envs loaded
 
     try {
+      const scopeComponents = await this.workspace.scope.getMany(scopeIds);
+
       // We don't want to load envs as part of this step, they will be loaded later
-      const scopeComponents = await this.workspace.scope.loadMany(scopeIds, undefined, {
-        loadApps: false,
-        loadEnvs: false,
-      });
+      // const scopeComponents = await this.workspace.scope.loadMany(scopeIds, undefined, {
+      //   loadApps: false,
+      //   loadEnvs: true,
+      //   loadCompAspects: false,
+      // });
       return {
         workspaceComponents: components,
         scopeComponents,
@@ -855,7 +895,7 @@ function sortKeys(obj: Object) {
 
 function printGroupsToHandle(groupsToHandle: Array<LoadGroup>, logger: Logger): void {
   groupsToHandle.forEach((group) => {
-    const { scopeIds, workspaceIds, aspects, core, seeders } = group;
+    const { scopeIds, workspaceIds, aspects, core, seeders, envs } = group;
     logger.console(
       `workspace-component-loader ~ groupsToHandle ${JSON.stringify(
         {
@@ -864,6 +904,7 @@ function printGroupsToHandle(groupsToHandle: Array<LoadGroup>, logger: Logger):
           aspects,
           core,
           seeders,
+          envs,
         },
         null,
         2
@@ -873,12 +914,13 @@ function printGroupsToHandle(groupsToHandle: Array<LoadGroup>, logger: Logger):
 }
 
 function loadGroupToStr(loadGroup: LoadGroup): string {
-  const { scopeIds, workspaceIds, aspects, core, seeders } = loadGroup;
+  const { scopeIds, workspaceIds, aspects, core, seeders, envs } = loadGroup;
 
   const attr: string[] = [];
   if (aspects) attr.push('aspects');
   if (core) attr.push('core');
   if (seeders) attr.push('seeders');
+  if (envs) attr.push('envs');
 
   return `workspaceIds: ${workspaceIds.length}, scopeIds: ${scopeIds.length}, (${attr.join('+')})`;
 }