@teambit/workspace 0.0.536 → 0.0.543

package/package.json

@@ -1,22 +1,23 @@
 {
   "name": "@teambit/workspace",
-  "version": "0.0.536",
+  "version": "0.0.543",
   "homepage": "https://bit.dev/teambit/workspace/workspace",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.workspace",
     "name": "workspace",
-    "version": "0.0.536"
+    "version": "0.0.543"
   },
   "dependencies": {
+    "lodash.compact": "3.0.1",
+    "lodash": "4.17.21",
+    "p-map-series": "2.1.0",
     "chalk": "2.4.2",
     "ink": "3.0.8",
     "semver": "7.3.4",
     "@teambit/harmony": "0.2.11",
     "graphql-tag": "2.12.1",
     "fs-extra": "10.0.0",
-    "lodash": "4.17.21",
-    "p-map-series": "2.1.0",
     "react-router-dom": "5.2.0",
     "detect-indent": "5.0.0",
     "detect-newline": "3.1.0",
@@ -32,60 +33,61 @@
     "@teambit/base-ui.surfaces.split-pane.hover-splitter": "1.0.0",
     "@teambit/base-ui.surfaces.split-pane.split-pane": "1.0.0",
     "@teambit/base-ui.graph.tree.recursive-tree": "1.0.0",
+    "@teambit/bit-error": "0.0.366",
+    "@teambit/legacy-bit-id": "0.0.369",
+    "@teambit/logger": "0.0.461",
+    "@teambit/scope": "0.0.543",
     "@teambit/cli": "0.0.380",
-    "@teambit/isolator": "0.0.536",
+    "@teambit/isolator": "0.0.543",
     "@teambit/component-tree": "0.0.366",
-    "@teambit/component.ui.component-status-resolver": "0.0.455",
-    "@teambit/harmony.modules.resolved-component": "0.0.449",
-    "@teambit/dependency-resolver": "0.0.536",
-    "@teambit/logger": "0.0.457",
-    "@teambit/compiler": "0.0.536",
-    "@teambit/component": "0.0.536",
-    "@teambit/graphql": "0.0.536",
-    "@teambit/aspect-loader": "0.0.536",
-    "@teambit/bundler": "0.0.536",
-    "@teambit/envs": "0.0.536",
-    "@teambit/pubsub": "0.0.536",
-    "@teambit/scope": "0.0.536",
-    "@teambit/ui": "0.0.536",
-    "@teambit/variants": "0.0.459",
-    "@teambit/legacy-bit-id": "0.0.369",
-    "@teambit/bit-error": "0.0.366",
+    "@teambit/component.ui.component-status-resolver": "0.0.459",
+    "@teambit/harmony.modules.resolved-component": "0.0.453",
+    "@teambit/dependency-resolver": "0.0.543",
+    "@teambit/compiler": "0.0.543",
+    "@teambit/component": "0.0.543",
+    "@teambit/graphql": "0.0.543",
+    "@teambit/aspect-loader": "0.0.543",
+    "@teambit/bundler": "0.0.543",
+    "@teambit/envs": "0.0.543",
+    "@teambit/pubsub": "0.0.543",
+    "@teambit/ui": "0.0.543",
+    "@teambit/variants": "0.0.463",
     "@teambit/component-issues": "0.0.15",
     "@teambit/config": "0.0.391",
-    "@teambit/harmony.modules.requireable-component": "0.0.449",
-    "@teambit/workspace.modules.match-pattern": "0.0.451",
-    "@teambit/command-bar": "0.0.536",
+    "@teambit/harmony.modules.requireable-component": "0.0.453",
+    "@teambit/workspace.modules.match-pattern": "0.0.455",
+    "@teambit/command-bar": "0.0.543",
     "@teambit/design.ui.surfaces.menu.link-item": "0.0.374",
-    "@teambit/graph": "0.0.536",
-    "@teambit/react-router": "0.0.536",
-    "@teambit/sidebar": "0.0.536",
-    "@teambit/ui-foundation.ui.main-dropdown": "0.0.451",
-    "@teambit/ui-foundation.ui.menu": "0.0.451",
-    "@teambit/ui-foundation.ui.react-router.slot-router": "0.0.453",
-    "@teambit/toolbox.time.time-format": "0.0.448",
+    "@teambit/graph": "0.0.543",
+    "@teambit/react-router": "0.0.543",
+    "@teambit/sidebar": "0.0.543",
+    "@teambit/ui-foundation.ui.main-dropdown": "0.0.455",
+    "@teambit/ui-foundation.ui.menu": "0.0.455",
+    "@teambit/ui-foundation.ui.react-router.slot-router": "0.0.457",
+    "@teambit/toolbox.time.time-format": "0.0.452",
     "@teambit/component-id": "0.0.370",
-    "@teambit/ui-foundation.ui.hooks.use-data-query": "0.0.452",
-    "@teambit/deprecation": "0.0.536",
-    "@teambit/ui-foundation.ui.constants.z-indexes": "0.0.451",
-    "@teambit/ui-foundation.ui.buttons.collapser": "0.0.156",
-    "@teambit/ui-foundation.ui.corner": "0.0.458",
-    "@teambit/ui-foundation.ui.notifications.notification-context": "0.0.452",
-    "@teambit/ui-foundation.ui.top-bar": "0.0.453",
+    "@teambit/ui-foundation.ui.hooks.use-data-query": "0.0.456",
+    "@teambit/deprecation": "0.0.543",
+    "@teambit/ui-foundation.ui.constants.z-indexes": "0.0.455",
+    "@teambit/ui-foundation.ui.buttons.collapser": "0.0.160",
+    "@teambit/ui-foundation.ui.corner": "0.0.462",
+    "@teambit/ui-foundation.ui.notifications.notification-context": "0.0.456",
+    "@teambit/ui-foundation.ui.top-bar": "0.0.457",
     "@teambit/design.ui.styles.ellipsis": "0.0.346",
     "@teambit/design.ui.styles.muted-italic": "0.0.35",
-    "@teambit/ui-foundation.ui.full-loader": "0.0.451",
-    "@teambit/ui-foundation.ui.side-bar": "0.0.455",
-    "@teambit/ui-foundation.ui.tree.drawer": "0.0.451",
-    "@teambit/explorer.ui.gallery.component-grid": "0.0.451",
-    "@teambit/workspace.ui.empty-workspace": "0.0.453",
-    "@teambit/workspace.ui.workspace-component-card": "0.0.454"
+    "@teambit/ui-foundation.ui.full-loader": "0.0.455",
+    "@teambit/ui-foundation.ui.side-bar": "0.0.459",
+    "@teambit/ui-foundation.ui.tree.drawer": "0.0.455",
+    "@teambit/explorer.ui.gallery.component-grid": "0.0.455",
+    "@teambit/workspace.ui.empty-workspace": "0.0.457",
+    "@teambit/workspace.ui.workspace-component-card": "0.0.458"
   },
   "devDependencies": {
+    "@types/lodash.compact": "3.0.6",
+    "@types/lodash": "4.14.165",
     "@types/react": "^17.0.8",
     "@types/semver": "7.3.4",
     "@types/fs-extra": "9.0.7",
-    "@types/lodash": "4.14.165",
     "@types/react-router-dom": "5.1.7",
     "@types/pluralize": "0.0.29",
     "@types/classnames": "2.2.11",

package/workspace.ts

@@ -43,7 +43,7 @@ import { ImportOptions } from '@teambit/legacy/dist/consumer/component-ops/impor
 import { NothingToImport } from '@teambit/legacy/dist/consumer/exceptions';
 import { BitIds } from '@teambit/legacy/dist/bit-id';
 import { BitId, InvalidScopeName, isValidScopeName } from '@teambit/legacy-bit-id';
-import { LocalLaneId } from '@teambit/legacy/dist/lane-id/lane-id';
+import { LocalLaneId, RemoteLaneId } from '@teambit/legacy/dist/lane-id/lane-id';
 import { Consumer, loadConsumer } from '@teambit/legacy/dist/consumer';
 import { GetBitMapComponentOptions } from '@teambit/legacy/dist/consumer/bit-map/bit-map';
 import AddComponents from '@teambit/legacy/dist/consumer/component-ops/add-components';
@@ -55,7 +55,6 @@ import { ComponentNotFound } from '@teambit/legacy/dist/scope/exceptions';
 import ComponentsList from '@teambit/legacy/dist/consumer/component/components-list';
 import { NoComponentDir } from '@teambit/legacy/dist/consumer/component/exceptions/no-component-dir';
 import { ExtensionDataList } from '@teambit/legacy/dist/consumer/config/extension-data';
-import { buildOneGraphForComponents } from '@teambit/legacy/dist/scope/graph/components-graph';
 import { pathIsInside } from '@teambit/legacy/dist/utils';
 import componentIdToPackageName from '@teambit/legacy/dist/utils/bit/component-id-to-package-name';
 import { PathOsBased, PathOsBasedRelative, PathOsBasedAbsolute } from '@teambit/legacy/dist/utils/path';
@@ -89,6 +88,7 @@ import {
 } from './workspace.provider';
 import { WorkspaceComponentLoader } from './workspace-component/workspace-component-loader';
 import { IncorrectEnvAspect } from './exceptions/incorrect-env-aspect';
+import { GraphFromFsBuilder, ShouldIgnoreFunc } from './build-graph-from-fs';
 
 export type EjectConfResult = {
   configPath: string;
@@ -392,7 +392,7 @@ export class Workspace implements ComponentFactory {
 
     const legacyIds = ids.map((id) => id._legacy);
 
-    const legacyGraph = await buildOneGraphForComponents(legacyIds, this.consumer);
+    const legacyGraph = await this.buildOneGraphForComponents(legacyIds);
     return legacyGraph;
   }
 
@@ -537,6 +537,22 @@ export class Workspace implements ComponentFactory {
     return this.consumer.getCurrentLaneId();
   }
 
+  /**
+   * if checked out to a lane, return the remote lane id (name+scope). otherwise, return null.
+   */
+  getCurrentRemoteLaneId(): RemoteLaneId | null {
+    const currentLane = this.getCurrentLaneId();
+    if (currentLane.isDefault()) {
+      return null;
+    }
+    const trackData = this.scope.legacyScope.lanes.getRemoteTrackedDataByLocalLane(currentLane.name);
+    const remoteLaneName = trackData?.remoteLane;
+    if (!remoteLaneName) {
+      return null;
+    }
+    return RemoteLaneId.from(remoteLaneName, trackData.remoteScope);
+  }
+
   getDefaultExtensions(): ExtensionDataList {
     if (!this.config.extensions) {
       return new ExtensionDataList();
@@ -608,7 +624,7 @@ export class Workspace implements ComponentFactory {
    * @param forCapsule
    */
   async importAndGetMany(ids: Array<ComponentID>, forCapsule = false): Promise<Component[]> {
-    await this.scope.import(ids);
+    await this.scope.import(ids, { reFetchUnBuiltVersion: shouldReFetchUnBuiltVersion() });
     return this.componentLoader.getMany(ids, forCapsule);
   }
 
@@ -894,7 +910,7 @@ export class Workspace implements ComponentFactory {
     return componentConfigFile;
   }
 
-  async getGraphWithoutCore(components: Component[]) {
+  async getAspectsGraphWithoutCore(components: Component[], isAspect?: ShouldIgnoreFunc) {
     const ids = components.map((component) => component.id._legacy);
     const coreAspectsStringIds = this.aspectLoader.getCoreAspectIds();
     const coreAspectsComponentIds = coreAspectsStringIds.map((id) => BitId.parse(id, true));
@@ -917,7 +933,7 @@ export class Workspace implements ComponentFactory {
     // This come to solve a circular loop when an env aspect use an aspect (as regular dep) and the aspect use the env aspect as its env
     // TODO: @gilad it causes many issues we need to find a better solution. removed for now.
     const ignoredIds = coreAspectsBitIds.concat([]);
-    return buildOneGraphForComponents(ids, this.consumer, undefined, BitIds.fromArray(ignoredIds));
+    return this.buildOneGraphForComponents(ids, BitIds.fromArray(ignoredIds), isAspect);
   }
 
   /**
@@ -932,14 +948,10 @@ export class Workspace implements ComponentFactory {
     const idsWithoutCore: string[] = difference(notLoadedIds, coreAspectsStringIds);
     const componentIds = await this.resolveMultipleComponentIds(idsWithoutCore);
     const components = await this.importAndGetAspects(componentIds);
-    const graph = await this.getGraphWithoutCore(components);
-    const allIdsP = graph.nodes().map(async (id) => {
-      return this.resolveComponentId(id);
-    });
-    const allIds = await Promise.all(allIdsP);
-    const allComponents = await this.getMany(allIds as ComponentID[]);
 
-    const aspects = allComponents.filter((component: Component) => {
+    const isAspect = async (bitId: BitId) => {
+      const id = await this.resolveComponentId(bitId);
+      const component = await this.get(id);
       let data = component.config.extensions.findExtension(EnvsAspect.id)?.data;
       if (!data) {
         // TODO: remove this once we re-export old components used to store the data here
@@ -959,11 +971,13 @@ export class Workspace implements ComponentFactory {
         }
       }
       return data.type === 'aspect';
-    });
-    // no need to filter core aspects as they are not included in the graph
-    // here we are trying to load extensions from the workspace.
+    };
+
+    const graph = await this.getAspectsGraphWithoutCore(components, isAspect);
+    const idsStr = graph.nodes();
+    const compIds = await this.resolveMultipleComponentIds(idsStr);
+    const aspects = await this.getMany(compIds);
     const { workspaceComps, scopeComps } = await this.groupComponentsByWorkspaceAndScope(aspects);
-    // load the scope first because we might need it for custom envs that extend external aspects
     const scopeIds = scopeComps.map((aspect) => aspect.id.toString());
     const workspaceAspects = await this.requireComponents(workspaceComps);
     const workspaceManifests = await this.aspectLoader.getManifestsFromRequireableExtensions(
@@ -978,6 +992,20 @@ export class Workspace implements ComponentFactory {
     await this.aspectLoader.loadExtensionsByManifests(allManifests, throwOnError);
   }
 
+  /**
+   * Note - this gets called from Harmony only.
+   * returns one graph that includes all dependencies types. each edge has a label of the dependency
+   * type. the nodes content is the Component object.
+   */
+  async buildOneGraphForComponents(
+    ids: BitId[],
+    ignoreIds?: BitIds,
+    shouldIgnoreFunc?: ShouldIgnoreFunc
+  ): Promise<LegacyGraph> {
+    const graphFromFsBuilder = new GraphFromFsBuilder(this, this.logger, ignoreIds, shouldIgnoreFunc);
+    return graphFromFsBuilder.buildGraph(ids);
+  }
+
   async resolveAspects(runtimeName?: string, componentIds?: ComponentID[]): Promise<AspectDefinition[]> {
     let missingPaths = false;
     const stringIds: string[] = [];
@@ -1468,4 +1496,17 @@ your workspace.jsonc has this component-id set. you might want to remove/change
   }
 }
 
+/**
+ * this is a super hacky way to do it. problem is that loadAspect is running as onStart hook, where we don't
+ * have the CLI fully loaded yet, so we can't get the command from the CLI aspect, we have to retrieve it from
+ * process.argv.
+ * in general, we don't want every command to try again and again fetching un-built versions. otherwise, every time
+ * Bit loads (even bit --help), it'll fetch them and slow down everything.
+ * instead, long-running commands and those that need the artifacts from the Version objects, should try to re-fetch.
+ */
+function shouldReFetchUnBuiltVersion() {
+  const commandsToReFetch = ['build', 'show', 'start', 'tag', 'install', 'link', 'import'];
+  return commandsToReFetch.includes(process.argv[2]);
+}
+
 export default Workspace;