@teambit/merging 1.0.410 → 1.0.411

package/artifacts/__bit_junit.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <testsuites tests="0" failures="0" errors="0" skipped="0">
-  <testsuite name="teambit.component/merging@1.0.410" tests="0" failures="0" errors="0" skipped="0"/>
+  <testsuite name="teambit.component/merging@1.0.411" tests="0" failures="0" errors="0" skipped="0"/>
 </testsuites>

package/artifacts/schema.json

@@ -20,6 +20,7 @@
           "line": 4,
           "character": 3
         },
+        "signature": "function mergeReport({ components, failedComponents, removedComponents, version, mergeSnapResults, mergeSnapError, leftUnresolvedConflicts, verbose, configMergeResults, workspaceConfigUpdateResult, }: ApplyVersionResults & {\n    configMergeResults?: ConfigMergeResult[];\n}): string",
         "name": "mergeReport",
         "exportNode": {
           "__schema": "FunctionLikeSchema",
@@ -250,6 +251,7 @@
           "line": 5,
           "character": 3
         },
+        "signature": "function applyVersionReport(components: ApplyVersionResult[], addName?: boolean, showVersion?: boolean): string",
         "name": "applyVersionReport",
         "exportNode": {
           "__schema": "FunctionLikeSchema",
@@ -364,6 +366,7 @@
           "line": 6,
           "character": 3
         },
+        "signature": "function conflictSummaryReport(components: ApplyVersionResult[]): {\n    conflictedComponents: number;\n    conflictedFiles: number;\n    conflictStr: string;\n}",
         "name": "conflictSummaryReport",
         "exportNode": {
           "__schema": "FunctionLikeSchema",
@@ -486,6 +489,7 @@
           "line": 7,
           "character": 3
         },
+        "signature": "function installationErrorOutput(installationError?: Error): string",
         "name": "installationErrorOutput",
         "exportNode": {
           "__schema": "FunctionLikeSchema",
@@ -539,6 +543,7 @@
           "line": 8,
           "character": 3
         },
+        "signature": "function compilationErrorOutput(compilationError?: Error): string",
         "name": "compilationErrorOutput",
         "exportNode": {
           "__schema": "FunctionLikeSchema",
@@ -592,6 +597,7 @@
           "line": 9,
           "character": 3
         },
+        "signature": "function getRemovedOutput(removedComponents?: ComponentID[]): string",
         "name": "getRemovedOutput",
         "exportNode": {
           "__schema": "FunctionLikeSchema",
@@ -653,6 +659,7 @@
           "line": 10,
           "character": 3
         },
+        "signature": "function getAddedOutput(addedComponents?: ComponentID[]): string",
         "name": "getAddedOutput",
         "exportNode": {
           "__schema": "FunctionLikeSchema",
@@ -714,6 +721,7 @@
           "line": 11,
           "character": 3
         },
+        "signature": "function getWorkspaceConfigUpdateOutput(workspaceConfigUpdateResult?: WorkspaceConfigUpdateResult): string",
         "name": "getWorkspaceConfigUpdateOutput",
         "exportNode": {
           "__schema": "FunctionLikeSchema",
@@ -767,6 +775,7 @@
           "line": 13,
           "character": 10
         },
+        "signature": "const compIsAlreadyMergedMsg: \"component is already merged\"",
         "name": "compIsAlreadyMergedMsg",
         "exportNode": {
           "__schema": "VariableLikeSchema",
@@ -797,6 +806,7 @@
           "line": 15,
           "character": 3
         },
+        "signature": "function threeWayMerge({ scope, otherComponent, otherLabel, currentComponent, currentLabel, baseComponent, }: {\n    scope: Scope;\n    otherComponent: Version;\n    otherLabel: string;\n    currentComponent: Component;\n    currentLabel: string;\n    baseComponent: Version;\n}): Promise<MergeResultsThreeWay>",
         "name": "threeWayMerge",
         "exportNode": {
           "__schema": "FunctionLikeSchema",
@@ -1124,6 +1134,7 @@
           "line": 16,
           "character": 3
         },
