@teambit/lanes 1.0.108 → 1.0.110

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@teambit/lanes",
-  "version": "1.0.108",
+  "version": "1.0.110",
   "homepage": "https://bit.cloud/teambit/lanes/lanes",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.lanes",
     "name": "lanes",
-    "version": "1.0.108"
+    "version": "1.0.110"
   },
   "dependencies": {
     "lodash": "4.17.21",
@@ -36,33 +36,33 @@
     "@teambit/ui-foundation.ui.menu": "0.0.502",
     "@teambit/ui-foundation.ui.react-router.slot-router": "0.0.506",
     "@teambit/ui-foundation.ui.react-router.use-query": "0.0.501",
-    "@teambit/scope": "1.0.108",
-    "@teambit/snapping": "1.0.108",
-    "@teambit/workspace": "1.0.108",
-    "@teambit/cli": "0.0.840",
-    "@teambit/express": "0.0.939",
-    "@teambit/logger": "0.0.933",
-    "@teambit/graphql": "1.0.108",
-    "@teambit/checkout": "1.0.108",
-    "@teambit/component-compare": "1.0.108",
-    "@teambit/component-writer": "1.0.108",
-    "@teambit/component": "1.0.108",
-    "@teambit/export": "1.0.108",
-    "@teambit/importer": "1.0.108",
-    "@teambit/lanes.modules.diff": "0.0.438",
-    "@teambit/merging": "1.0.108",
-    "@teambit/remove": "1.0.108",
+    "@teambit/scope": "1.0.110",
+    "@teambit/snapping": "1.0.110",
+    "@teambit/workspace": "1.0.110",
+    "@teambit/cli": "0.0.842",
+    "@teambit/express": "0.0.941",
+    "@teambit/logger": "0.0.935",
+    "@teambit/graphql": "1.0.110",
+    "@teambit/checkout": "1.0.110",
+    "@teambit/component-compare": "1.0.110",
+    "@teambit/component-writer": "1.0.110",
+    "@teambit/component": "1.0.110",
+    "@teambit/export": "1.0.110",
+    "@teambit/importer": "1.0.110",
+    "@teambit/lanes.modules.diff": "0.0.439",
+    "@teambit/merging": "1.0.110",
+    "@teambit/remove": "1.0.110",
     "@teambit/lanes.entities.lane-diff": "0.0.164",
-    "@teambit/ui": "1.0.108"
+    "@teambit/ui": "1.0.110"
   },
   "devDependencies": {
     "@types/lodash": "4.14.165",
     "@types/mocha": "9.1.0",
     "@types/jest": "^29.2.2",
     "@types/testing-library__jest-dom": "^5.9.5",
-    "@teambit/harmony.envs.core-aspect-env": "0.0.13",
-    "@teambit/component.testing.mock-components": "0.0.180",
-    "@teambit/harmony.testing.load-aspect": "0.0.179",
+    "@teambit/harmony.envs.core-aspect-env": "0.0.15",
+    "@teambit/component.testing.mock-components": "0.0.181",
+    "@teambit/harmony.testing.load-aspect": "0.0.180",
     "@teambit/workspace.testing.mock-workspace": "0.0.18"
   },
   "peerDependencies": {
@@ -75,11 +75,15 @@
   "optionalDependencies": {},
   "peerDependenciesMeta": {},
   "exports": {
-    "node": {
-      "require": "./dist/index.js",
-      "import": "./dist/esm.mjs"
+    ".": {
+      "node": {
+        "require": "./dist/index.js",
+        "import": "./dist/esm.mjs"
+      },
+      "default": "./dist/index.js"
     },
-    "default": "./dist/index.js"
+    "./dist/*": "./dist/*",
+    "./artifacts/*": "./artifacts/*"
   },
   "private": false,
   "engines": {

package/create-lane.ts

@@ -1,118 +0,0 @@
-import { BitError } from '@teambit/bit-error';
-import { LaneId } from '@teambit/lane-id';
-import { Consumer } from '@teambit/legacy/dist/consumer';
-import { ScopeMain } from '@teambit/scope';
-// import { ComponentIdList } from '@teambit/component-id';
-import Lane, { LaneComponent } from '@teambit/legacy/dist/scope/models/lane';
-import { isSnap } from '@teambit/component-version';
-import { getBitCloudUser } from '@teambit/snapping';
-import ComponentsList from '@teambit/legacy/dist/consumer/component/components-list';
-import { Ref } from '@teambit/legacy/dist/scope/objects';
-import { Workspace } from '@teambit/workspace';
-import { compact } from 'lodash';
-
-const MAX_LANE_NAME_LENGTH = 800;
-
-export async function createLane(
-  workspace: Workspace,
-  laneName: string,
-  scopeName: string,
-  remoteLane?: Lane
-): Promise<Lane> {
-  const consumer = workspace.consumer;
-  const lanes = await consumer.scope.listLanes();
-  if (lanes.find((lane) => lane.name === laneName)) {
-    throw new BitError(`lane "${laneName}" already exists, to switch to this lane, please use "bit switch" command`);
-  }
-  const bitCloudUser = await getBitCloudUser();
-  throwForInvalidLaneName(laneName);
-  await throwForStagedComponents(consumer);
-  const getDataToPopulateLaneObjectIfNeeded = async (): Promise<LaneComponent[]> => {
-    if (remoteLane) return remoteLane.components;
-    // when branching from one lane to another, copy components from the origin lane
-    // when branching from main, no need to copy anything
-    const currentLaneObject = await consumer.getCurrentLaneObject();
-    if (!currentLaneObject) return [];
-    const laneComponents = currentLaneObject.components;
-    const workspaceIds = consumer.bitMap.getAllBitIds();
-    const laneComponentWithBitmapHead = await Promise.all(
-      laneComponents.map(async ({ id, head }) => {
-        const compId = await workspace.resolveComponentId(id.changeVersion(head.toString()));
-        const isRemoved = await workspace.scope.isComponentRemoved(compId);
-        if (isRemoved) return null;
-        const bitmapHead = workspaceIds.searchWithoutVersion(id);
-        if (bitmapHead && isSnap(bitmapHead.version)) {
-          return { id, head: Ref.from(bitmapHead.version as string) };
-        }
-        return { id, head };
-      })
-    );
-    return compact(laneComponentWithBitmapHead);
-  };
-
-  const forkedFrom = await getLaneOrigin(consumer);
-  const newLane = remoteLane
-    ? Lane.from({
-        name: laneName,
-        hash: remoteLane.hash().toString(),
-        log: remoteLane.log,
-        scope: remoteLane.scope,
-        forkedFrom,
-      })
-    : Lane.create(laneName, scopeName, forkedFrom, bitCloudUser);
-  const dataToPopulate = await getDataToPopulateLaneObjectIfNeeded();
-  newLane.setLaneComponents(dataToPopulate);
-
-  await consumer.scope.lanes.saveLane(newLane);
-
-  return newLane;
-}
-
-export async function createLaneInScope(laneName: string, scope: ScopeMain): Promise<Lane> {
-  const lanes = await scope.legacyScope.listLanes();
-  if (lanes.find((lane) => lane.name === laneName)) {
-    throw new BitError(`lane "${laneName}" already exists`);
-  }
-  throwForInvalidLaneName(laneName);
-  const newLane = Lane.create(laneName, scope.name);
-  await scope.legacyScope.lanes.saveLane(newLane);
-  return newLane;
-}
-
-async function getLaneOrigin(consumer: Consumer): Promise<LaneId | undefined> {
-  const currentLaneId = consumer.bitMap.laneId;
-  if (!currentLaneId) return undefined;
-  if (consumer.bitMap.isLaneExported) {
-    return currentLaneId;
-  }
-  // current lane is new.
-  const currentLane = await consumer.getCurrentLaneObject();
-  return currentLane?.forkedFrom;
-}
-
-export function throwForInvalidLaneName(laneName: string) {
-  if (!isValidLaneName(laneName)) {
-    throw new BitError(
-      `lane "${laneName}" has invalid characters. lane name can only contain alphanumeric, lowercase characters, and the following ["-", "_", "$", "!"]`
-    );
-  }
-}
-
-export async function throwForStagedComponents(consumer: Consumer) {
-  const componentList = new ComponentsList(consumer);
-  const stagedComponents = await componentList.listExportPendingComponentsIds();
-  if (stagedComponents.length) {
-    throw new BitError(
-      `unable to switch/create a new lane, please export or reset the following components first: ${stagedComponents.join(
-        ', '
-      )}`
-    );
-  }
-}
-
-function isValidLaneName(val: unknown): boolean {
-  if (typeof val !== 'string') return false;
-  if (val.length > MAX_LANE_NAME_LENGTH) return false;
-  // @todo: should we allow slash? if so, we should probably replace the lane-delimiter with something else. (maybe ":")
-  return /^[$\-_!a-z0-9]+$/.test(val);
-}

package/index.ts

@@ -1,8 +0,0 @@
-import { LanesAspect } from './lanes.aspect';
-
-export type { LanesMain, Lane } from './lanes.main.runtime';
-export type { LanesQuery } from '@teambit/lanes.ui.models.lanes-model';
-export { LanesModel } from '@teambit/lanes.ui.models.lanes-model';
-export type { LanesUI, LaneCompareProps, LaneProviderIgnoreSlot } from './lanes.ui.runtime';
-export default LanesAspect;
-export { LanesAspect };