@teambit/workspace 0.0.881 → 0.0.883

package/dist/workspace-component/component-status.js

@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.ComponentStatus = void 0;
-
 class ComponentStatus {
   constructor(
   /**
@@ -53,7 +52,6 @@ class ComponentStatus {
     this.nested = nested;
     this.isInCurrentLane = isInCurrentLane;
   }
-
   static fromLegacy(status, hasModifiedDependencies, isOutdated, isInCurrentLane) {
     const modify = {
       hasModifiedFiles: !!status.modified,
@@ -61,9 +59,7 @@ class ComponentStatus {
     };
     return new ComponentStatus(modify, !!status.newlyCreated, !!status.deleted, !!status.staged, !status.notExist, !status.missingFromScope, isOutdated, !!status.nested, isInCurrentLane);
   }
-
 }
-
 exports.ComponentStatus = ComponentStatus;
 
 //# sourceMappingURL=component-status.js.map

package/dist/workspace-component/component-status.js.map

@@ -1 +1 @@
-{"version":3,"names":["ComponentStatus","constructor","modifyInfo","isNew","isDeleted","isStaged","isInWorkspace","isInScope","isOutdated","nested","isInCurrentLane","fromLegacy","status","hasModifiedDependencies","modify","hasModifiedFiles","modified","newlyCreated","deleted","staged","notExist","missingFromScope"],"sources":["component-status.ts"],"sourcesContent":["import { ComponentStatus as LegacyComponentStatus } from '@teambit/legacy/dist/consumer/component-ops/component-status-loader';\n\nexport type ModifyInfo = {\n  hasModifiedFiles: boolean;\n  hasModifiedDependencies: boolean;\n};\n\nexport class ComponentStatus {\n  constructor(\n    /**\n     * is the component modified.\n     */\n    readonly modifyInfo: ModifyInfo,\n\n    /**\n     * is the new component new.\n     */\n    readonly isNew: boolean,\n\n    /**\n     * is the component deleted from the workspace.\n     */\n    readonly isDeleted: boolean,\n\n    /**\n     * is the component staged.\n     */\n    readonly isStaged: boolean,\n\n    /**\n     * does the component exists in the workspace.\n     */\n    readonly isInWorkspace: boolean,\n\n    /**\n     * does the component exists in the scope.\n     */\n    readonly isInScope: boolean,\n\n    /**\n     * does the component is outdated (pending for update).\n     */\n    readonly isOutdated: boolean,\n\n    /**\n     *  the component is not authored and not imported.\n     */\n    readonly nested?: boolean,\n    /**\n     * does the component exist on the current lane\n     */\n    readonly isInCurrentLane?: boolean\n  ) {}\n\n  static fromLegacy(\n    status: LegacyComponentStatus,\n    hasModifiedDependencies: boolean,\n    isOutdated: boolean,\n    isInCurrentLane?: boolean\n  ) {\n    const modify: ModifyInfo = {\n      hasModifiedFiles: !!status.modified,\n      hasModifiedDependencies,\n    };\n    return new ComponentStatus(\n      modify,\n      !!status.newlyCreated,\n      !!status.deleted,\n      !!status.staged,\n      !status.notExist,\n      !status.missingFromScope,\n      isOutdated,\n      !!status.nested,\n      isInCurrentLane\n    );\n  }\n}\n"],"mappings":";;;;;;;AAOO,MAAMA,eAAN,CAAsB;EAC3BC,WAAW;EACT;AACJ;AACA;EACaC,UAJA;EAMT;AACJ;AACA;EACaC,KATA;EAWT;AACJ;AACA;EACaC,SAdA;EAgBT;AACJ;AACA;EACaC,QAnBA;EAqBT;AACJ;AACA;EACaC,aAxBA;EA0BT;AACJ;AACA;EACaC,SA7BA;EA+BT;AACJ;AACA;EACaC,UAlCA;EAoCT;AACJ;AACA;EACaC,MAvCA;EAwCT;AACJ;AACA;EACaC,eA3CA,EA4CT;IAAA,KAxCSR,UAwCT,GAxCSA,UAwCT;IAAA,KAnCSC,KAmCT,GAnCSA,KAmCT;IAAA,KA9BSC,SA8BT,GA9BSA,SA8BT;IAAA,KAzBSC,QAyBT,GAzBSA,QAyBT;IAAA,KApBSC,aAoBT,GApBSA,aAoBT;IAAA,KAfSC,SAeT,GAfSA,SAeT;IAAA,KAVSC,UAUT,GAVSA,UAUT;IAAA,KALSC,MAKT,GALSA,MAKT;IAAA,KADSC,eACT,GADSA,eACT;EAAE;;EAEa,OAAVC,UAAU,CACfC,MADe,EAEfC,uBAFe,EAGfL,UAHe,EAIfE,eAJe,EAKf;IACA,MAAMI,MAAkB,GAAG;MACzBC,gBAAgB,EAAE,CAAC,CAACH,MAAM,CAACI,QADF;MAEzBH;IAFyB,CAA3B;IAIA,OAAO,IAAIb,eAAJ,CACLc,MADK,EAEL,CAAC,CAACF,MAAM,CAACK,YAFJ,EAGL,CAAC,CAACL,MAAM,CAACM,OAHJ,EAIL,CAAC,CAACN,MAAM,CAACO,MAJJ,EAKL,CAACP,MAAM,CAACQ,QALH,EAML,CAACR,MAAM,CAACS,gBANH,EAOLb,UAPK,EAQL,CAAC,CAACI,MAAM,CAACH,MARJ,EASLC,eATK,CAAP;EAWD;;AApE0B"}
+{"version":3,"names":["ComponentStatus","constructor","modifyInfo","isNew","isDeleted","isStaged","isInWorkspace","isInScope","isOutdated","nested","isInCurrentLane","fromLegacy","status","hasModifiedDependencies","modify","hasModifiedFiles","modified","newlyCreated","deleted","staged","notExist","missingFromScope"],"sources":["component-status.ts"],"sourcesContent":["import { ComponentStatus as LegacyComponentStatus } from '@teambit/legacy/dist/consumer/component-ops/component-status-loader';\n\nexport type ModifyInfo = {\n  hasModifiedFiles: boolean;\n  hasModifiedDependencies: boolean;\n};\n\nexport class ComponentStatus {\n  constructor(\n    /**\n     * is the component modified.\n     */\n    readonly modifyInfo: ModifyInfo,\n\n    /**\n     * is the new component new.\n     */\n    readonly isNew: boolean,\n\n    /**\n     * is the component deleted from the workspace.\n     */\n    readonly isDeleted: boolean,\n\n    /**\n     * is the component staged.\n     */\n    readonly isStaged: boolean,\n\n    /**\n     * does the component exists in the workspace.\n     */\n    readonly isInWorkspace: boolean,\n\n    /**\n     * does the component exists in the scope.\n     */\n    readonly isInScope: boolean,\n\n    /**\n     * does the component is outdated (pending for update).\n     */\n    readonly isOutdated: boolean,\n\n    /**\n     *  the component is not authored and not imported.\n     */\n    readonly nested?: boolean,\n    /**\n     * does the component exist on the current lane\n     */\n    readonly isInCurrentLane?: boolean\n  ) {}\n\n  static fromLegacy(\n    status: LegacyComponentStatus,\n    hasModifiedDependencies: boolean,\n    isOutdated: boolean,\n    isInCurrentLane?: boolean\n  ) {\n    const modify: ModifyInfo = {\n      hasModifiedFiles: !!status.modified,\n      hasModifiedDependencies,\n    };\n    return new ComponentStatus(\n      modify,\n      !!status.newlyCreated,\n      !!status.deleted,\n      !!status.staged,\n      !status.notExist,\n      !status.missingFromScope,\n      isOutdated,\n      !!status.nested,\n      isInCurrentLane\n    );\n  }\n}\n"],"mappings":";;;;;;AAOO,MAAMA,eAAe,CAAC;EAC3BC,WAAW;EACT;AACJ;AACA;EACaC,UAAsB;EAE/B;AACJ;AACA;EACaC,KAAc;EAEvB;AACJ;AACA;EACaC,SAAkB;EAE3B;AACJ;AACA;EACaC,QAAiB;EAE1B;AACJ;AACA;EACaC,aAAsB;EAE/B;AACJ;AACA;EACaC,SAAkB;EAE3B;AACJ;AACA;EACaC,UAAmB;EAE5B;AACJ;AACA;EACaC,MAAgB;EACzB;AACJ;AACA;EACaC,eAAyB,EAClC;IAAA,KAxCSR,UAAsB,GAAtBA,UAAsB;IAAA,KAKtBC,KAAc,GAAdA,KAAc;IAAA,KAKdC,SAAkB,GAAlBA,SAAkB;IAAA,KAKlBC,QAAiB,GAAjBA,QAAiB;IAAA,KAKjBC,aAAsB,GAAtBA,aAAsB;IAAA,KAKtBC,SAAkB,GAAlBA,SAAkB;IAAA,KAKlBC,UAAmB,GAAnBA,UAAmB;IAAA,KAKnBC,MAAgB,GAAhBA,MAAgB;IAAA,KAIhBC,eAAyB,GAAzBA,eAAyB;EACjC;EAEH,OAAOC,UAAU,CACfC,MAA6B,EAC7BC,uBAAgC,EAChCL,UAAmB,EACnBE,eAAyB,EACzB;IACA,MAAMI,MAAkB,GAAG;MACzBC,gBAAgB,EAAE,CAAC,CAACH,MAAM,CAACI,QAAQ;MACnCH;IACF,CAAC;IACD,OAAO,IAAIb,eAAe,CACxBc,MAAM,EACN,CAAC,CAACF,MAAM,CAACK,YAAY,EACrB,CAAC,CAACL,MAAM,CAACM,OAAO,EAChB,CAAC,CAACN,MAAM,CAACO,MAAM,EACf,CAACP,MAAM,CAACQ,QAAQ,EAChB,CAACR,MAAM,CAACS,gBAAgB,EACxBb,UAAU,EACV,CAAC,CAACI,MAAM,CAACH,MAAM,EACfC,eAAe,CAChB;EACH;AACF;AAAC"}