+        "signature": "function getMergeStrategyInteractive(): Promise<MergeStrategy>",
         "name": "getMergeStrategyInteractive",
         "exportNode": {
           "__schema": "FunctionLikeSchema",
@@ -1168,6 +1179,7 @@
           "line": 17,
           "character": 3
         },
+        "signature": "type MergeStrategy = \"theirs\" | \"ours\" | \"manual\"",
         "name": "MergeStrategy",
         "exportNode": {
           "__schema": "TypeSchema",
@@ -1214,6 +1226,7 @@
           "line": 18,
           "character": 3
         },
+        "signature": "const FileStatus: {\n    merged: string;\n    manual: string;\n    binaryConflict: string;\n    updated: string;\n    added: string;\n    removed: string;\n    overridden: string;\n    unchanged: string;\n    remainDeleted: string;\n    deletedConflict: string;\n}",
         "name": "FileStatus",
         "exportNode": {
           "__schema": "VariableLikeSchema",
@@ -1244,6 +1257,7 @@
           "line": 19,
           "character": 3
         },
+        "signature": "const MergeOptions: {\n    ours: string;\n    theirs: string;\n    manual: string;\n}",
         "name": "MergeOptions",
         "exportNode": {
           "__schema": "VariableLikeSchema",
@@ -1274,6 +1288,7 @@
           "line": 20,
           "character": 3
         },
+        "signature": "type MergeResultsThreeWay = {\n    addFiles: Array<{\n        filePath: PathLinux;\n        fsFile: SourceFile;\n    }>;\n    removeFiles: Array<{\n        filePath: PathLinux;\n    }>;\n    remainDeletedFiles: Array<{\n        filePath: PathLinux;\n    }>;\n    deletedConflictFiles: Array<{\n        filePath: PathLinux;\n        fsFile?: SourceFile;\n    }>;\n    modifiedFiles: Array<{\n        filePath: PathLinux;\n        fsFile: SourceFile;\n        baseFile?: SourceFileModel;\n        otherFile: SourceFileModel;\n        output: string | null | undefined;\n        conflict: string | null | undefined;\n        isBinaryConflict?: boolean;\n    }>;\n    unModifiedFiles: Array<{\n        filePath: PathLinux;\n        fsFile: SourceFile;\n    }>;\n    overrideFiles: Array<{\n        filePath: PathLinux;\n        fsFile: SourceFile;\n    }>;\n    updatedFiles: Array<{\n        filePath: PathLinux;\n        otherFile: SourceFileModel;\n        content: Buffer;\n    }>;\n    hasConflicts: boolean;\n}",
         "name": "MergeResultsThreeWay",
         "exportNode": {
           "__schema": "TypeSchema",
@@ -1358,7 +1373,7 @@
                             "componentId": {
                               "scope": "teambit.component",
                               "name": "sources",
-                              "version": "0.0.29"
+                              "version": "0.0.30"
                             }
                           },
                           "isOptional": false
@@ -1611,7 +1626,7 @@
                             "componentId": {
                               "scope": "teambit.component",
                               "name": "sources",
-                              "version": "0.0.29"
+                              "version": "0.0.30"
                             }
                           },
                           "isOptional": false
@@ -1845,7 +1860,7 @@
                             "componentId": {
                               "scope": "teambit.component",
                               "name": "sources",
-                              "version": "0.0.29"
+                              "version": "0.0.30"
                             }
                           },
                           "isOptional": false
@@ -1922,7 +1937,7 @@
                             "componentId": {
                               "scope": "teambit.component",
                               "name": "sources",
-                              "version": "0.0.29"
+                              "version": "0.0.30"
                             }
                           },
                           "isOptional": false
@@ -2057,6 +2072,7 @@
           "line": 22,
           "character": 10
         },
