@teambit/scope 1.0.107 → 1.0.109

package/dist/scope.graphql.d.ts

@@ -4,9 +4,9 @@ export declare function scopeSchema(scopeMain: ScopeMain): {
     resolvers: {
         Scope: {
             name: (scope: ScopeMain) => string;
-            description: (scope: ScopeMain) => string | undefined;
-            icon: (scope: ScopeMain) => string | undefined;
-            backgroundIconColor: (scope: ScopeMain) => string | undefined;
+            description: (scope: ScopeMain) => string;
+            icon: (scope: ScopeMain) => string;
+            backgroundIconColor: (scope: ScopeMain) => string;
             components: (scope: ScopeMain, props?: {
                 offset: number;
                 limit: number;
@@ -15,7 +15,7 @@ export declare function scopeSchema(scopeMain: ScopeMain): {
             }) => Promise<import("@teambit/component").Component[]>;
             get: (scope: ScopeMain, { id }: {
                 id: string;
-            }) => Promise<import("@teambit/component").Component | undefined>;
+            }) => Promise<import("@teambit/component").Component>;
             _getLegacy: (scope: ScopeMain, { id }: {
                 id: string;
             }) => Promise<any>;

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

@@ -33,35 +33,35 @@ import { EnvsMain } from '@teambit/envs';
 import { ScopeComponentLoader } from './scope-component-loader';
 import { StagedConfig } from './staged-config';
 import { ScopeAspectsLoader, ScopeLoadAspectsOptions } from './scope-aspects-loader';
-declare type RemoteEventMetadata = {
+type RemoteEventMetadata = {
     auth?: AuthData;
     headers?: {};
 };
-declare type RemoteEvent<Data> = (data: Data, metadata: RemoteEventMetadata, errors?: Array<string | Error>) => Promise<void>;
-declare type OnPostPutData = {
+type RemoteEvent<Data> = (data: Data, metadata: RemoteEventMetadata, errors?: Array<string | Error>) => Promise<void>;
+type OnPostPutData = {
     ids: ComponentID[];
     lanes: Lane[];
 };
-declare type OnPostDeleteData = {
+type OnPostDeleteData = {
     ids: ComponentID[];
 };
-declare type OnPreFetchObjectData = {
+type OnPreFetchObjectData = {
     ids: string[];
     fetchOptions: FETCH_OPTIONS;
 };
-declare type OnPostPut = RemoteEvent<OnPostPutData>;
-declare type OnPostExport = RemoteEvent<OnPostPutData>;
-declare type OnPostDelete = RemoteEvent<OnPostDeleteData>;
-declare type OnPostObjectsPersist = RemoteEvent<undefined>;
-declare type OnPreFetchObjects = RemoteEvent<OnPreFetchObjectData>;
-declare type OnCompAspectReCalc = (component: Component) => Promise<AspectData | undefined>;
-export declare type OnPostPutSlot = SlotRegistry<OnPostPut>;
-export declare type OnPostDeleteSlot = SlotRegistry<OnPostDelete>;
-export declare type OnPostExportSlot = SlotRegistry<OnPostExport>;
-export declare type OnPostObjectsPersistSlot = SlotRegistry<OnPostObjectsPersist>;
-export declare type OnPreFetchObjectsSlot = SlotRegistry<OnPreFetchObjects>;
-export declare type OnCompAspectReCalcSlot = SlotRegistry<OnCompAspectReCalc>;
-export declare type LoadOptions = {
+type OnPostPut = RemoteEvent<OnPostPutData>;
+type OnPostExport = RemoteEvent<OnPostPutData>;
+type OnPostDelete = RemoteEvent<OnPostDeleteData>;
+type OnPostObjectsPersist = RemoteEvent<undefined>;
+type OnPreFetchObjects = RemoteEvent<OnPreFetchObjectData>;
+type OnCompAspectReCalc = (component: Component) => Promise<AspectData | undefined>;
+export type OnPostPutSlot = SlotRegistry<OnPostPut>;
+export type OnPostDeleteSlot = SlotRegistry<OnPostDelete>;
+export type OnPostExportSlot = SlotRegistry<OnPostExport>;
+export type OnPostObjectsPersistSlot = SlotRegistry<OnPostObjectsPersist>;
+export type OnPreFetchObjectsSlot = SlotRegistry<OnPreFetchObjects>;
+export type OnCompAspectReCalcSlot = SlotRegistry<OnCompAspectReCalc>;
+export type LoadOptions = {
     /**
      * In case the component we are loading is app, whether to load it as app (in a scope aspects capsule)
      */
@@ -71,7 +71,7 @@ export declare type LoadOptions = {
      */
     loadEnvs?: boolean;
 };
-export declare type ScopeConfig = {
+export type ScopeConfig = {
     httpTimeOut: number;
     description?: string;
     icon?: string;
@@ -264,7 +264,7 @@ export declare class ScopeMain implements ComponentFactory {
      * in the future, this can return components that failed to load in the scope due to objects file
      * corruption or similar issues.
      */
-    listInvalid(): Promise<never[]>;
+    listInvalid(): Promise<any[]>;
     /**
      * get ids of all scope components.
      * @param includeCache whether or not include components that their scope-name is different than the current scope-name
@@ -328,6 +328,14 @@ export declare class ScopeMain implements ComponentFactory {
     idsByPattern(pattern: string, throwForNoMatch?: boolean): Promise<ComponentID[]>;
     filterIdsFromPoolIdsByPattern(pattern: string, ids: ComponentID[], throwForNoMatch?: boolean, filterByStateFunc?: (state: any, poolIds: ComponentID[]) => Promise<ComponentID[]>): Promise<ComponentID[]>;
     getSnapDistance(id: ComponentID, throws?: boolean): Promise<SnapsDistance>;
+    /**
+     * 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
+     */
+    getSnapsDistanceBetweenTwoSnaps(componentId: ComponentID, sourceHead?: string, targetHead?: string, throws?: boolean): Promise<SnapsDistance>;
     getExactVersionBySemverRange(id: ComponentID, range: string): Promise<string | undefined>;
     resumeExport(exportId: string, remotes: string[]): Promise<string[]>;
     /**
@@ -364,7 +372,7 @@ export declare class ScopeMain implements ComponentFactory {
     /**
      * declare the slots of scope extension.
      */
-    static slots: (((registerFn: () => string) => SlotRegistry<OnPostPut>) | ((registerFn: () => string) => SlotRegistry<OnPostObjectsPersist>) | ((registerFn: () => string) => SlotRegistry<OnPreFetchObjects>) | ((registerFn: () => string) => SlotRegistry<OnCompAspectReCalc>))[];
+    static slots: (((registerFn: () => string) => SlotRegistry<OnPostPut>) | ((registerFn: () => string) => SlotRegistry<OnCompAspectReCalc>))[];
     static runtime: import("@teambit/harmony").RuntimeDefinition;
     static dependencies: import("@teambit/harmony").Aspect[];
     static defaultConfig: ScopeConfig;
@@ -387,6 +395,6 @@ export declare class ScopeMain implements ComponentFactory {
         OnPostObjectsPersistSlot,
         OnPreFetchObjectsSlot,
         OnCompAspectReCalcSlot
-    ], harmony: Harmony): Promise<ScopeMain | undefined>;
+    ], harmony: Harmony): Promise<ScopeMain>;
 }
 export {};

package/dist/scope.main.runtime.js

@@ -144,6 +144,13 @@ function _scopeLoader() {
   };
   return data;
 }
+function _getDivergeData() {
+  const data = require("@teambit/legacy/dist/scope/component-ops/get-diverge-data");
+  _getDivergeData = function () {
+    return data;
+  };
+  return data;
+}
 function _actions() {
   const data = require("@teambit/legacy/dist/scope/actions");
   _actions = function () {
@@ -526,8 +533,7 @@ class ScopeMain {
   }
   builderDataMapToLegacyOnTagResults(builderDataComponentMap) {
     const builderDataToLegacyExtension = (component, builderData) => {
-      var _component$state$aspe;
-      const existingBuilder = (_component$state$aspe = component.state.aspects.get(_builder().BuilderAspect.id)) === null || _component$state$aspe === void 0 ? void 0 : _component$state$aspe.legacy;
+      const existingBuilder = component.state.aspects.get(_builder().BuilderAspect.id)?.legacy;
       const builderExtension = existingBuilder || new (_config().ExtensionDataEntry)(undefined, undefined, _builder().BuilderAspect.id);
       builderExtension.data = builderData;
       return builderExtension;
@@ -592,7 +598,7 @@ class ScopeMain {
     force,
     lanes
   }, headers) {
-    const authData = (0, _http().getAuthDataFromHeader)(headers === null || headers === void 0 ? void 0 : headers.authorization);
+    const authData = (0, _http().getAuthDataFromHeader)(headers?.authorization);
     const result = await (0, _scope2().remove)({
       path: this.path,
       ids,
@@ -801,7 +807,7 @@ class ScopeMain {
    * list all components in the scope.
    */
   async list(filter, includeCache = false, includeFromLanes = false, includeDeleted = false) {
-    const patternsWithScope = (filter === null || filter === void 0 ? void 0 : filter.namespaces) && (filter === null || filter === void 0 ? void 0 : filter.namespaces.map(pattern => `**/${pattern || '**'}`)) || undefined;
+    const patternsWithScope = filter?.namespaces && filter?.namespaces.map(pattern => `**/${pattern || '**'}`) || undefined;
     const componentsIds = await this.listIds(includeCache, includeFromLanes, patternsWithScope);
     const comps = await this.getMany(filter && filter.limit ? (0, _lodash().slice)(componentsIds, filter.offset, filter.offset + filter.limit) : componentsIds);
     return includeDeleted ? comps : comps.filter(comp => !comp.isDeleted());
@@ -830,7 +836,7 @@ class ScopeMain {
     const modelComponentsToList = allModelComponents.filter(filterByCacheAndLanes);
     let ids = modelComponentsToList.map(component => _componentId().ComponentID.fromLegacy(component.toBitIdWithLatestVersion(), component.scope || this.name));
     if (patterns && patterns.length > 0) {
-      ids = ids.filter(id => patterns === null || patterns === void 0 ? void 0 : patterns.some(pattern => (0, _workspaceModules().isMatchNamespacePatternItem)(id.toStringWithoutVersion(), pattern).match));
+      ids = ids.filter(id => patterns?.some(pattern => (0, _workspaceModules().isMatchNamespacePatternItem)(id.toStringWithoutVersion(), pattern).match));
     }
     this.logger.debug(`scope listIds: total ${ids.length} components after filter scope`);
     return ids;
@@ -1027,13 +1033,32 @@ class ScopeMain {
     await modelComp.setDivergeData(this.legacyScope.objects, throws);
     return modelComp.getDivergeData();
   }
+  /**
+   * 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 getSnapsDistanceBetweenTwoSnaps(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.legacyScope.getModelComponent(componentId);
+    return (0, _getDivergeData().getDivergeData)({
+      modelComponent,
+      repo: this.legacyScope.objects,
+      sourceHead: sourceHead ? _objects().Ref.from(sourceHead) : modelComponent.head || null,
+      targetHead: targetHead ? _objects().Ref.from(targetHead) : modelComponent.head || null,
+      throws
+    });
+  }
   async getExactVersionBySemverRange(id, range) {
-    var _semver$maxSatisfying;
     const modelComponent = await this.legacyScope.getModelComponent(id);
     const versions = modelComponent.listVersions();
-    return (_semver$maxSatisfying = _semver().default.maxSatisfying(versions, range, {
+    return _semver().default.maxSatisfying(versions, range, {
       includePrerelease: true
-    })) === null || _semver$maxSatisfying === void 0 ? void 0 : _semver$maxSatisfying.toString();
+    })?.toString();
   }
   async resumeExport(exportId, remotes) {
     return (0, _exportScopeComponents().resumeExport)(this.legacyScope, exportId, remotes);
@@ -1066,9 +1091,8 @@ class ScopeMain {
     try {
       return await this.legacyScope.getConsumerComponent(id);
     } catch (err) {
-      var _await$this$get;
       // in case the component is missing locally, this.get imports it.
-      return (_await$this$get = await this.get(id)) === null || _await$this$get === void 0 ? void 0 : _await$this$get.state._consumer;
+      return (await this.get(id))?.state._consumer;
     }
   }
 
@@ -1107,16 +1131,14 @@ class ScopeMain {
     // important! previously, this was running for any aspect, not only apps. (the if statement was `this.aspectLoader.isAspectComponent(component)`)
     // Ran suggests changing it and if it breaks something, we'll document is and fix it.
     if (opts.loadApps) {
-      var _appData$data;
       const appData = component.state.aspects.get('teambit.harmony/application');
-      if (appData !== null && appData !== void 0 && (_appData$data = appData.data) !== null && _appData$data !== void 0 && _appData$data.appName) {
+      if (appData?.data?.appName) {
         aspectIds.push(component.id.toString());
       }
     }
     if (opts.loadEnvs) {
-      var _envsData$data, _envsData$data2, _envsData$data3;
       const envsData = component.state.aspects.get(_envs().default.id);
-      if (envsData !== null && envsData !== void 0 && (_envsData$data = envsData.data) !== null && _envsData$data !== void 0 && _envsData$data.services || envsData !== null && envsData !== void 0 && (_envsData$data2 = envsData.data) !== null && _envsData$data2 !== void 0 && _envsData$data2.self || (envsData === null || envsData === void 0 || (_envsData$data3 = envsData.data) === null || _envsData$data3 === void 0 ? void 0 : _envsData$data3.type) === 'env') {
+      if (envsData?.data?.services || envsData?.data?.self || envsData?.data?.type === 'env') {
         aspectIds.push(component.id.toString());
       }
     }
@@ -1157,7 +1179,7 @@ class ScopeMain {
 
   static async provider([componentExt, ui, graphql, cli, isolator, aspectLoader, express, loggerMain, envs, depsResolver, globalConfig], config, [postPutSlot, postDeleteSlot, postExportSlot, postObjectsPersistSlot, preFetchObjectsSlot, OnCompAspectReCalcSlot], harmony) {
     const bitConfig = harmony.config.get('teambit.harmony/bit');
-    const legacyScope = await (0, _scopeLoader().loadScopeIfExist)(bitConfig === null || bitConfig === void 0 ? void 0 : bitConfig.cwd);
+    const legacyScope = await (0, _scopeLoader().loadScopeIfExist)(bitConfig?.cwd);
     if (!legacyScope) {
       return undefined;
     }