@teambit/merge-lanes 1.0.97 → 1.0.99

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

@@ -18,7 +18,7 @@ export declare class MergeLaneCmd implements Command {
     migration: boolean;
     remoteOp: boolean;
     constructor(mergeLanes: MergeLanesMain, globalConfig: GlobalConfigMain);
-    report([name, pattern]: [string, string], { ours, theirs, manual, autoMergeResolve, build, workspace: existingOnWorkspaceOnly, squash, noSnap, tag, message: snapMessage, keepReadme, noSquash, skipDependencyInstallation, skipFetch, includeDeps, resolveUnrelated, ignoreConfigChanges, verbose, includeNonLaneComps, }: {
+    report([name, pattern]: [string, string], { ours, theirs, manual, autoMergeResolve, build, workspace: existingOnWorkspaceOnly, squash, noSnap, tag, message: snapMessage, keepReadme, noSquash, skipDependencyInstallation, skipFetch, includeDeps, resolveUnrelated, ignoreConfigChanges, verbose, excludeNonLaneComps, }: {
         ours?: boolean;
         theirs?: boolean;
         manual?: boolean;
@@ -37,6 +37,6 @@ export declare class MergeLaneCmd implements Command {
         resolveUnrelated?: string | boolean;
         ignoreConfigChanges?: boolean;
         verbose?: boolean;
-        includeNonLaneComps?: boolean;
+        excludeNonLaneComps?: boolean;
     }): Promise<string>;
 }

package/dist/merge-lane.cmd.js

@@ -75,7 +75,7 @@ so then the history (and the source-code) of the other lane will be kept.
 Component pattern format: ${_constants().COMPONENT_PATTERN_HELP}`
     }]);
     _defineProperty(this, "alias", '');
-    _defineProperty(this, "options", [['', 'ours', 'DEPRECATED. use --auto-merge-resolve. in case of a conflict, keep local modifications'], ['', 'theirs', 'DEPRECATED. use --auto-merge-resolve. in case of a conflict, override local with incoming changes'], ['', 'manual', 'DEPRECATED. use --auto-merge-resolve'], ['', 'auto-merge-resolve <merge-strategy>', 'in case of a merge conflict, resolve according to the provided strategy: [ours, theirs, manual]'], ['', 'workspace', 'merge only lane components that are in the current workspace'], ['', 'no-snap', 'do not auto snap after merge completed without conflicts'], ['', 'tag', 'auto-tag all lane components after merging into main (or tag-merge in case of snap-merge)'], ['', 'build', 'in case of snap during the merge, run the build-pipeline (similar to bit snap --build)'], ['m', 'message <message>', 'override the default message for the auto snap'], ['', 'keep-readme', 'skip deleting the lane readme component after merging'], ['', 'no-squash', 'relevant for merging lanes into main, which by default squashes all lane snaps'], ['', 'squash', 'EXPERIMENTAL. relevant for merging a lane into another non-main lane, which by default does not squash'], ['', 'ignore-config-changes', 'allow merging when components are modified due to config changes (such as dependencies) only and not files'], ['', 'verbose', 'show details of components that were not merged successfully'], ['x', 'skip-dependency-installation', 'do not install dependencies of the imported components'], ['', 'skip-fetch', 'use the local state of target-lane if exits locally, without updating it from the remote'], ['', 'include-deps', 'relevant for "--pattern" and "--workspace". merge also dependencies of the specified components'], ['', 'resolve-unrelated [merge-strategy]', 'relevant when a component on a lane and the component on main have nothing in common. merge-strategy can be "ours" (default) or "theirs"'], ['', 'include-non-lane-comps', 'when merging main, include workspace components that are not on the lane (by default only lane components are merged)']]);
+    _defineProperty(this, "options", [['', 'ours', 'DEPRECATED. use --auto-merge-resolve. in case of a conflict, keep local modifications'], ['', 'theirs', 'DEPRECATED. use --auto-merge-resolve. in case of a conflict, override local with incoming changes'], ['', 'manual', 'DEPRECATED. use --auto-merge-resolve'], ['', 'auto-merge-resolve <merge-strategy>', 'in case of a merge conflict, resolve according to the provided strategy: [ours, theirs, manual]'], ['', 'workspace', 'merge only lane components that are in the current workspace'], ['', 'no-snap', 'do not auto snap after merge completed without conflicts'], ['', 'tag', 'auto-tag all lane components after merging into main (or tag-merge in case of snap-merge)'], ['', 'build', 'in case of snap during the merge, run the build-pipeline (similar to bit snap --build)'], ['m', 'message <message>', 'override the default message for the auto snap'], ['', 'keep-readme', 'skip deleting the lane readme component after merging'], ['', 'no-squash', 'relevant for merging lanes into main, which by default squashes all lane snaps'], ['', 'squash', 'EXPERIMENTAL. relevant for merging a lane into another non-main lane, which by default does not squash'], ['', 'ignore-config-changes', 'allow merging when components are modified due to config changes (such as dependencies) only and not files'], ['', 'verbose', 'show details of components that were not merged successfully'], ['x', 'skip-dependency-installation', 'do not install dependencies of the imported components'], ['', 'skip-fetch', 'use the local state of target-lane if exits locally, without updating it from the remote'], ['', 'include-deps', 'relevant for "--pattern" and "--workspace". merge also dependencies of the specified components'], ['', 'resolve-unrelated [merge-strategy]', 'relevant when a component on a lane and the component on main have nothing in common. merge-strategy can be "ours" (default) or "theirs"'], ['', 'include-non-lane-comps', '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)'], ['', 'exclude-non-lane-comps', 'when merging main into a lane, exclude workspace components that are not on the lane (by default all workspace components are merged)']]);
     _defineProperty(this, "loader", true);
     _defineProperty(this, "private", true);
     _defineProperty(this, "migration", true);
@@ -100,7 +100,7 @@ Component pattern format: ${_constants().COMPONENT_PATTERN_HELP}`
     resolveUnrelated,
     ignoreConfigChanges,
     verbose = false,
-    includeNonLaneComps = false
+    excludeNonLaneComps = false
   }) {
     build = (await this.globalConfig.getBool(_constants().CFG_FORCE_LOCAL_BUILD)) || Boolean(build);
     if (ours || theirs || manual) {
@@ -148,7 +148,7 @@ Component pattern format: ${_constants().COMPONENT_PATTERN_HELP}`
       resolveUnrelated: getResolveUnrelated(),
       ignoreConfigChanges,
       includeDeps,
-      includeNonLaneComps
+      excludeNonLaneComps
     });
     const mergeResult = (0, _merging().mergeReport)(_objectSpread(_objectSpread({}, mergeResults), {}, {
       configMergeResults,

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","arg","_toPrimitive","String","input","hint","prim","Symbol","toPrimitive","undefined","res","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","includeNonLaneComps","getBool","CFG_FORCE_LOCAL_BUILD","Boolean","BitError","mergeStrategy","getResolveUnrelated","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    ['', '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    ['', 'manual', 'DEPRECATED. use --auto-merge-resolve'],\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    ['', '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      'when merging main, include workspace components that are not on the lane (by default only lane components are merged)',\n    ],\n  ] as CommandOptions;\n  loader = true;\n  private = true;\n  migration = 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      includeNonLaneComps = 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      includeNonLaneComps?: boolean;\n    }\n  ): Promise<string> {\n    build = (await this.globalConfig.getBool(CFG_FORCE_LOCAL_BUILD)) || Boolean(build);\n    if (ours || theirs || manual) {\n      throw new BitError(\n        'the \"--ours\", \"--theirs\" and \"--manual\" 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    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      includeNonLaneComps,\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","arg","_toPrimitive","String","input","hint","prim","Symbol","toPrimitive","undefined","res","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","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    ['', '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    ['', 'manual', 'DEPRECATED. use --auto-merge-resolve'],\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    ['', '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  migration = 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 || manual) {\n      throw new BitError(\n        'the \"--ours\", \"--theirs\" and \"--manual\" 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    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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"}

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

@@ -29,7 +29,7 @@ export declare type MergeLaneOptions = {
     resolveUnrelated?: MergeStrategy;
     ignoreConfigChanges?: boolean;
     skipFetch?: boolean;
-    includeNonLaneComps?: boolean;
+    excludeNonLaneComps?: boolean;
 };
 export declare class MergeLanesMain {
     private workspace;

package/dist/merge-lanes.main.runtime.js

@@ -229,7 +229,7 @@ class MergeLanesMain {
       resolveUnrelated,
       ignoreConfigChanges,
       skipFetch,
-      includeNonLaneComps
+      excludeNonLaneComps
     } = options;
     const currentLaneId = consumer.getCurrentLaneId();
     if (tag && !currentLaneId.isDefault()) {
@@ -266,7 +266,7 @@ class MergeLanesMain {
     const getBitIds = async () => {
       if (isDefaultLane) {
         if (!currentLane) throw new Error(`unable to merge ${_laneId().DEFAULT_LANE}, the current lane was not found`);
-        return this.getMainIdsToMerge(currentLane, includeNonLaneComps);
+        return this.getMainIdsToMerge(currentLane, !excludeNonLaneComps);
       }
       if (!otherLane) throw new Error(`lane must be defined for non-default`);
       return otherLane.toBitIds();
@@ -383,7 +383,7 @@ class MergeLanesMain {
       checkoutError
     };
   }
-  async getMainIdsToMerge(lane, includeNonLaneComps = false) {
+  async getMainIdsToMerge(lane, includeNonLaneComps) {
     const laneIds = lane.toBitIds();
     const ids = laneIds.filter(id => this.scope.isExported(id));
     if (includeNonLaneComps) {

package/dist/merge-lanes.main.runtime.js.map

@@ -1 +1 @@
-{"version":3,"names":["_bitError","data","require","_path","_interopRequireDefault","_cli","_importer","_lanes","_merging","_workspace","_interopRequireWildcard","_snapping","_componentId","_pMapSeries","_scope","_scopeComponentsImporter","_laneId","_logger","_checkout","_remove","_lodash","_export","_globalConfig","_getDivergeData","_mergeLanes","_mergeLane","_mergeLaneFromScope","_missingCompsToMerge","_mergeAbort","_lastMerged","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","obj","ownKeys","keys","getOwnPropertySymbols","o","filter","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","key","value","_toPropertyKey","configurable","writable","arg","_toPrimitive","String","input","hint","prim","Symbol","toPrimitive","undefined","res","TypeError","Number","MergeLanesMain","constructor","workspace","merging","lanes","logger","remove","scope","exporter","importer","checkout","mergeLane","laneName","options","BitError","consumer","mergeStrategy","noSnap","tag","snapMessage","existingOnWorkspaceOnly","build","keepReadme","squash","noSquash","pattern","includeDeps","skipDependencyInstallation","resolveUnrelated","ignoreConfigChanges","skipFetch","includeNonLaneComps","currentLaneId","getCurrentLaneId","isDefault","toString","otherLaneId","getParsedLaneId","isEqual","currentLane","loadLane","isDefaultLane","laneToFetchArtifactsFrom","getOtherLane","importObjectsFromMainIfExist","toBitIds","toVersionLatest","lane","shouldFetch","isNew","otherLane","fetchLaneWithItsComponents","getBitIds","Error","DEFAULT_LANE","getMainIdsToMerge","bitIds","debug","shouldSquash","allComponentsStatus","getMergeStatus","componentIds","resolveMultipleComponentIds","compIdsFromPattern","filterIdsFromPoolIdsByPattern","filterComponentsStatus","bitId","find","c","id","isEqualWithoutVersion","unchangedLegitimately","unchangedMessage","workspaceIds","listIds","throwForFailures","squashSnaps","idsToMerge","map","importHeadArtifactsFromLane","lastMerged","LastMerged","snapshot","takeSnapshot","mergeResults","mergeSnaps","laneId","localLane","persistSnapshot","mergedSuccessfully","failedComponents","every","failedComponent","deleteResults","readmeComponent","_otherLane$readmeComp","readmeComponentId","changeVersion","head","hash","removeLocallyByIds","readmeResult","configMergeResults","configMergeResult","onDestroy","name","compact","abortLaneMerge","checkoutProps","mergeAbortOpts","OutsideWorkspaceError","lastMerge","getCurrentLane","compDirsToRemove","restoreFromLastMerged","_reloadConsumer","objects","unmergedComponents","removeAllComponents","write","configMergeFile","getConflictMergeFile","delete","checkoutResults","checkoutError","ids","restoreMissingComponents","err","error","restoredItems","path","basename","bitMap","mapPath","config","join","laneIds","isExported","mainNotOnLane","modelComponents","Promise","all","legacyScope","getModelComponent","toComponentId","mergeFromScope","fromLane","toLane","fromLaneId","LaneId","parse","fromLaneObj","importLaneObject","toLaneId","getDefaultLaneId","toLaneObj","fromLaneBitIds","getIdsToMerge","laneCompIds","ComponentIdList","fromArray","scopeComponentsImporter","ScopeComponentsImporter","getInstance","importWithoutDeps","cache","ignoreMissingHead","includeVersionHistory","reason","throwIfNotUpToDate","repo","mergedPreviously","mergedNow","log","getLogForSquash","bitObjectsPerComp","pMapSeries","_toLaneObj$getCompone","modelComponent","fromVersionObj","loadVersion","version","isRemoved","fromLaneHead","getRef","toLaneHead","getComponent","divergeData","getDivergeData","sourceHead","targetHead","throwForNoCommonSnap","modifiedVersion","squashOneComp","addComponent","setHead","bitObjects","b","bitObjectsFlat","flat","writeObjectsToTheFS","exportedIds","exported","exportMany","idsWithFutureScope","laneObject","allVersions","exportHeadsOnly","ignoreMissingExternalArtifacts","exportOrigin","status","diffStatus","skipChanges","compsNotUpToDate","componentsStatus","s","upToDate","componentId","provider","cli","loggerMain","globalConfig","_lanesCommand$command","_lanesCommand$command2","createLogger","MergeLanesAspect","lanesCommand","getCommand","mergeLanesMain","commands","MergeLaneCmd","MergeAbortLaneCmd","register","MergeLaneFromScopeCmd","exports","LanesAspect","CLIAspect","WorkspaceAspect","MergingAspect","LoggerAspect","RemoveAspect","ScopeAspect","ExportAspect","ImporterAspect","CheckoutAspect","GlobalConfigAspect","MainRuntime","compIdsToKeep","allBitIds","bitIdsFromPattern","bitIdsNotFromPattern","hasWithoutVersion","filteredComponentStatus","depsToAdd","missingDepsFromHead","missingDepsFromHistory","versionsToCheckPerId","compId","fromStatus","targetVersions","snapsOnTargetOnly","_otherLane$getCompone","headOnTarget","toImport","v","scopeImporter","remoteVersion","versionObj","flattenedDeps","getAllFlattenedDependencies","depsNotIncludeInPattern","depsOnLane","dep","isOnLane","isIdOnLane","_otherLane$getCompone2","depsOnLaneStr","toStringWithoutVersion","MissingCompsToMerge","uniq","depsWithoutVersion","d","depsUniqWithoutVersion","uniqFromArray","basicLog","getBasicLog","message","currentLaneName","succeededComponents","componentFromModel","modifiedComp","add","versionHistory","updateRebasedVersionHistory","messageTitle","isDiverged","isSourceAhead","isTargetAhead","remoteSnaps","getAllMessages","importManyObjects","versionObjects","load","getFinalMessage","allMessage","allMessageStr","m","currentParents","parents","commonSnapBeforeDiverge","doSquash","addAsOnlyParent","getModelComponentIfExist","ref","removeParent","finalMessage","setSquashed","previousParents","addRuntime","_default"],"sources":["merge-lanes.main.runtime.ts"],"sourcesContent":["import { BitError } from '@teambit/bit-error';\nimport path from 'path';\nimport { CLIAspect, CLIMain, MainRuntime } from '@teambit/cli';\nimport ImporterAspect, { ImporterMain } from '@teambit/importer';\nimport { LanesAspect, LanesMain } from '@teambit/lanes';\nimport MergingAspect, {\n  MergingMain,\n  ComponentMergeStatus,\n  ConfigMergeResult,\n  ApplyVersionResults,\n} from '@teambit/merging';\nimport WorkspaceAspect, { OutsideWorkspaceError, Workspace } from '@teambit/workspace';\nimport { getBasicLog } from '@teambit/snapping';\nimport { ComponentID, ComponentIdList } from '@teambit/component-id';\nimport { Log } from '@teambit/legacy/dist/scope/models/version';\nimport pMapSeries from 'p-map-series';\nimport { Scope as LegacyScope } from '@teambit/legacy/dist/scope';\nimport { Consumer } from '@teambit/legacy/dist/consumer';\nimport { MergeStrategy } from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport { ScopeAspect, ScopeMain } from '@teambit/scope';\nimport ScopeComponentsImporter from '@teambit/legacy/dist/scope/component-ops/scope-components-importer';\nimport { DEFAULT_LANE, LaneId } from '@teambit/lane-id';\nimport { Lane, Version } from '@teambit/legacy/dist/scope/models';\nimport { Logger, LoggerAspect, LoggerMain } from '@teambit/logger';\nimport CheckoutAspect, { CheckoutMain, CheckoutProps, throwForFailures } from '@teambit/checkout';\nimport { SnapsDistance } from '@teambit/legacy/dist/scope/component-ops/snaps-distance';\nimport { RemoveAspect, RemoveMain } from '@teambit/remove';\nimport { compact, uniq } from 'lodash';\nimport { ExportAspect, ExportMain } from '@teambit/export';\nimport GlobalConfigAspect, { GlobalConfigMain } from '@teambit/global-config';\nimport { BitObject, Ref } from '@teambit/legacy/dist/scope/objects';\nimport { getDivergeData } from '@teambit/legacy/dist/scope/component-ops/get-diverge-data';\nimport { MergeLanesAspect } from './merge-lanes.aspect';\nimport { MergeLaneCmd } from './merge-lane.cmd';\nimport { MergeLaneFromScopeCmd } from './merge-lane-from-scope.cmd';\nimport { MissingCompsToMerge } from './exceptions/missing-comps-to-merge';\nimport { MergeAbortLaneCmd, MergeAbortOpts } from './merge-abort.cmd';\nimport { LastMerged } from './last-merged';\n\nexport type MergeLaneOptions = {\n  mergeStrategy: MergeStrategy;\n  ours?: boolean;\n  theirs?: boolean;\n  noSnap: boolean;\n  snapMessage: string;\n  existingOnWorkspaceOnly: boolean;\n  build: boolean;\n  keepReadme: boolean;\n  squash?: boolean;\n  noSquash: boolean;\n  tag?: boolean;\n  pattern?: string;\n  includeDeps?: boolean;\n  skipDependencyInstallation?: boolean;\n  resolveUnrelated?: MergeStrategy;\n  ignoreConfigChanges?: boolean;\n  skipFetch?: boolean;\n  includeNonLaneComps?: boolean;\n};\n\nexport class MergeLanesMain {\n  constructor(\n    private workspace: Workspace | undefined,\n    private merging: MergingMain,\n    private lanes: LanesMain,\n    readonly logger: Logger,\n    private remove: RemoveMain,\n    private scope: ScopeMain,\n    private exporter: ExportMain,\n    private importer: ImporterMain,\n    private checkout: CheckoutMain\n  ) {}\n\n  // eslint-disable-next-line complexity\n  async mergeLane(\n    laneName: string,\n    options: MergeLaneOptions\n  ): Promise<{ mergeResults: ApplyVersionResults; deleteResults: any; configMergeResults: ConfigMergeResult[] }> {\n    if (!this.workspace) {\n      throw new BitError(`unable to merge a lane outside of Bit workspace`);\n    }\n    const consumer = this.workspace.consumer;\n\n    const {\n      mergeStrategy,\n      noSnap,\n      tag,\n      snapMessage,\n      existingOnWorkspaceOnly,\n      build,\n      keepReadme,\n      squash,\n      noSquash,\n      pattern,\n      includeDeps,\n      skipDependencyInstallation,\n      resolveUnrelated,\n      ignoreConfigChanges,\n      skipFetch,\n      includeNonLaneComps,\n    } = options;\n\n    const currentLaneId = consumer.getCurrentLaneId();\n    if (tag && !currentLaneId.isDefault()) {\n      throw new BitError(`--tag only possible when on main. currently checked out to ${currentLaneId.toString()}`);\n    }\n    const otherLaneId = await consumer.getParsedLaneId(laneName);\n    if (otherLaneId.isEqual(currentLaneId)) {\n      throw new BitError(\n        `unable to merge lane \"${otherLaneId.toString()}\", you're already at this lane. to get updates, simply run \"bit checkout head\"`\n      );\n    }\n    if (resolveUnrelated && currentLaneId.isDefault()) {\n      throw new BitError(\n        `unable to resolve unrelated when on main. switch to ${otherLaneId.toString()} and run \"bit lane merge main --resolve-unrelated\"`\n      );\n    }\n    const currentLane = currentLaneId.isDefault() ? null : await consumer.scope.loadLane(currentLaneId);\n    const isDefaultLane = otherLaneId.isDefault();\n    let laneToFetchArtifactsFrom: Lane | undefined;\n    const getOtherLane = async () => {\n      if (isDefaultLane) {\n        if (!skipFetch) {\n          await this.importer.importObjectsFromMainIfExist(currentLane?.toBitIds().toVersionLatest() || []);\n        }\n        return undefined;\n      }\n      let lane = await consumer.scope.loadLane(otherLaneId);\n      const shouldFetch = !lane || (!skipFetch && !lane.isNew);\n      if (shouldFetch) {\n        // don't assign `lane` to the result of this command. otherwise, if you have local snaps, it'll ignore them and use the remote-lane.\n        const otherLane = await this.lanes.fetchLaneWithItsComponents(otherLaneId);\n        laneToFetchArtifactsFrom = otherLane;\n        lane = await consumer.scope.loadLane(otherLaneId);\n      }\n      return lane;\n    };\n    const otherLane = await getOtherLane();\n    const getBitIds = async () => {\n      if (isDefaultLane) {\n        if (!currentLane) throw new Error(`unable to merge ${DEFAULT_LANE}, the current lane was not found`);\n        return this.getMainIdsToMerge(currentLane, includeNonLaneComps);\n      }\n      if (!otherLane) throw new Error(`lane must be defined for non-default`);\n      return otherLane.toBitIds();\n    };\n    const bitIds = await getBitIds();\n    this.logger.debug(`merging the following bitIds: ${bitIds.toString()}`);\n\n    const shouldSquash = squash || (currentLaneId.isDefault() && !noSquash);\n    let allComponentsStatus = await this.merging.getMergeStatus(bitIds, currentLane, otherLane, {\n      resolveUnrelated,\n      ignoreConfigChanges,\n      shouldSquash,\n    });\n\n    if (pattern) {\n      const componentIds = await this.workspace.resolveMultipleComponentIds(bitIds);\n      const compIdsFromPattern = await this.workspace.filterIdsFromPoolIdsByPattern(pattern, componentIds);\n      allComponentsStatus = await filterComponentsStatus(\n        allComponentsStatus,\n        compIdsFromPattern,\n        bitIds,\n        this.workspace,\n        includeDeps,\n        otherLane || undefined,\n        shouldSquash\n      );\n      bitIds.forEach((bitId) => {\n        if (!allComponentsStatus.find((c) => c.id.isEqualWithoutVersion(bitId))) {\n          allComponentsStatus.push({ id: bitId, unchangedLegitimately: true, unchangedMessage: `excluded by pattern` });\n        }\n      });\n    }\n    if (existingOnWorkspaceOnly) {\n      const workspaceIds = await this.workspace.listIds();\n      const compIdsFromPattern = workspaceIds.filter((id) =>\n        allComponentsStatus.find((c) => c.id.isEqualWithoutVersion(id))\n      );\n      allComponentsStatus = await filterComponentsStatus(\n        allComponentsStatus,\n        compIdsFromPattern,\n        bitIds,\n        this.workspace,\n        includeDeps,\n        otherLane || undefined,\n        shouldSquash\n      );\n      bitIds.forEach((bitId) => {\n        if (!allComponentsStatus.find((c) => c.id.isEqualWithoutVersion(bitId))) {\n          allComponentsStatus.push({\n            id: bitId,\n            unchangedLegitimately: true,\n            unchangedMessage: `not in the workspace`,\n          });\n        }\n      });\n    }\n\n    throwForFailures(allComponentsStatus);\n\n    if (shouldSquash) {\n      await squashSnaps(allComponentsStatus, otherLaneId, consumer);\n    }\n\n    if (laneToFetchArtifactsFrom) {\n      const idsToMerge = allComponentsStatus.map((c) => c.id);\n      await this.importer.importHeadArtifactsFromLane(laneToFetchArtifactsFrom, idsToMerge, true);\n    }\n\n    const lastMerged = new LastMerged(this.scope, consumer, this.logger);\n    const snapshot = await lastMerged.takeSnapshot(currentLane);\n\n    const mergeResults = await this.merging.mergeSnaps({\n      mergeStrategy,\n      allComponentsStatus,\n      laneId: otherLaneId,\n      localLane: currentLane,\n      noSnap,\n      tag,\n      snapMessage,\n      build,\n      skipDependencyInstallation,\n    });\n\n    await lastMerged.persistSnapshot(snapshot);\n\n    const mergedSuccessfully =\n      !mergeResults.failedComponents ||\n      mergeResults.failedComponents.length === 0 ||\n      mergeResults.failedComponents.every((failedComponent) => failedComponent.unchangedLegitimately);\n\n    let deleteResults = {};\n\n    if (!keepReadme && otherLane && otherLane.readmeComponent && mergedSuccessfully) {\n      const readmeComponentId = otherLane.readmeComponent.id.changeVersion(otherLane.readmeComponent?.head?.hash);\n      deleteResults = await this.remove.removeLocallyByIds([readmeComponentId]);\n    } else if (otherLane && !otherLane.readmeComponent) {\n      deleteResults = { readmeResult: '' };\n    }\n    const configMergeResults = allComponentsStatus.map((c) => c.configMergeResult);\n\n    await this.workspace.consumer.onDestroy(`lane-merge (${otherLaneId.name})`);\n\n    return { mergeResults, deleteResults, configMergeResults: compact(configMergeResults) };\n  }\n\n  async abortLaneMerge(checkoutProps: CheckoutProps, mergeAbortOpts: MergeAbortOpts) {\n    if (!this.workspace) throw new OutsideWorkspaceError();\n    const lastMerge = new LastMerged(this.scope, this.workspace.consumer, this.logger);\n    const currentLane = await this.lanes.getCurrentLane();\n    const { compDirsToRemove } = await lastMerge.restoreFromLastMerged(mergeAbortOpts, currentLane);\n\n    await this.workspace._reloadConsumer();\n\n    this.workspace.consumer.scope.objects.unmergedComponents.removeAllComponents();\n    await this.workspace.consumer.scope.objects.unmergedComponents.write();\n\n    const configMergeFile = this.workspace.getConflictMergeFile();\n    await configMergeFile.delete();\n\n    let checkoutResults: ApplyVersionResults | undefined;\n    let checkoutError: Error | undefined;\n    checkoutProps.ids = await this.workspace.listIds();\n    checkoutProps.restoreMissingComponents = true;\n    try {\n      checkoutResults = await this.checkout.checkout(checkoutProps);\n    } catch (err: any) {\n      this.logger.error(`merge-abort got an error during the checkout stage`, err);\n      checkoutError = err;\n    }\n\n    const restoredItems = [\n      `${path.basename(this.workspace.consumer.bitMap.mapPath)} file`,\n      `${path.basename(this.workspace.consumer.config.path)} file`,\n    ];\n    if (compDirsToRemove.length) {\n      restoredItems.push(`deleted components directories: ${compDirsToRemove.join(', ')}`);\n    }\n    if (currentLane) {\n      restoredItems.push(`${currentLane.id()} lane object`);\n    }\n\n    return { checkoutResults, restoredItems, checkoutError };\n  }\n\n  private async getMainIdsToMerge(lane: Lane, includeNonLaneComps = false) {\n    const laneIds = lane.toBitIds();\n    const ids = laneIds.filter((id) => this.scope.isExported(id));\n    if (includeNonLaneComps) {\n      if (!this.workspace) {\n        throw new BitError(`getMainIdsToMerge needs workspace`);\n      }\n      const workspaceIds = (await this.workspace.listIds()).map((id) => id);\n      const mainNotOnLane = workspaceIds.filter(\n        (id) => !laneIds.find((laneId) => laneId.isEqualWithoutVersion(id)) && this.scope.isExported(id)\n      );\n      ids.push(...mainNotOnLane);\n    }\n\n    const modelComponents = await Promise.all(ids.map((id) => this.scope.legacyScope.getModelComponent(id)));\n    return compact(\n      modelComponents.map((c) => {\n        if (!c.head) return null; // probably the component was never merged to main\n        return c.toComponentId().changeVersion(c.head.toString());\n      })\n    );\n  }\n\n  async mergeFromScope(\n    fromLane: string,\n    toLane: string,\n    options: Partial<MergeLaneOptions> & { push?: boolean }\n  ): Promise<{\n    mergedPreviously: string[];\n    mergedNow: string[];\n    exportedIds: string[];\n  }> {\n    if (this.workspace) {\n      throw new BitError(\n        `unable to run this command from a workspace, please create a new bare-scope and run it from there`\n      );\n    }\n    const fromLaneId = LaneId.parse(fromLane);\n    const fromLaneObj = await this.lanes.importLaneObject(fromLaneId);\n    const toLaneId = toLane === DEFAULT_LANE ? this.lanes.getDefaultLaneId() : LaneId.parse(toLane);\n    const toLaneObj = toLaneId.isDefault() ? undefined : await this.lanes.importLaneObject(toLaneId);\n    const fromLaneBitIds = fromLaneObj.toBitIds();\n    const getIdsToMerge = async (): Promise<ComponentIdList> => {\n      if (!options.pattern) return fromLaneBitIds;\n      const laneCompIds = await this.scope.resolveMultipleComponentIds(fromLaneBitIds);\n      const ids = await this.scope.filterIdsFromPoolIdsByPattern(options.pattern, laneCompIds);\n      return ComponentIdList.fromArray(ids.map((id) => id));\n    };\n    const idsToMerge = await getIdsToMerge();\n    const scopeComponentsImporter = ScopeComponentsImporter.getInstance(this.scope.legacyScope);\n    await scopeComponentsImporter.importWithoutDeps(idsToMerge.toVersionLatest(), {\n      cache: false,\n      lane: fromLaneObj,\n      ignoreMissingHead: true,\n      includeVersionHistory: true,\n      reason: `of \"from\" lane (${fromLaneId.name}) for lane-merge to get all version-history`,\n    });\n\n    // get their main/to-lane as well\n    await scopeComponentsImporter.importWithoutDeps(idsToMerge.toVersionLatest(), {\n      cache: false,\n      lane: toLaneObj,\n      ignoreMissingHead: true,\n      includeVersionHistory: true,\n      reason: `of \"to\" lane (${toLaneId.name}) for lane-merge to get all version-history`,\n    });\n    await this.importer.importHeadArtifactsFromLane(fromLaneObj, undefined, true);\n    await this.throwIfNotUpToDate(fromLaneId, toLaneId);\n    const repo = this.scope.legacyScope.objects;\n    // loop through all components, make sure they're all ahead of main (it might not be on main yet).\n    // then, change the version object to include an extra parent to point to the main.\n    // then, change the component object head to point to this changed version\n    const mergedPreviously: ComponentID[] = [];\n    const mergedNow: ComponentID[] = [];\n    const shouldSquash = !toLaneObj && !options.noSquash; // only when merging to main we squash.\n    const log = await getLogForSquash(fromLaneId);\n    const bitObjectsPerComp = await pMapSeries(idsToMerge, async (id) => {\n      const modelComponent = await this.scope.legacyScope.getModelComponent(id);\n      const fromVersionObj = await modelComponent.loadVersion(id.version as string, repo);\n      if (fromVersionObj.isRemoved()) return undefined;\n      const fromLaneHead = modelComponent.getRef(id.version as string);\n      if (!fromLaneHead) throw new Error(`lane head must be defined for ${id.toString()}`);\n      const toLaneHead = toLaneObj ? toLaneObj.getComponent(id)?.head : modelComponent.head || null;\n      if (toLaneHead?.isEqual(fromLaneHead)) {\n        mergedPreviously.push(id);\n        return undefined;\n      }\n\n      const divergeData = await getDivergeData({\n        repo,\n        modelComponent,\n        sourceHead: toLaneHead,\n        targetHead: fromLaneHead,\n        throwForNoCommonSnap: true,\n      });\n      const modifiedVersion = shouldSquash\n        ? await squashOneComp(\n            DEFAULT_LANE,\n            fromLaneId,\n            id,\n            divergeData,\n            log,\n            this.scope.legacyScope,\n            fromVersionObj,\n            options.snapMessage\n          )\n        : undefined;\n      const objects: BitObject[] = [];\n      if (modifiedVersion) objects.push(modifiedVersion);\n      if (toLaneObj) {\n        toLaneObj.addComponent({ id: id.changeVersion(undefined), head: fromLaneHead });\n      } else {\n        modelComponent.setHead(fromLaneHead);\n        objects.push(modelComponent);\n      }\n      mergedNow.push(id);\n      return { id, objects };\n    });\n    const bitObjects = compact(bitObjectsPerComp).map((b) => b.objects);\n    const bitObjectsFlat = bitObjects.flat();\n    if (toLaneObj) bitObjectsFlat.push(toLaneObj);\n    await repo.writeObjectsToTheFS(bitObjectsFlat);\n    let exportedIds: string[] = [];\n    if (options.push) {\n      const ids = compact(bitObjectsPerComp).map((b) => b.id);\n      const bitIds = ComponentIdList.fromArray(ids);\n      const { exported } = await this.exporter.exportMany({\n        scope: this.scope.legacyScope,\n        ids: shouldSquash ? bitIds : new ComponentIdList(),\n        idsWithFutureScope: shouldSquash ? bitIds : new ComponentIdList(),\n        laneObject: toLaneObj,\n        allVersions: false,\n        // no need to export anything else other than the head. the normal calculation of what to export won't apply here\n        // as it is done from the scope.\n        exportHeadsOnly: shouldSquash,\n        // all artifacts must be pushed. they're all considered \"external\" in this case, because it's running from a\n        // bare-scope, but we don't want to ignore them, otherwise, they'll be missing from the component-scopes.\n        ignoreMissingExternalArtifacts: false,\n        exportOrigin: 'lane-merge',\n      });\n      exportedIds = exported.map((id) => id.toString());\n    }\n\n    return {\n      mergedPreviously: mergedPreviously.map((id) => id.toString()),\n      mergedNow: mergedNow.map((id) => id.toString()),\n      exportedIds,\n    };\n  }\n  private async throwIfNotUpToDate(fromLaneId: LaneId, toLaneId: LaneId) {\n    const status = await this.lanes.diffStatus(fromLaneId, toLaneId, { skipChanges: true });\n    const compsNotUpToDate = status.componentsStatus.filter((s) => !s.upToDate);\n    if (compsNotUpToDate.length) {\n      throw new Error(`unable to merge, the following components are not up-to-date:\n${compsNotUpToDate.map((s) => s.componentId.toString()).join('\\n')}`);\n    }\n  }\n\n  static slots = [];\n  static dependencies = [\n    LanesAspect,\n    CLIAspect,\n    WorkspaceAspect,\n    MergingAspect,\n    LoggerAspect,\n    RemoveAspect,\n    ScopeAspect,\n    ExportAspect,\n    ImporterAspect,\n    CheckoutAspect,\n    GlobalConfigAspect,\n  ];\n  static runtime = MainRuntime;\n\n  static async provider([\n    lanes,\n    cli,\n    workspace,\n    merging,\n    loggerMain,\n    remove,\n    scope,\n    exporter,\n    importer,\n    checkout,\n    globalConfig,\n  ]: [\n    LanesMain,\n    CLIMain,\n    Workspace,\n    MergingMain,\n    LoggerMain,\n    RemoveMain,\n    ScopeMain,\n    ExportMain,\n    ImporterMain,\n    CheckoutMain,\n    GlobalConfigMain\n  ]) {\n    const logger = loggerMain.createLogger(MergeLanesAspect.id);\n    const lanesCommand = cli.getCommand('lane');\n    const mergeLanesMain = new MergeLanesMain(\n      workspace,\n      merging,\n      lanes,\n      logger,\n      remove,\n      scope,\n      exporter,\n      importer,\n      checkout\n    );\n    lanesCommand?.commands?.push(new MergeLaneCmd(mergeLanesMain, globalConfig));\n    lanesCommand?.commands?.push(new MergeAbortLaneCmd(mergeLanesMain));\n    cli.register(new MergeLaneFromScopeCmd(mergeLanesMain));\n    return mergeLanesMain;\n  }\n}\n\nasync function filterComponentsStatus(\n  allComponentsStatus: ComponentMergeStatus[],\n  compIdsToKeep: ComponentID[],\n  allBitIds: ComponentID[],\n  workspace: Workspace,\n  includeDeps = false,\n  otherLane?: Lane, // lane that gets merged into the current lane. if not provided, it's main that gets merged into the current lane\n  shouldSquash?: boolean\n): Promise<ComponentMergeStatus[]> {\n  const bitIdsFromPattern = ComponentIdList.fromArray(compIdsToKeep);\n  const bitIdsNotFromPattern = allBitIds.filter((bitId) => !bitIdsFromPattern.hasWithoutVersion(bitId));\n  const filteredComponentStatus: ComponentMergeStatus[] = [];\n  const depsToAdd: ComponentID[] = [];\n  const missingDepsFromHead = {};\n  const missingDepsFromHistory: string[] = [];\n\n  const versionsToCheckPerId = await pMapSeries(compIdsToKeep, async (compId) => {\n    const fromStatus = allComponentsStatus.find((c) => c.id.isEqualWithoutVersion(compId));\n    if (!fromStatus) {\n      throw new Error(`filterComponentsStatus: unable to find ${compId.toString()} in component-status`);\n    }\n    filteredComponentStatus.push(fromStatus);\n    if (fromStatus.unchangedMessage) {\n      return undefined;\n    }\n    if (!otherLane) {\n      // if merging main, no need to check whether the deps are included in the pattern.\n      return undefined;\n    }\n    const { divergeData } = fromStatus;\n    if (!divergeData) {\n      throw new Error(`filterComponentsStatus: unable to find divergeData for ${compId.toString()}`);\n    }\n    let targetVersions: Ref[] = divergeData.snapsOnTargetOnly;\n    if (!targetVersions.length) {\n      return undefined;\n    }\n    const modelComponent = await workspace.consumer.scope.getModelComponent(compId);\n    if (shouldSquash) {\n      // no need to check all versions, we merge only the head\n      const headOnTarget = otherLane ? otherLane.getComponent(compId)?.head : modelComponent.head;\n      if (!headOnTarget) {\n        throw new Error(`filterComponentsStatus: unable to find head for ${compId.toString()}`);\n      }\n      targetVersions = [headOnTarget];\n    }\n\n    return { compId, targetVersions, modelComponent };\n  });\n\n  // all these versions needs to be imported to load them later and check whether they have dependencies on the target lane\n  const toImport = compact(versionsToCheckPerId)\n    .map((c) => c.targetVersions.map((v) => c.compId.changeVersion(v.toString())))\n    .flat();\n  await workspace.consumer.scope.scopeImporter.importWithoutDeps(ComponentIdList.fromArray(toImport), {\n    lane: otherLane,\n    cache: true,\n    includeVersionHistory: false,\n    reason: 'import all history of given patterns components to check whether they have dependencies on the lane',\n  });\n\n  await pMapSeries(compact(versionsToCheckPerId), async ({ compId, targetVersions, modelComponent }) => {\n    await pMapSeries(targetVersions, async (remoteVersion) => {\n      const versionObj = await modelComponent.loadVersion(remoteVersion.toString(), workspace.consumer.scope.objects);\n      const flattenedDeps = versionObj.getAllFlattenedDependencies();\n      const depsNotIncludeInPattern = flattenedDeps.filter((id) =>\n        bitIdsNotFromPattern.find((bitId) => bitId.isEqualWithoutVersion(id))\n      );\n      if (!depsNotIncludeInPattern.length) {\n        return;\n      }\n      const depsOnLane: ComponentID[] = [];\n      await Promise.all(\n        depsNotIncludeInPattern.map(async (dep) => {\n          const isOnLane = await workspace.consumer.scope.isIdOnLane(dep, otherLane);\n          if (isOnLane) {\n            depsOnLane.push(dep);\n          }\n        })\n      );\n      if (!depsOnLane.length) {\n        return;\n      }\n      if (includeDeps) {\n        depsToAdd.push(...depsOnLane);\n      } else {\n        const headOnTarget = otherLane ? otherLane.getComponent(compId)?.head : modelComponent.head;\n        const depsOnLaneStr = depsOnLane.map((dep) => dep.toStringWithoutVersion());\n        if (headOnTarget?.isEqual(remoteVersion)) {\n          depsOnLaneStr.forEach((dep) => {\n            (missingDepsFromHead[dep] ||= []).push(compId.toStringWithoutVersion());\n          });\n        } else {\n          missingDepsFromHistory.push(...depsOnLaneStr);\n        }\n      }\n    });\n  });\n  if (Object.keys(missingDepsFromHead).length || missingDepsFromHistory.length) {\n    throw new MissingCompsToMerge(missingDepsFromHead, uniq(missingDepsFromHistory));\n  }\n\n  if (depsToAdd.length) {\n    // remove the version, otherwise, the uniq gives duplicate components with different versions.\n    const depsWithoutVersion = depsToAdd.map((d) => d.changeVersion(undefined));\n    const depsUniqWithoutVersion = ComponentIdList.uniqFromArray(depsWithoutVersion);\n    depsUniqWithoutVersion.forEach((id) => {\n      const fromStatus = allComponentsStatus.find((c) => c.id.isEqualWithoutVersion(id));\n      if (!fromStatus) {\n        throw new Error(`filterComponentsStatus: unable to find ${id.toString()} in component-status`);\n      }\n      filteredComponentStatus.push(fromStatus);\n    });\n  }\n  return filteredComponentStatus;\n}\n\nasync function getLogForSquash(otherLaneId: LaneId) {\n  const basicLog = await getBasicLog();\n  const log = {\n    ...basicLog,\n    message: `squashed during merge from ${otherLaneId.toString()}`,\n  };\n  return log;\n}\n\nasync function squashSnaps(allComponentsStatus: ComponentMergeStatus[], otherLaneId: LaneId, consumer: Consumer) {\n  const currentLaneName = consumer.getCurrentLaneId().name;\n  const succeededComponents = allComponentsStatus.filter((c) => !c.unchangedMessage);\n  const log = await getLogForSquash(otherLaneId);\n\n  await Promise.all(\n    succeededComponents.map(async ({ id, divergeData, componentFromModel }) => {\n      if (!divergeData) {\n        throw new Error(`unable to squash. divergeData is missing from ${id.toString()}`);\n      }\n\n      const modifiedComp = await squashOneComp(\n        currentLaneName,\n        otherLaneId,\n        id,\n        divergeData,\n        log,\n        consumer.scope,\n        componentFromModel\n      );\n      if (modifiedComp) {\n        consumer.scope.objects.add(modifiedComp);\n        const modelComponent = await consumer.scope.getModelComponent(id);\n        const versionHistory = await modelComponent.updateRebasedVersionHistory(consumer.scope.objects, [modifiedComp]);\n        if (versionHistory) consumer.scope.objects.add(versionHistory);\n      }\n    })\n  );\n}\n\n/**\n * returns Version object if it was modified. otherwise, returns undefined\n */\nasync function squashOneComp(\n  currentLaneName: string,\n  otherLaneId: LaneId,\n  id: ComponentID,\n  divergeData: SnapsDistance,\n  log: Log,\n  scope: LegacyScope,\n  componentFromModel?: Version,\n  messageTitle?: string\n): Promise<Version | undefined> {\n  if (divergeData.isDiverged()) {\n    throw new BitError(`unable to squash because ${id.toString()} is diverged in history.\nconsider switching to \"${\n      otherLaneId.name\n    }\" first, merging \"${currentLaneName}\", then switching back to \"${currentLaneName}\" and merging \"${\n      otherLaneId.name\n    }\"\nalternatively, use \"--no-squash\" flag to keep the entire history of \"${otherLaneId.name}\"`);\n  }\n  if (divergeData.isSourceAhead()) {\n    // nothing to do. current is ahead, nothing to merge. (it was probably filtered out already as a \"failedComponent\")\n    return undefined;\n  }\n  if (!divergeData.isTargetAhead()) {\n    // nothing to do. current and remote are the same, nothing to merge. (it was probably filtered out already as a \"failedComponent\")\n    return undefined;\n  }\n  // remote is ahead and was not diverge.\n  const remoteSnaps = divergeData.snapsOnTargetOnly;\n  if (remoteSnaps.length === 0) {\n    throw new Error(`remote is ahead but it has no snaps. it's impossible`);\n  }\n  const getAllMessages = async () => {\n    if (!messageTitle) return [];\n    await scope.scopeImporter.importManyObjects({ [otherLaneId.scope]: remoteSnaps.map((s) => s.toString()) });\n    const versionObjects = (await Promise.all(remoteSnaps.map((s) => scope.objects.load(s)))) as Version[];\n    return compact(versionObjects).map((v) => v.log.message);\n  };\n  const getFinalMessage = async (): Promise<string | undefined> => {\n    if (!messageTitle) return undefined;\n    const allMessage = await getAllMessages();\n    const allMessageStr = compact(allMessage)\n      .map((m) => `[*] ${m}`)\n      .join('\\n');\n    return `${messageTitle}\\n${allMessageStr}`;\n  };\n  if (!componentFromModel) {\n    throw new Error('unable to squash, the componentFromModel is missing');\n  }\n  const currentParents = componentFromModel.parents;\n\n  // if the remote has only one snap, there is nothing to squash.\n  // other checks here is to make sure `componentFromModel.addAsOnlyParent` call is not needed.\n  if (remoteSnaps.length === 1 && divergeData.commonSnapBeforeDiverge && currentParents.length === 1) {\n    return undefined;\n  }\n\n  const doSquash = async () => {\n    if (divergeData.commonSnapBeforeDiverge) {\n      componentFromModel.addAsOnlyParent(divergeData.commonSnapBeforeDiverge);\n      return;\n    }\n    if (currentLaneName !== DEFAULT_LANE) {\n      // when squashing into lane, we have to take main into account\n      const modelComponent = await scope.getModelComponentIfExist(id);\n      if (!modelComponent) throw new Error(`missing ModelComponent for ${id.toString()}`);\n      if (modelComponent.head) {\n        componentFromModel.addAsOnlyParent(modelComponent.head);\n        return;\n      }\n    }\n    // there is no commonSnapBeforeDiverge. the local has no snaps, all are remote, no need for parents. keep only head.\n    componentFromModel.parents.forEach((ref) => componentFromModel.removeParent(ref));\n  };\n\n  await doSquash();\n\n  const finalMessage = await getFinalMessage();\n  componentFromModel.setSquashed({ previousParents: currentParents, laneId: otherLaneId }, log, finalMessage);\n  return componentFromModel;\n}\n\nMergeLanesAspect.addRuntime(MergeLanesMain);\n\nexport default MergeLanesMain;\n"],"mappings":"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"}
+{"version":3,"names":["_bitError","data","require","_path","_interopRequireDefault","_cli","_importer","_lanes","_merging","_workspace","_interopRequireWildcard","_snapping","_componentId","_pMapSeries","_scope","_scopeComponentsImporter","_laneId","_logger","_checkout","_remove","_lodash","_export","_globalConfig","_getDivergeData","_mergeLanes","_mergeLane","_mergeLaneFromScope","_missingCompsToMerge","_mergeAbort","_lastMerged","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","obj","ownKeys","keys","getOwnPropertySymbols","o","filter","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","key","value","_toPropertyKey","configurable","writable","arg","_toPrimitive","String","input","hint","prim","Symbol","toPrimitive","undefined","res","TypeError","Number","MergeLanesMain","constructor","workspace","merging","lanes","logger","remove","scope","exporter","importer","checkout","mergeLane","laneName","options","BitError","consumer","mergeStrategy","noSnap","tag","snapMessage","existingOnWorkspaceOnly","build","keepReadme","squash","noSquash","pattern","includeDeps","skipDependencyInstallation","resolveUnrelated","ignoreConfigChanges","skipFetch","excludeNonLaneComps","currentLaneId","getCurrentLaneId","isDefault","toString","otherLaneId","getParsedLaneId","isEqual","currentLane","loadLane","isDefaultLane","laneToFetchArtifactsFrom","getOtherLane","importObjectsFromMainIfExist","toBitIds","toVersionLatest","lane","shouldFetch","isNew","otherLane","fetchLaneWithItsComponents","getBitIds","Error","DEFAULT_LANE","getMainIdsToMerge","bitIds","debug","shouldSquash","allComponentsStatus","getMergeStatus","componentIds","resolveMultipleComponentIds","compIdsFromPattern","filterIdsFromPoolIdsByPattern","filterComponentsStatus","bitId","find","c","id","isEqualWithoutVersion","unchangedLegitimately","unchangedMessage","workspaceIds","listIds","throwForFailures","squashSnaps","idsToMerge","map","importHeadArtifactsFromLane","lastMerged","LastMerged","snapshot","takeSnapshot","mergeResults","mergeSnaps","laneId","localLane","persistSnapshot","mergedSuccessfully","failedComponents","every","failedComponent","deleteResults","readmeComponent","_otherLane$readmeComp","readmeComponentId","changeVersion","head","hash","removeLocallyByIds","readmeResult","configMergeResults","configMergeResult","onDestroy","name","compact","abortLaneMerge","checkoutProps","mergeAbortOpts","OutsideWorkspaceError","lastMerge","getCurrentLane","compDirsToRemove","restoreFromLastMerged","_reloadConsumer","objects","unmergedComponents","removeAllComponents","write","configMergeFile","getConflictMergeFile","delete","checkoutResults","checkoutError","ids","restoreMissingComponents","err","error","restoredItems","path","basename","bitMap","mapPath","config","join","includeNonLaneComps","laneIds","isExported","mainNotOnLane","modelComponents","Promise","all","legacyScope","getModelComponent","toComponentId","mergeFromScope","fromLane","toLane","fromLaneId","LaneId","parse","fromLaneObj","importLaneObject","toLaneId","getDefaultLaneId","toLaneObj","fromLaneBitIds","getIdsToMerge","laneCompIds","ComponentIdList","fromArray","scopeComponentsImporter","ScopeComponentsImporter","getInstance","importWithoutDeps","cache","ignoreMissingHead","includeVersionHistory","reason","throwIfNotUpToDate","repo","mergedPreviously","mergedNow","log","getLogForSquash","bitObjectsPerComp","pMapSeries","_toLaneObj$getCompone","modelComponent","fromVersionObj","loadVersion","version","isRemoved","fromLaneHead","getRef","toLaneHead","getComponent","divergeData","getDivergeData","sourceHead","targetHead","throwForNoCommonSnap","modifiedVersion","squashOneComp","addComponent","setHead","bitObjects","b","bitObjectsFlat","flat","writeObjectsToTheFS","exportedIds","exported","exportMany","idsWithFutureScope","laneObject","allVersions","exportHeadsOnly","ignoreMissingExternalArtifacts","exportOrigin","status","diffStatus","skipChanges","compsNotUpToDate","componentsStatus","s","upToDate","componentId","provider","cli","loggerMain","globalConfig","_lanesCommand$command","_lanesCommand$command2","createLogger","MergeLanesAspect","lanesCommand","getCommand","mergeLanesMain","commands","MergeLaneCmd","MergeAbortLaneCmd","register","MergeLaneFromScopeCmd","exports","LanesAspect","CLIAspect","WorkspaceAspect","MergingAspect","LoggerAspect","RemoveAspect","ScopeAspect","ExportAspect","ImporterAspect","CheckoutAspect","GlobalConfigAspect","MainRuntime","compIdsToKeep","allBitIds","bitIdsFromPattern","bitIdsNotFromPattern","hasWithoutVersion","filteredComponentStatus","depsToAdd","missingDepsFromHead","missingDepsFromHistory","versionsToCheckPerId","compId","fromStatus","targetVersions","snapsOnTargetOnly","_otherLane$getCompone","headOnTarget","toImport","v","scopeImporter","remoteVersion","versionObj","flattenedDeps","getAllFlattenedDependencies","depsNotIncludeInPattern","depsOnLane","dep","isOnLane","isIdOnLane","_otherLane$getCompone2","depsOnLaneStr","toStringWithoutVersion","MissingCompsToMerge","uniq","depsWithoutVersion","d","depsUniqWithoutVersion","uniqFromArray","basicLog","getBasicLog","message","currentLaneName","succeededComponents","componentFromModel","modifiedComp","add","versionHistory","updateRebasedVersionHistory","messageTitle","isDiverged","isSourceAhead","isTargetAhead","remoteSnaps","getAllMessages","importManyObjects","versionObjects","load","getFinalMessage","allMessage","allMessageStr","m","currentParents","parents","commonSnapBeforeDiverge","doSquash","addAsOnlyParent","getModelComponentIfExist","ref","removeParent","finalMessage","setSquashed","previousParents","addRuntime","_default"],"sources":["merge-lanes.main.runtime.ts"],"sourcesContent":["import { BitError } from '@teambit/bit-error';\nimport path from 'path';\nimport { CLIAspect, CLIMain, MainRuntime } from '@teambit/cli';\nimport ImporterAspect, { ImporterMain } from '@teambit/importer';\nimport { LanesAspect, LanesMain } from '@teambit/lanes';\nimport MergingAspect, {\n  MergingMain,\n  ComponentMergeStatus,\n  ConfigMergeResult,\n  ApplyVersionResults,\n} from '@teambit/merging';\nimport WorkspaceAspect, { OutsideWorkspaceError, Workspace } from '@teambit/workspace';\nimport { getBasicLog } from '@teambit/snapping';\nimport { ComponentID, ComponentIdList } from '@teambit/component-id';\nimport { Log } from '@teambit/legacy/dist/scope/models/version';\nimport pMapSeries from 'p-map-series';\nimport { Scope as LegacyScope } from '@teambit/legacy/dist/scope';\nimport { Consumer } from '@teambit/legacy/dist/consumer';\nimport { MergeStrategy } from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport { ScopeAspect, ScopeMain } from '@teambit/scope';\nimport ScopeComponentsImporter from '@teambit/legacy/dist/scope/component-ops/scope-components-importer';\nimport { DEFAULT_LANE, LaneId } from '@teambit/lane-id';\nimport { Lane, Version } from '@teambit/legacy/dist/scope/models';\nimport { Logger, LoggerAspect, LoggerMain } from '@teambit/logger';\nimport CheckoutAspect, { CheckoutMain, CheckoutProps, throwForFailures } from '@teambit/checkout';\nimport { SnapsDistance } from '@teambit/legacy/dist/scope/component-ops/snaps-distance';\nimport { RemoveAspect, RemoveMain } from '@teambit/remove';\nimport { compact, uniq } from 'lodash';\nimport { ExportAspect, ExportMain } from '@teambit/export';\nimport GlobalConfigAspect, { GlobalConfigMain } from '@teambit/global-config';\nimport { BitObject, Ref } from '@teambit/legacy/dist/scope/objects';\nimport { getDivergeData } from '@teambit/legacy/dist/scope/component-ops/get-diverge-data';\nimport { MergeLanesAspect } from './merge-lanes.aspect';\nimport { MergeLaneCmd } from './merge-lane.cmd';\nimport { MergeLaneFromScopeCmd } from './merge-lane-from-scope.cmd';\nimport { MissingCompsToMerge } from './exceptions/missing-comps-to-merge';\nimport { MergeAbortLaneCmd, MergeAbortOpts } from './merge-abort.cmd';\nimport { LastMerged } from './last-merged';\n\nexport type MergeLaneOptions = {\n  mergeStrategy: MergeStrategy;\n  ours?: boolean;\n  theirs?: boolean;\n  noSnap: boolean;\n  snapMessage: string;\n  existingOnWorkspaceOnly: boolean;\n  build: boolean;\n  keepReadme: boolean;\n  squash?: boolean;\n  noSquash: boolean;\n  tag?: boolean;\n  pattern?: string;\n  includeDeps?: boolean;\n  skipDependencyInstallation?: boolean;\n  resolveUnrelated?: MergeStrategy;\n  ignoreConfigChanges?: boolean;\n  skipFetch?: boolean;\n  excludeNonLaneComps?: boolean;\n};\n\nexport class MergeLanesMain {\n  constructor(\n    private workspace: Workspace | undefined,\n    private merging: MergingMain,\n    private lanes: LanesMain,\n    readonly logger: Logger,\n    private remove: RemoveMain,\n    private scope: ScopeMain,\n    private exporter: ExportMain,\n    private importer: ImporterMain,\n    private checkout: CheckoutMain\n  ) {}\n\n  // eslint-disable-next-line complexity\n  async mergeLane(\n    laneName: string,\n    options: MergeLaneOptions\n  ): Promise<{ mergeResults: ApplyVersionResults; deleteResults: any; configMergeResults: ConfigMergeResult[] }> {\n    if (!this.workspace) {\n      throw new BitError(`unable to merge a lane outside of Bit workspace`);\n    }\n    const consumer = this.workspace.consumer;\n\n    const {\n      mergeStrategy,\n      noSnap,\n      tag,\n      snapMessage,\n      existingOnWorkspaceOnly,\n      build,\n      keepReadme,\n      squash,\n      noSquash,\n      pattern,\n      includeDeps,\n      skipDependencyInstallation,\n      resolveUnrelated,\n      ignoreConfigChanges,\n      skipFetch,\n      excludeNonLaneComps,\n    } = options;\n\n    const currentLaneId = consumer.getCurrentLaneId();\n    if (tag && !currentLaneId.isDefault()) {\n      throw new BitError(`--tag only possible when on main. currently checked out to ${currentLaneId.toString()}`);\n    }\n    const otherLaneId = await consumer.getParsedLaneId(laneName);\n    if (otherLaneId.isEqual(currentLaneId)) {\n      throw new BitError(\n        `unable to merge lane \"${otherLaneId.toString()}\", you're already at this lane. to get updates, simply run \"bit checkout head\"`\n      );\n    }\n    if (resolveUnrelated && currentLaneId.isDefault()) {\n      throw new BitError(\n        `unable to resolve unrelated when on main. switch to ${otherLaneId.toString()} and run \"bit lane merge main --resolve-unrelated\"`\n      );\n    }\n    const currentLane = currentLaneId.isDefault() ? null : await consumer.scope.loadLane(currentLaneId);\n    const isDefaultLane = otherLaneId.isDefault();\n    let laneToFetchArtifactsFrom: Lane | undefined;\n    const getOtherLane = async () => {\n      if (isDefaultLane) {\n        if (!skipFetch) {\n          await this.importer.importObjectsFromMainIfExist(currentLane?.toBitIds().toVersionLatest() || []);\n        }\n        return undefined;\n      }\n      let lane = await consumer.scope.loadLane(otherLaneId);\n      const shouldFetch = !lane || (!skipFetch && !lane.isNew);\n      if (shouldFetch) {\n        // don't assign `lane` to the result of this command. otherwise, if you have local snaps, it'll ignore them and use the remote-lane.\n        const otherLane = await this.lanes.fetchLaneWithItsComponents(otherLaneId);\n        laneToFetchArtifactsFrom = otherLane;\n        lane = await consumer.scope.loadLane(otherLaneId);\n      }\n      return lane;\n    };\n    const otherLane = await getOtherLane();\n    const getBitIds = async () => {\n      if (isDefaultLane) {\n        if (!currentLane) throw new Error(`unable to merge ${DEFAULT_LANE}, the current lane was not found`);\n        return this.getMainIdsToMerge(currentLane, !excludeNonLaneComps);\n      }\n      if (!otherLane) throw new Error(`lane must be defined for non-default`);\n      return otherLane.toBitIds();\n    };\n    const bitIds = await getBitIds();\n    this.logger.debug(`merging the following bitIds: ${bitIds.toString()}`);\n\n    const shouldSquash = squash || (currentLaneId.isDefault() && !noSquash);\n    let allComponentsStatus = await this.merging.getMergeStatus(bitIds, currentLane, otherLane, {\n      resolveUnrelated,\n      ignoreConfigChanges,\n      shouldSquash,\n    });\n\n    if (pattern) {\n      const componentIds = await this.workspace.resolveMultipleComponentIds(bitIds);\n      const compIdsFromPattern = await this.workspace.filterIdsFromPoolIdsByPattern(pattern, componentIds);\n      allComponentsStatus = await filterComponentsStatus(\n        allComponentsStatus,\n        compIdsFromPattern,\n        bitIds,\n        this.workspace,\n        includeDeps,\n        otherLane || undefined,\n        shouldSquash\n      );\n      bitIds.forEach((bitId) => {\n        if (!allComponentsStatus.find((c) => c.id.isEqualWithoutVersion(bitId))) {\n          allComponentsStatus.push({ id: bitId, unchangedLegitimately: true, unchangedMessage: `excluded by pattern` });\n        }\n      });\n    }\n    if (existingOnWorkspaceOnly) {\n      const workspaceIds = await this.workspace.listIds();\n      const compIdsFromPattern = workspaceIds.filter((id) =>\n        allComponentsStatus.find((c) => c.id.isEqualWithoutVersion(id))\n      );\n      allComponentsStatus = await filterComponentsStatus(\n        allComponentsStatus,\n        compIdsFromPattern,\n        bitIds,\n        this.workspace,\n        includeDeps,\n        otherLane || undefined,\n        shouldSquash\n      );\n      bitIds.forEach((bitId) => {\n        if (!allComponentsStatus.find((c) => c.id.isEqualWithoutVersion(bitId))) {\n          allComponentsStatus.push({\n            id: bitId,\n            unchangedLegitimately: true,\n            unchangedMessage: `not in the workspace`,\n          });\n        }\n      });\n    }\n\n    throwForFailures(allComponentsStatus);\n\n    if (shouldSquash) {\n      await squashSnaps(allComponentsStatus, otherLaneId, consumer);\n    }\n\n    if (laneToFetchArtifactsFrom) {\n      const idsToMerge = allComponentsStatus.map((c) => c.id);\n      await this.importer.importHeadArtifactsFromLane(laneToFetchArtifactsFrom, idsToMerge, true);\n    }\n\n    const lastMerged = new LastMerged(this.scope, consumer, this.logger);\n    const snapshot = await lastMerged.takeSnapshot(currentLane);\n\n    const mergeResults = await this.merging.mergeSnaps({\n      mergeStrategy,\n      allComponentsStatus,\n      laneId: otherLaneId,\n      localLane: currentLane,\n      noSnap,\n      tag,\n      snapMessage,\n      build,\n      skipDependencyInstallation,\n    });\n\n    await lastMerged.persistSnapshot(snapshot);\n\n    const mergedSuccessfully =\n      !mergeResults.failedComponents ||\n      mergeResults.failedComponents.length === 0 ||\n      mergeResults.failedComponents.every((failedComponent) => failedComponent.unchangedLegitimately);\n\n    let deleteResults = {};\n\n    if (!keepReadme && otherLane && otherLane.readmeComponent && mergedSuccessfully) {\n      const readmeComponentId = otherLane.readmeComponent.id.changeVersion(otherLane.readmeComponent?.head?.hash);\n      deleteResults = await this.remove.removeLocallyByIds([readmeComponentId]);\n    } else if (otherLane && !otherLane.readmeComponent) {\n      deleteResults = { readmeResult: '' };\n    }\n    const configMergeResults = allComponentsStatus.map((c) => c.configMergeResult);\n\n    await this.workspace.consumer.onDestroy(`lane-merge (${otherLaneId.name})`);\n\n    return { mergeResults, deleteResults, configMergeResults: compact(configMergeResults) };\n  }\n\n  async abortLaneMerge(checkoutProps: CheckoutProps, mergeAbortOpts: MergeAbortOpts) {\n    if (!this.workspace) throw new OutsideWorkspaceError();\n    const lastMerge = new LastMerged(this.scope, this.workspace.consumer, this.logger);\n    const currentLane = await this.lanes.getCurrentLane();\n    const { compDirsToRemove } = await lastMerge.restoreFromLastMerged(mergeAbortOpts, currentLane);\n\n    await this.workspace._reloadConsumer();\n\n    this.workspace.consumer.scope.objects.unmergedComponents.removeAllComponents();\n    await this.workspace.consumer.scope.objects.unmergedComponents.write();\n\n    const configMergeFile = this.workspace.getConflictMergeFile();\n    await configMergeFile.delete();\n\n    let checkoutResults: ApplyVersionResults | undefined;\n    let checkoutError: Error | undefined;\n    checkoutProps.ids = await this.workspace.listIds();\n    checkoutProps.restoreMissingComponents = true;\n    try {\n      checkoutResults = await this.checkout.checkout(checkoutProps);\n    } catch (err: any) {\n      this.logger.error(`merge-abort got an error during the checkout stage`, err);\n      checkoutError = err;\n    }\n\n    const restoredItems = [\n      `${path.basename(this.workspace.consumer.bitMap.mapPath)} file`,\n      `${path.basename(this.workspace.consumer.config.path)} file`,\n    ];\n    if (compDirsToRemove.length) {\n      restoredItems.push(`deleted components directories: ${compDirsToRemove.join(', ')}`);\n    }\n    if (currentLane) {\n      restoredItems.push(`${currentLane.id()} lane object`);\n    }\n\n    return { checkoutResults, restoredItems, checkoutError };\n  }\n\n  private async getMainIdsToMerge(lane: Lane, includeNonLaneComps: boolean) {\n    const laneIds = lane.toBitIds();\n    const ids = laneIds.filter((id) => this.scope.isExported(id));\n    if (includeNonLaneComps) {\n      if (!this.workspace) {\n        throw new BitError(`getMainIdsToMerge needs workspace`);\n      }\n      const workspaceIds = (await this.workspace.listIds()).map((id) => id);\n      const mainNotOnLane = workspaceIds.filter(\n        (id) => !laneIds.find((laneId) => laneId.isEqualWithoutVersion(id)) && this.scope.isExported(id)\n      );\n      ids.push(...mainNotOnLane);\n    }\n\n    const modelComponents = await Promise.all(ids.map((id) => this.scope.legacyScope.getModelComponent(id)));\n    return compact(\n      modelComponents.map((c) => {\n        if (!c.head) return null; // probably the component was never merged to main\n        return c.toComponentId().changeVersion(c.head.toString());\n      })\n    );\n  }\n\n  async mergeFromScope(\n    fromLane: string,\n    toLane: string,\n    options: Partial<MergeLaneOptions> & { push?: boolean }\n  ): Promise<{\n    mergedPreviously: string[];\n    mergedNow: string[];\n    exportedIds: string[];\n  }> {\n    if (this.workspace) {\n      throw new BitError(\n        `unable to run this command from a workspace, please create a new bare-scope and run it from there`\n      );\n    }\n    const fromLaneId = LaneId.parse(fromLane);\n    const fromLaneObj = await this.lanes.importLaneObject(fromLaneId);\n    const toLaneId = toLane === DEFAULT_LANE ? this.lanes.getDefaultLaneId() : LaneId.parse(toLane);\n    const toLaneObj = toLaneId.isDefault() ? undefined : await this.lanes.importLaneObject(toLaneId);\n    const fromLaneBitIds = fromLaneObj.toBitIds();\n    const getIdsToMerge = async (): Promise<ComponentIdList> => {\n      if (!options.pattern) return fromLaneBitIds;\n      const laneCompIds = await this.scope.resolveMultipleComponentIds(fromLaneBitIds);\n      const ids = await this.scope.filterIdsFromPoolIdsByPattern(options.pattern, laneCompIds);\n      return ComponentIdList.fromArray(ids.map((id) => id));\n    };\n    const idsToMerge = await getIdsToMerge();\n    const scopeComponentsImporter = ScopeComponentsImporter.getInstance(this.scope.legacyScope);\n    await scopeComponentsImporter.importWithoutDeps(idsToMerge.toVersionLatest(), {\n      cache: false,\n      lane: fromLaneObj,\n      ignoreMissingHead: true,\n      includeVersionHistory: true,\n      reason: `of \"from\" lane (${fromLaneId.name}) for lane-merge to get all version-history`,\n    });\n\n    // get their main/to-lane as well\n    await scopeComponentsImporter.importWithoutDeps(idsToMerge.toVersionLatest(), {\n      cache: false,\n      lane: toLaneObj,\n      ignoreMissingHead: true,\n      includeVersionHistory: true,\n      reason: `of \"to\" lane (${toLaneId.name}) for lane-merge to get all version-history`,\n    });\n    await this.importer.importHeadArtifactsFromLane(fromLaneObj, undefined, true);\n    await this.throwIfNotUpToDate(fromLaneId, toLaneId);\n    const repo = this.scope.legacyScope.objects;\n    // loop through all components, make sure they're all ahead of main (it might not be on main yet).\n    // then, change the version object to include an extra parent to point to the main.\n    // then, change the component object head to point to this changed version\n    const mergedPreviously: ComponentID[] = [];\n    const mergedNow: ComponentID[] = [];\n    const shouldSquash = !toLaneObj && !options.noSquash; // only when merging to main we squash.\n    const log = await getLogForSquash(fromLaneId);\n    const bitObjectsPerComp = await pMapSeries(idsToMerge, async (id) => {\n      const modelComponent = await this.scope.legacyScope.getModelComponent(id);\n      const fromVersionObj = await modelComponent.loadVersion(id.version as string, repo);\n      if (fromVersionObj.isRemoved()) return undefined;\n      const fromLaneHead = modelComponent.getRef(id.version as string);\n      if (!fromLaneHead) throw new Error(`lane head must be defined for ${id.toString()}`);\n      const toLaneHead = toLaneObj ? toLaneObj.getComponent(id)?.head : modelComponent.head || null;\n      if (toLaneHead?.isEqual(fromLaneHead)) {\n        mergedPreviously.push(id);\n        return undefined;\n      }\n\n      const divergeData = await getDivergeData({\n        repo,\n        modelComponent,\n        sourceHead: toLaneHead,\n        targetHead: fromLaneHead,\n        throwForNoCommonSnap: true,\n      });\n      const modifiedVersion = shouldSquash\n        ? await squashOneComp(\n            DEFAULT_LANE,\n            fromLaneId,\n            id,\n            divergeData,\n            log,\n            this.scope.legacyScope,\n            fromVersionObj,\n            options.snapMessage\n          )\n        : undefined;\n      const objects: BitObject[] = [];\n      if (modifiedVersion) objects.push(modifiedVersion);\n      if (toLaneObj) {\n        toLaneObj.addComponent({ id: id.changeVersion(undefined), head: fromLaneHead });\n      } else {\n        modelComponent.setHead(fromLaneHead);\n        objects.push(modelComponent);\n      }\n      mergedNow.push(id);\n      return { id, objects };\n    });\n    const bitObjects = compact(bitObjectsPerComp).map((b) => b.objects);\n    const bitObjectsFlat = bitObjects.flat();\n    if (toLaneObj) bitObjectsFlat.push(toLaneObj);\n    await repo.writeObjectsToTheFS(bitObjectsFlat);\n    let exportedIds: string[] = [];\n    if (options.push) {\n      const ids = compact(bitObjectsPerComp).map((b) => b.id);\n      const bitIds = ComponentIdList.fromArray(ids);\n      const { exported } = await this.exporter.exportMany({\n        scope: this.scope.legacyScope,\n        ids: shouldSquash ? bitIds : new ComponentIdList(),\n        idsWithFutureScope: shouldSquash ? bitIds : new ComponentIdList(),\n        laneObject: toLaneObj,\n        allVersions: false,\n        // no need to export anything else other than the head. the normal calculation of what to export won't apply here\n        // as it is done from the scope.\n        exportHeadsOnly: shouldSquash,\n        // all artifacts must be pushed. they're all considered \"external\" in this case, because it's running from a\n        // bare-scope, but we don't want to ignore them, otherwise, they'll be missing from the component-scopes.\n        ignoreMissingExternalArtifacts: false,\n        exportOrigin: 'lane-merge',\n      });\n      exportedIds = exported.map((id) => id.toString());\n    }\n\n    return {\n      mergedPreviously: mergedPreviously.map((id) => id.toString()),\n      mergedNow: mergedNow.map((id) => id.toString()),\n      exportedIds,\n    };\n  }\n  private async throwIfNotUpToDate(fromLaneId: LaneId, toLaneId: LaneId) {\n    const status = await this.lanes.diffStatus(fromLaneId, toLaneId, { skipChanges: true });\n    const compsNotUpToDate = status.componentsStatus.filter((s) => !s.upToDate);\n    if (compsNotUpToDate.length) {\n      throw new Error(`unable to merge, the following components are not up-to-date:\n${compsNotUpToDate.map((s) => s.componentId.toString()).join('\\n')}`);\n    }\n  }\n\n  static slots = [];\n  static dependencies = [\n    LanesAspect,\n    CLIAspect,\n    WorkspaceAspect,\n    MergingAspect,\n    LoggerAspect,\n    RemoveAspect,\n    ScopeAspect,\n    ExportAspect,\n    ImporterAspect,\n    CheckoutAspect,\n    GlobalConfigAspect,\n  ];\n  static runtime = MainRuntime;\n\n  static async provider([\n    lanes,\n    cli,\n    workspace,\n    merging,\n    loggerMain,\n    remove,\n    scope,\n    exporter,\n    importer,\n    checkout,\n    globalConfig,\n  ]: [\n    LanesMain,\n    CLIMain,\n    Workspace,\n    MergingMain,\n    LoggerMain,\n    RemoveMain,\n    ScopeMain,\n    ExportMain,\n    ImporterMain,\n    CheckoutMain,\n    GlobalConfigMain\n  ]) {\n    const logger = loggerMain.createLogger(MergeLanesAspect.id);\n    const lanesCommand = cli.getCommand('lane');\n    const mergeLanesMain = new MergeLanesMain(\n      workspace,\n      merging,\n      lanes,\n      logger,\n      remove,\n      scope,\n      exporter,\n      importer,\n      checkout\n    );\n    lanesCommand?.commands?.push(new MergeLaneCmd(mergeLanesMain, globalConfig));\n    lanesCommand?.commands?.push(new MergeAbortLaneCmd(mergeLanesMain));\n    cli.register(new MergeLaneFromScopeCmd(mergeLanesMain));\n    return mergeLanesMain;\n  }\n}\n\nasync function filterComponentsStatus(\n  allComponentsStatus: ComponentMergeStatus[],\n  compIdsToKeep: ComponentID[],\n  allBitIds: ComponentID[],\n  workspace: Workspace,\n  includeDeps = false,\n  otherLane?: Lane, // lane that gets merged into the current lane. if not provided, it's main that gets merged into the current lane\n  shouldSquash?: boolean\n): Promise<ComponentMergeStatus[]> {\n  const bitIdsFromPattern = ComponentIdList.fromArray(compIdsToKeep);\n  const bitIdsNotFromPattern = allBitIds.filter((bitId) => !bitIdsFromPattern.hasWithoutVersion(bitId));\n  const filteredComponentStatus: ComponentMergeStatus[] = [];\n  const depsToAdd: ComponentID[] = [];\n  const missingDepsFromHead = {};\n  const missingDepsFromHistory: string[] = [];\n\n  const versionsToCheckPerId = await pMapSeries(compIdsToKeep, async (compId) => {\n    const fromStatus = allComponentsStatus.find((c) => c.id.isEqualWithoutVersion(compId));\n    if (!fromStatus) {\n      throw new Error(`filterComponentsStatus: unable to find ${compId.toString()} in component-status`);\n    }\n    filteredComponentStatus.push(fromStatus);\n    if (fromStatus.unchangedMessage) {\n      return undefined;\n    }\n    if (!otherLane) {\n      // if merging main, no need to check whether the deps are included in the pattern.\n      return undefined;\n    }\n    const { divergeData } = fromStatus;\n    if (!divergeData) {\n      throw new Error(`filterComponentsStatus: unable to find divergeData for ${compId.toString()}`);\n    }\n    let targetVersions: Ref[] = divergeData.snapsOnTargetOnly;\n    if (!targetVersions.length) {\n      return undefined;\n    }\n    const modelComponent = await workspace.consumer.scope.getModelComponent(compId);\n    if (shouldSquash) {\n      // no need to check all versions, we merge only the head\n      const headOnTarget = otherLane ? otherLane.getComponent(compId)?.head : modelComponent.head;\n      if (!headOnTarget) {\n        throw new Error(`filterComponentsStatus: unable to find head for ${compId.toString()}`);\n      }\n      targetVersions = [headOnTarget];\n    }\n\n    return { compId, targetVersions, modelComponent };\n  });\n\n  // all these versions needs to be imported to load them later and check whether they have dependencies on the target lane\n  const toImport = compact(versionsToCheckPerId)\n    .map((c) => c.targetVersions.map((v) => c.compId.changeVersion(v.toString())))\n    .flat();\n  await workspace.consumer.scope.scopeImporter.importWithoutDeps(ComponentIdList.fromArray(toImport), {\n    lane: otherLane,\n    cache: true,\n    includeVersionHistory: false,\n    reason: 'import all history of given patterns components to check whether they have dependencies on the lane',\n  });\n\n  await pMapSeries(compact(versionsToCheckPerId), async ({ compId, targetVersions, modelComponent }) => {\n    await pMapSeries(targetVersions, async (remoteVersion) => {\n      const versionObj = await modelComponent.loadVersion(remoteVersion.toString(), workspace.consumer.scope.objects);\n      const flattenedDeps = versionObj.getAllFlattenedDependencies();\n      const depsNotIncludeInPattern = flattenedDeps.filter((id) =>\n        bitIdsNotFromPattern.find((bitId) => bitId.isEqualWithoutVersion(id))\n      );\n      if (!depsNotIncludeInPattern.length) {\n        return;\n      }\n      const depsOnLane: ComponentID[] = [];\n      await Promise.all(\n        depsNotIncludeInPattern.map(async (dep) => {\n          const isOnLane = await workspace.consumer.scope.isIdOnLane(dep, otherLane);\n          if (isOnLane) {\n            depsOnLane.push(dep);\n          }\n        })\n      );\n      if (!depsOnLane.length) {\n        return;\n      }\n      if (includeDeps) {\n        depsToAdd.push(...depsOnLane);\n      } else {\n        const headOnTarget = otherLane ? otherLane.getComponent(compId)?.head : modelComponent.head;\n        const depsOnLaneStr = depsOnLane.map((dep) => dep.toStringWithoutVersion());\n        if (headOnTarget?.isEqual(remoteVersion)) {\n          depsOnLaneStr.forEach((dep) => {\n            (missingDepsFromHead[dep] ||= []).push(compId.toStringWithoutVersion());\n          });\n        } else {\n          missingDepsFromHistory.push(...depsOnLaneStr);\n        }\n      }\n    });\n  });\n  if (Object.keys(missingDepsFromHead).length || missingDepsFromHistory.length) {\n    throw new MissingCompsToMerge(missingDepsFromHead, uniq(missingDepsFromHistory));\n  }\n\n  if (depsToAdd.length) {\n    // remove the version, otherwise, the uniq gives duplicate components with different versions.\n    const depsWithoutVersion = depsToAdd.map((d) => d.changeVersion(undefined));\n    const depsUniqWithoutVersion = ComponentIdList.uniqFromArray(depsWithoutVersion);\n    depsUniqWithoutVersion.forEach((id) => {\n      const fromStatus = allComponentsStatus.find((c) => c.id.isEqualWithoutVersion(id));\n      if (!fromStatus) {\n        throw new Error(`filterComponentsStatus: unable to find ${id.toString()} in component-status`);\n      }\n      filteredComponentStatus.push(fromStatus);\n    });\n  }\n  return filteredComponentStatus;\n}\n\nasync function getLogForSquash(otherLaneId: LaneId) {\n  const basicLog = await getBasicLog();\n  const log = {\n    ...basicLog,\n    message: `squashed during merge from ${otherLaneId.toString()}`,\n  };\n  return log;\n}\n\nasync function squashSnaps(allComponentsStatus: ComponentMergeStatus[], otherLaneId: LaneId, consumer: Consumer) {\n  const currentLaneName = consumer.getCurrentLaneId().name;\n  const succeededComponents = allComponentsStatus.filter((c) => !c.unchangedMessage);\n  const log = await getLogForSquash(otherLaneId);\n\n  await Promise.all(\n    succeededComponents.map(async ({ id, divergeData, componentFromModel }) => {\n      if (!divergeData) {\n        throw new Error(`unable to squash. divergeData is missing from ${id.toString()}`);\n      }\n\n      const modifiedComp = await squashOneComp(\n        currentLaneName,\n        otherLaneId,\n        id,\n        divergeData,\n        log,\n        consumer.scope,\n        componentFromModel\n      );\n      if (modifiedComp) {\n        consumer.scope.objects.add(modifiedComp);\n        const modelComponent = await consumer.scope.getModelComponent(id);\n        const versionHistory = await modelComponent.updateRebasedVersionHistory(consumer.scope.objects, [modifiedComp]);\n        if (versionHistory) consumer.scope.objects.add(versionHistory);\n      }\n    })\n  );\n}\n\n/**\n * returns Version object if it was modified. otherwise, returns undefined\n */\nasync function squashOneComp(\n  currentLaneName: string,\n  otherLaneId: LaneId,\n  id: ComponentID,\n  divergeData: SnapsDistance,\n  log: Log,\n  scope: LegacyScope,\n  componentFromModel?: Version,\n  messageTitle?: string\n): Promise<Version | undefined> {\n  if (divergeData.isDiverged()) {\n    throw new BitError(`unable to squash because ${id.toString()} is diverged in history.\nconsider switching to \"${\n      otherLaneId.name\n    }\" first, merging \"${currentLaneName}\", then switching back to \"${currentLaneName}\" and merging \"${\n      otherLaneId.name\n    }\"\nalternatively, use \"--no-squash\" flag to keep the entire history of \"${otherLaneId.name}\"`);\n  }\n  if (divergeData.isSourceAhead()) {\n    // nothing to do. current is ahead, nothing to merge. (it was probably filtered out already as a \"failedComponent\")\n    return undefined;\n  }\n  if (!divergeData.isTargetAhead()) {\n    // nothing to do. current and remote are the same, nothing to merge. (it was probably filtered out already as a \"failedComponent\")\n    return undefined;\n  }\n  // remote is ahead and was not diverge.\n  const remoteSnaps = divergeData.snapsOnTargetOnly;\n  if (remoteSnaps.length === 0) {\n    throw new Error(`remote is ahead but it has no snaps. it's impossible`);\n  }\n  const getAllMessages = async () => {\n    if (!messageTitle) return [];\n    await scope.scopeImporter.importManyObjects({ [otherLaneId.scope]: remoteSnaps.map((s) => s.toString()) });\n    const versionObjects = (await Promise.all(remoteSnaps.map((s) => scope.objects.load(s)))) as Version[];\n    return compact(versionObjects).map((v) => v.log.message);\n  };\n  const getFinalMessage = async (): Promise<string | undefined> => {\n    if (!messageTitle) return undefined;\n    const allMessage = await getAllMessages();\n    const allMessageStr = compact(allMessage)\n      .map((m) => `[*] ${m}`)\n      .join('\\n');\n    return `${messageTitle}\\n${allMessageStr}`;\n  };\n  if (!componentFromModel) {\n    throw new Error('unable to squash, the componentFromModel is missing');\n  }\n  const currentParents = componentFromModel.parents;\n\n  // if the remote has only one snap, there is nothing to squash.\n  // other checks here is to make sure `componentFromModel.addAsOnlyParent` call is not needed.\n  if (remoteSnaps.length === 1 && divergeData.commonSnapBeforeDiverge && currentParents.length === 1) {\n    return undefined;\n  }\n\n  const doSquash = async () => {\n    if (divergeData.commonSnapBeforeDiverge) {\n      componentFromModel.addAsOnlyParent(divergeData.commonSnapBeforeDiverge);\n      return;\n    }\n    if (currentLaneName !== DEFAULT_LANE) {\n      // when squashing into lane, we have to take main into account\n      const modelComponent = await scope.getModelComponentIfExist(id);\n      if (!modelComponent) throw new Error(`missing ModelComponent for ${id.toString()}`);\n      if (modelComponent.head) {\n        componentFromModel.addAsOnlyParent(modelComponent.head);\n        return;\n      }\n    }\n    // there is no commonSnapBeforeDiverge. the local has no snaps, all are remote, no need for parents. keep only head.\n    componentFromModel.parents.forEach((ref) => componentFromModel.removeParent(ref));\n  };\n\n  await doSquash();\n\n  const finalMessage = await getFinalMessage();\n  componentFromModel.setSquashed({ previousParents: currentParents, laneId: otherLaneId }, log, finalMessage);\n  return componentFromModel;\n}\n\nMergeLanesAspect.addRuntime(MergeLanesMain);\n\nexport default MergeLanesMain;\n"],"mappings":"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"}

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@teambit/merge-lanes",
-  "version": "1.0.97",
+  "version": "1.0.99",
   "homepage": "https://bit.cloud/teambit/lanes/merge-lanes",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.lanes",
     "name": "merge-lanes",
-    "version": "1.0.97"
+    "version": "1.0.99"
   },
   "dependencies": {
     "chalk": "2.4.2",
@@ -22,17 +22,17 @@
     "@teambit/harmony": "0.4.6",
     "@teambit/component-id": "1.2.0",
     "@teambit/logger": "0.0.926",
-    "@teambit/scope": "1.0.97",
-    "@teambit/checkout": "1.0.97",
+    "@teambit/scope": "1.0.99",
+    "@teambit/checkout": "1.0.99",
     "@teambit/cli": "0.0.833",
     "@teambit/global-config": "0.0.835",
-    "@teambit/merging": "1.0.97",
-    "@teambit/remove": "1.0.97",
-    "@teambit/export": "1.0.97",
-    "@teambit/importer": "1.0.97",
-    "@teambit/lanes": "1.0.97",
-    "@teambit/snapping": "1.0.97",
-    "@teambit/workspace": "1.0.97"
+    "@teambit/merging": "1.0.99",
+    "@teambit/remove": "1.0.99",
+    "@teambit/export": "1.0.99",
+    "@teambit/importer": "1.0.99",
+    "@teambit/lanes": "1.0.99",
+    "@teambit/snapping": "1.0.99",
+    "@teambit/workspace": "1.0.99"
   },
   "devDependencies": {
     "@types/fs-extra": "9.0.7",