+        "signature": "type MergeFileResult = {\n    filePath: PathLinux;\n    output: string | null | undefined;\n    conflict: string | null | undefined;\n    isBinaryConflict?: boolean | undefined;\n}",
         "name": "MergeFileResult",
         "exportNode": {
           "__schema": "TypeSchema",
@@ -2222,6 +2238,7 @@
           "line": 22,
           "character": 27
         },
+        "signature": "type MergeFileParams = {\n    filePath: PathLinux;\n    currentFile: {\n        label: string;\n        path: PathOsBased;\n    };\n    baseFile: {\n        path: PathOsBased;\n    };\n    otherFile: {\n        label: string;\n        path: PathOsBased;\n    };\n}",
         "name": "MergeFileParams",
         "exportNode": {
           "__schema": "TypeSchema",
@@ -2434,6 +2451,7 @@
           "line": 22,
           "character": 44
         },
+        "signature": "function mergeFiles({ filePath, currentFile, baseFile, otherFile, }: MergeFileParams): Promise<MergeFileResult>",
         "name": "mergeFiles",
         "exportNode": {
           "__schema": "FunctionLikeSchema",
@@ -2556,6 +2574,7 @@
           "line": 24,
           "character": 3
         },
+        "signature": "class MergingMain",
         "name": "MergingMain",
         "exportNode": {
           "__schema": "ClassSchema",
@@ -4194,6 +4213,7 @@
           "line": 25,
           "character": 3
         },
+        "signature": "type ComponentMergeStatus = ComponentStatusBase & {\n    mergeResults?: MergeResultsThreeWay | null | undefined;\n    divergeData?: SnapsDistance | undefined;\n    resolvedUnrelated?: ResolveUnrelatedData | undefined;\n    configMergeResult?: ConfigMergeResult | undefined;\n}",
         "name": "ComponentMergeStatus",
         "exportNode": {
           "__schema": "TypeSchema",
@@ -4341,6 +4361,7 @@
           "line": 26,
           "character": 3
         },
+        "signature": "type ApplyVersionResults = {\n    components?: ApplyVersionResult[] | undefined;\n    version?: string | undefined;\n    failedComponents?: FailedComponents[] | undefined;\n    removedComponents?: ComponentID[] | undefined;\n    ... 11 more ...;\n    workspaceConfigUpdateResult?: WorkspaceConfigUpdateResult | undefined;\n}",
         "name": "ApplyVersionResults",
         "exportNode": {
           "__schema": "TypeSchema",
@@ -4746,6 +4767,7 @@
           "line": 27,
           "character": 3
         },
+        "signature": "type ApplyVersionResult = {\n    id: ComponentID;\n    filesStatus: FilesStatus;\n}",
         "name": "ApplyVersionResult",
         "exportNode": {
           "__schema": "TypeSchema",
@@ -4820,6 +4842,7 @@
           "line": 28,
           "character": 3
         },
+        "signature": "type FilesStatus = {\n    [fileName: string]: \"unchanged\" | \"manual\" | \"added\" | \"updated\" | \"removed\" | \"overridden\" | \"merged\" | \"binaryConflict\" | \"remainDeleted\" | \"deletedConflict\";\n}",
         "name": "FilesStatus",
         "exportNode": {
           "__schema": "TypeSchema",
@@ -4904,6 +4927,7 @@
           "line": 29,
           "character": 3
         },
+        "signature": "type FailedComponents = {\n    id: ComponentID;\n    unchangedMessage: string;\n    unchangedLegitimately?: boolean | undefined;\n}",
         "name": "FailedComponents",
         "exportNode": {
           "__schema": "TypeSchema",
@@ -5008,6 +5032,7 @@
           "line": 32,
           "character": 10
         },
+        "signature": "const MergingAspect: Aspect",
         "name": "MergingAspect",
         "exportNode": {
           "__schema": "VariableLikeSchema",
@@ -5854,7 +5879,7 @@
                   "_legacy": {
                     "scope": "teambit.component",
                     "name": "merging",
-                    "version": "1.0.410"
+                    "version": "1.0.411"
                   },
                   "_scope": "teambit.component"
                 }
