@teambit/merging 1.0.225 → 1.0.227

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

@@ -1,152 +0,0 @@
-import { CLIMain } from '@teambit/cli';
-import { Workspace } from '@teambit/workspace';
-import { Consumer } from '@teambit/legacy/dist/consumer';
-import { MergeStrategy, FileStatus } from '@teambit/legacy/dist/consumer/versions-ops/merge-version';
-import { SnappingMain } from '@teambit/snapping';
-import { ComponentID, ComponentIdList } from '@teambit/component-id';
-import { LaneId } from '@teambit/lane-id';
-import { AutoTagResult } from '@teambit/legacy/dist/scope/component-ops/auto-tag';
-import { Lane, ModelComponent } from '@teambit/legacy/dist/scope/models';
-import { Ref } from '@teambit/legacy/dist/scope/objects';
-import { ConfigMain } from '@teambit/config';
-import { RemoveMain } from '@teambit/remove';
-import { ComponentWriterMain } from '@teambit/component-writer';
-import ConsumerComponent from '@teambit/legacy/dist/consumer/component/consumer-component';
-import { ImporterMain } from '@teambit/importer';
-import { Logger, LoggerMain } from '@teambit/logger';
-import { GlobalConfigMain } from '@teambit/global-config';
-import { MergeResultsThreeWay } from '@teambit/legacy/dist/consumer/versions-ops/merge-version/three-way-merge';
-import { CheckoutMain, ComponentStatusBase } from '@teambit/checkout';
-import { ConfigMergerMain, ConfigMergeResult, WorkspaceConfigUpdateResult } from '@teambit/config-merger';
-import { SnapsDistance } from '@teambit/legacy/dist/scope/component-ops/snaps-distance';
-import { InstallMain } from '@teambit/install';
-import { ScopeMain } from '@teambit/scope';
-import { MergeStatusProviderOptions } from './merge-status-provider';
-type ResolveUnrelatedData = {
-    strategy: MergeStrategy;
-    headOnCurrentLane: Ref;
-    unrelatedHead: Ref;
-    unrelatedLaneId: LaneId;
-};
-export type ComponentMergeStatus = ComponentStatusBase & {
-    mergeResults?: MergeResultsThreeWay | null;
-    divergeData?: SnapsDistance;
-    resolvedUnrelated?: ResolveUnrelatedData;
-    configMergeResult?: ConfigMergeResult;
-};
-export type ComponentMergeStatusBeforeMergeAttempt = ComponentStatusBase & {
-    divergeData?: SnapsDistance;
-    resolvedUnrelated?: ResolveUnrelatedData;
-    mergeProps?: {
-        otherLaneHead: Ref;
-        currentId: ComponentID;
-        modelComponent: ModelComponent;
-    };
-};
-export type FailedComponents = {
-    id: ComponentID;
-    unchangedMessage: string;
-    unchangedLegitimately?: boolean;
-};
-export type FilesStatus = {
-    [fileName: string]: keyof typeof FileStatus;
-};
-export type MergeSnapResults = {
-    snappedComponents: ConsumerComponent[];
-    autoSnappedResults: AutoTagResult[];
-    removedComponents?: ComponentIdList;
-    exportedIds?: ComponentID[];
-} | null;
-export type ApplyVersionResult = {
-    id: ComponentID;
-    filesStatus: FilesStatus;
-};
-export type ApplyVersionResults = {
-    components?: ApplyVersionResult[];
-    version?: string;
-    failedComponents?: FailedComponents[];
-    removedComponents?: ComponentID[];
-    addedComponents?: ComponentID[];
-    resolvedComponents?: ConsumerComponent[];
-    abortedComponents?: ApplyVersionResult[];
-    mergeSnapResults?: MergeSnapResults;
-    mergeSnapError?: Error;
-    leftUnresolvedConflicts?: boolean;
-    verbose?: boolean;
-    newFromLane?: string[];
-    newFromLaneAdded?: boolean;
-    installationError?: Error;
-    compilationError?: Error;
-    workspaceConfigUpdateResult?: WorkspaceConfigUpdateResult;
-};
-export declare class MergingMain {
-    private workspace;
-    private scope;
-    private install;
-    private snapping;
-    private checkout;
-    private logger;
-    private componentWriter;
-    private importer;
-    private config;
-    private remove;
-    private configMerger;
-    constructor(workspace: Workspace, scope: ScopeMain, install: InstallMain, snapping: SnappingMain, checkout: CheckoutMain, logger: Logger, componentWriter: ComponentWriterMain, importer: ImporterMain, config: ConfigMain, remove: RemoveMain, configMerger: ConfigMergerMain);
-    merge(ids: string[], mergeStrategy: MergeStrategy, abort: boolean, resolve: boolean, noSnap: boolean, message: string, build: boolean, skipDependencyInstallation: boolean): Promise<ApplyVersionResults>;
-    /**
-     * when user is on main, it merges the remote main components into local.
-     * when user is on a lane, it merges the remote lane components into the local lane.
-     */
-    mergeComponentsFromRemote(consumer: Consumer, bitIds: ComponentID[], mergeStrategy: MergeStrategy, noSnap: boolean, snapMessage: string, build: boolean, skipDependencyInstallation: boolean): Promise<ApplyVersionResults>;
-    /**
-     * merge multiple components according to the "allComponentsStatus".
-     */
-    mergeSnaps({ mergeStrategy, allComponentsStatus, otherLaneId, currentLane, noSnap, tag, snapMessage, build, skipDependencyInstallation, }: {
-        mergeStrategy: MergeStrategy;
-        allComponentsStatus: ComponentMergeStatus[];
-        otherLaneId: LaneId;
-        currentLane: Lane | null;
-        noSnap: boolean;
-        tag?: boolean;
-        snapMessage: string;
-        build: boolean;
-        skipDependencyInstallation?: boolean;
-    }): Promise<ApplyVersionResults>;
-    /**
-     * this function gets called from two different commands:
-     * 1. "bit merge <ids...>", when merging a component from a remote to the local.
-     * in this case, the remote and local are on the same lane or both on main.
-     * 2. "bit lane merge", when merging from one lane to another.
-     */
-    getMergeStatus(bitIds: ComponentID[], // the id.version is the version we want to merge to the current component
-    options: MergeStatusProviderOptions, currentLane: Lane | null, // currently checked out lane. if on main, then it's null.
-    otherLane?: Lane | null): Promise<ComponentMergeStatus[]>;
-    private applyVersionMultiple;
-    private applyVersion;
-    private abortMerge;
-    private resolveMerge;
-    private getAllComponentsStatus;
-    private snapResolvedComponents;
-    private tagAllLaneComponent;
-    private getIdsForUnmerged;
-    private getComponentsToMerge;
-    static slots: never[];
-    static dependencies: import("@teambit/harmony").Aspect[];
-    static runtime: import("@teambit/harmony").RuntimeDefinition;
-    static provider([cli, workspace, scope, snapping, checkout, install, loggerMain, compWriter, importer, config, remove, globalConfig, configMerger,]: [
-        CLIMain,
-        Workspace,
-        ScopeMain,
-        SnappingMain,
-        CheckoutMain,
-        InstallMain,
-        LoggerMain,
-        ComponentWriterMain,
-        ImporterMain,
-        ConfigMain,
-        RemoveMain,
-        GlobalConfigMain,
-        ConfigMergerMain
-    ]): Promise<MergingMain>;
-}
-export {};