package/dist/workspace-component/index.js

@@ -15,24 +15,18 @@ Object.defineProperty(exports, "WorkspaceComponent", {
     return _workspaceComponent().WorkspaceComponent;
   }
 });
-
 function _workspaceComponent() {
   const data = require("./workspace-component");
-
   _workspaceComponent = function () {
     return data;
   };
-
   return data;
 }
-
 function _componentStatus() {
   const data = require("./component-status");
-
   _componentStatus = function () {
     return data;
   };
-
   return data;
 }
 

package/dist/workspace-component/index.js.map

@@ -1 +1 @@
-{"version":3,"names":[],"sources":["index.ts"],"sourcesContent":["export { WorkspaceComponent } from './workspace-component';\nexport { ComponentStatus } from './component-status';\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA"}
+{"version":3,"names":[],"sources":["index.ts"],"sourcesContent":["export { WorkspaceComponent } from './workspace-component';\nexport { ComponentStatus } from './component-status';\n"],"mappings":";;;;;;;;;;;;;;;;;AAAA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AACA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA"}

package/dist/workspace-component/workspace-component-loader.js

@@ -1,188 +1,132 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 require("core-js/modules/es.array.iterator.js");
-
 require("core-js/modules/es.array.sort.js");
-
 require("core-js/modules/es.promise.js");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.WorkspaceComponentLoader = void 0;
-
 function _defineProperty2() {
   const data = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
   _defineProperty2 = function () {
     return data;
   };
-
   return data;
 }
-
 function _component() {
   const data = require("@teambit/component");
-
   _component = function () {
     return data;
   };
-
   return data;
 }
-
 function _extensionData() {
   const data = require("@teambit/legacy/dist/consumer/config/extension-data");
-
   _extensionData = function () {
     return data;
   };
-
   return data;
 }
-
 function _pMapSeries() {
   const data = _interopRequireDefault(require("p-map-series"));
-
   _pMapSeries = function () {
     return data;
   };
-
   return data;
 }
-
 function _lodash() {
   const data = require("lodash");
-
   _lodash = function () {
     return data;
   };
-
   return data;
 }
-
 function _component2() {
   const data = _interopRequireDefault(require("@teambit/legacy/dist/consumer/component"));
-
   _component2 = function () {
     return data;
   };
-
   return data;
 }
-
 function _exceptions() {
   const data = require("@teambit/legacy/dist/consumer/bit-map/exceptions");
-
   _exceptions = function () {
     return data;
   };
-
   return data;
 }
-
 function _utils() {
   const data = require("@teambit/legacy/dist/utils");
-
   _utils = function () {
     return data;
   };
-
   return data;
 }
-
 function _componentIssues() {
   const data = require("@teambit/component-issues");
-
   _componentIssues = function () {
     return data;
   };
-
   return data;
 }
-
 function _exceptions2() {
   const data = require("@teambit/legacy/dist/scope/exceptions");
-
   _exceptions2 = function () {
     return data;
   };
-
   return data;
 }
-
 function _dependencyResolver() {
   const data = require("@teambit/dependency-resolver");
-
   _dependencyResolver = function () {
     return data;
   };
-
   return data;
 }
-
 function _envs() {
   const data = require("@teambit/envs");
-
   _envs = function () {
     return data;
   };
-
   return data;
 }
-
 function _config() {
   const data = require("@teambit/legacy/dist/consumer/config");
-
   _config = function () {
     return data;
   };
-
   return data;
 }
-
 function _inMemoryCache() {
   const data = require("@teambit/legacy/dist/cache/in-memory-cache");
-
   _inMemoryCache = function () {
     return data;
   };
-
   return data;
 }
-
 function _cacheFactory() {
   const data = require("@teambit/legacy/dist/cache/cache-factory");
-
   _cacheFactory = function () {
     return data;
   };
-
   return data;
 }
-
 function _componentNotFoundInPath() {
   const data = _interopRequireDefault(require("@teambit/legacy/dist/consumer/component/exceptions/component-not-found-in-path"));
-
   _componentNotFoundInPath = function () {
     return data;
   };
-
   return data;
 }
-
 function _workspaceComponent() {
   const data = require("./workspace-component");
-
   _workspaceComponent = function () {
     return data;
   };
-
   return data;
 }
-
 class WorkspaceComponentLoader {
   // cache loaded components
   constructor(workspace, logger, dependencyResolver, envs) {
@@ -195,7 +139,6 @@ class WorkspaceComponentLoader {
       maxSize: (0, _inMemoryCache().getMaxSizeForComponents)()
     });
   }
-
   async getMany(ids, loadOpts) {
     const idsWithoutEmpty = (0, _lodash().compact)(ids);
     const errors = [];
@@ -210,7 +153,6 @@ class WorkspaceComponentLoader {
           });
           return undefined;
         }
