@teambit/lanes 1.0.107 → 1.0.109

package/dist/lanes.main.runtime.d.ts

@@ -17,28 +17,27 @@ import { Lane } from '@teambit/legacy/dist/scope/models';
 import { ExportMain } from '@teambit/export';
 import { ComponentCompareMain } from '@teambit/component-compare';
 import { ComponentWriterMain } from '@teambit/component-writer';
-import { SnapsDistance } from '@teambit/legacy/dist/scope/component-ops/snaps-distance';
 import { RemoveMain } from '@teambit/remove';
 import { MergingMain } from '@teambit/merging';
 import { CheckoutMain } from '@teambit/checkout';
 import { ChangeType } from '@teambit/lanes.entities.lane-diff';
 import ComponentsList, { DivergeDataPerId } from '@teambit/legacy/dist/consumer/component/components-list';
 export { Lane };
-export declare type SnapsDistanceObj = {
+export type SnapsDistanceObj = {
     onSource: string[];
     onTarget: string[];
     common?: string;
 };
-export declare type LaneResults = {
+export type LaneResults = {
     lanes: LaneData[];
     currentLane?: string | null;
 };
-export declare type CreateLaneOptions = {
+export type CreateLaneOptions = {
     scope?: string;
     alias?: string;
     forkLaneNewScope?: boolean;
 };
-export declare type SwitchLaneOptions = {
+export type SwitchLaneOptions = {
     alias?: string;
     merge?: MergeStrategy;
     getAll?: boolean;
@@ -47,7 +46,7 @@ export declare type SwitchLaneOptions = {
     verbose?: boolean;
     override?: boolean;
 };
-export declare type LaneComponentDiffStatus = {
+export type LaneComponentDiffStatus = {
     componentId: ComponentID;
     sourceHead: string;
     targetHead?: string;
@@ -61,19 +60,19 @@ export declare type LaneComponentDiffStatus = {
     snapsDistance?: SnapsDistanceObj;
     unrelated?: boolean;
 };
-export declare type LaneDiffStatusOptions = {
+export type LaneDiffStatusOptions = {
     skipChanges?: boolean;
 };
-export declare type LaneDiffStatus = {
+export type LaneDiffStatus = {
     source: LaneId;
     target: LaneId;
     componentsStatus: LaneComponentDiffStatus[];
 };
-export declare type MarkRemoveOnLaneResult = {
+export type MarkRemoveOnLaneResult = {
     removedFromWs: ComponentID[];
     markedRemoved: ComponentID[];
 };
-declare type CreateLaneResult = {
+type CreateLaneResult = {
     laneId: LaneId;
     hash: string;
     alias?: string;
@@ -130,14 +129,6 @@ export declare class LanesMain {
     }>;
     exportLane(lane: Lane): Promise<void>;
     importLaneObject(laneId: LaneId, persistIfNotExists?: boolean): Promise<Lane>;
-    /**
-     * get the distance for a component between two lanes. for example, lane-b forked from lane-a and lane-b added some new snaps
-     * @param componentId
-     * @param sourceHead head on the source lane. leave empty if the source is main
-     * @param targetHead head on the target lane. leave empty if the target is main
-     * @returns
-     */
-    getSnapsDistance(componentId: ComponentID, sourceHead?: string, targetHead?: string, throws?: boolean): Promise<SnapsDistance>;
     /**
      * get the head hash (snap) of main. return undefined if the component exists only on a lane and was never merged to main
      */
@@ -197,7 +188,7 @@ export declare class LanesMain {
     get createRoutePath(): string;
     get deleteRoutePath(): string;
     get restoreRoutePath(): string;
-    static slots: never[];
+    static slots: any[];
     static dependencies: import("@teambit/harmony").Aspect[];
     static runtime: import("@teambit/harmony").RuntimeDefinition;
     static provider([cli, scope, workspace, graphql, merging, component, loggerMain, importer, exporter, express, componentCompare, componentWriter, remove, checkout,]: [

package/dist/lanes.main.runtime.js

@@ -324,13 +324,12 @@ class LanesMain {
     showDefaultLane,
     notMerged
   }) {
-    var _this$workspace;
     const showMergeData = Boolean(merged || notMerged);
-    const consumer = (_this$workspace = this.workspace) === null || _this$workspace === void 0 ? void 0 : _this$workspace.consumer;
+    const consumer = this.workspace?.consumer;
     if (remote) {
       const laneId = name ? _laneId().LaneId.from(name, remote) : undefined;
       const remoteObj = await (0, _getRemoteByName().default)(remote, consumer);
-      const lanes = await remoteObj.listLanes(laneId === null || laneId === void 0 ? void 0 : laneId.toString(), showMergeData);
+      const lanes = await remoteObj.listLanes(laneId?.toString(), showMergeData);
       // no need to filter soft-removed here. it was filtered already in the remote
       return lanes;
     }
@@ -376,8 +375,7 @@ class LanesMain {
     }));
   }
   getCurrentLaneName() {
-    var _this$getCurrentLaneI;
-    return ((_this$getCurrentLaneI = this.getCurrentLaneId()) === null || _this$getCurrentLaneI === void 0 ? void 0 : _this$getCurrentLaneI.name) || null;
+    return this.getCurrentLaneId()?.name || null;
   }
   getCurrentLaneNameOrAlias() {
     const currentLaneId = this.getCurrentLaneId();
@@ -402,8 +400,7 @@ class LanesMain {
     return _laneId().LaneId.from(_laneId().DEFAULT_LANE, this.scope.name);
   }
   setCurrentLane(laneId, alias, exported) {
-    var _this$workspace2;
-    (_this$workspace2 = this.workspace) === null || _this$workspace2 === void 0 || _this$workspace2.consumer.setCurrentLane(laneId, exported);
+    this.workspace?.consumer.setCurrentLane(laneId, exported);
   }
   async createLane(name, {
     scope,
@@ -463,7 +460,7 @@ if you wish to keep ${scope} scope, please re-run the command with "--fork-lane-
     const beforeTrackDataCloned = beforeTrackData ? _objectSpread({}, beforeTrackData) : undefined;
     const afterTrackData = {
       localLane: localName,
-      remoteLane: remoteName || (beforeTrackData === null || beforeTrackData === void 0 ? void 0 : beforeTrackData.remoteLane) || localName,
+      remoteLane: remoteName || beforeTrackData?.remoteLane || localName,
       remoteScope
     };
     this.scope.legacyScope.lanes.trackLane(afterTrackData);
@@ -572,7 +569,7 @@ please create a new lane instead, which will include all components of this lane
 
     // change current-lane if needed
     const currentLaneId = this.getCurrentLaneId();
-    if (currentLaneId !== null && currentLaneId !== void 0 && currentLaneId.isEqual(laneId)) {
+    if (currentLaneId?.isEqual(laneId)) {
       const newLaneId = _laneId().LaneId.from(newName, lane.scope);
       const isExported = this.workspace.consumer.bitMap.isLaneExported;
       this.setCurrentLane(newLaneId, undefined, isExported);
@@ -597,32 +594,12 @@ please create a new lane instead, which will include all components of this lane
     return this.importer.importLaneObject(laneId, persistIfNotExists);
   }
 
-  /**
-   * get the distance for a component between two lanes. for example, lane-b forked from lane-a and lane-b added some new snaps
-   * @param componentId
-   * @param sourceHead head on the source lane. leave empty if the source is main
-   * @param targetHead head on the target lane. leave empty if the target is main
-   * @returns
-   */
-  async getSnapsDistance(componentId, sourceHead, targetHead, throws) {
-    if (!sourceHead && !targetHead) throw new Error(`getDivergeData got sourceHead and targetHead empty. at least one of them should be populated`);
-    const modelComponent = await this.scope.legacyScope.getModelComponent(componentId);
-    return (0, _getDivergeData().getDivergeData)({
-      modelComponent,
-      repo: this.scope.legacyScope.objects,
-      sourceHead: sourceHead ? _objects().Ref.from(sourceHead) : modelComponent.head || null,
-      targetHead: targetHead ? _objects().Ref.from(targetHead) : modelComponent.head || null,
-      throws
-    });
-  }
-
   /**
    * get the head hash (snap) of main. return undefined if the component exists only on a lane and was never merged to main
    */
   async getHeadOnMain(componentId) {
-    var _modelComponent$head;
     const modelComponent = await this.scope.legacyScope.getModelComponent(componentId);
-    return (_modelComponent$head = modelComponent.head) === null || _modelComponent$head === void 0 ? void 0 : _modelComponent$head.toString();
+    return modelComponent.head?.toString();
   }
 
   /**
@@ -642,12 +619,11 @@ please create a new lane instead, which will include all components of this lane
     return lane;
   }
   async removeLanes(laneNames, opts) {
-    var _this$workspace3;
-    if (!this.workspace && !(opts !== null && opts !== void 0 && opts.remote)) {
+    if (!this.workspace && !opts?.remote) {
       await this.scope.legacyScope.lanes.removeLanes(this.scope.legacyScope, laneNames, true);
       return laneNames;
     }
-    const results = await (0, _removeLanes().default)((_this$workspace3 = this.workspace) === null || _this$workspace3 === void 0 ? void 0 : _this$workspace3.consumer, laneNames, !!(opts !== null && opts !== void 0 && opts.remote), !!(opts !== null && opts !== void 0 && opts.force));
+    const results = await (0, _removeLanes().default)(this.workspace?.consumer, laneNames, !!opts?.remote, !!opts?.force);
     if (this.workspace) await this.workspace.consumer.onDestroy('lane-remove');
     return results.laneResults;
   }
@@ -774,7 +750,7 @@ please create a new lane instead, which will include all components of this lane
     const scope = this.workspace.scope.legacyScope;
     const laneId = laneName ? await scope.lanes.parseLaneIdFromString(laneName) : this.getCurrentLaneId();
     const lane = await scope.loadLane(laneId);
-    if (!(lane !== null && lane !== void 0 && lane.readmeComponent)) {
+    if (!lane?.readmeComponent) {
       throw new (_bitError().BitError)(`there is no readme component added to the lane ${laneName || currentLaneName}`);
     }
     const readmeComponentId = await this.workspace.resolveComponentId(lane.readmeComponent.id);
@@ -793,16 +769,16 @@ please create a new lane instead, which will include all components of this lane
     };
   }
   async diffStatus(sourceLaneId, targetLaneId, options) {
-    this.logger.profile(`diff status for source lane: ${sourceLaneId.name} and target lane: ${targetLaneId === null || targetLaneId === void 0 ? void 0 : targetLaneId.name}`);
+    this.logger.profile(`diff status for source lane: ${sourceLaneId.name} and target lane: ${targetLaneId?.name}`);
     const sourceLane = sourceLaneId.isDefault() ? await this.getLaneDataOfDefaultLane() : await this.loadLane(sourceLaneId);
-    const sourceLaneComponents = sourceLaneId.isDefault() ? sourceLane === null || sourceLane === void 0 ? void 0 : sourceLane.components.map(main => ({
+    const sourceLaneComponents = sourceLaneId.isDefault() ? sourceLane?.components.map(main => ({
       id: main.id,
       head: _objects().Ref.from(main.head)
-    })) : sourceLane === null || sourceLane === void 0 ? void 0 : sourceLane.components;
+    })) : sourceLane?.components;
     const targetLane = targetLaneId ? await this.loadLane(targetLaneId) : undefined;
-    const targetLaneIds = targetLane === null || targetLane === void 0 ? void 0 : targetLane.toBitIds();
+    const targetLaneIds = targetLane?.toBitIds();
     const host = this.componentAspect.getHost();
-    const targetMainHeads = !targetLaneId || targetLaneId !== null && targetLaneId !== void 0 && targetLaneId.isDefault() ? (0, _lodash().compact)(await Promise.all((sourceLaneComponents || []).map(async ({
+    const targetMainHeads = !targetLaneId || targetLaneId?.isDefault() ? (0, _lodash().compact)(await Promise.all((sourceLaneComponents || []).map(async ({
       id
     }) => {
       const componentId = await host.resolveComponentId(id);
@@ -814,13 +790,12 @@ please create a new lane instead, which will include all components of this lane
       id,
       head
     }) => {
-      var _targetLaneIds$search;
       const componentId = await host.resolveComponentId(id);
       const sourceVersionObj = await this.scope.legacyScope.objects.load(head, true);
       if (sourceVersionObj.isRemoved()) {
         return null;
       }
-      const headOnTargetLane = targetLaneIds ? (_targetLaneIds$search = targetLaneIds.searchWithoutVersion(id)) === null || _targetLaneIds$search === void 0 ? void 0 : _targetLaneIds$search.version : await this.getHeadOnMain(componentId);
+      const headOnTargetLane = targetLaneIds ? targetLaneIds.searchWithoutVersion(id)?.version : await this.getHeadOnMain(componentId);
       if (headOnTargetLane) {
         const targetVersionObj = await this.scope.legacyScope.objects.load(_objects().Ref.from(headOnTargetLane), true);
         if (targetVersionObj.isRemoved()) {
@@ -836,13 +811,13 @@ please create a new lane instead, which will include all components of this lane
       };
     })));
     const snapDistancesByComponentId = new Map();
-    this.logger.profile(`get snaps distance for source lane: ${sourceLane === null || sourceLane === void 0 ? void 0 : sourceLane.id.name} and target lane: ${targetLane === null || targetLane === void 0 ? void 0 : targetLane.id.name} with ${diffProps.length} components`);
+    this.logger.profile(`get snaps distance for source lane: ${sourceLane?.id.name} and target lane: ${targetLane?.id.name} with ${diffProps.length} components`);
     await (0, _pMap().default)(diffProps, async ({
       componentId,
       sourceHead,
       targetHead
     }) => {
-      const snapsDistance = await this.getSnapsDistance(componentId, sourceHead, targetHead, false);
+      const snapsDistance = await this.scope.getSnapsDistanceBetweenTwoSnaps(componentId, sourceHead, targetHead, false);
       if (snapsDistance) {
         snapDistancesByComponentId.set(componentId.toString(), {
           snapsDistance,
@@ -854,10 +829,10 @@ please create a new lane instead, which will include all components of this lane
     }, {
       concurrency: (0, _concurrency().concurrentComponentsLimit)()
     });
-    this.logger.profile(`get snaps distance for source lane: ${sourceLane === null || sourceLane === void 0 ? void 0 : sourceLane.id.name} and target lane: ${targetLane === null || targetLane === void 0 ? void 0 : targetLane.id.name} with ${diffProps.length} components`);
+    this.logger.profile(`get snaps distance for source lane: ${sourceLane?.id.name} and target lane: ${targetLane?.id.name} with ${diffProps.length} components`);
     const commonSnapsToImport = (0, _lodash().compact)([...snapDistancesByComponentId.values()].map(s => s.snapsDistance.commonSnapBeforeDiverge ? s.componentId.changeVersion(s.snapsDistance.commonSnapBeforeDiverge.hash) : null));
-    const sourceOrTargetLane = ((sourceLaneId.isDefault() ? null : sourceLane) || (targetLaneId !== null && targetLaneId !== void 0 && targetLaneId.isDefault() ? null : targetLane)) ?? undefined;
-    if (commonSnapsToImport.length > 0 && !(options !== null && options !== void 0 && options.skipChanges)) {
+    const sourceOrTargetLane = ((sourceLaneId.isDefault() ? null : sourceLane) || (targetLaneId?.isDefault() ? null : targetLane)) ?? undefined;
+    if (commonSnapsToImport.length > 0 && !options?.skipChanges) {
       await this.scope.legacyScope.scopeImporter.importWithoutDeps(_componentId().ComponentIdList.fromArray(commonSnapsToImport), {
         cache: true,
         reason: `get the common snap for lane diff`,
@@ -868,11 +843,8 @@ please create a new lane instead, which will include all components of this lane
       componentId,
       sourceHead,
       targetHead
-    }) => {
-      var _snapDistancesByCompo;
-      return this.componentDiffStatus(componentId, sourceHead, targetHead, (_snapDistancesByCompo = snapDistancesByComponentId.get(componentId.toString())) === null || _snapDistancesByCompo === void 0 ? void 0 : _snapDistancesByCompo.snapsDistance, options);
-    });
-    this.logger.profile(`diff status for source lane: ${sourceLaneId.name} and target lane: ${targetLaneId === null || targetLaneId === void 0 ? void 0 : targetLaneId.name}`);
+    }) => this.componentDiffStatus(componentId, sourceHead, targetHead, snapDistancesByComponentId.get(componentId.toString())?.snapsDistance, options));
+    this.logger.profile(`diff status for source lane: ${sourceLaneId.name} and target lane: ${targetLaneId?.name}`);
     return {
       source: sourceLaneId,
       target: targetLaneId || this.getDefaultLaneId(),
@@ -880,19 +852,18 @@ please create a new lane instead, which will include all components of this lane
     };
   }
   async componentDiffStatus(componentId, sourceHead, targetHead, snapsDistance, options) {
-    var _snapsDistance$common;
-    if (snapsDistance !== null && snapsDistance !== void 0 && snapsDistance.err) {
+    if (snapsDistance?.err) {
       const noCommonSnap = snapsDistance.err instanceof _noCommonSnap().NoCommonSnap;
       return {
         componentId,
         sourceHead,
         targetHead,
-        upToDate: snapsDistance === null || snapsDistance === void 0 ? void 0 : snapsDistance.isUpToDate(),
+        upToDate: snapsDistance?.isUpToDate(),
         unrelated: noCommonSnap || undefined,
         changes: []
       };
     }
-    const commonSnap = snapsDistance === null || snapsDistance === void 0 ? void 0 : snapsDistance.commonSnapBeforeDiverge;
+    const commonSnap = snapsDistance?.commonSnapBeforeDiverge;
     const getChanges = async () => {
       if (!commonSnap) return [_lanesEntities().ChangeType.NEW];
 
@@ -914,37 +885,36 @@ please create a new lane instead, which will include all components of this lane
       }
       return changed;
     };
-    const changes = !(options !== null && options !== void 0 && options.skipChanges) ? await getChanges() : undefined;
+    const changes = !options?.skipChanges ? await getChanges() : undefined;
     const changeType = changes ? changes[0] : undefined;
     return {
       componentId,
       changeType,
       changes,
       sourceHead,
-      targetHead: commonSnap === null || commonSnap === void 0 ? void 0 : commonSnap.hash,
-      upToDate: snapsDistance === null || snapsDistance === void 0 ? void 0 : snapsDistance.isUpToDate(),
+      targetHead: commonSnap?.hash,
+      upToDate: snapsDistance?.isUpToDate(),
       snapsDistance: {
-        onSource: (snapsDistance === null || snapsDistance === void 0 ? void 0 : snapsDistance.snapsOnSourceOnly.map(s => s.hash)) ?? [],
-        onTarget: (snapsDistance === null || snapsDistance === void 0 ? void 0 : snapsDistance.snapsOnTargetOnly.map(s => s.hash)) ?? [],
-        common: snapsDistance === null || snapsDistance === void 0 || (_snapsDistance$common = snapsDistance.commonSnapBeforeDiverge) === null || _snapsDistance$common === void 0 ? void 0 : _snapsDistance$common.hash
+        onSource: snapsDistance?.snapsOnSourceOnly.map(s => s.hash) ?? [],
+        onTarget: snapsDistance?.snapsOnTargetOnly.map(s => s.hash) ?? [],
+        common: snapsDistance?.commonSnapBeforeDiverge?.hash
       }
     };
   }
   async componentDiffStatusOld(componentId, sourceHead, targetHead, options) {
-    var _snapsDistance$common2;
-    const snapsDistance = await this.getSnapsDistance(componentId, sourceHead, targetHead, false);
-    if (snapsDistance !== null && snapsDistance !== void 0 && snapsDistance.err) {
+    const snapsDistance = await this.scope.getSnapsDistanceBetweenTwoSnaps(componentId, sourceHead, targetHead, false);
+    if (snapsDistance?.err) {
       const noCommonSnap = snapsDistance.err instanceof _noCommonSnap().NoCommonSnap;
       return {
         componentId,
         sourceHead,
         targetHead,
-        upToDate: snapsDistance === null || snapsDistance === void 0 ? void 0 : snapsDistance.isUpToDate(),
+        upToDate: snapsDistance?.isUpToDate(),
         unrelated: noCommonSnap || undefined,
         changes: []
       };
     }
-    const commonSnap = snapsDistance === null || snapsDistance === void 0 ? void 0 : snapsDistance.commonSnapBeforeDiverge;
+    const commonSnap = snapsDistance?.commonSnapBeforeDiverge;
     const getChanges = async () => {
       if (!commonSnap) return [_lanesEntities().ChangeType.NEW];
       const compare = await this.componentCompare.compare(componentId.changeVersion(commonSnap.hash).toString(), componentId.changeVersion(sourceHead).toString());
@@ -964,19 +934,19 @@ please create a new lane instead, which will include all components of this lane
       }
       return changed;
     };
-    const changes = !(options !== null && options !== void 0 && options.skipChanges) ? await getChanges() : undefined;
+    const changes = !options?.skipChanges ? await getChanges() : undefined;
     const changeType = changes ? changes[0] : undefined;
     return {
       componentId,
       changeType,
       changes,
       sourceHead,
-      targetHead: commonSnap === null || commonSnap === void 0 ? void 0 : commonSnap.hash,
-      upToDate: snapsDistance === null || snapsDistance === void 0 ? void 0 : snapsDistance.isUpToDate(),
+      targetHead: commonSnap?.hash,
+      upToDate: snapsDistance?.isUpToDate(),
       snapsDistance: {
-        onSource: (snapsDistance === null || snapsDistance === void 0 ? void 0 : snapsDistance.snapsOnSourceOnly.map(s => s.hash)) ?? [],
-        onTarget: (snapsDistance === null || snapsDistance === void 0 ? void 0 : snapsDistance.snapsOnTargetOnly.map(s => s.hash)) ?? [],
-        common: snapsDistance === null || snapsDistance === void 0 || (_snapsDistance$common2 = snapsDistance.commonSnapBeforeDiverge) === null || _snapsDistance$common2 === void 0 ? void 0 : _snapsDistance$common2.hash
+        onSource: snapsDistance?.snapsOnSourceOnly.map(s => s.hash) ?? [],
+        onTarget: snapsDistance?.snapsOnTargetOnly.map(s => s.hash) ?? [],
+        common: snapsDistance?.commonSnapBeforeDiverge?.hash
       }
     };
   }
@@ -1036,14 +1006,13 @@ please create a new lane instead, which will include all components of this lane
    * it also fetches the original lane from the remote to make sure the data is up to date.
    */
   async listUpdatesFromForked(componentsList) {
-    var _this$workspace4;
-    const consumer = (_this$workspace4 = this.workspace) === null || _this$workspace4 === void 0 ? void 0 : _this$workspace4.consumer;
+    const consumer = this.workspace?.consumer;
     if (!consumer) throw new Error(`unable to get listUpdatesFromForked outside of a workspace`);
     if (consumer.isOnMain()) {
       return [];
     }
     const lane = await consumer.getCurrentLaneObject();
-    const forkedFromLaneId = lane === null || lane === void 0 ? void 0 : lane.forkedFrom;
+    const forkedFromLaneId = lane?.forkedFrom;
     if (!forkedFromLaneId) {
       return [];
     }
@@ -1081,8 +1050,7 @@ please create a new lane instead, which will include all components of this lane
     return (0, _lodash().compact)(results);
   }
   async getLaneDataOfDefaultLane() {
-    var _this$workspace5;
-    const consumer = (_this$workspace5 = this.workspace) === null || _this$workspace5 === void 0 ? void 0 : _this$workspace5.consumer;
+    const consumer = this.workspace?.consumer;
     let bitIds = [];
     if (!consumer) {
       const scopeComponents = await this.scope.list();