@teambit/merge-lanes 1.0.161 → 1.0.163

package/dist/merge-lane-from-scope.cmd.d.ts

@@ -31,7 +31,21 @@ export declare class MergeLaneFromScopeCmd implements Command {
     report([fromLane, toLane]: [string, string], { pattern, push, keepReadme, noSquash, includeDeps, title, titleBase64, reMerge, }: Flags): Promise<string>;
     json([fromLane, toLane]: [string, string], { pattern, push, keepReadme, noSquash, includeDeps, reMerge }: Flags): Promise<{
         code: number;
-        data: any;
+        data: {
+            mergedNow: string[];
+            mergedPreviously: string[];
+            exportedIds: string[];
+            unmerged: {
+                id: string;
+                reason: string;
+            }[];
+            conflicts: {
+                files: string[];
+                config?: boolean | undefined;
+                id: string;
+            }[] | undefined;
+            snappedIds: string[] | undefined;
+        };
         error?: undefined;
     } | {
         code: number;

package/dist/merge-lane-from-scope.cmd.js

@@ -32,7 +32,12 @@ function _bitError() {
   };
   return data;
 }
+const _excluded = ["id"];
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
@@ -49,7 +54,7 @@ this is intended to use from the UI, which will have a button to merge an existi
 the lane must be up-to-date with the other lane, otherwise, conflicts might occur which are not handled in this command`);
     _defineProperty(this, "arguments", [{
       name: 'from-lane',
-      description: 'lane-id to merge from'
+      description: `lane-id to merge from or "${_laneId().DEFAULT_LANE}"`
     }, {
       name: 'to-lane',
       description: `lane-id to merge to. default is "${_laneId().DEFAULT_LANE}"`
@@ -73,11 +78,15 @@ the lane must be up-to-date with the other lane, otherwise, conflicts might occu
     if (includeDeps && !pattern) {
       throw new (_bitError().BitError)(`"--include-deps" flag is relevant only for --pattern flag`);
     }
+    if (fromLane === _laneId().DEFAULT_LANE && !toLane) {
+      throw new (_bitError().BitError)('to merge from the main lane, specify the target lane');
+    }
     const titleBase64Decoded = titleBase64 ? (0, _utils().fromBase64)(titleBase64) : undefined;
     const {
       mergedNow,
-      mergedPreviously,
-      exportedIds
+      unmerged,
+      exportedIds,
+      conflicts
     } = await this.mergeLanes.mergeFromScope(fromLane, toLane || _laneId().DEFAULT_LANE, {
       push,
       keepReadme,
@@ -89,11 +98,13 @@ the lane must be up-to-date with the other lane, otherwise, conflicts might occu
     });
     const mergedTitle = _chalk().default.green(`successfully merged ${mergedNow.length} components from ${fromLane} to ${toLane || _laneId().DEFAULT_LANE}`);
     const mergedOutput = mergedNow.length ? `${mergedTitle}\n${mergedNow.join('\n')}` : '';
-    const nonMergedTitle = _chalk().default.bold(`the following ${mergedPreviously.length} components were already merged before, they were left intact`);
-    const nonMergedOutput = mergedPreviously.length ? `\n${nonMergedTitle}\n${mergedPreviously.join('\n')}` : '';
+    const nonMergedTitle = _chalk().default.bold(`the following ${unmerged.length} components were not merged`);
+    const nonMergedOutput = unmerged.length ? `\n${nonMergedTitle}\n${unmerged.map(u => `${u.id} (${u.reason})`).join('\n')}` : '';
+    const conflictsTitle = _chalk().default.bold(`the following ${conflicts?.length} components have conflicts, the merge was not completed`);
+    const conflictsOutput = conflicts?.length ? `\n${conflictsTitle}\n${conflicts.map(u => `${u.id} (files: ${u.files.join(', ') || 'N/A'}) (config: ${u.config})`).join('\n')}` : '';
     const exportedTitle = _chalk().default.green(`successfully exported ${exportedIds.length} components`);
     const exportedOutput = exportedIds.length ? `\n${exportedTitle}\n${exportedIds.join('\n')}` : '';
-    return mergedOutput + nonMergedOutput + exportedOutput;
+    return mergedOutput + nonMergedOutput + conflictsOutput + exportedOutput;
   }
   async json([fromLane, toLane], {
     pattern,
@@ -118,7 +129,28 @@ the lane must be up-to-date with the other lane, otherwise, conflicts might occu
       });
       return {
         code: 0,
-        data: results
+        data: _objectSpread(_objectSpread({}, results), {}, {
+          mergedNow: results.mergedNow.map(id => id.toString()),
+          mergedPreviously: results.mergedPreviously.map(id => id.toString()),
+          exportedIds: results.exportedIds.map(id => id.toString()),
+          unmerged: results.unmerged.map(({
+            id,
+            reason
+          }) => ({
+            id: id.toString(),
+            reason
+          })),
+          conflicts: results.conflicts?.map(_ref => {
+            let {
+                id
+              } = _ref,
+              rest = _objectWithoutProperties(_ref, _excluded);
+            return _objectSpread({
+              id: id.toString()
+            }, rest);
+          }),
+          snappedIds: results.snappedIds?.map(id => id.toString())
+        })
       };
     } catch (err) {
       return {

package/dist/merge-lane-from-scope.cmd.js.map

@@ -1 +1 @@
-{"version":3,"names":["_chalk","data","_interopRequireDefault","require","_laneId","_utils","_bitError","obj","__esModule","default","_defineProperty","key","value","_toPropertyKey","Object","defineProperty","enumerable","configurable","writable","t","i","_toPrimitive","String","r","e","Symbol","toPrimitive","call","TypeError","Number","MergeLaneFromScopeCmd","constructor","mergeLanes","name","description","DEFAULT_LANE","report","fromLane","toLane","pattern","push","keepReadme","noSquash","includeDeps","title","titleBase64","reMerge","BitError","titleBase64Decoded","fromBase64","undefined","mergedNow","mergedPreviously","exportedIds","mergeFromScope","snapMessage","mergedTitle","chalk","green","length","mergedOutput","join","nonMergedTitle","bold","nonMergedOutput","exportedTitle","exportedOutput","json","results","code","err","error","message","exports"],"sources":["merge-lane-from-scope.cmd.ts"],"sourcesContent":["import chalk from 'chalk';\nimport { DEFAULT_LANE } from '@teambit/lane-id';\nimport { Command, CommandOptions } from '@teambit/cli';\nimport { fromBase64 } from '@teambit/legacy/dist/utils';\nimport { BitError } from '@teambit/bit-error';\nimport { MergeLanesMain } from './merge-lanes.main.runtime';\n\ntype Flags = {\n  pattern?: string;\n  push?: boolean;\n  keepReadme?: boolean;\n  noSquash: boolean;\n  includeDeps?: boolean;\n  title?: string;\n  titleBase64?: string;\n  reMerge?: boolean;\n};\n\n/**\n * private command. the underscore prefix is intended.\n */\nexport class MergeLaneFromScopeCmd implements Command {\n  name = '_merge-lane <from-lane> [to-lane]';\n  description = `merge a remote lane into another lane or main via a bare-scope (not workspace)`;\n  extendedDescription = `to merge from a workspace, use \"bit lane merge\" command.\nthis is intended to use from the UI, which will have a button to merge an existing lane.\nthe lane must be up-to-date with the other lane, otherwise, conflicts might occur which are not handled in this command`;\n  arguments = [\n    {\n      name: 'from-lane',\n      description: 'lane-id to merge from',\n    },\n    {\n      name: 'to-lane',\n      description: `lane-id to merge to. default is \"${DEFAULT_LANE}\"`,\n    },\n  ];\n  alias = '';\n  options = [\n    ['', 'pattern <string>', 'partially merge the lane with the specified component-pattern'],\n    [\n      '',\n      'title <string>',\n      'if provided, it replaces the original message with this title and append squashed snaps messages',\n    ],\n    ['', 'title-base64 <string>', 'same as --title flag but the title is base64 encoded'],\n    ['', 'push', 'export the updated objects to the original scopes once done'],\n    ['', 'keep-readme', 'skip deleting the lane readme component after merging'],\n    ['', 'no-squash', 'relevant for merging lanes into main, which by default squash.'],\n    ['', 'include-deps', 'relevant for \"--pattern\". merge also dependencies of the given components'],\n    ['', 're-merge', 'helpful when last merge failed during export. do not skip components that seemed to be merged'],\n    ['j', 'json', 'output as json format'],\n  ] as CommandOptions;\n  loader = true;\n  private = true;\n  remoteOp = true;\n\n  constructor(private mergeLanes: MergeLanesMain) {}\n\n  async report(\n    [fromLane, toLane]: [string, string],\n    {\n      pattern,\n      push = false,\n      keepReadme = false,\n      noSquash = false,\n      includeDeps = false,\n      title,\n      titleBase64,\n      reMerge,\n    }: Flags\n  ): Promise<string> {\n    if (includeDeps && !pattern) {\n      throw new BitError(`\"--include-deps\" flag is relevant only for --pattern flag`);\n    }\n\n    const titleBase64Decoded = titleBase64 ? fromBase64(titleBase64) : undefined;\n\n    const { mergedNow, mergedPreviously, exportedIds } = await this.mergeLanes.mergeFromScope(\n      fromLane,\n      toLane || DEFAULT_LANE,\n      {\n        push,\n        keepReadme,\n        noSquash,\n        pattern,\n        includeDeps,\n        snapMessage: titleBase64Decoded || title,\n        reMerge,\n      }\n    );\n\n    const mergedTitle = chalk.green(\n      `successfully merged ${mergedNow.length} components from ${fromLane} to ${toLane || DEFAULT_LANE}`\n    );\n    const mergedOutput = mergedNow.length ? `${mergedTitle}\\n${mergedNow.join('\\n')}` : '';\n\n    const nonMergedTitle = chalk.bold(\n      `the following ${mergedPreviously.length} components were already merged before, they were left intact`\n    );\n    const nonMergedOutput = mergedPreviously.length ? `\\n${nonMergedTitle}\\n${mergedPreviously.join('\\n')}` : '';\n\n    const exportedTitle = chalk.green(`successfully exported ${exportedIds.length} components`);\n    const exportedOutput = exportedIds.length ? `\\n${exportedTitle}\\n${exportedIds.join('\\n')}` : '';\n\n    return mergedOutput + nonMergedOutput + exportedOutput;\n  }\n  async json(\n    [fromLane, toLane]: [string, string],\n    { pattern, push = false, keepReadme = false, noSquash = false, includeDeps = false, reMerge }: Flags\n  ) {\n    if (includeDeps && !pattern) {\n      throw new BitError(`\"--include-deps\" flag is relevant only for --pattern flag`);\n    }\n    let results: any;\n    try {\n      results = await this.mergeLanes.mergeFromScope(fromLane, toLane || DEFAULT_LANE, {\n        push,\n        keepReadme,\n        noSquash,\n        pattern,\n        includeDeps,\n        reMerge,\n      });\n      return {\n        code: 0,\n        data: results,\n      };\n    } catch (err: any) {\n      return {\n        code: 1,\n        error: err.message,\n      };\n    }\n  }\n}\n"],"mappings":"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"}
+{"version":3,"names":["_chalk","data","_interopRequireDefault","require","_laneId","_utils","_bitError","_excluded","obj","__esModule","default","_objectWithoutProperties","source","excluded","target","_objectWithoutPropertiesLoose","key","i","Object","getOwnPropertySymbols","sourceSymbolKeys","length","indexOf","prototype","propertyIsEnumerable","call","sourceKeys","keys","ownKeys","e","r","t","o","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","defineProperty","value","_toPropertyKey","configurable","writable","_toPrimitive","String","Symbol","toPrimitive","TypeError","Number","MergeLaneFromScopeCmd","constructor","mergeLanes","name","description","DEFAULT_LANE","report","fromLane","toLane","pattern","keepReadme","noSquash","includeDeps","title","titleBase64","reMerge","BitError","titleBase64Decoded","fromBase64","undefined","mergedNow","unmerged","exportedIds","conflicts","mergeFromScope","snapMessage","mergedTitle","chalk","green","mergedOutput","join","nonMergedTitle","bold","nonMergedOutput","map","u","id","reason","conflictsTitle","conflictsOutput","files","config","exportedTitle","exportedOutput","json","results","code","toString","mergedPreviously","_ref","rest","snappedIds","err","error","message","exports"],"sources":["merge-lane-from-scope.cmd.ts"],"sourcesContent":["import chalk from 'chalk';\nimport { DEFAULT_LANE } from '@teambit/lane-id';\nimport { Command, CommandOptions } from '@teambit/cli';\nimport { fromBase64 } from '@teambit/legacy/dist/utils';\nimport { BitError } from '@teambit/bit-error';\nimport { MergeFromScopeResult, MergeLanesMain } from './merge-lanes.main.runtime';\n\ntype Flags = {\n  pattern?: string;\n  push?: boolean;\n  keepReadme?: boolean;\n  noSquash: boolean;\n  includeDeps?: boolean;\n  title?: string;\n  titleBase64?: string;\n  reMerge?: boolean;\n};\n\n/**\n * private command. the underscore prefix is intended.\n */\nexport class MergeLaneFromScopeCmd implements Command {\n  name = '_merge-lane <from-lane> [to-lane]';\n  description = `merge a remote lane into another lane or main via a bare-scope (not workspace)`;\n  extendedDescription = `to merge from a workspace, use \"bit lane merge\" command.\nthis is intended to use from the UI, which will have a button to merge an existing lane.\nthe lane must be up-to-date with the other lane, otherwise, conflicts might occur which are not handled in this command`;\n  arguments = [\n    {\n      name: 'from-lane',\n      description: `lane-id to merge from or \"${DEFAULT_LANE}\"`,\n    },\n    {\n      name: 'to-lane',\n      description: `lane-id to merge to. default is \"${DEFAULT_LANE}\"`,\n    },\n  ];\n  alias = '';\n  options = [\n    ['', 'pattern <string>', 'partially merge the lane with the specified component-pattern'],\n    [\n      '',\n      'title <string>',\n      'if provided, it replaces the original message with this title and append squashed snaps messages',\n    ],\n    ['', 'title-base64 <string>', 'same as --title flag but the title is base64 encoded'],\n    ['', 'push', 'export the updated objects to the original scopes once done'],\n    ['', 'keep-readme', 'skip deleting the lane readme component after merging'],\n    ['', 'no-squash', 'relevant for merging lanes into main, which by default squash.'],\n    ['', 'include-deps', 'relevant for \"--pattern\". merge also dependencies of the given components'],\n    ['', 're-merge', 'helpful when last merge failed during export. do not skip components that seemed to be merged'],\n    ['j', 'json', 'output as json format'],\n  ] as CommandOptions;\n  loader = true;\n  private = true;\n  remoteOp = true;\n\n  constructor(private mergeLanes: MergeLanesMain) {}\n\n  async report(\n    [fromLane, toLane]: [string, string],\n    {\n      pattern,\n      push = false,\n      keepReadme = false,\n      noSquash = false,\n      includeDeps = false,\n      title,\n      titleBase64,\n      reMerge,\n    }: Flags\n  ): Promise<string> {\n    if (includeDeps && !pattern) {\n      throw new BitError(`\"--include-deps\" flag is relevant only for --pattern flag`);\n    }\n    if (fromLane === DEFAULT_LANE && !toLane) {\n      throw new BitError('to merge from the main lane, specify the target lane');\n    }\n\n    const titleBase64Decoded = titleBase64 ? fromBase64(titleBase64) : undefined;\n\n    const { mergedNow, unmerged, exportedIds, conflicts } = await this.mergeLanes.mergeFromScope(\n      fromLane,\n      toLane || DEFAULT_LANE,\n      {\n        push,\n        keepReadme,\n        noSquash,\n        pattern,\n        includeDeps,\n        snapMessage: titleBase64Decoded || title,\n        reMerge,\n      }\n    );\n\n    const mergedTitle = chalk.green(\n      `successfully merged ${mergedNow.length} components from ${fromLane} to ${toLane || DEFAULT_LANE}`\n    );\n    const mergedOutput = mergedNow.length ? `${mergedTitle}\\n${mergedNow.join('\\n')}` : '';\n\n    const nonMergedTitle = chalk.bold(`the following ${unmerged.length} components were not merged`);\n    const nonMergedOutput = unmerged.length\n      ? `\\n${nonMergedTitle}\\n${unmerged.map((u) => `${u.id} (${u.reason})`).join('\\n')}`\n      : '';\n\n    const conflictsTitle = chalk.bold(\n      `the following ${conflicts?.length} components have conflicts, the merge was not completed`\n    );\n    const conflictsOutput = conflicts?.length\n      ? `\\n${conflictsTitle}\\n${conflicts\n          .map((u) => `${u.id} (files: ${u.files.join(', ') || 'N/A'}) (config: ${u.config})`)\n          .join('\\n')}`\n      : '';\n\n    const exportedTitle = chalk.green(`successfully exported ${exportedIds.length} components`);\n    const exportedOutput = exportedIds.length ? `\\n${exportedTitle}\\n${exportedIds.join('\\n')}` : '';\n\n    return mergedOutput + nonMergedOutput + conflictsOutput + exportedOutput;\n  }\n  async json(\n    [fromLane, toLane]: [string, string],\n    { pattern, push = false, keepReadme = false, noSquash = false, includeDeps = false, reMerge }: Flags\n  ) {\n    if (includeDeps && !pattern) {\n      throw new BitError(`\"--include-deps\" flag is relevant only for --pattern flag`);\n    }\n    let results: MergeFromScopeResult;\n    try {\n      results = await this.mergeLanes.mergeFromScope(fromLane, toLane || DEFAULT_LANE, {\n        push,\n        keepReadme,\n        noSquash,\n        pattern,\n        includeDeps,\n        reMerge,\n      });\n      return {\n        code: 0,\n        data: {\n          ...results,\n          mergedNow: results.mergedNow.map((id) => id.toString()),\n          mergedPreviously: results.mergedPreviously.map((id) => id.toString()),\n          exportedIds: results.exportedIds.map((id) => id.toString()),\n          unmerged: results.unmerged.map(({ id, reason }) => ({ id: id.toString(), reason })),\n          conflicts: results.conflicts?.map(({ id, ...rest }) => ({ id: id.toString(), ...rest })),\n          snappedIds: results.snappedIds?.map((id) => id.toString()),\n        },\n      };\n    } catch (err: any) {\n      return {\n        code: 1,\n        error: err.message,\n      };\n    }\n  }\n}\n"],"mappings":"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"}

