@teambit/merge-lanes 1.0.151 → 1.0.153

package/artifacts/__bit_junit.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <testsuites>
-  <testsuite name="teambit.lanes/merge-lanes@1.0.151" tests="0" failures="0" errors="0" skipped="0"/>
+  <testsuite name="teambit.lanes/merge-lanes@1.0.153" tests="0" failures="0" errors="0" skipped="0"/>
 </testsuites>

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

@@ -8,6 +8,7 @@ type Flags = {
     includeDeps?: boolean;
     title?: string;
     titleBase64?: string;
+    reMerge?: boolean;
 };
 /**
  * private command. the underscore prefix is intended.
@@ -27,8 +28,8 @@ export declare class MergeLaneFromScopeCmd implements Command {
     private: boolean;
     remoteOp: boolean;
     constructor(mergeLanes: MergeLanesMain);
-    report([fromLane, toLane]: [string, string], { pattern, push, keepReadme, noSquash, includeDeps, title, titleBase64 }: Flags): Promise<string>;
-    json([fromLane, toLane]: [string, string], { pattern, push, keepReadme, noSquash, includeDeps }: Flags): Promise<{
+    report([fromLane, toLane]: [string, string], { pattern, push, keepReadme, noSquash, includeDeps, title, titleBase64, reMerge, }: Flags): Promise<string>;
+    json([fromLane, toLane]: [string, string], { pattern, push, keepReadme, noSquash, includeDeps, reMerge }: Flags): Promise<{
         code: number;
         data: any;
         error?: undefined;

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

@@ -55,7 +55,7 @@ the lane must be up-to-date with the other lane, otherwise, conflicts might occu
       description: `lane-id to merge to. default is "${_laneId().DEFAULT_LANE}"`
     }]);
     _defineProperty(this, "alias", '');
-    _defineProperty(this, "options", [['', 'pattern <string>', 'partially merge the lane with the specified component-pattern'], ['', 'title <string>', 'if provided, it replaces the original message with this title and append squashed snaps messages'], ['', 'title-base64 <string>', 'same as --title flag but the title is base64 encoded'], ['', 'push', 'export the updated objects to the original scopes once done'], ['', 'keep-readme', 'skip deleting the lane readme component after merging'], ['', 'no-squash', 'relevant for merging lanes into main, which by default squash.'], ['', 'include-deps', 'relevant for "--pattern". merge also dependencies of the given components'], ['j', 'json', 'output as json format']]);
+    _defineProperty(this, "options", [['', 'pattern <string>', 'partially merge the lane with the specified component-pattern'], ['', 'title <string>', 'if provided, it replaces the original message with this title and append squashed snaps messages'], ['', 'title-base64 <string>', 'same as --title flag but the title is base64 encoded'], ['', 'push', 'export the updated objects to the original scopes once done'], ['', 'keep-readme', 'skip deleting the lane readme component after merging'], ['', 'no-squash', 'relevant for merging lanes into main, which by default squash.'], ['', 'include-deps', 'relevant for "--pattern". merge also dependencies of the given components'], ['', 're-merge', 'helpful when last merge failed during export. do not skip components that seemed to be merged'], ['j', 'json', 'output as json format']]);
     _defineProperty(this, "loader", true);
     _defineProperty(this, "private", true);
     _defineProperty(this, "remoteOp", true);
@@ -67,7 +67,8 @@ the lane must be up-to-date with the other lane, otherwise, conflicts might occu
     noSquash = false,
     includeDeps = false,
     title,
-    titleBase64
+    titleBase64,
+    reMerge
   }) {
     if (includeDeps && !pattern) {
       throw new (_bitError().BitError)(`"--include-deps" flag is relevant only for --pattern flag`);
@@ -83,7 +84,8 @@ the lane must be up-to-date with the other lane, otherwise, conflicts might occu
       noSquash,
       pattern,
       includeDeps,
-      snapMessage: titleBase64Decoded || title
+      snapMessage: titleBase64Decoded || title,
+      reMerge
     });
     const mergedTitle = _chalk().default.green(`successfully merged ${mergedNow.length} components from ${fromLane} to ${toLane || _laneId().DEFAULT_LANE}`);
     const mergedOutput = mergedNow.length ? `${mergedTitle}\n${mergedNow.join('\n')}` : '';
@@ -98,7 +100,8 @@ the lane must be up-to-date with the other lane, otherwise, conflicts might occu
     push = false,
     keepReadme = false,
     noSquash = false,
-    includeDeps = false
+    includeDeps = false,
+    reMerge
   }) {
     if (includeDeps && !pattern) {
       throw new (_bitError().BitError)(`"--include-deps" flag is relevant only for --pattern flag`);
@@ -110,7 +113,8 @@ the lane must be up-to-date with the other lane, otherwise, conflicts might occu
         keepReadme,
         noSquash,
         pattern,
-        includeDeps
+        includeDeps,
+        reMerge
       });
       return {
         code: 0,

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

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

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

@@ -56,6 +56,7 @@ export declare class MergeLanesMain {
     private getMainIdsToMerge;
     mergeFromScope(fromLane: string, toLane: string, options: Partial<MergeLaneOptions> & {
         push?: boolean;
+        reMerge?: boolean;
     }): Promise<{
         mergedPreviously: string[];
         mergedNow: string[];

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

@@ -454,7 +454,7 @@ class MergeLanesMain {
       const fromLaneHead = modelComponent.getRef(id.version);
       if (!fromLaneHead) throw new Error(`lane head must be defined for ${id.toString()}`);
       const toLaneHead = toLaneObj ? toLaneObj.getComponent(id)?.head : modelComponent.head || null;
-      if (toLaneHead?.isEqual(fromLaneHead)) {
+      if (toLaneHead?.isEqual(fromLaneHead) && !options.reMerge) {
         mergedPreviously.push(id);
         return undefined;
       }

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

@@ -1 +1 @@
-{"version":3,"names":["_bitError","data","require","_path","_interopRequireDefault","_cli","_importer","_lanes","_merging","_workspace","_interopRequireWildcard","_basicLog","_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","_toPrimitive","String","Symbol","toPrimitive","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","ids","getMainIdsToMerge","compIdList","ComponentIdList","fromArray","toVersionLatest","importObjectsFromMainIfExist","laneToFetchArtifactsFrom","getOtherLane","lane","shouldFetch","isNew","otherLane","fetchLaneWithItsComponents","undefined","getBitIds","modelComponents","Promise","all","map","id","legacyScope","getModelComponent","compact","c","head","toComponentId","changeVersion","Error","toBitIds","idsToMerge","debug","shouldSquash","allComponentsStatus","getMergeStatus","componentIds","resolveMultipleComponentIds","compIdsFromPattern","filterIdsFromPoolIdsByPattern","filterComponentsStatus","bitId","find","isEqualWithoutVersion","unchangedLegitimately","unchangedMessage","workspaceIds","listIds","throwForFailures","squashSnaps","importHeadArtifactsFromLane","lastMerged","LastMerged","snapshot","takeSnapshot","mergeResults","mergeSnaps","persistSnapshot","mergedSuccessfully","failedComponents","every","failedComponent","deleteResults","readmeComponent","readmeComponentId","hash","removeLocallyByIds","reasonForRemoval","readmeResult","configMergeResults","configMergeResult","onDestroy","name","abortLaneMerge","checkoutProps","mergeAbortOpts","OutsideWorkspaceError","lastMerge","getCurrentLane","compDirsToRemove","restoreFromLastMerged","_reloadConsumer","objects","unmergedComponents","removeAllComponents","write","configMergeFile","getConflictMergeFile","delete","checkoutResults","checkoutError","restoreMissingComponents","err","error","restoredItems","path","basename","bitMap","mapPath","config","join","includeNonLaneComps","DEFAULT_LANE","laneIds","isExported","mainNotOnLane","laneId","mergeFromScope","fromLane","toLane","fromLaneId","LaneId","parse","fromLaneObj","importLaneObject","toLaneId","getDefaultLaneId","toLaneObj","fromLaneBitIds","getIdsToMerge","laneCompIds","scopeComponentsImporter","ScopeComponentsImporter","getInstance","importWithoutDeps","cache","ignoreMissingHead","includeVersionHistory","reason","throwIfNotUpToDate","repo","mergedPreviously","mergedNow","log","getLogForSquash","bitObjectsPerComp","pMapSeries","modelComponent","fromVersionObj","loadVersion","version","isRemoved","fromLaneHead","getRef","toLaneHead","getComponent","divergeData","getDivergeData","sourceHead","targetHead","throwForNoCommonSnap","modifiedVersion","squashOneComp","addComponent","setHead","bitObjects","b","bitObjectsFlat","flat","writeObjectsToTheFS","exportedIds","bitIds","exported","exportMany","idsWithFutureScope","laneObject","allVersions","exportHeadsOnly","ignoreMissingExternalArtifacts","exportOrigin","status","diffStatus","skipChanges","compsNotUpToDate","componentsStatus","s","upToDate","componentId","provider","cli","loggerMain","globalConfig","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","headOnTarget","toImport","v","scopeImporter","remoteVersion","versionObj","flattenedDeps","getAllFlattenedDependencies","depsNotIncludeInPattern","depsOnLane","dep","isOnLane","isIdOnLane","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, { MergingMain, ComponentMergeStatus, ApplyVersionResults } from '@teambit/merging';\nimport WorkspaceAspect, { OutsideWorkspaceError, Workspace } from '@teambit/workspace';\nimport { getBasicLog } from '@teambit/legacy/dist/utils/bit/basic-log';\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 { ConfigMergeResult } from '@teambit/config-merger';\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    if (isDefaultLane) {\n      if (!skipFetch) {\n        const ids = await this.getMainIdsToMerge(currentLane, !excludeNonLaneComps);\n        const compIdList = ComponentIdList.fromArray(ids).toVersionLatest();\n        await this.importer.importObjectsFromMainIfExist(compIdList);\n      }\n    }\n    let laneToFetchArtifactsFrom: Lane | undefined;\n    const getOtherLane = async () => {\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 = isDefaultLane ? undefined : await getOtherLane();\n    const getBitIds = async () => {\n      if (isDefaultLane) {\n        const ids = await this.getMainIdsToMerge(currentLane, !excludeNonLaneComps);\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      if (!otherLane) throw new Error(`lane must be defined for non-default`);\n      return otherLane.toBitIds();\n    };\n    const idsToMerge = await getBitIds();\n    this.logger.debug(`merging the following ids: ${idsToMerge.toString()}`);\n\n    const shouldSquash = squash || (currentLaneId.isDefault() && !noSquash);\n    let allComponentsStatus = await this.merging.getMergeStatus(\n      idsToMerge,\n      {\n        resolveUnrelated,\n        ignoreConfigChanges,\n        shouldSquash,\n        mergeStrategy,\n      },\n      currentLane,\n      otherLane\n    );\n\n    if (pattern) {\n      const componentIds = await this.workspace.resolveMultipleComponentIds(idsToMerge);\n      const compIdsFromPattern = await this.workspace.filterIdsFromPoolIdsByPattern(pattern, componentIds);\n      allComponentsStatus = await filterComponentsStatus(\n        allComponentsStatus,\n        compIdsFromPattern,\n        idsToMerge,\n        this.workspace,\n        includeDeps,\n        otherLane || undefined,\n        shouldSquash\n      );\n      idsToMerge.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        idsToMerge,\n        this.workspace,\n        includeDeps,\n        otherLane || undefined,\n        shouldSquash\n      );\n      idsToMerge.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 ids = allComponentsStatus.map((c) => c.id);\n      await this.importer.importHeadArtifactsFromLane(laneToFetchArtifactsFrom, ids, 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      otherLaneId,\n      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], { reasonForRemoval: 'lane-merge' });\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 | null, includeNonLaneComps = true) {\n    if (!lane) throw new Error(`unable to merge ${DEFAULT_LANE}, the current lane was not found`);\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();\n      const mainNotOnLane = workspaceIds.filter(\n        (id) => !laneIds.find((laneId) => laneId.isEqualWithoutVersion(id)) && this.scope.isExported(id)\n      );\n      ids.push(...mainNotOnLane);\n    }\n    return ids;\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","_basicLog","_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","_toPrimitive","String","Symbol","toPrimitive","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","ids","getMainIdsToMerge","compIdList","ComponentIdList","fromArray","toVersionLatest","importObjectsFromMainIfExist","laneToFetchArtifactsFrom","getOtherLane","lane","shouldFetch","isNew","otherLane","fetchLaneWithItsComponents","undefined","getBitIds","modelComponents","Promise","all","map","id","legacyScope","getModelComponent","compact","c","head","toComponentId","changeVersion","Error","toBitIds","idsToMerge","debug","shouldSquash","allComponentsStatus","getMergeStatus","componentIds","resolveMultipleComponentIds","compIdsFromPattern","filterIdsFromPoolIdsByPattern","filterComponentsStatus","bitId","find","isEqualWithoutVersion","unchangedLegitimately","unchangedMessage","workspaceIds","listIds","throwForFailures","squashSnaps","importHeadArtifactsFromLane","lastMerged","LastMerged","snapshot","takeSnapshot","mergeResults","mergeSnaps","persistSnapshot","mergedSuccessfully","failedComponents","every","failedComponent","deleteResults","readmeComponent","readmeComponentId","hash","removeLocallyByIds","reasonForRemoval","readmeResult","configMergeResults","configMergeResult","onDestroy","name","abortLaneMerge","checkoutProps","mergeAbortOpts","OutsideWorkspaceError","lastMerge","getCurrentLane","compDirsToRemove","restoreFromLastMerged","_reloadConsumer","objects","unmergedComponents","removeAllComponents","write","configMergeFile","getConflictMergeFile","delete","checkoutResults","checkoutError","restoreMissingComponents","err","error","restoredItems","path","basename","bitMap","mapPath","config","join","includeNonLaneComps","DEFAULT_LANE","laneIds","isExported","mainNotOnLane","laneId","mergeFromScope","fromLane","toLane","fromLaneId","LaneId","parse","fromLaneObj","importLaneObject","toLaneId","getDefaultLaneId","toLaneObj","fromLaneBitIds","getIdsToMerge","laneCompIds","scopeComponentsImporter","ScopeComponentsImporter","getInstance","importWithoutDeps","cache","ignoreMissingHead","includeVersionHistory","reason","throwIfNotUpToDate","repo","mergedPreviously","mergedNow","log","getLogForSquash","bitObjectsPerComp","pMapSeries","modelComponent","fromVersionObj","loadVersion","version","isRemoved","fromLaneHead","getRef","toLaneHead","getComponent","reMerge","divergeData","getDivergeData","sourceHead","targetHead","throwForNoCommonSnap","modifiedVersion","squashOneComp","addComponent","setHead","bitObjects","b","bitObjectsFlat","flat","writeObjectsToTheFS","exportedIds","bitIds","exported","exportMany","idsWithFutureScope","laneObject","allVersions","exportHeadsOnly","ignoreMissingExternalArtifacts","exportOrigin","status","diffStatus","skipChanges","compsNotUpToDate","componentsStatus","s","upToDate","componentId","provider","cli","loggerMain","globalConfig","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","headOnTarget","toImport","v","scopeImporter","remoteVersion","versionObj","flattenedDeps","getAllFlattenedDependencies","depsNotIncludeInPattern","depsOnLane","dep","isOnLane","isIdOnLane","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, { MergingMain, ComponentMergeStatus, ApplyVersionResults } from '@teambit/merging';\nimport WorkspaceAspect, { OutsideWorkspaceError, Workspace } from '@teambit/workspace';\nimport { getBasicLog } from '@teambit/legacy/dist/utils/bit/basic-log';\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 { ConfigMergeResult } from '@teambit/config-merger';\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    if (isDefaultLane) {\n      if (!skipFetch) {\n        const ids = await this.getMainIdsToMerge(currentLane, !excludeNonLaneComps);\n        const compIdList = ComponentIdList.fromArray(ids).toVersionLatest();\n        await this.importer.importObjectsFromMainIfExist(compIdList);\n      }\n    }\n    let laneToFetchArtifactsFrom: Lane | undefined;\n    const getOtherLane = async () => {\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 = isDefaultLane ? undefined : await getOtherLane();\n    const getBitIds = async () => {\n      if (isDefaultLane) {\n        const ids = await this.getMainIdsToMerge(currentLane, !excludeNonLaneComps);\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      if (!otherLane) throw new Error(`lane must be defined for non-default`);\n      return otherLane.toBitIds();\n    };\n    const idsToMerge = await getBitIds();\n    this.logger.debug(`merging the following ids: ${idsToMerge.toString()}`);\n\n    const shouldSquash = squash || (currentLaneId.isDefault() && !noSquash);\n    let allComponentsStatus = await this.merging.getMergeStatus(\n      idsToMerge,\n      {\n        resolveUnrelated,\n        ignoreConfigChanges,\n        shouldSquash,\n        mergeStrategy,\n      },\n      currentLane,\n      otherLane\n    );\n\n    if (pattern) {\n      const componentIds = await this.workspace.resolveMultipleComponentIds(idsToMerge);\n      const compIdsFromPattern = await this.workspace.filterIdsFromPoolIdsByPattern(pattern, componentIds);\n      allComponentsStatus = await filterComponentsStatus(\n        allComponentsStatus,\n        compIdsFromPattern,\n        idsToMerge,\n        this.workspace,\n        includeDeps,\n        otherLane || undefined,\n        shouldSquash\n      );\n      idsToMerge.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        idsToMerge,\n        this.workspace,\n        includeDeps,\n        otherLane || undefined,\n        shouldSquash\n      );\n      idsToMerge.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 ids = allComponentsStatus.map((c) => c.id);\n      await this.importer.importHeadArtifactsFromLane(laneToFetchArtifactsFrom, ids, 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      otherLaneId,\n      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], { reasonForRemoval: 'lane-merge' });\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 | null, includeNonLaneComps = true) {\n    if (!lane) throw new Error(`unable to merge ${DEFAULT_LANE}, the current lane was not found`);\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();\n      const mainNotOnLane = workspaceIds.filter(\n        (id) => !laneIds.find((laneId) => laneId.isEqualWithoutVersion(id)) && this.scope.isExported(id)\n      );\n      ids.push(...mainNotOnLane);\n    }\n    return ids;\n  }\n\n  async mergeFromScope(\n    fromLane: string,\n    toLane: string,\n    options: Partial<MergeLaneOptions> & { push?: boolean; reMerge?: 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) && !options.reMerge) {\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.151",
+  "version": "1.0.153",
   "homepage": "https://bit.cloud/teambit/lanes/merge-lanes",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.lanes",
     "name": "merge-lanes",
-    "version": "1.0.151"
+    "version": "1.0.153"
   },
   "dependencies": {
     "chalk": "2.4.2",
@@ -19,18 +19,18 @@
     "@teambit/lane-id": "0.0.311",
     "@teambit/harmony": "0.4.6",
     "@teambit/component-id": "1.2.0",
-    "@teambit/logger": "0.0.942",
-    "@teambit/scope": "1.0.151",
-    "@teambit/checkout": "1.0.151",
-    "@teambit/cli": "0.0.849",
-    "@teambit/global-config": "0.0.852",
-    "@teambit/merging": "1.0.151",
-    "@teambit/remove": "1.0.151",
-    "@teambit/config-merger": "0.0.18",
-    "@teambit/export": "1.0.151",
-    "@teambit/importer": "1.0.151",
-    "@teambit/lanes": "1.0.151",
-    "@teambit/workspace": "1.0.151"
+    "@teambit/logger": "0.0.943",
+    "@teambit/scope": "1.0.153",
+    "@teambit/checkout": "1.0.153",
+    "@teambit/cli": "0.0.850",
+    "@teambit/global-config": "0.0.853",
+    "@teambit/merging": "1.0.153",
+    "@teambit/remove": "1.0.153",
+    "@teambit/config-merger": "0.0.20",
+    "@teambit/export": "1.0.153",
+    "@teambit/importer": "1.0.153",
+    "@teambit/lanes": "1.0.153",
+    "@teambit/workspace": "1.0.153"
   },
   "devDependencies": {
     "@types/fs-extra": "9.0.7",