@teambit/merging 1.0.228 → 1.0.230

package/dist/index.d.ts

@@ -0,0 +1,6 @@
+import { MergingAspect } from './merging.aspect';
+export { mergeReport, applyVersionReport, conflictSummaryReport, installationErrorOutput, compilationErrorOutput, getRemovedOutput, getAddedOutput, getWorkspaceConfigUpdateOutput, } from './merge-cmd';
+export { compIsAlreadyMergedMsg } from './merge-status-provider';
+export type { MergingMain, ComponentMergeStatus, ApplyVersionResults, ApplyVersionResult, FilesStatus, FailedComponents, } from './merging.main.runtime';
+export default MergingAspect;
+export { MergingAspect };

package/dist/merge-cmd.d.ts

@@ -0,0 +1,50 @@
+import { Command, CommandOptions } from '@teambit/cli';
+import { ComponentID } from '@teambit/component-id';
+import { MergeStrategy } from '@teambit/legacy/dist/consumer/versions-ops/merge-version';
+import { GlobalConfigMain } from '@teambit/global-config';
+import { ConfigMergeResult, WorkspaceConfigUpdateResult } from '@teambit/config-merger';
+import { ApplyVersionResults, MergingMain, ApplyVersionResult } from './merging.main.runtime';
+export declare class MergeCmd implements Command {
+    private merging;
+    private globalConfig;
+    name: string;
+    description: string;
+    helpUrl: string;
+    group: string;
+    extendedDescription: string;
+    alias: string;
+    options: CommandOptions;
+    loader: boolean;
+    constructor(merging: MergingMain, globalConfig: GlobalConfigMain);
+    report([ids]: [string[]], { ours, theirs, manual, autoMergeResolve, abort, resolve, build, noSnap, verbose, message, skipDependencyInstallation, }: {
+        ours?: boolean;
+        theirs?: boolean;
+        manual?: boolean;
+        autoMergeResolve?: MergeStrategy;
+        abort?: boolean;
+        resolve?: boolean;
+        build?: boolean;
+        noSnap?: boolean;
+        verbose?: boolean;
+        message: string;
+        skipDependencyInstallation?: boolean;
+    }): Promise<string>;
+}
+export declare function mergeReport({ components, failedComponents, removedComponents, version, mergeSnapResults, mergeSnapError, leftUnresolvedConflicts, verbose, configMergeResults, workspaceConfigUpdateResult, }: ApplyVersionResults & {
+    configMergeResults?: ConfigMergeResult[];
+}): string;
+export declare function getWorkspaceConfigUpdateOutput(workspaceConfigUpdateResult?: WorkspaceConfigUpdateResult): string;
+/**
+ * shows only the file-changes section.
+ * if all files are "unchanged", it returns an empty string
+ */
+export declare function applyVersionReport(components: ApplyVersionResult[], addName?: boolean, showVersion?: boolean): string;
+export declare function conflictSummaryReport(components: ApplyVersionResult[]): {
+    conflictedComponents: number;
+    conflictedFiles: number;
+    conflictStr: string;
+};
+export declare function installationErrorOutput(installationError?: Error): string;
+export declare function compilationErrorOutput(compilationError?: Error): string;
+export declare function getRemovedOutput(removedComponents?: ComponentID[]): string;
+export declare function getAddedOutput(addedComponents?: ComponentID[]): string;

package/dist/merge-status-provider.d.ts

@@ -0,0 +1,31 @@
+import { Workspace } from '@teambit/workspace';
+import { MergeStrategy } from '@teambit/legacy/dist/consumer/versions-ops/merge-version';
+import { ComponentID } from '@teambit/component-id';
+import { Lane } from '@teambit/legacy/dist/scope/models';
+import { ImporterMain } from '@teambit/importer';
+import { Logger } from '@teambit/logger';
+import { ScopeMain } from '@teambit/scope';
+import { ComponentMergeStatus } from './merging.main.runtime';
+export type MergeStatusProviderOptions = {
+    resolveUnrelated?: MergeStrategy;
+    mergeStrategy: MergeStrategy;
+    ignoreConfigChanges?: boolean;
+    shouldSquash?: boolean;
+};
+export declare const compIsAlreadyMergedMsg = "component is already merged";
+export declare class MergeStatusProvider {
+    private scope;
+    private logger;
+    private importer;
+    private options;
+    private workspace?;
+    private currentLane?;
+    private otherLane?;
+    constructor(scope: ScopeMain, logger: Logger, importer: ImporterMain, options: MergeStatusProviderOptions, workspace?: Workspace | undefined, currentLane?: Lane | undefined, // currently checked out lane. if on main, then it's undefined.
+    otherLane?: Lane | undefined);
+    getStatus(bitIds: ComponentID[]): Promise<ComponentMergeStatus[]>;
+    private getComponentMergeStatus;
+    private returnUnmerged;
+    private getComponentStatusBeforeMergeAttempt;
+    private handleNoCommonSnap;
+}