package/dist/merge-lane.cmd.js

@@ -129,7 +129,7 @@ Component pattern format: ${_constants().COMPONENT_PATTERN_HELP}`
       mergeResults,
       deleteResults,
       configMergeResults
-    } = await this.mergeLanes.mergeLane(name, {
+    } = await this.mergeLanes.mergeLaneByCLI(name, {
       build,
       // @ts-ignore
       mergeStrategy,

package/dist/merge-lane.cmd.js.map

@@ -1 +1 @@
-{"version":3,"names":["_chalk","data","_interopRequireDefault","require","_merging","_constants","_bitError","_remove","obj","__esModule","default","ownKeys","e","r","t","Object","keys","getOwnPropertySymbols","o","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","defineProperty","key","value","_toPropertyKey","configurable","writable","i","_toPrimitive","String","Symbol","toPrimitive","call","TypeError","Number","MergeLaneCmd","constructor","mergeLanes","globalConfig","name","description","COMPONENT_PATTERN_HELP","report","pattern","ours","theirs","manual","autoMergeResolve","build","workspace","existingOnWorkspaceOnly","squash","noSnap","tag","message","snapMessage","keepReadme","noSquash","skipDependencyInstallation","skipFetch","includeDeps","resolveUnrelated","ignoreConfigChanges","verbose","excludeNonLaneComps","getBool","CFG_FORCE_LOCAL_BUILD","Boolean","BitError","mergeStrategy","getResolveUnrelated","undefined","Error","mergeResults","deleteResults","configMergeResults","mergeLane","mergeResult","mergeReport","deleteOutput","localResult","removeTemplate","remoteResult","map","item","readmeResult","chalk","yellow","exports"],"sources":["merge-lane.cmd.ts"],"sourcesContent":["import chalk from 'chalk';\nimport { Command, CommandOptions } from '@teambit/cli';\nimport { MergeStrategy } from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport { mergeReport } from '@teambit/merging';\nimport { GlobalConfigMain } from '@teambit/global-config';\nimport { COMPONENT_PATTERN_HELP, CFG_FORCE_LOCAL_BUILD } from '@teambit/legacy/dist/constants';\nimport { BitError } from '@teambit/bit-error';\nimport { removeTemplate } from '@teambit/remove';\nimport { MergeLanesMain } from './merge-lanes.main.runtime';\n\nexport class MergeLaneCmd implements Command {\n  name = 'merge <lane> [pattern]';\n  description = `merge a local or a remote lane to the current lane`;\n  extendedDescription = `by default, the provided lane will be fetched from the remote before merging.\nto merge the lane from the local scope without updating it first, use \"--skip-fetch\" flag.\n\nwhen the current and merge candidate lanes are diverged in history and the files could be merged with no conflicts,\nthese components will be snap-merged to complete the merge. use \"no-snap\" to opt-out, or \"tag\" to tag instead.\n\nin case a component in both ends don't share history (no snap is found in common), the merge will require \"--resolve-unrelated\" flag.\nthis flag keeps the history of one end and saves a reference to the other end. the decision of which end to keep is determined by the following:\n1. if the component exists on main, then the history linked to main will be kept.\nin this case, the strategy of \"--resolve-unrelated\" only determines which source-code to keep. it's not about the history.\n2. if the component doesn't exist on main, then by default, the history of the current lane will be kept.\nunless \"--resolve-unrelated\" is set to \"theirs\", in which case the history of the other lane will be kept.\n2. a. an edge case: if the component is deleted on the current lane, the strategy will always be \"theirs\".\nso then the history (and the source-code) of the other lane will be kept.\n`;\n  arguments = [\n    {\n      name: 'lane',\n      description: 'lane-name or full lane-id (if remote) to merge to the current lane',\n    },\n    {\n      name: 'pattern',\n      description: `partially merge the lane - only components that match the specified component-pattern\nComponent pattern format: ${COMPONENT_PATTERN_HELP}`,\n    },\n  ];\n  alias = '';\n  options = [\n    [\n      '',\n      'manual',\n      'same as \"--auto-merge-resolve manual\". in case of merge conflict, write the files with the conflict markers',\n    ],\n    [\n      '',\n      'auto-merge-resolve <merge-strategy>',\n      'in case of a merge conflict, resolve according to the provided strategy: [ours, theirs, manual]',\n    ],\n    ['', 'ours', 'DEPRECATED. use --auto-merge-resolve. in case of a conflict, keep local modifications'],\n    ['', 'theirs', 'DEPRECATED. use --auto-merge-resolve. in case of a conflict, override local with incoming changes'],\n    ['', 'workspace', 'merge only lane components that are in the current workspace'],\n    ['', 'no-snap', 'do not auto snap after merge completed without conflicts'],\n    ['', 'tag', 'auto-tag all lane components after merging into main (or tag-merge in case of snap-merge)'],\n    ['', 'build', 'in case of snap during the merge, run the build-pipeline (similar to bit snap --build)'],\n    ['m', 'message <message>', 'override the default message for the auto snap'],\n    ['', 'keep-readme', 'skip deleting the lane readme component after merging'],\n    ['', 'no-squash', 'relevant for merging lanes into main, which by default squashes all lane snaps'],\n    [\n      '',\n      'squash',\n      'EXPERIMENTAL. relevant for merging a lane into another non-main lane, which by default does not squash',\n    ],\n    [\n      '',\n      'ignore-config-changes',\n      'allow merging when components are modified due to config changes (such as dependencies) only and not files',\n    ],\n    ['', 'verbose', 'show details of components that were not merged successfully'],\n    ['x', 'skip-dependency-installation', 'do not install dependencies of the imported components'],\n    ['', 'skip-fetch', 'use the local state of target-lane if exits locally, without updating it from the remote'],\n    [\n      '',\n      'include-deps',\n      'relevant for \"--pattern\" and \"--workspace\". merge also dependencies of the specified components',\n    ],\n    [\n      '',\n      'resolve-unrelated [merge-strategy]',\n      'relevant when a component on a lane and the component on main have nothing in common. merge-strategy can be \"ours\" (default) or \"theirs\"',\n    ],\n    [\n      '',\n      'include-non-lane-comps',\n      'DEPRECATED (this is now the default). when merging main, include workspace components that are not on the lane (by default only lane components are merged)',\n    ],\n    [\n      '',\n      'exclude-non-lane-comps',\n      'when merging main into a lane, exclude workspace components that are not on the lane (by default all workspace components are merged)',\n    ],\n  ] as CommandOptions;\n  loader = true;\n  private = true;\n  remoteOp = true;\n\n  constructor(private mergeLanes: MergeLanesMain, private globalConfig: GlobalConfigMain) {}\n\n  async report(\n    [name, pattern]: [string, string],\n    {\n      ours,\n      theirs,\n      manual,\n      autoMergeResolve,\n      build,\n      workspace: existingOnWorkspaceOnly = false,\n      squash = false,\n      noSnap = false,\n      tag = false,\n      message: snapMessage = '',\n      keepReadme = false,\n      noSquash = false,\n      skipDependencyInstallation = false,\n      skipFetch = false,\n      includeDeps = false,\n      resolveUnrelated,\n      ignoreConfigChanges,\n      verbose = false,\n      excludeNonLaneComps = false,\n    }: {\n      ours?: boolean;\n      theirs?: boolean;\n      manual?: boolean;\n      autoMergeResolve?: string;\n      workspace?: boolean;\n      build?: boolean;\n      noSnap: boolean;\n      tag: boolean;\n      message: string;\n      keepReadme?: boolean;\n      squash?: boolean;\n      noSquash: boolean;\n      skipDependencyInstallation?: boolean;\n      skipFetch: boolean;\n      includeDeps?: boolean;\n      resolveUnrelated?: string | boolean;\n      ignoreConfigChanges?: boolean;\n      verbose?: boolean;\n      excludeNonLaneComps?: boolean;\n    }\n  ): Promise<string> {\n    build = (await this.globalConfig.getBool(CFG_FORCE_LOCAL_BUILD)) || Boolean(build);\n    if (ours || theirs) {\n      throw new BitError(\n        'the \"--ours\" and \"--theirs\" flags are deprecated. use \"--auto-merge-resolve\" instead. see \"bit lane merge --help\" for more information'\n      );\n    }\n    if (\n      autoMergeResolve &&\n      autoMergeResolve !== 'ours' &&\n      autoMergeResolve !== 'theirs' &&\n      autoMergeResolve !== 'manual'\n    ) {\n      throw new BitError('--auto-merge-resolve must be one of the following: [ours, theirs, manual]');\n    }\n    if (manual) autoMergeResolve = 'manual';\n    const mergeStrategy = autoMergeResolve;\n    if (noSnap && snapMessage) throw new BitError('unable to use \"no-snap\" and \"message\" flags together');\n    if (includeDeps && !pattern && !existingOnWorkspaceOnly) {\n      throw new BitError(`\"--include-deps\" flag is relevant only for --workspace and --pattern flags`);\n    }\n    const getResolveUnrelated = (): MergeStrategy | undefined => {\n      if (!resolveUnrelated) return undefined;\n      if (typeof resolveUnrelated === 'boolean') return 'ours';\n      if (resolveUnrelated !== 'ours' && resolveUnrelated !== 'theirs' && resolveUnrelated !== 'manual') {\n        throw new Error('--resolve-unrelated must be one of the following: [ours, theirs, manual]');\n      }\n      return resolveUnrelated;\n    };\n    if (resolveUnrelated && typeof resolveUnrelated === 'boolean') {\n      resolveUnrelated = 'ours';\n    }\n    const { mergeResults, deleteResults, configMergeResults } = await this.mergeLanes.mergeLane(name, {\n      build,\n      // @ts-ignore\n      mergeStrategy,\n      ours,\n      theirs,\n      existingOnWorkspaceOnly,\n      noSnap,\n      snapMessage,\n      keepReadme,\n      squash,\n      noSquash,\n      tag,\n      pattern,\n      skipDependencyInstallation,\n      skipFetch,\n      resolveUnrelated: getResolveUnrelated(),\n      ignoreConfigChanges,\n      includeDeps,\n      excludeNonLaneComps,\n    });\n\n    const mergeResult = mergeReport({ ...mergeResults, configMergeResults, verbose });\n    const deleteOutput = `\\n${deleteResults.localResult ? removeTemplate(deleteResults.localResult, false) : ''}${(\n      deleteResults.remoteResult || []\n    ).map((item) => removeTemplate(item, true))}${\n      (deleteResults.readmeResult && chalk.yellow(deleteResults.readmeResult)) || ''\n    }\\n`;\n    return mergeResult + deleteOutput;\n  }\n}\n"],"mappings":"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"}
+{"version":3,"names":["_chalk","data","_interopRequireDefault","require","_merging","_constants","_bitError","_remove","obj","__esModule","default","ownKeys","e","r","t","Object","keys","getOwnPropertySymbols","o","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","defineProperty","key","value","_toPropertyKey","configurable","writable","i","_toPrimitive","String","Symbol","toPrimitive","call","TypeError","Number","MergeLaneCmd","constructor","mergeLanes","globalConfig","name","description","COMPONENT_PATTERN_HELP","report","pattern","ours","theirs","manual","autoMergeResolve","build","workspace","existingOnWorkspaceOnly","squash","noSnap","tag","message","snapMessage","keepReadme","noSquash","skipDependencyInstallation","skipFetch","includeDeps","resolveUnrelated","ignoreConfigChanges","verbose","excludeNonLaneComps","getBool","CFG_FORCE_LOCAL_BUILD","Boolean","BitError","mergeStrategy","getResolveUnrelated","undefined","Error","mergeResults","deleteResults","configMergeResults","mergeLaneByCLI","mergeResult","mergeReport","deleteOutput","localResult","removeTemplate","remoteResult","map","item","readmeResult","chalk","yellow","exports"],"sources":["merge-lane.cmd.ts"],"sourcesContent":["import chalk from 'chalk';\nimport { Command, CommandOptions } from '@teambit/cli';\nimport { MergeStrategy } from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport { mergeReport } from '@teambit/merging';\nimport { GlobalConfigMain } from '@teambit/global-config';\nimport { COMPONENT_PATTERN_HELP, CFG_FORCE_LOCAL_BUILD } from '@teambit/legacy/dist/constants';\nimport { BitError } from '@teambit/bit-error';\nimport { removeTemplate } from '@teambit/remove';\nimport { MergeLanesMain } from './merge-lanes.main.runtime';\n\nexport class MergeLaneCmd implements Command {\n  name = 'merge <lane> [pattern]';\n  description = `merge a local or a remote lane to the current lane`;\n  extendedDescription = `by default, the provided lane will be fetched from the remote before merging.\nto merge the lane from the local scope without updating it first, use \"--skip-fetch\" flag.\n\nwhen the current and merge candidate lanes are diverged in history and the files could be merged with no conflicts,\nthese components will be snap-merged to complete the merge. use \"no-snap\" to opt-out, or \"tag\" to tag instead.\n\nin case a component in both ends don't share history (no snap is found in common), the merge will require \"--resolve-unrelated\" flag.\nthis flag keeps the history of one end and saves a reference to the other end. the decision of which end to keep is determined by the following:\n1. if the component exists on main, then the history linked to main will be kept.\nin this case, the strategy of \"--resolve-unrelated\" only determines which source-code to keep. it's not about the history.\n2. if the component doesn't exist on main, then by default, the history of the current lane will be kept.\nunless \"--resolve-unrelated\" is set to \"theirs\", in which case the history of the other lane will be kept.\n2. a. an edge case: if the component is deleted on the current lane, the strategy will always be \"theirs\".\nso then the history (and the source-code) of the other lane will be kept.\n`;\n  arguments = [\n    {\n      name: 'lane',\n      description: 'lane-name or full lane-id (if remote) to merge to the current lane',\n    },\n    {\n      name: 'pattern',\n      description: `partially merge the lane - only components that match the specified component-pattern\nComponent pattern format: ${COMPONENT_PATTERN_HELP}`,\n    },\n  ];\n  alias = '';\n  options = [\n    [\n      '',\n      'manual',\n      'same as \"--auto-merge-resolve manual\". in case of merge conflict, write the files with the conflict markers',\n    ],\n    [\n      '',\n      'auto-merge-resolve <merge-strategy>',\n      'in case of a merge conflict, resolve according to the provided strategy: [ours, theirs, manual]',\n    ],\n    ['', 'ours', 'DEPRECATED. use --auto-merge-resolve. in case of a conflict, keep local modifications'],\n    ['', 'theirs', 'DEPRECATED. use --auto-merge-resolve. in case of a conflict, override local with incoming changes'],\n    ['', 'workspace', 'merge only lane components that are in the current workspace'],\n    ['', 'no-snap', 'do not auto snap after merge completed without conflicts'],\n    ['', 'tag', 'auto-tag all lane components after merging into main (or tag-merge in case of snap-merge)'],\n    ['', 'build', 'in case of snap during the merge, run the build-pipeline (similar to bit snap --build)'],\n    ['m', 'message <message>', 'override the default message for the auto snap'],\n    ['', 'keep-readme', 'skip deleting the lane readme component after merging'],\n    ['', 'no-squash', 'relevant for merging lanes into main, which by default squashes all lane snaps'],\n    [\n      '',\n      'squash',\n      'EXPERIMENTAL. relevant for merging a lane into another non-main lane, which by default does not squash',\n    ],\n    [\n      '',\n      'ignore-config-changes',\n      'allow merging when components are modified due to config changes (such as dependencies) only and not files',\n    ],\n    ['', 'verbose', 'show details of components that were not merged successfully'],\n    ['x', 'skip-dependency-installation', 'do not install dependencies of the imported components'],\n    ['', 'skip-fetch', 'use the local state of target-lane if exits locally, without updating it from the remote'],\n    [\n      '',\n      'include-deps',\n      'relevant for \"--pattern\" and \"--workspace\". merge also dependencies of the specified components',\n    ],\n    [\n      '',\n      'resolve-unrelated [merge-strategy]',\n      'relevant when a component on a lane and the component on main have nothing in common. merge-strategy can be \"ours\" (default) or \"theirs\"',\n    ],\n    [\n      '',\n      'include-non-lane-comps',\n      'DEPRECATED (this is now the default). when merging main, include workspace components that are not on the lane (by default only lane components are merged)',\n    ],\n    [\n      '',\n      'exclude-non-lane-comps',\n      'when merging main into a lane, exclude workspace components that are not on the lane (by default all workspace components are merged)',\n    ],\n  ] as CommandOptions;\n  loader = true;\n  private = true;\n  remoteOp = true;\n\n  constructor(private mergeLanes: MergeLanesMain, private globalConfig: GlobalConfigMain) {}\n\n  async report(\n    [name, pattern]: [string, string],\n    {\n      ours,\n      theirs,\n      manual,\n      autoMergeResolve,\n      build,\n      workspace: existingOnWorkspaceOnly = false,\n      squash = false,\n      noSnap = false,\n      tag = false,\n      message: snapMessage = '',\n      keepReadme = false,\n      noSquash = false,\n      skipDependencyInstallation = false,\n      skipFetch = false,\n      includeDeps = false,\n      resolveUnrelated,\n      ignoreConfigChanges,\n      verbose = false,\n      excludeNonLaneComps = false,\n    }: {\n      ours?: boolean;\n      theirs?: boolean;\n      manual?: boolean;\n      autoMergeResolve?: string;\n      workspace?: boolean;\n      build?: boolean;\n      noSnap: boolean;\n      tag: boolean;\n      message: string;\n      keepReadme?: boolean;\n      squash?: boolean;\n      noSquash: boolean;\n      skipDependencyInstallation?: boolean;\n      skipFetch: boolean;\n      includeDeps?: boolean;\n      resolveUnrelated?: string | boolean;\n      ignoreConfigChanges?: boolean;\n      verbose?: boolean;\n      excludeNonLaneComps?: boolean;\n    }\n  ): Promise<string> {\n    build = (await this.globalConfig.getBool(CFG_FORCE_LOCAL_BUILD)) || Boolean(build);\n    if (ours || theirs) {\n      throw new BitError(\n        'the \"--ours\" and \"--theirs\" flags are deprecated. use \"--auto-merge-resolve\" instead. see \"bit lane merge --help\" for more information'\n      );\n    }\n    if (\n      autoMergeResolve &&\n      autoMergeResolve !== 'ours' &&\n      autoMergeResolve !== 'theirs' &&\n      autoMergeResolve !== 'manual'\n    ) {\n      throw new BitError('--auto-merge-resolve must be one of the following: [ours, theirs, manual]');\n    }\n    if (manual) autoMergeResolve = 'manual';\n    const mergeStrategy = autoMergeResolve;\n    if (noSnap && snapMessage) throw new BitError('unable to use \"no-snap\" and \"message\" flags together');\n    if (includeDeps && !pattern && !existingOnWorkspaceOnly) {\n      throw new BitError(`\"--include-deps\" flag is relevant only for --workspace and --pattern flags`);\n    }\n    const getResolveUnrelated = (): MergeStrategy | undefined => {\n      if (!resolveUnrelated) return undefined;\n      if (typeof resolveUnrelated === 'boolean') return 'ours';\n      if (resolveUnrelated !== 'ours' && resolveUnrelated !== 'theirs' && resolveUnrelated !== 'manual') {\n        throw new Error('--resolve-unrelated must be one of the following: [ours, theirs, manual]');\n      }\n      return resolveUnrelated;\n    };\n    if (resolveUnrelated && typeof resolveUnrelated === 'boolean') {\n      resolveUnrelated = 'ours';\n    }\n    const { mergeResults, deleteResults, configMergeResults } = await this.mergeLanes.mergeLaneByCLI(name, {\n      build,\n      // @ts-ignore\n      mergeStrategy,\n      ours,\n      theirs,\n      existingOnWorkspaceOnly,\n      noSnap,\n      snapMessage,\n      keepReadme,\n      squash,\n      noSquash,\n      tag,\n      pattern,\n      skipDependencyInstallation,\n      skipFetch,\n      resolveUnrelated: getResolveUnrelated(),\n      ignoreConfigChanges,\n      includeDeps,\n      excludeNonLaneComps,\n    });\n\n    const mergeResult = mergeReport({ ...mergeResults, configMergeResults, verbose });\n    const deleteOutput = `\\n${deleteResults.localResult ? removeTemplate(deleteResults.localResult, false) : ''}${(\n      deleteResults.remoteResult || []\n    ).map((item) => removeTemplate(item, true))}${\n      (deleteResults.readmeResult && chalk.yellow(deleteResults.readmeResult)) || ''\n    }\\n`;\n    return mergeResult + deleteOutput;\n  }\n}\n"],"mappings":"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"}

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

