@teambit/workspace 0.0.867 → 0.0.869

package/component-tree.widget.tsx

@@ -1,26 +1,20 @@
 import { ComponentTreeNode, ComponentTreeNodeProps } from '@teambit/component-tree';
 import { ComponentStatusResolver } from '@teambit/component.ui.component-status-resolver';
 import { useLanes } from '@teambit/lanes.hooks.use-lanes';
-import React, { useContext, useMemo } from 'react';
-
-import { WorkspaceContext } from './ui/workspace/workspace-context';
+import React, { useMemo } from 'react';
 
 export class ComponentTreeWidget implements ComponentTreeNode {
   widget = ({ component }: ComponentTreeNodeProps) => {
-    const workspace = useContext(WorkspaceContext);
-    const workspaceComponent = workspace.getComponent(component.id);
     const { lanesModel } = useLanes();
 
     const isInCurrentLane = useMemo(() => {
-      return workspaceComponent?.id && lanesModel?.isInViewedLane(workspaceComponent.id);
-    }, [lanesModel?.viewedLane, workspaceComponent?.id]);
-
-    if (!workspaceComponent) return null;
+      return component.id && lanesModel?.isComponentOnLaneButNotOnMain(component.id);
+    }, [lanesModel?.viewedLane, component.id]);
 
     return (
       <ComponentStatusResolver
-        status={workspaceComponent.status}
-        issuesCount={workspaceComponent.issuesCount}
+        status={component.status}
+        issuesCount={component.issuesCount}
         isInCurrentLane={isInCurrentLane}
       />
     );

package/dist/component-tree.widget.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="react" />
 import { ComponentTreeNode, ComponentTreeNodeProps } from '@teambit/component-tree';
 export declare class ComponentTreeWidget implements ComponentTreeNode {
-    widget: ({ component }: ComponentTreeNodeProps) => JSX.Element | null;
+    widget: ({ component }: ComponentTreeNodeProps) => JSX.Element;
 }

package/dist/component-tree.widget.js

@@ -47,16 +47,6 @@ function _react() {
   return data;
 }
 
-function _workspaceContext() {
-  const data = require("./ui/workspace/workspace-context");
-
-  _workspaceContext = function () {
-    return data;
-  };
-
-  return data;
-}
-
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -66,18 +56,15 @@ class ComponentTreeWidget {
     (0, _defineProperty2().default)(this, "widget", ({
       component
     }) => {
-      const workspace = (0, _react().useContext)(_workspaceContext().WorkspaceContext);
-      const workspaceComponent = workspace.getComponent(component.id);
       const {
         lanesModel
       } = (0, _lanesHooks().useLanes)();
       const isInCurrentLane = (0, _react().useMemo)(() => {
-        return (workspaceComponent === null || workspaceComponent === void 0 ? void 0 : workspaceComponent.id) && (lanesModel === null || lanesModel === void 0 ? void 0 : lanesModel.isInViewedLane(workspaceComponent.id));
-      }, [lanesModel === null || lanesModel === void 0 ? void 0 : lanesModel.viewedLane, workspaceComponent === null || workspaceComponent === void 0 ? void 0 : workspaceComponent.id]);
-      if (!workspaceComponent) return null;
+        return component.id && (lanesModel === null || lanesModel === void 0 ? void 0 : lanesModel.isComponentOnLaneButNotOnMain(component.id));
+      }, [lanesModel === null || lanesModel === void 0 ? void 0 : lanesModel.viewedLane, component.id]);
       return /*#__PURE__*/_react().default.createElement(_componentUi().ComponentStatusResolver, {
-        status: workspaceComponent.status,
-        issuesCount: workspaceComponent.issuesCount,
+        status: component.status,
+        issuesCount: component.issuesCount,
         isInCurrentLane: isInCurrentLane
       });
     });

package/dist/component-tree.widget.js.map