@@ -6674,7 +6699,7 @@
                             "componentId": {
                               "scope": "teambit.component",
                               "name": "sources",
-                              "version": "0.0.29"
+                              "version": "0.0.30"
                             }
                           },
                           "isOptional": false
@@ -6927,7 +6952,7 @@
                             "componentId": {
                               "scope": "teambit.component",
                               "name": "sources",
-                              "version": "0.0.29"
+                              "version": "0.0.30"
                             }
                           },
                           "isOptional": false
@@ -7161,7 +7186,7 @@
                             "componentId": {
                               "scope": "teambit.component",
                               "name": "sources",
-                              "version": "0.0.29"
+                              "version": "0.0.30"
                             }
                           },
                           "isOptional": false
@@ -7238,7 +7263,7 @@
                             "componentId": {
                               "scope": "teambit.component",
                               "name": "sources",
-                              "version": "0.0.29"
+                              "version": "0.0.30"
                             }
                           },
                           "isOptional": false
@@ -11138,7 +11163,7 @@
   "componentId": {
     "scope": "teambit.component",
     "name": "merging",
-    "version": "1.0.410"
+    "version": "1.0.411"
   },
   "taggedModuleExports": []
 }

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@teambit/merging",
-  "version": "1.0.410",
+  "version": "1.0.411",
   "homepage": "https://bit.cloud/teambit/component/merging",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.component",
     "name": "merging",
-    "version": "1.0.410"
+    "version": "1.0.411"
   },
   "dependencies": {
     "chalk": "2.4.2",
@@ -17,27 +17,27 @@
     "@teambit/component-id": "1.2.0",
     "@teambit/lane-id": "0.0.311",
     "@teambit/harmony": "0.4.6",
-    "@teambit/cli": "0.0.987",
-    "@teambit/config-merger": "0.0.277",
-    "@teambit/global-config": "0.0.990",
+    "@teambit/cli": "0.0.988",
+    "@teambit/config-merger": "0.0.278",
+    "@teambit/global-config": "0.0.991",
     "@teambit/git.modules.git-executable": "0.0.1",
     "@teambit/legacy.utils": "0.0.5",
-    "@teambit/importer": "1.0.410",
-    "@teambit/logger": "0.0.1080",
-    "@teambit/scope": "1.0.410",
-    "@teambit/workspace": "1.0.410",
-    "@teambit/checkout": "1.0.410",
-    "@teambit/component-writer": "1.0.410",
-    "@teambit/config": "0.0.1161",
-    "@teambit/dependency-resolver": "1.0.410",
-    "@teambit/install": "1.0.410",
-    "@teambit/legacy.component-list": "0.0.30",
+    "@teambit/importer": "1.0.411",
+    "@teambit/logger": "0.0.1081",
+    "@teambit/scope": "1.0.411",
+    "@teambit/workspace": "1.0.411",
+    "@teambit/checkout": "1.0.411",
+    "@teambit/component-writer": "1.0.411",
+    "@teambit/config": "0.0.1162",
+    "@teambit/dependency-resolver": "1.0.411",
+    "@teambit/install": "1.0.411",
+    "@teambit/legacy.component-list": "0.0.31",
     "@teambit/pkg.modules.component-package-name": "0.0.4",
-    "@teambit/remove": "1.0.410",
-    "@teambit/snapping": "1.0.410",
+    "@teambit/remove": "1.0.411",
+    "@teambit/snapping": "1.0.411",
     "@teambit/toolbox.path.path": "0.0.4",
     "@teambit/legacy.cli.prompts": "0.0.2",
-    "@teambit/component.sources": "0.0.29",
+    "@teambit/component.sources": "0.0.30",
     "@teambit/toolbox.crypto.sha1": "0.0.1",
     "@teambit/toolbox.string.eol": "0.0.1"
   },