@@ -3,8 +3,10 @@ import { ImporterMain } from '@teambit/importer';
 import { LanesMain } from '@teambit/lanes';
 import { MergingMain, ApplyVersionResults } from '@teambit/merging';
 import { Workspace } from '@teambit/workspace';
+import { ComponentID } from '@teambit/component-id';
 import { MergeStrategy } from '@teambit/legacy/dist/consumer/versions-ops/merge-version';
 import { ScopeMain } from '@teambit/scope';
+import { LaneId } from '@teambit/lane-id';
 import { ConfigMergeResult } from '@teambit/config-merger';
 import { Logger, LoggerMain } from '@teambit/logger';
 import { CheckoutMain, CheckoutProps } from '@teambit/checkout';
@@ -32,6 +34,21 @@ export type MergeLaneOptions = {
     skipFetch?: boolean;
     excludeNonLaneComps?: boolean;
 };
+export type MergeFromScopeResult = {
+    mergedNow: ComponentID[];
+    exportedIds: ComponentID[];
+    unmerged: {
+        id: ComponentID;
+        reason: string;
+    }[];
+    conflicts?: Array<{
+        id: ComponentID;
+        files: string[];
+        config?: boolean;
+    }>;
+    snappedIds?: ComponentID[];
+    mergedPreviously: ComponentID[];
+};
 export declare class MergeLanesMain {
     private workspace;
     private merging;
@@ -43,7 +60,12 @@ export declare class MergeLanesMain {
     private importer;
     private checkout;
     constructor(workspace: Workspace | undefined, merging: MergingMain, lanes: LanesMain, logger: Logger, remove: RemoveMain, scope: ScopeMain, exporter: ExportMain, importer: ImporterMain, checkout: CheckoutMain);
-    mergeLane(laneName: string, options: MergeLaneOptions): Promise<{
+    mergeLaneByCLI(laneName: string, options: MergeLaneOptions): Promise<{
+        mergeResults: ApplyVersionResults;
+        deleteResults: any;
+        configMergeResults: ConfigMergeResult[];
+    }>;
+    mergeLane(otherLaneId: LaneId, currentLaneId: LaneId, options: MergeLaneOptions): Promise<{
         mergeResults: ApplyVersionResults;
         deleteResults: any;
         configMergeResults: ConfigMergeResult[];
@@ -57,11 +79,7 @@ export declare class MergeLanesMain {
     mergeFromScope(fromLane: string, toLane: string, options: Partial<MergeLaneOptions> & {
         push?: boolean;
         reMerge?: boolean;
-    }): Promise<{
-        mergedPreviously: string[];
-        mergedNow: string[];
-        exportedIds: string[];
-    }>;
+    }): Promise<MergeFromScopeResult>;
     private throwIfNotUpToDate;
     static slots: never[];
     static dependencies: import("@teambit/harmony").Aspect[];