-
         throw err;
       });
     });
@@ -218,20 +160,18 @@ class WorkspaceComponentLoader {
     errors.forEach(err => {
       this.logger.console(`failed loading component ${err.id.toString()}, see full error in debug.log file`);
       this.logger.warn(`failed loading component ${err.id.toString()}`, err.err);
-    }); // remove errored components
-
+    });
+    // remove errored components
     const filteredComponents = (0, _lodash().compact)(components);
     longProcessLogger.end();
     return filteredComponents;
   }
-
   async getInvalid(ids) {
     const idsWithoutEmpty = (0, _lodash().compact)(ids);
     const errors = [];
     const longProcessLogger = this.logger.createLongProcessLogger('loading components', ids.length);
     await (0, _pMapSeries().default)(idsWithoutEmpty, async id => {
       longProcessLogger.logProgress(id.toString());
-
       try {
         await this.workspace.consumer.loadComponent(id._legacy);
       } catch (err) {
@@ -242,36 +182,28 @@ class WorkspaceComponentLoader {
           });
           return;
         }
-
         throw err;
       }
     });
     return errors;
   }
-
   async get(componentId, legacyComponent, useCache = true, storeInCache = true, loadOpts) {
     const bitIdWithVersion = (0, _utils().getLatestVersionNumber)(this.workspace.consumer.bitmapIdsFromCurrentLane, componentId._legacy);
     const id = bitIdWithVersion.version ? componentId.changeVersion(bitIdWithVersion.version) : componentId;
     const fromCache = this.getFromCache(id, loadOpts);
-
     if (fromCache && useCache) {
       return fromCache;
     }
-
-    const consumerComponent = legacyComponent || (await this.getConsumerComponent(id)); // in case of out-of-sync, the id may changed during the load process
-
+    const consumerComponent = legacyComponent || (await this.getConsumerComponent(id));
+    // in case of out-of-sync, the id may changed during the load process
     const updatedId = consumerComponent ? _component().ComponentID.fromLegacy(consumerComponent.id, id.scope) : id;
     const component = await this.loadOne(updatedId, consumerComponent, loadOpts);
-
     if (storeInCache) {
       this.addMultipleEnvsIssueIfNeeded(component); // it's in storeInCache block, otherwise, it wasn't fully loaded
-
       this.saveInCache(component, loadOpts);
     }
-
     return component;
   }