@@ -1 +1 @@
-{"version":3,"names":["ComponentTreeWidget","component","workspace","useContext","WorkspaceContext","workspaceComponent","getComponent","id","lanesModel","useLanes","isInCurrentLane","useMemo","isInViewedLane","viewedLane","status","issuesCount"],"sources":["component-tree.widget.tsx"],"sourcesContent":["import { ComponentTreeNode, ComponentTreeNodeProps } from '@teambit/component-tree';\nimport { ComponentStatusResolver } from '@teambit/component.ui.component-status-resolver';\nimport { useLanes } from '@teambit/lanes.hooks.use-lanes';\nimport React, { useContext, useMemo } from 'react';\n\nimport { WorkspaceContext } from './ui/workspace/workspace-context';\n\nexport class ComponentTreeWidget implements ComponentTreeNode {\n  widget = ({ component }: ComponentTreeNodeProps) => {\n    const workspace = useContext(WorkspaceContext);\n    const workspaceComponent = workspace.getComponent(component.id);\n    const { lanesModel } = useLanes();\n\n    const isInCurrentLane = useMemo(() => {\n      return workspaceComponent?.id && lanesModel?.isInViewedLane(workspaceComponent.id);\n    }, [lanesModel?.viewedLane, workspaceComponent?.id]);\n\n    if (!workspaceComponent) return null;\n\n    return (\n      <ComponentStatusResolver\n        status={workspaceComponent.status}\n        issuesCount={workspaceComponent.issuesCount}\n        isInCurrentLane={isInCurrentLane}\n      />\n    );\n  };\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AAEA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;;;;;AAEO,MAAMA,mBAAN,CAAuD;EAAA;IAAA,gDACnD,CAAC;MAAEC;IAAF,CAAD,KAA2C;MAClD,MAAMC,SAAS,GAAG,IAAAC,mBAAA,EAAWC,oCAAX,CAAlB;MACA,MAAMC,kBAAkB,GAAGH,SAAS,CAACI,YAAV,CAAuBL,SAAS,CAACM,EAAjC,CAA3B;MACA,MAAM;QAAEC;MAAF,IAAiB,IAAAC,sBAAA,GAAvB;MAEA,MAAMC,eAAe,GAAG,IAAAC,gBAAA,EAAQ,MAAM;QACpC,OAAO,CAAAN,kBAAkB,SAAlB,IAAAA,kBAAkB,WAAlB,YAAAA,kBAAkB,CAAEE,EAApB,MAA0BC,UAA1B,aAA0BA,UAA1B,uBAA0BA,UAAU,CAAEI,cAAZ,CAA2BP,kBAAkB,CAACE,EAA9C,CAA1B,CAAP;MACD,CAFuB,EAErB,CAACC,UAAD,aAACA,UAAD,uBAACA,UAAU,CAAEK,UAAb,EAAyBR,kBAAzB,aAAyBA,kBAAzB,uBAAyBA,kBAAkB,CAAEE,EAA7C,CAFqB,CAAxB;MAIA,IAAI,CAACF,kBAAL,EAAyB,OAAO,IAAP;MAEzB,oBACE,+BAAC,sCAAD;QACE,MAAM,EAAEA,kBAAkB,CAACS,MAD7B;QAEE,WAAW,EAAET,kBAAkB,CAACU,WAFlC;QAGE,eAAe,EAAEL;MAHnB,EADF;IAOD,CAnB2D;EAAA;;AAAA"}
+{"version":3,"names":["ComponentTreeWidget","component","lanesModel","useLanes","isInCurrentLane","useMemo","id","isComponentOnLaneButNotOnMain","viewedLane","status","issuesCount"],"sources":["component-tree.widget.tsx"],"sourcesContent":["import { ComponentTreeNode, ComponentTreeNodeProps } from '@teambit/component-tree';\nimport { ComponentStatusResolver } from '@teambit/component.ui.component-status-resolver';\nimport { useLanes } from '@teambit/lanes.hooks.use-lanes';\nimport React, { useMemo } from 'react';\n\nexport class ComponentTreeWidget implements ComponentTreeNode {\n  widget = ({ component }: ComponentTreeNodeProps) => {\n    const { lanesModel } = useLanes();\n\n    const isInCurrentLane = useMemo(() => {\n      return component.id && lanesModel?.isComponentOnLaneButNotOnMain(component.id);\n    }, [lanesModel?.viewedLane, component.id]);\n\n    return (\n      <ComponentStatusResolver\n        status={component.status}\n        issuesCount={component.issuesCount}\n        isInCurrentLane={isInCurrentLane}\n      />\n    );\n  };\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;;;;;AAEO,MAAMA,mBAAN,CAAuD;EAAA;IAAA,gDACnD,CAAC;MAAEC;IAAF,CAAD,KAA2C;MAClD,MAAM;QAAEC;MAAF,IAAiB,IAAAC,sBAAA,GAAvB;MAEA,MAAMC,eAAe,GAAG,IAAAC,gBAAA,EAAQ,MAAM;QACpC,OAAOJ,SAAS,CAACK,EAAV,KAAgBJ,UAAhB,aAAgBA,UAAhB,uBAAgBA,UAAU,CAAEK,6BAAZ,CAA0CN,SAAS,CAACK,EAApD,CAAhB,CAAP;MACD,CAFuB,EAErB,CAACJ,UAAD,aAACA,UAAD,uBAACA,UAAU,CAAEM,UAAb,EAAyBP,SAAS,CAACK,EAAnC,CAFqB,CAAxB;MAIA,oBACE,+BAAC,sCAAD;QACE,MAAM,EAAEL,SAAS,CAACQ,MADpB;QAEE,WAAW,EAAER,SAAS,CAACS,WAFzB;QAGE,eAAe,EAAEN;MAHnB,EADF;IAOD,CAf2D;EAAA;;AAAA"}

package/dist/index.d.ts

@@ -9,7 +9,7 @@ export * from './events';
 export type { WorkspaceUI } from './workspace.ui.runtime';
 export type { SerializableResults, OnComponentLoad, OnComponentEventResult } from './on-component-events';
 export { ComponentStatus } from './workspace-component';
-export { WorkspaceModelComponent } from './ui/workspace/workspace-model';
+export { WorkspaceModelComponent, Workspace as WorkspaceModel } from './ui/workspace/workspace-model';
 export { WorkspaceContext } from './ui/workspace/workspace-context';
 export type { WorkspaceComponent } from './workspace-component';
 export type { ComponentConfigFile } from './component-config-file';

package/dist/index.js

@@ -8,6 +8,7 @@ var _exportNames = {
   CheckTypes: true,
   ComponentStatus: true,
   WorkspaceModelComponent: true,
+  WorkspaceModel: true,
   WorkspaceContext: true
 };
 Object.defineProperty(exports, "CheckTypes", {
@@ -34,6 +35,12 @@ Object.defineProperty(exports, "WorkspaceContext", {
     return _workspaceContext().WorkspaceContext;
   }
 });
+Object.defineProperty(exports, "WorkspaceModel", {
+  enumerable: true,
+  get: function () {
+    return _workspaceModel().Workspace;
+  }
+});
 Object.defineProperty(exports, "WorkspaceModelComponent", {
   enumerable: true,
   get: function () {

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["WorkspaceAspect"],"sources":["index.ts"],"sourcesContent":["import { WorkspaceAspect } from './workspace.aspect';\n// eslint-disable-next-line import/prefer-default-export\nexport type { default as Workspace, ExtensionsOrigin } from './workspace';\n// TODO: change to module path once track the utils folder\nexport type { ResolvedComponent } from '@teambit/harmony.modules.resolved-component';\nexport type { AlreadyExistsError as ComponentConfigFileAlreadyExistsError } from './component-config-file';\nexport type { WorkspaceMain } from './workspace.main.runtime';\nexport type { WatchOptions } from './watch/watcher';\nexport { CheckTypes } from './watch/check-types';\nexport * from './events';\nexport type { WorkspaceUI } from './workspace.ui.runtime';\nexport type { SerializableResults, OnComponentLoad, OnComponentEventResult } from './on-component-events';\nexport { ComponentStatus } from './workspace-component';\nexport { WorkspaceModelComponent } from './ui/workspace/workspace-model';\nexport { WorkspaceContext } from './ui/workspace/workspace-context';\nexport type { WorkspaceComponent } from './workspace-component';\nexport type { ComponentConfigFile } from './component-config-file';\n\nexport { WorkspaceAspect };\nexport default WorkspaceAspect;\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AAQA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;;AAAA;EAAA;EAAA;EAAA;EAAA;IAAA;IAAA;MAAA;IAAA;EAAA;AAAA;;AAGA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;eAKeA,4B"}
+{"version":3,"names":["WorkspaceAspect"],"sources":["index.ts"],"sourcesContent":["import { WorkspaceAspect } from './workspace.aspect';\n// eslint-disable-next-line import/prefer-default-export\nexport type { default as Workspace, ExtensionsOrigin } from './workspace';\n// TODO: change to module path once track the utils folder\nexport type { ResolvedComponent } from '@teambit/harmony.modules.resolved-component';\nexport type { AlreadyExistsError as ComponentConfigFileAlreadyExistsError } from './component-config-file';\nexport type { WorkspaceMain } from './workspace.main.runtime';\nexport type { WatchOptions } from './watch/watcher';\nexport { CheckTypes } from './watch/check-types';\nexport * from './events';\nexport type { WorkspaceUI } from './workspace.ui.runtime';\nexport type { SerializableResults, OnComponentLoad, OnComponentEventResult } from './on-component-events';\nexport { ComponentStatus } from './workspace-component';\nexport { WorkspaceModelComponent, Workspace as WorkspaceModel } from './ui/workspace/workspace-model';\nexport { WorkspaceContext } from './ui/workspace/workspace-context';\nexport type { WorkspaceComponent } from './workspace-component';\nexport type { ComponentConfigFile } from './component-config-file';\n\nexport { WorkspaceAspect };\nexport default WorkspaceAspect;\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AAQA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;;AAAA;EAAA;EAAA;EAAA;EAAA;IAAA;IAAA;MAAA;IAAA;EAAA;AAAA;;AAGA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;eAKeA,4B"}

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

@@ -1 +1 @@
-{"version":3,"names":["WorkspaceComponentLoader","constructor","workspace","logger","dependencyResolver","envs","componentsCache","createInMemoryCache","maxSize","getMaxSizeForComponents","getMany","ids","idsWithoutEmpty","compact","errors","longProcessLogger","createLongProcessLogger","length","componentsP","mapSeries","id","logProgress","toString","get","catch","err","isComponentNotExistsError","push","undefined","components","forEach","console","warn","filteredComponents","end","getInvalid","consumer","loadComponent","_legacy","ConsumerComponent","isComponentInvalidByErrorType","componentId","legacyComponent","useCache","storeInCache","loadOpts","bitIdWithVersion","getLatestVersionNumber","bitmapIdsFromCurrentLane","version","changeVersion","fromCache","getFromCache","consumerComponent","getConsumerComponent","updatedId","ComponentID","fromLegacy","scope","component","loadOne","addMultipleEnvsIssueIfNeeded","saveInCache","getIfExist","getAllEnvsConfiguredOnComponent","envIds","uniq","map","env","state","issues","getOrCreate","IssuesClasses","MultipleEnvs","data","clearCache","deleteAll","clearComponentCache","idStr","cacheKey","keys","startsWith","delete","componentFromScope","MissingBitMapComponent","extensions","componentExtensions","extensionsFromConsumerComponent","ExtensionDataList","extensionDataList","mergeConfigs","filterRemovedExtensions","State","Config","mainFile","createAspectList","ComponentFS","fromVinyls","files","dependencies","workspaceComponent","WorkspaceComponent","head","tags","executeLoadSlot","newComponentFromState","createComponentCacheKey","set","isEqual","debug","name","message","ComponentNotFound","ComponentNotFoundInPath","_consumer","removed","envsData","getEnvSystemDescriptor","policy","mergeVariantPolicies","config","extractDepsFromLegacy","depResolverData","serialize","Promise","all","upsertExtensionData","EnvsAspect","DependencyResolverAspect","aspectListWithEnvsAndDeps","aspects","entries","onComponentLoadSlot","toArray","promises","extension","onLoad","updatedAspectList","TagMap","existingExtension","findExtension","Object","assign","getDataEntry","ExtensionDataEntry","JSON","stringify","sortKeys","obj","fromPairs","sort","k1","k2","localeCompare"],"sources":["workspace-component-loader.ts"],"sourcesContent":["import { Component, ComponentFS, ComponentID, Config, InvalidComponent, State, TagMap } from '@teambit/component';\nimport { BitId } from '@teambit/legacy-bit-id';\nimport { ExtensionDataList } from '@teambit/legacy/dist/consumer/config/extension-data';\nimport mapSeries from 'p-map-series';\nimport { compact, fromPairs, uniq } from 'lodash';\nimport ConsumerComponent from '@teambit/legacy/dist/consumer/component';\nimport { MissingBitMapComponent } from '@teambit/legacy/dist/consumer/bit-map/exceptions';\nimport { getLatestVersionNumber } from '@teambit/legacy/dist/utils';\nimport { IssuesClasses } from '@teambit/component-issues';\nimport { ComponentNotFound } from '@teambit/legacy/dist/scope/exceptions';\nimport { DependencyResolverAspect, DependencyResolverMain } from '@teambit/dependency-resolver';\nimport { Logger } from '@teambit/logger';\nimport { EnvsAspect, EnvsMain } from '@teambit/envs';\nimport { ExtensionDataEntry } from '@teambit/legacy/dist/consumer/config';\nimport { getMaxSizeForComponents, InMemoryCache } from '@teambit/legacy/dist/cache/in-memory-cache';\nimport { createInMemoryCache } from '@teambit/legacy/dist/cache/cache-factory';\nimport ComponentNotFoundInPath from '@teambit/legacy/dist/consumer/component/exceptions/component-not-found-in-path';\nimport { ComponentLoadOptions } from '@teambit/legacy/dist/consumer/component/component-loader';\nimport { Workspace } from '../workspace';\nimport { WorkspaceComponent } from './workspace-component';\n\nexport class WorkspaceComponentLoader {\n  private componentsCache: InMemoryCache<Component>; // cache loaded components\n  constructor(\n    private workspace: Workspace,\n    private logger: Logger,\n    private dependencyResolver: DependencyResolverMain,\n    private envs: EnvsMain\n  ) {\n    this.componentsCache = createInMemoryCache({ maxSize: getMaxSizeForComponents() });\n  }\n\n  async getMany(ids: Array<ComponentID>): Promise<Component[]> {\n    const idsWithoutEmpty = compact(ids);\n    const errors: { id: ComponentID; err: Error }[] = [];\n    const longProcessLogger = this.logger.createLongProcessLogger('loading components', ids.length);\n    const componentsP = mapSeries(idsWithoutEmpty, async (id: ComponentID) => {\n      longProcessLogger.logProgress(id.toString());\n      return this.get(id).catch((err) => {\n        if (this.isComponentNotExistsError(err)) {\n          errors.push({\n            id,\n            err,\n          });\n          return undefined;\n        }\n        throw err;\n      });\n    });\n    const components = await componentsP;\n    errors.forEach((err) => {\n      this.logger.console(`failed loading component ${err.id.toString()}, see full error in debug.log file`);\n      this.logger.warn(`failed loading component ${err.id.toString()}`, err.err);\n    });\n    // remove errored components\n    const filteredComponents: Component[] = compact(components);\n    longProcessLogger.end();\n    return filteredComponents;\n  }\n\n  async getInvalid(ids: Array<ComponentID>): Promise<InvalidComponent[]> {\n    const idsWithoutEmpty = compact(ids);\n    const errors: InvalidComponent[] = [];\n    const longProcessLogger = this.logger.createLongProcessLogger('loading components', ids.length);\n    await mapSeries(idsWithoutEmpty, async (id: ComponentID) => {\n      longProcessLogger.logProgress(id.toString());\n      try {\n        await this.workspace.consumer.loadComponent(id._legacy);\n      } catch (err: any) {\n        if (ConsumerComponent.isComponentInvalidByErrorType(err)) {\n          errors.push({\n            id,\n            err,\n          });\n          return;\n        }\n        throw err;\n      }\n    });\n    return errors;\n  }\n\n  async get(\n    componentId: ComponentID,\n    legacyComponent?: ConsumerComponent,\n    useCache = true,\n    storeInCache = true,\n    loadOpts?: ComponentLoadOptions\n  ): Promise<Component> {\n    const bitIdWithVersion: BitId = getLatestVersionNumber(\n      this.workspace.consumer.bitmapIdsFromCurrentLane,\n      componentId._legacy\n    );\n    const id = bitIdWithVersion.version ? componentId.changeVersion(bitIdWithVersion.version) : componentId;\n    const fromCache = this.getFromCache(id, loadOpts);\n    if (fromCache && useCache) {\n      return fromCache;\n    }\n    const consumerComponent = legacyComponent || (await this.getConsumerComponent(id));\n    // in case of out-of-sync, the id may changed during the load process\n    const updatedId = consumerComponent ? ComponentID.fromLegacy(consumerComponent.id, id.scope) : id;\n    const component = await this.loadOne(updatedId, consumerComponent, loadOpts);\n    if (storeInCache) {\n      this.addMultipleEnvsIssueIfNeeded(component); // it's in storeInCache block, otherwise, it wasn't fully loaded\n      this.saveInCache(component, loadOpts);\n    }\n    return component;\n  }\n\n  async getIfExist(componentId: ComponentID) {\n    try {\n      return await this.get(componentId);\n    } catch (err: any) {\n      if (this.isComponentNotExistsError(err)) {\n        return undefined;\n      }\n      throw err;\n    }\n  }\n\n  private addMultipleEnvsIssueIfNeeded(component: Component) {\n    const envs = this.envs.getAllEnvsConfiguredOnComponent(component);\n    const envIds = uniq(envs.map((env) => env.id));\n    if (envIds.length < 2) {\n      return;\n    }\n    component.state.issues.getOrCreate(IssuesClasses.MultipleEnvs).data = envIds;\n  }\n\n  clearCache() {\n    this.componentsCache.deleteAll();\n  }\n  clearComponentCache(id: ComponentID) {\n    const idStr = id.toString();\n    for (const cacheKey of this.componentsCache.keys()) {\n      if (cacheKey === idStr || cacheKey.startsWith(`${idStr}:`)) {\n        this.componentsCache.delete(cacheKey);\n      }\n    }\n  }\n\n  private async loadOne(id: ComponentID, consumerComponent?: ConsumerComponent, loadOpts?: ComponentLoadOptions) {\n    const componentFromScope = await this.workspace.scope.get(id);\n    if (!consumerComponent) {\n      if (!componentFromScope) throw new MissingBitMapComponent(id.toString());\n      return componentFromScope;\n    }\n    const { extensions } = await this.workspace.componentExtensions(id, componentFromScope);\n    const extensionsFromConsumerComponent = consumerComponent.extensions || new ExtensionDataList();\n    // Merge extensions added by the legacy code in memory (for example data of dependency resolver)\n    const extensionDataList = ExtensionDataList.mergeConfigs([\n      extensionsFromConsumerComponent,\n      extensions,\n    ]).filterRemovedExtensions();\n\n    // temporarily mutate consumer component extensions until we remove all direct access from legacy to extensions data\n    // TODO: remove this once we remove all direct access from legacy code to extensions data\n    consumerComponent.extensions = extensionDataList;\n\n    const state = new State(\n      new Config(consumerComponent.mainFile, extensionDataList),\n      await this.workspace.createAspectList(extensionDataList),\n      ComponentFS.fromVinyls(consumerComponent.files),\n      consumerComponent.dependencies,\n      consumerComponent\n    );\n    if (componentFromScope) {\n      // Removed by @gilad. do not mutate the component from the scope\n      // componentFromScope.state = state;\n      // const workspaceComponent = WorkspaceComponent.fromComponent(componentFromScope, this.workspace);\n      const workspaceComponent = new WorkspaceComponent(\n        componentFromScope.id,\n        componentFromScope.head,\n        state,\n        componentFromScope.tags,\n        this.workspace\n      );\n      return this.executeLoadSlot(workspaceComponent, loadOpts);\n    }\n    return this.executeLoadSlot(this.newComponentFromState(id, state), loadOpts);\n  }\n\n  private saveInCache(component: Component, loadOpts?: ComponentLoadOptions): void {\n    const cacheKey = createComponentCacheKey(component.id, loadOpts);\n    this.componentsCache.set(cacheKey, component);\n  }\n\n  /**\n   * make sure that not only the id-str match, but also the legacy-id.\n   * this is needed because the ComponentID.toString() is the same whether or not the legacy-id has\n   * scope-name, as it includes the defaultScope if the scope is empty.\n   * as a result, when out-of-sync is happening and the id is changed to include scope-name in the\n   * legacy-id, the component is the cache has the old id.\n   */\n  private getFromCache(id: ComponentID, loadOpts?: ComponentLoadOptions): Component | undefined {\n    const cacheKey = createComponentCacheKey(id, loadOpts);\n    const fromCache = this.componentsCache.get(cacheKey);\n    if (fromCache && fromCache.id._legacy.isEqual(id._legacy)) {\n      return fromCache;\n    }\n    return undefined;\n  }\n\n  private async getConsumerComponent(id: ComponentID): Promise<ConsumerComponent | undefined> {\n    try {\n      return await this.workspace.consumer.loadComponent(id._legacy);\n    } catch (err: any) {\n      // don't return undefined for any error. otherwise, if the component is invalid (e.g. main\n      // file is missing) it returns the model component later unexpectedly, or if it's new, it\n      // shows MissingBitMapComponent error incorrectly.\n      if (this.isComponentNotExistsError(err)) {\n        this.logger.debug(\n          `failed loading component \"${id.toString()}\" from the workspace due to \"${err.name}\" error\\n${err.message}`\n        );\n        return undefined;\n      }\n      throw err;\n    }\n  }\n\n  private isComponentNotExistsError(err: Error): boolean {\n    return (\n      err instanceof ComponentNotFound ||\n      err instanceof MissingBitMapComponent ||\n      err instanceof ComponentNotFoundInPath\n    );\n  }\n\n  private async executeLoadSlot(component: Component, loadOpts?: ComponentLoadOptions) {\n    if (component.state._consumer.removed) {\n      // if it was soft-removed now, the component is not in the FS. loading aspects such as composition ends up with\n      // errors as they try to read component files from the filesystem.\n      return component;\n    }\n\n    // Special load events which runs from the workspace but should run from the correct aspect\n    // TODO: remove this once those extensions dependent on workspace\n    const envsData = await this.workspace.getEnvSystemDescriptor(component);\n\n    // Move to deps resolver main runtime once we switch ws<> deps resolver direction\n    const policy = await this.dependencyResolver.mergeVariantPolicies(component.config.extensions);\n    const dependencies = await this.dependencyResolver.extractDepsFromLegacy(component, policy);\n\n    const depResolverData = {\n      dependencies,\n      policy: policy.serialize(),\n    };\n\n    // Make sure we are adding the envs / deps data first because other on load events might depend on it\n    await Promise.all([\n      this.upsertExtensionData(component, EnvsAspect.id, envsData),\n      this.upsertExtensionData(component, DependencyResolverAspect.id, depResolverData)\n    ]);\n\n    // 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\n    // 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\n    const aspectListWithEnvsAndDeps = await this.workspace.createAspectList(component.state.config.extensions);\n    component.state.aspects = aspectListWithEnvsAndDeps;\n\n    const entries = this.workspace.onComponentLoadSlot.toArray();\n    const promises = entries.map(async ([extension, onLoad]) => {\n      const data = await onLoad(component, loadOpts);\n      return this.upsertExtensionData(component, extension, data);\n    });\n\n    await Promise.all(promises);\n\n    // Update the aspect list to have changes happened during the on load slot (new data added above)\n    const updatedAspectList = await this.workspace.createAspectList(component.state.config.extensions);\n    component.state.aspects = updatedAspectList;\n    return component;\n  }\n\n  private newComponentFromState(id: ComponentID, state: State): Component {\n    return new WorkspaceComponent(id, null, state, new TagMap(), this.workspace);\n  }\n\n  private async upsertExtensionData(component: Component, extension: string, data: any) {\n    const existingExtension = component.state.config.extensions.findExtension(extension);\n    if (existingExtension && data) {\n      // Only merge top level of extension data\n      Object.assign(existingExtension.data, data);\n      return;\n    }\n    component.state.config.extensions.push(await this.getDataEntry(extension, data));\n  }\n\n  private async getDataEntry(extension: string, data: { [key: string]: any }): Promise<ExtensionDataEntry> {\n    // TODO: @gilad we need to refactor the extension data entry api.\n    return new ExtensionDataEntry(undefined, undefined, extension, undefined, data);\n  }\n}\n\nfunction createComponentCacheKey(id: ComponentID, loadOpts?: ComponentLoadOptions): string {\n  return `${id.toString()}:${JSON.stringify(sortKeys(loadOpts ?? {}))}`;\n}\n\nfunction sortKeys(obj: Object) {\n  return fromPairs(Object.entries(obj).sort(([k1], [k2]) => k1.localeCompare(k2)));\n}\n"],"mappings":"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"}
+{"version":3,"names":["WorkspaceComponentLoader","constructor","workspace","logger","dependencyResolver","envs","componentsCache","createInMemoryCache","maxSize","getMaxSizeForComponents","getMany","ids","idsWithoutEmpty","compact","errors","longProcessLogger","createLongProcessLogger","length","componentsP","mapSeries","id","logProgress","toString","get","catch","err","isComponentNotExistsError","push","undefined","components","forEach","console","warn","filteredComponents","end","getInvalid","consumer","loadComponent","_legacy","ConsumerComponent","isComponentInvalidByErrorType","componentId","legacyComponent","useCache","storeInCache","loadOpts","bitIdWithVersion","getLatestVersionNumber","bitmapIdsFromCurrentLane","version","changeVersion","fromCache","getFromCache","consumerComponent","getConsumerComponent","updatedId","ComponentID","fromLegacy","scope","component","loadOne","addMultipleEnvsIssueIfNeeded","saveInCache","getIfExist","getAllEnvsConfiguredOnComponent","envIds","uniq","map","env","state","issues","getOrCreate","IssuesClasses","MultipleEnvs","data","clearCache","deleteAll","clearComponentCache","idStr","cacheKey","keys","startsWith","delete","componentFromScope","MissingBitMapComponent","extensions","componentExtensions","extensionsFromConsumerComponent","ExtensionDataList","extensionDataList","mergeConfigs","filterRemovedExtensions","State","Config","mainFile","createAspectList","ComponentFS","fromVinyls","files","dependencies","workspaceComponent","WorkspaceComponent","head","tags","executeLoadSlot","newComponentFromState","createComponentCacheKey","set","isEqual","debug","name","message","ComponentNotFound","ComponentNotFoundInPath","_consumer","removed","envsData","getEnvSystemDescriptor","policy","mergeVariantPolicies","config","extractDepsFromLegacy","depResolverData","serialize","Promise","all","upsertExtensionData","EnvsAspect","DependencyResolverAspect","aspectListWithEnvsAndDeps","aspects","entries","onComponentLoadSlot","toArray","promises","extension","onLoad","updatedAspectList","TagMap","existingExtension","findExtension","Object","assign","getDataEntry","ExtensionDataEntry","JSON","stringify","sortKeys","obj","fromPairs","sort","k1","k2","localeCompare"],"sources":["workspace-component-loader.ts"],"sourcesContent":["import { Component, ComponentFS, ComponentID, Config, InvalidComponent, State, TagMap } from '@teambit/component';\nimport { BitId } from '@teambit/legacy-bit-id';\nimport { ExtensionDataList } from '@teambit/legacy/dist/consumer/config/extension-data';\nimport mapSeries from 'p-map-series';\nimport { compact, fromPairs, uniq } from 'lodash';\nimport ConsumerComponent from '@teambit/legacy/dist/consumer/component';\nimport { MissingBitMapComponent } from '@teambit/legacy/dist/consumer/bit-map/exceptions';\nimport { getLatestVersionNumber } from '@teambit/legacy/dist/utils';\nimport { IssuesClasses } from '@teambit/component-issues';\nimport { ComponentNotFound } from '@teambit/legacy/dist/scope/exceptions';\nimport { DependencyResolverAspect, DependencyResolverMain } from '@teambit/dependency-resolver';\nimport { Logger } from '@teambit/logger';\nimport { EnvsAspect, EnvsMain } from '@teambit/envs';\nimport { ExtensionDataEntry } from '@teambit/legacy/dist/consumer/config';\nimport { getMaxSizeForComponents, InMemoryCache } from '@teambit/legacy/dist/cache/in-memory-cache';\nimport { createInMemoryCache } from '@teambit/legacy/dist/cache/cache-factory';\nimport ComponentNotFoundInPath from '@teambit/legacy/dist/consumer/component/exceptions/component-not-found-in-path';\nimport { ComponentLoadOptions } from '@teambit/legacy/dist/consumer/component/component-loader';\nimport { Workspace } from '../workspace';\nimport { WorkspaceComponent } from './workspace-component';\n\nexport class WorkspaceComponentLoader {\n  private componentsCache: InMemoryCache<Component>; // cache loaded components\n  constructor(\n    private workspace: Workspace,\n    private logger: Logger,\n    private dependencyResolver: DependencyResolverMain,\n    private envs: EnvsMain\n  ) {\n    this.componentsCache = createInMemoryCache({ maxSize: getMaxSizeForComponents() });\n  }\n\n  async getMany(ids: Array<ComponentID>): Promise<Component[]> {\n    const idsWithoutEmpty = compact(ids);\n    const errors: { id: ComponentID; err: Error }[] = [];\n    const longProcessLogger = this.logger.createLongProcessLogger('loading components', ids.length);\n    const componentsP = mapSeries(idsWithoutEmpty, async (id: ComponentID) => {\n      longProcessLogger.logProgress(id.toString());\n      return this.get(id).catch((err) => {\n        if (this.isComponentNotExistsError(err)) {\n          errors.push({\n            id,\n            err,\n          });\n          return undefined;\n        }\n        throw err;\n      });\n    });\n    const components = await componentsP;\n    errors.forEach((err) => {\n      this.logger.console(`failed loading component ${err.id.toString()}, see full error in debug.log file`);\n      this.logger.warn(`failed loading component ${err.id.toString()}`, err.err);\n    });\n    // remove errored components\n    const filteredComponents: Component[] = compact(components);\n    longProcessLogger.end();\n    return filteredComponents;\n  }\n\n  async getInvalid(ids: Array<ComponentID>): Promise<InvalidComponent[]> {\n    const idsWithoutEmpty = compact(ids);\n    const errors: InvalidComponent[] = [];\n    const longProcessLogger = this.logger.createLongProcessLogger('loading components', ids.length);\n    await mapSeries(idsWithoutEmpty, async (id: ComponentID) => {\n      longProcessLogger.logProgress(id.toString());\n      try {\n        await this.workspace.consumer.loadComponent(id._legacy);\n      } catch (err: any) {\n        if (ConsumerComponent.isComponentInvalidByErrorType(err)) {\n          errors.push({\n            id,\n            err,\n          });\n          return;\n        }\n        throw err;\n      }\n    });\n    return errors;\n  }\n\n  async get(\n    componentId: ComponentID,\n    legacyComponent?: ConsumerComponent,\n    useCache = true,\n    storeInCache = true,\n    loadOpts?: ComponentLoadOptions\n  ): Promise<Component> {\n    const bitIdWithVersion: BitId = getLatestVersionNumber(\n      this.workspace.consumer.bitmapIdsFromCurrentLane,\n      componentId._legacy\n    );\n    const id = bitIdWithVersion.version ? componentId.changeVersion(bitIdWithVersion.version) : componentId;\n    const fromCache = this.getFromCache(id, loadOpts);\n    if (fromCache && useCache) {\n      return fromCache;\n    }\n    const consumerComponent = legacyComponent || (await this.getConsumerComponent(id));\n    // in case of out-of-sync, the id may changed during the load process\n    const updatedId = consumerComponent ? ComponentID.fromLegacy(consumerComponent.id, id.scope) : id;\n    const component = await this.loadOne(updatedId, consumerComponent, loadOpts);\n    if (storeInCache) {\n      this.addMultipleEnvsIssueIfNeeded(component); // it's in storeInCache block, otherwise, it wasn't fully loaded\n      this.saveInCache(component, loadOpts);\n    }\n    return component;\n  }\n\n  async getIfExist(componentId: ComponentID) {\n    try {\n      return await this.get(componentId);\n    } catch (err: any) {\n      if (this.isComponentNotExistsError(err)) {\n        return undefined;\n      }\n      throw err;\n    }\n  }\n\n  private addMultipleEnvsIssueIfNeeded(component: Component) {\n    const envs = this.envs.getAllEnvsConfiguredOnComponent(component);\n    const envIds = uniq(envs.map((env) => env.id));\n    if (envIds.length < 2) {\n      return;\n    }\n    component.state.issues.getOrCreate(IssuesClasses.MultipleEnvs).data = envIds;\n  }\n\n  clearCache() {\n    this.componentsCache.deleteAll();\n  }\n  clearComponentCache(id: ComponentID) {\n    const idStr = id.toString();\n    for (const cacheKey of this.componentsCache.keys()) {\n      if (cacheKey === idStr || cacheKey.startsWith(`${idStr}:`)) {\n        this.componentsCache.delete(cacheKey);\n      }\n    }\n  }\n\n  private async loadOne(id: ComponentID, consumerComponent?: ConsumerComponent, loadOpts?: ComponentLoadOptions) {\n    const componentFromScope = await this.workspace.scope.get(id);\n    if (!consumerComponent) {\n      if (!componentFromScope) throw new MissingBitMapComponent(id.toString());\n      return componentFromScope;\n    }\n    const { extensions } = await this.workspace.componentExtensions(id, componentFromScope);\n    const extensionsFromConsumerComponent = consumerComponent.extensions || new ExtensionDataList();\n    // Merge extensions added by the legacy code in memory (for example data of dependency resolver)\n    const extensionDataList = ExtensionDataList.mergeConfigs([\n      extensionsFromConsumerComponent,\n      extensions,\n    ]).filterRemovedExtensions();\n\n    // temporarily mutate consumer component extensions until we remove all direct access from legacy to extensions data\n    // TODO: remove this once we remove all direct access from legacy code to extensions data\n    consumerComponent.extensions = extensionDataList;\n\n    const state = new State(\n      new Config(consumerComponent.mainFile, extensionDataList),\n      await this.workspace.createAspectList(extensionDataList),\n      ComponentFS.fromVinyls(consumerComponent.files),\n      consumerComponent.dependencies,\n      consumerComponent\n    );\n    if (componentFromScope) {\n      // Removed by @gilad. do not mutate the component from the scope\n      // componentFromScope.state = state;\n      // const workspaceComponent = WorkspaceComponent.fromComponent(componentFromScope, this.workspace);\n      const workspaceComponent = new WorkspaceComponent(\n        componentFromScope.id,\n        componentFromScope.head,\n        state,\n        componentFromScope.tags,\n        this.workspace\n      );\n      return this.executeLoadSlot(workspaceComponent, loadOpts);\n    }\n    return this.executeLoadSlot(this.newComponentFromState(id, state), loadOpts);\n  }\n\n  private saveInCache(component: Component, loadOpts?: ComponentLoadOptions): void {\n    const cacheKey = createComponentCacheKey(component.id, loadOpts);\n    this.componentsCache.set(cacheKey, component);\n  }\n\n  /**\n   * make sure that not only the id-str match, but also the legacy-id.\n   * this is needed because the ComponentID.toString() is the same whether or not the legacy-id has\n   * scope-name, as it includes the defaultScope if the scope is empty.\n   * as a result, when out-of-sync is happening and the id is changed to include scope-name in the\n   * legacy-id, the component is the cache has the old id.\n   */\n  private getFromCache(id: ComponentID, loadOpts?: ComponentLoadOptions): Component | undefined {\n    const cacheKey = createComponentCacheKey(id, loadOpts);\n    const fromCache = this.componentsCache.get(cacheKey);\n    if (fromCache && fromCache.id._legacy.isEqual(id._legacy)) {\n      return fromCache;\n    }\n    return undefined;\n  }\n\n  private async getConsumerComponent(id: ComponentID): Promise<ConsumerComponent | undefined> {\n    try {\n      return await this.workspace.consumer.loadComponent(id._legacy);\n    } catch (err: any) {\n      // don't return undefined for any error. otherwise, if the component is invalid (e.g. main\n      // file is missing) it returns the model component later unexpectedly, or if it's new, it\n      // shows MissingBitMapComponent error incorrectly.\n      if (this.isComponentNotExistsError(err)) {\n        this.logger.debug(\n          `failed loading component \"${id.toString()}\" from the workspace due to \"${err.name}\" error\\n${err.message}`\n        );\n        return undefined;\n      }\n      throw err;\n    }\n  }\n\n  private isComponentNotExistsError(err: Error): boolean {\n    return (\n      err instanceof ComponentNotFound ||\n      err instanceof MissingBitMapComponent ||\n      err instanceof ComponentNotFoundInPath\n    );\n  }\n\n  private async executeLoadSlot(component: Component, loadOpts?: ComponentLoadOptions) {\n    if (component.state._consumer.removed) {\n      // if it was soft-removed now, the component is not in the FS. loading aspects such as composition ends up with\n      // errors as they try to read component files from the filesystem.\n      return component;\n    }\n\n    // Special load events which runs from the workspace but should run from the correct aspect\n    // TODO: remove this once those extensions dependent on workspace\n    const envsData = await this.workspace.getEnvSystemDescriptor(component);\n\n    // Move to deps resolver main runtime once we switch ws<> deps resolver direction\n    const policy = await this.dependencyResolver.mergeVariantPolicies(component.config.extensions);\n    const dependencies = await this.dependencyResolver.extractDepsFromLegacy(component, policy);\n\n    const depResolverData = {\n      dependencies,\n      policy: policy.serialize(),\n    };\n\n    // Make sure we are adding the envs / deps data first because other on load events might depend on it\n    await Promise.all([\n      this.upsertExtensionData(component, EnvsAspect.id, envsData),\n      this.upsertExtensionData(component, DependencyResolverAspect.id, depResolverData),\n    ]);\n\n    // 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\n    // 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\n    const aspectListWithEnvsAndDeps = await this.workspace.createAspectList(component.state.config.extensions);\n    component.state.aspects = aspectListWithEnvsAndDeps;\n\n    const entries = this.workspace.onComponentLoadSlot.toArray();\n    const promises = entries.map(async ([extension, onLoad]) => {\n      const data = await onLoad(component, loadOpts);\n      return this.upsertExtensionData(component, extension, data);\n    });\n\n    await Promise.all(promises);\n\n    // Update the aspect list to have changes happened during the on load slot (new data added above)\n    const updatedAspectList = await this.workspace.createAspectList(component.state.config.extensions);\n    component.state.aspects = updatedAspectList;\n    return component;\n  }\n\n  private newComponentFromState(id: ComponentID, state: State): Component {\n    return new WorkspaceComponent(id, null, state, new TagMap(), this.workspace);\n  }\n\n  private async upsertExtensionData(component: Component, extension: string, data: any) {\n    const existingExtension = component.state.config.extensions.findExtension(extension);\n    if (existingExtension && data) {\n      // Only merge top level of extension data\n      Object.assign(existingExtension.data, data);\n      return;\n    }\n    component.state.config.extensions.push(await this.getDataEntry(extension, data));\n  }\n\n  private async getDataEntry(extension: string, data: { [key: string]: any }): Promise<ExtensionDataEntry> {\n    // TODO: @gilad we need to refactor the extension data entry api.\n    return new ExtensionDataEntry(undefined, undefined, extension, undefined, data);\n  }\n}\n\nfunction createComponentCacheKey(id: ComponentID, loadOpts?: ComponentLoadOptions): string {\n  return `${id.toString()}:${JSON.stringify(sortKeys(loadOpts ?? {}))}`;\n}\n\nfunction sortKeys(obj: Object) {\n  return fromPairs(Object.entries(obj).sort(([k1], [k2]) => k1.localeCompare(k2)));\n}\n"],"mappings":"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"}

package/dist/workspace.js

@@ -830,7 +830,9 @@ class Workspace {
       const icon = this.aspectLoader.getDescriptor(env.id).icon || env.env.icon;
       return {
         type: systemDescriptor.type,
-        id: env.id,
+        // Make sure to store the env id in the data without the version
+        // The version should always come from the aspect id configured on the component
+        id: env.id.split('@')[0],
         name: env.name,
         icon,
         description: env.description,