package/dist/merging.aspect.d.ts

@@ -0,0 +1,2 @@
+import { Aspect } from '@teambit/harmony';
+export declare const MergingAspect: Aspect;

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

@@ -0,0 +1,152 @@
+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 {};

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@teambit/merging",
-  "version": "1.0.228",
+  "version": "1.0.230",
   "homepage": "https://bit.cloud/teambit/component/merging",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.component",
     "name": "merging",
-    "version": "1.0.228"
+    "version": "1.0.230"
   },
   "dependencies": {
     "chalk": "2.4.2",
@@ -16,25 +16,25 @@
     "@teambit/component-id": "1.2.0",
     "@teambit/lane-id": "0.0.311",
     "@teambit/harmony": "0.4.6",
-    "@teambit/cli": "0.0.861",
-    "@teambit/config-merger": "0.0.95",
-    "@teambit/global-config": "0.0.864",
-    "@teambit/importer": "1.0.228",
-    "@teambit/logger": "0.0.954",
-    "@teambit/scope": "1.0.228",
-    "@teambit/workspace": "1.0.228",
-    "@teambit/checkout": "1.0.228",
-    "@teambit/component-writer": "1.0.228",
-    "@teambit/config": "0.0.979",
-    "@teambit/install": "1.0.228",
-    "@teambit/remove": "1.0.228",
-    "@teambit/snapping": "1.0.228"
+    "@teambit/cli": "0.0.862",
+    "@teambit/config-merger": "0.0.97",
+    "@teambit/global-config": "0.0.865",
+    "@teambit/importer": "1.0.230",
+    "@teambit/logger": "0.0.955",
+    "@teambit/scope": "1.0.230",
+    "@teambit/workspace": "1.0.230",
+    "@teambit/checkout": "1.0.230",
+    "@teambit/component-writer": "1.0.230",
+    "@teambit/config": "0.0.981",
+    "@teambit/install": "1.0.230",
+    "@teambit/remove": "1.0.230",
+    "@teambit/snapping": "1.0.230"
   },
   "devDependencies": {
     "@types/lodash": "4.14.165",
     "@types/mocha": "9.1.0",
     "chai": "4.3.0",
-    "@teambit/harmony.envs.core-aspect-env": "0.0.30"
+    "@teambit/harmony.envs.core-aspect-env": "0.0.33"
   },
   "peerDependencies": {
     "@teambit/legacy": "1.0.624"

package/tsconfig.json

@@ -20,8 +20,7 @@
     "emitDeclarationOnly": true,
     "strict": true,
     "strictPropertyInitialization": false,
-    "noImplicitAny": false,
-    "composite": true
+    "noImplicitAny": false
   },
   "exclude": [
     "artifacts",
@@ -36,46 +35,5 @@
   "include": [
     "**/*",
     "**/*.json"
-  ],
-  "references": [
-    {
-      "path": "/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.harmony_cli@0.0.861"
-    },
-    {
-      "path": "/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.workspace_config-merger@0.0.95"
-    },
-    {
-      "path": "/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.harmony_global-config@0.0.864"
-    },
-    {
-      "path": "/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.scope_importer@1.0.228"
-    },
-    {
-      "path": "/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.harmony_logger@0.0.954"
-    },
-    {
-      "path": "/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.scope_scope@1.0.228"
-    },
-    {
-      "path": "/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.workspace_workspace@1.0.228"
-    },
-    {
-      "path": "/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.component_checkout@1.0.228"
-    },
-    {
-      "path": "/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.component_component-writer@1.0.228"
-    },
-    {
-      "path": "/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.harmony_config@0.0.979"
-    },
-    {
-      "path": "/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.workspace_install@1.0.228"
-    },
-    {
-      "path": "/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.component_remove@1.0.228"
-    },
-    {
-      "path": "/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.component_snapping@1.0.228"
-    }
   ]
 }