-
   async getIfExist(componentId) {
     try {
       return await this.get(componentId);
@@ -279,56 +211,45 @@ class WorkspaceComponentLoader {
       if (this.isComponentNotExistsError(err)) {
         return undefined;
       }
-
       throw err;
     }
   }
-
   addMultipleEnvsIssueIfNeeded(component) {
     const envs = this.envs.getAllEnvsConfiguredOnComponent(component);
     const envIds = (0, _lodash().uniq)(envs.map(env => env.id));
-
     if (envIds.length < 2) {
       return;
     }
-
     component.state.issues.getOrCreate(_componentIssues().IssuesClasses.MultipleEnvs).data = envIds;
   }
-
   clearCache() {
     this.componentsCache.deleteAll();
   }
-
   clearComponentCache(id) {
     const idStr = id.toString();
-
     for (const cacheKey of this.componentsCache.keys()) {
       if (cacheKey === idStr || cacheKey.startsWith(`${idStr}:`)) {
         this.componentsCache.delete(cacheKey);
       }
     }
   }
-
   async loadOne(id, consumerComponent, loadOpts) {
     const componentFromScope = await this.workspace.scope.get(id);
-
     if (!consumerComponent) {
       if (!componentFromScope) throw new (_exceptions().MissingBitMapComponent)(id.toString());
       return componentFromScope;
     }
-
     const {
       extensions
     } = await this.workspace.componentExtensions(id, componentFromScope);
-    const extensionsFromConsumerComponent = consumerComponent.extensions || new (_extensionData().ExtensionDataList)(); // Merge extensions added by the legacy code in memory (for example data of dependency resolver)
+    const extensionsFromConsumerComponent = consumerComponent.extensions || new (_extensionData().ExtensionDataList)();
+    // Merge extensions added by the legacy code in memory (for example data of dependency resolver)
+    const extensionDataList = _extensionData().ExtensionDataList.mergeConfigs([extensionsFromConsumerComponent, extensions]).filterRemovedExtensions();
 
-    const extensionDataList = _extensionData().ExtensionDataList.mergeConfigs([extensionsFromConsumerComponent, extensions]).filterRemovedExtensions(); // temporarily mutate consumer component extensions until we remove all direct access from legacy to extensions data
+    // temporarily mutate consumer component extensions until we remove all direct access from legacy to extensions data
     // TODO: remove this once we remove all direct access from legacy code to extensions data
-
-
     consumerComponent.extensions = extensionDataList;
     const state = new (_component().State)(new (_component().Config)(consumerComponent.mainFile, extensionDataList), await this.workspace.createAspectList(extensionDataList), _component().ComponentFS.fromVinyls(consumerComponent.files), consumerComponent.dependencies, consumerComponent);
-
     if (componentFromScope) {
       // Removed by @gilad. do not mutate the component from the scope
       // componentFromScope.state = state;
@@ -337,14 +258,13 @@ class WorkspaceComponentLoader {
       const updatedComp = await this.executeLoadSlot(workspaceComponent, loadOpts);
       return updatedComp;
     }
-
     return this.executeLoadSlot(this.newComponentFromState(id, state), loadOpts);
   }
-
   saveInCache(component, loadOpts) {
     const cacheKey = createComponentCacheKey(component.id, loadOpts);
     this.componentsCache.set(cacheKey, component);
   }
+
   /**
    * make sure that not only the id-str match, but also the legacy-id.
    * this is needed because the ComponentID.toString() is the same whether or not the legacy-id has
@@ -352,19 +272,14 @@ class WorkspaceComponentLoader {
    * as a result, when out-of-sync is happening and the id is changed to include scope-name in the
    * legacy-id, the component is the cache has the old id.
    */
-
-
   getFromCache(id, loadOpts) {
     const cacheKey = createComponentCacheKey(id, loadOpts);
     const fromCache = this.componentsCache.get(cacheKey);
-
     if (fromCache && fromCache.id._legacy.isEqual(id._legacy)) {
       return fromCache;
     }
-
     return undefined;
   }
-
   async getConsumerComponent(id) {
     try {
       return await this.workspace.consumer.loadComponent(id._legacy);
@@ -376,36 +291,44 @@ class WorkspaceComponentLoader {
         this.logger.debug(`failed loading component "${id.toString()}" from the workspace due to "${err.name}" error\n${err.message}`);
         return undefined;
       }
-
       throw err;
     }
   }
-
   isComponentNotExistsError(err) {
     return err instanceof _exceptions2().ComponentNotFound || err instanceof _exceptions().MissingBitMapComponent || err instanceof _componentNotFoundInPath().default;
   }
-
   async executeLoadSlot(component, loadOpts) {
     if (component.state._consumer.removed) {
       // if it was soft-removed now, the component is not in the FS. loading aspects such as composition ends up with
       // errors as they try to read component files from the filesystem.
       return component;
-    } // Special load events which runs from the workspace but should run from the correct aspect
-    // TODO: remove this once those extensions dependent on workspace
-
+    }
 
-    const envsData = await this.workspace.getEnvSystemDescriptor(component); // Move to deps resolver main runtime once we switch ws<> deps resolver direction
+    // Special load events which runs from the workspace but should run from the correct aspect
+    // TODO: remove this once those extensions dependent on workspace
+    const envsData = await this.workspace.getEnvSystemDescriptor(component);
 
+    // Move to deps resolver main runtime once we switch ws<> deps resolver direction
     const policy = await this.dependencyResolver.mergeVariantPolicies(component.config.extensions);
-    const dependencies = await this.dependencyResolver.extractDepsFromLegacy(component, policy);
+    const dependenciesList = await this.dependencyResolver.extractDepsFromLegacy(component, policy);
+    let dependenciesFromUnmergedHead;
+    // Get dependencies from unmerged head if needed
+    // we take it from there, as they might not be installed yet and we need to get their versions from the model
+    const unmergedComponent = await this.workspace.getUnmergedComponent(component.id);
+    if (unmergedComponent) {
+      dependenciesFromUnmergedHead = await this.dependencyResolver.extractDepsFromLegacy(unmergedComponent, policy);
+    }
+    const mergedDependencies = dependenciesFromUnmergedHead ? _dependencyResolver().DependencyList.merge([dependenciesList, dependenciesFromUnmergedHead]) : dependenciesList;
     const depResolverData = {
-      dependencies,
+      dependencies: mergedDependencies.serialize(),
       policy: policy.serialize()
-    }; // Make sure we are adding the envs / deps data first because other on load events might depend on it
+    };
 
-    await Promise.all([this.upsertExtensionData(component, _envs().EnvsAspect.id, envsData), this.upsertExtensionData(component, _dependencyResolver().DependencyResolverAspect.id, depResolverData)]); // We are updating the component state with the envs and deps data here, so in case we have other slots that depend on this data
-    // they will be able to get it, as it's very common use case that during on load someone want to access to the component env for example
+    // Make sure we are adding the envs / deps data first because other on load events might depend on it
+    await Promise.all([this.upsertExtensionData(component, _envs().EnvsAspect.id, envsData), this.upsertExtensionData(component, _dependencyResolver().DependencyResolverAspect.id, depResolverData)]);
 
+    // We are updating the component state with the envs and deps data here, so in case we have other slots that depend on this data
+    // they will be able to get it, as it's very common use case that during on load someone want to access to the component env for example
     const aspectListWithEnvsAndDeps = await this.workspace.createAspectList(component.state.config.extensions);
     component.state.aspects = aspectListWithEnvsAndDeps;
     const entries = this.workspace.onComponentLoadSlot.toArray();
@@ -413,43 +336,35 @@ class WorkspaceComponentLoader {
       const data = await onLoad(component, loadOpts);
       return this.upsertExtensionData(component, extension, data);
     });
-    await Promise.all(promises); // Update the aspect list to have changes happened during the on load slot (new data added above)
+    await Promise.all(promises);
 
+    // Update the aspect list to have changes happened during the on load slot (new data added above)
     const updatedAspectList = await this.workspace.createAspectList(component.state.config.extensions);
     component.state.aspects = updatedAspectList;
     return component;
   }
-
   newComponentFromState(id, state) {
     return new (_workspaceComponent().WorkspaceComponent)(id, null, state, new (_component().TagMap)(), this.workspace);
   }
-
   async upsertExtensionData(component, extension, data) {
     if (!data) return;
     const existingExtension = component.state.config.extensions.findExtension(extension);
-
     if (existingExtension) {
       // Only merge top level of extension data
       Object.assign(existingExtension.data, data);
       return;
     }
-
     component.state.config.extensions.push(await this.getDataEntry(extension, data));
   }
-
   async getDataEntry(extension, data) {
     // TODO: @gilad we need to refactor the extension data entry api.
     return new (_config().ExtensionDataEntry)(undefined, undefined, extension, undefined, data);
   }
-
 }
-
 exports.WorkspaceComponentLoader = WorkspaceComponentLoader;
-
 function createComponentCacheKey(id, loadOpts) {
   return `${id.toString()}:${JSON.stringify(sortKeys(loadOpts !== null && loadOpts !== void 0 ? loadOpts : {}))}`;
 }
-
 function sortKeys(obj) {
   return (0, _lodash().fromPairs)(Object.entries(obj).sort(([k1], [k2]) => k1.localeCompare(k2)));
 }