@teambit/merge-lanes 1.0.107 → 1.0.109

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -0,0 +1 @@
1
+ !function(e,o){"object"==typeof exports&&"object"==typeof module?module.exports=o():"function"==typeof define&&define.amd?define([],o):"object"==typeof exports?exports["teambit.lanes/merge-lanes-preview"]=o():e["teambit.lanes/merge-lanes-preview"]=o()}(self,(()=>(()=>{"use strict";var e={d:(o,t)=>{for(var r in t)e.o(t,r)&&!e.o(o,r)&&Object.defineProperty(o,r,{enumerable:!0,get:t[r]})},o:(e,o)=>Object.prototype.hasOwnProperty.call(e,o),r:e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})}},o={};e.r(o),e.d(o,{compositions:()=>t,compositions_metadata:()=>n,overview:()=>r});const t=[],r=[],n={compositions:[]};return o})()));
@@ -3,7 +3,7 @@ import { Lane } from '@teambit/legacy/dist/scope/models';
3
3
  import { Consumer } from '@teambit/legacy/dist/consumer';
4
4
  import { Logger } from '@teambit/logger';
5
5
  import { MergeAbortOpts } from './merge-abort.cmd';
6
- declare type Snapshot = {
6
+ type Snapshot = {
7
7
  copyOfCurrentLane?: Lane;
8
8
  copyOfBitmap: string;
9
9
  copyOfWorkspaceJsonc: string;
@@ -1,6 +1,6 @@
1
1
  import { Command, CommandOptions } from '@teambit/cli';
2
2
  import { MergeLanesMain } from './merge-lanes.main.runtime';
3
- export declare type MergeAbortOpts = {
3
+ export type MergeAbortOpts = {
4
4
  silent?: boolean;
5
5
  };
6
6
  export declare class MergeAbortLaneCmd implements Command {
@@ -1,6 +1,6 @@
1
1
  import { Command, CommandOptions } from '@teambit/cli';
2
2
  import { MergeLanesMain } from './merge-lanes.main.runtime';
3
- declare type Flags = {
3
+ type Flags = {
4
4
  pattern?: string;
5
5
  push?: boolean;
6
6
  keepReadme?: boolean;
@@ -11,7 +11,7 @@ import { RemoveMain } from '@teambit/remove';
11
11
  import { ExportMain } from '@teambit/export';
12
12
  import { GlobalConfigMain } from '@teambit/global-config';
13
13
  import { MergeAbortOpts } from './merge-abort.cmd';
14
- export declare type MergeLaneOptions = {
14
+ export type MergeLaneOptions = {
15
15
  mergeStrategy: MergeStrategy;
16
16
  ours?: boolean;
17
17
  theirs?: boolean;
@@ -48,9 +48,9 @@ export declare class MergeLanesMain {
48
48
  configMergeResults: ConfigMergeResult[];
49
49
  }>;
50
50
  abortLaneMerge(checkoutProps: CheckoutProps, mergeAbortOpts: MergeAbortOpts): Promise<{
51
- checkoutResults: ApplyVersionResults | undefined;
51
+ checkoutResults: ApplyVersionResults;
52
52
  restoredItems: string[];
53
- checkoutError: Error | undefined;
53
+ checkoutError: Error;
54
54
  }>;
55
55
  private getMainIdsToMerge;
56
56
  mergeFromScope(fromLane: string, toLane: string, options: Partial<MergeLaneOptions> & {
@@ -61,7 +61,7 @@ export declare class MergeLanesMain {
61
61
  exportedIds: string[];
62
62
  }>;
63
63
  private throwIfNotUpToDate;
64
- static slots: never[];
64
+ static slots: any[];
65
65
  static dependencies: import("@teambit/harmony").Aspect[];
66
66
  static runtime: import("@teambit/harmony").RuntimeDefinition;
67
67
  static provider([lanes, cli, workspace, merging, loggerMain, remove, scope, exporter, importer, checkout, globalConfig,]: [
@@ -248,7 +248,7 @@ class MergeLanesMain {
248
248
  const getOtherLane = async () => {
249
249
  if (isDefaultLane) {
250
250
  if (!skipFetch) {
251
- await this.importer.importObjectsFromMainIfExist((currentLane === null || currentLane === void 0 ? void 0 : currentLane.toBitIds().toVersionLatest()) || []);
251
+ await this.importer.importObjectsFromMainIfExist(currentLane?.toBitIds().toVersionLatest() || []);
252
252
  }
253
253
  return undefined;
254
254
  }
@@ -332,8 +332,7 @@ class MergeLanesMain {
332
332
  const mergedSuccessfully = !mergeResults.failedComponents || mergeResults.failedComponents.length === 0 || mergeResults.failedComponents.every(failedComponent => failedComponent.unchangedLegitimately);
333
333
  let deleteResults = {};
334
334
  if (!keepReadme && otherLane && otherLane.readmeComponent && mergedSuccessfully) {
335
- var _otherLane$readmeComp;
336
- const readmeComponentId = otherLane.readmeComponent.id.changeVersion((_otherLane$readmeComp = otherLane.readmeComponent) === null || _otherLane$readmeComp === void 0 || (_otherLane$readmeComp = _otherLane$readmeComp.head) === null || _otherLane$readmeComp === void 0 ? void 0 : _otherLane$readmeComp.hash);
335
+ const readmeComponentId = otherLane.readmeComponent.id.changeVersion(otherLane.readmeComponent?.head?.hash);
337
336
  deleteResults = await this.remove.removeLocallyByIds([readmeComponentId]);
338
337
  } else if (otherLane && !otherLane.readmeComponent) {
339
338
  deleteResults = {
@@ -444,14 +443,13 @@ class MergeLanesMain {
444
443
  const shouldSquash = !toLaneObj && !options.noSquash; // only when merging to main we squash.
445
444
  const log = await getLogForSquash(fromLaneId);
446
445
  const bitObjectsPerComp = await (0, _pMapSeries().default)(idsToMerge, async id => {
447
- var _toLaneObj$getCompone;
448
446
  const modelComponent = await this.scope.legacyScope.getModelComponent(id);
449
447
  const fromVersionObj = await modelComponent.loadVersion(id.version, repo);
450
448
  if (fromVersionObj.isRemoved()) return undefined;
451
449
  const fromLaneHead = modelComponent.getRef(id.version);
452
450
  if (!fromLaneHead) throw new Error(`lane head must be defined for ${id.toString()}`);
453
- const toLaneHead = toLaneObj ? (_toLaneObj$getCompone = toLaneObj.getComponent(id)) === null || _toLaneObj$getCompone === void 0 ? void 0 : _toLaneObj$getCompone.head : modelComponent.head || null;
454
- if (toLaneHead !== null && toLaneHead !== void 0 && toLaneHead.isEqual(fromLaneHead)) {
451
+ const toLaneHead = toLaneObj ? toLaneObj.getComponent(id)?.head : modelComponent.head || null;
452
+ if (toLaneHead?.isEqual(fromLaneHead)) {
455
453
  mergedPreviously.push(id);
456
454
  return undefined;
457
455
  }
@@ -523,12 +521,11 @@ ${compsNotUpToDate.map(s => s.componentId.toString()).join('\n')}`);
523
521
  }
524
522
  }
525
523
  static async provider([lanes, cli, workspace, merging, loggerMain, remove, scope, exporter, importer, checkout, globalConfig]) {
526
- var _lanesCommand$command, _lanesCommand$command2;
527
524
  const logger = loggerMain.createLogger(_mergeLanes().MergeLanesAspect.id);
528
525
  const lanesCommand = cli.getCommand('lane');
529
526
  const mergeLanesMain = new MergeLanesMain(workspace, merging, lanes, logger, remove, scope, exporter, importer, checkout);
530
- lanesCommand === null || lanesCommand === void 0 || (_lanesCommand$command = lanesCommand.commands) === null || _lanesCommand$command === void 0 || _lanesCommand$command.push(new (_mergeLane().MergeLaneCmd)(mergeLanesMain, globalConfig));
531
- lanesCommand === null || lanesCommand === void 0 || (_lanesCommand$command2 = lanesCommand.commands) === null || _lanesCommand$command2 === void 0 || _lanesCommand$command2.push(new (_mergeAbort().MergeAbortLaneCmd)(mergeLanesMain));
527
+ lanesCommand?.commands?.push(new (_mergeLane().MergeLaneCmd)(mergeLanesMain, globalConfig));
528
+ lanesCommand?.commands?.push(new (_mergeAbort().MergeAbortLaneCmd)(mergeLanesMain));
532
529
  cli.register(new (_mergeLaneFromScope().MergeLaneFromScopeCmd)(mergeLanesMain));
533
530
  return mergeLanesMain;
534
531
  }
@@ -571,9 +568,8 @@ shouldSquash) {
571
568
  }
572
569
  const modelComponent = await workspace.consumer.scope.getModelComponent(compId);
573
570
  if (shouldSquash) {
574
- var _otherLane$getCompone;
575
571
  // no need to check all versions, we merge only the head
576
- const headOnTarget = otherLane ? (_otherLane$getCompone = otherLane.getComponent(compId)) === null || _otherLane$getCompone === void 0 ? void 0 : _otherLane$getCompone.head : modelComponent.head;
572
+ const headOnTarget = otherLane ? otherLane.getComponent(compId)?.head : modelComponent.head;
577
573
  if (!headOnTarget) {
578
574
  throw new Error(`filterComponentsStatus: unable to find head for ${compId.toString()}`);
579
575
  }
@@ -619,10 +615,9 @@ shouldSquash) {
619
615
  if (includeDeps) {
620
616
  depsToAdd.push(...depsOnLane);
621
617
  } else {
622
- var _otherLane$getCompone2;
623
- const headOnTarget = otherLane ? (_otherLane$getCompone2 = otherLane.getComponent(compId)) === null || _otherLane$getCompone2 === void 0 ? void 0 : _otherLane$getCompone2.head : modelComponent.head;
618
+ const headOnTarget = otherLane ? otherLane.getComponent(compId)?.head : modelComponent.head;
624
619
  const depsOnLaneStr = depsOnLane.map(dep => dep.toStringWithoutVersion());
625
- if (headOnTarget !== null && headOnTarget !== void 0 && headOnTarget.isEqual(remoteVersion)) {
620
+ if (headOnTarget?.isEqual(remoteVersion)) {
626
621
  depsOnLaneStr.forEach(dep => {
627
622
  (missingDepsFromHead[dep] ||= []).push(compId.toStringWithoutVersion());
628
623
  });
@@ -1 +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","_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","laneToFetchArtifactsFrom","getOtherLane","importObjectsFromMainIfExist","toBitIds","toVersionLatest","undefined","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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"}
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","_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","laneToFetchArtifactsFrom","getOtherLane","importObjectsFromMainIfExist","toBitIds","toVersionLatest","undefined","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","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","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","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, {\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 CHANGED
@@ -1,12 +1,12 @@
1
1
  {
2
2
  "name": "@teambit/merge-lanes",
3
- "version": "1.0.107",
3
+ "version": "1.0.109",
4
4
  "homepage": "https://bit.cloud/teambit/lanes/merge-lanes",
5
5
  "main": "dist/index.js",
6
6
  "componentId": {
7
7
  "scope": "teambit.lanes",
8
8
  "name": "merge-lanes",
9
- "version": "1.0.107"
9
+ "version": "1.0.109"
10
10
  },
11
11
  "dependencies": {
12
12
  "chalk": "2.4.2",
@@ -15,39 +15,33 @@
15
15
  "yesno": "0.4.0",
16
16
  "lodash": "4.17.21",
17
17
  "p-map-series": "2.1.0",
18
- "core-js": "^3.0.0",
19
- "@babel/runtime": "7.20.0",
20
18
  "@teambit/bit-error": "0.0.404",
21
19
  "@teambit/lane-id": "0.0.311",
22
20
  "@teambit/harmony": "0.4.6",
23
21
  "@teambit/component-id": "1.2.0",
24
- "@teambit/logger": "0.0.932",
25
- "@teambit/scope": "1.0.107",
26
- "@teambit/checkout": "1.0.107",
27
- "@teambit/cli": "0.0.839",
28
- "@teambit/global-config": "0.0.841",
29
- "@teambit/merging": "1.0.107",
30
- "@teambit/remove": "1.0.107",
31
- "@teambit/export": "1.0.107",
32
- "@teambit/importer": "1.0.107",
33
- "@teambit/lanes": "1.0.107",
34
- "@teambit/snapping": "1.0.107",
35
- "@teambit/workspace": "1.0.107"
22
+ "@teambit/logger": "0.0.934",
23
+ "@teambit/scope": "1.0.109",
24
+ "@teambit/checkout": "1.0.109",
25
+ "@teambit/cli": "0.0.841",
26
+ "@teambit/global-config": "0.0.843",
27
+ "@teambit/merging": "1.0.109",
28
+ "@teambit/remove": "1.0.109",
29
+ "@teambit/export": "1.0.109",
30
+ "@teambit/importer": "1.0.109",
31
+ "@teambit/lanes": "1.0.109",
32
+ "@teambit/snapping": "1.0.109",
33
+ "@teambit/workspace": "1.0.109"
36
34
  },
37
35
  "devDependencies": {
38
36
  "@types/fs-extra": "9.0.7",
39
37
  "@types/lodash": "4.14.165",
40
38
  "@types/mocha": "9.1.0",
41
- "@types/node": "12.20.4",
42
- "@types/react": "^17.0.8",
43
- "@types/react-dom": "^17.0.5",
44
- "@types/jest": "^26.0.0",
45
- "@types/testing-library__jest-dom": "5.9.5"
39
+ "@types/jest": "^29.2.2",
40
+ "@types/testing-library__jest-dom": "^5.9.5",
41
+ "@teambit/harmony.envs.core-aspect-env": "0.0.14"
46
42
  },
47
43
  "peerDependencies": {
48
- "@teambit/legacy": "1.0.624",
49
- "react": "^16.8.0 || ^17.0.0",
50
- "react-dom": "^16.8.0 || ^17.0.0"
44
+ "@teambit/legacy": "1.0.624"
51
45
  },
52
46
  "license": "Apache-2.0",
53
47
  "optionalDependencies": {},
@@ -61,7 +55,7 @@
61
55
  },
62
56
  "private": false,
63
57
  "engines": {
64
- "node": ">=12.22.0"
58
+ "node": ">=16.0.0"
65
59
  },
66
60
  "repository": {
67
61
  "type": "git",
@@ -70,12 +64,9 @@
70
64
  "keywords": [
71
65
  "bit",
72
66
  "bit-aspect",
67
+ "bit-core-aspect",
73
68
  "components",
74
69
  "collaboration",
75
- "web",
76
- "react",
77
- "react-components",
78
- "angular",
79
- "angular-components"
70
+ "web"
80
71
  ]
81
72
  }
package/tsconfig.json CHANGED
@@ -1,38 +1,33 @@
1
1
  {
2
2
  "compilerOptions": {
3
3
  "lib": [
4
- "es2019",
5
- "DOM",
6
- "ES6",
7
- "DOM.Iterable",
8
- "ScriptHost"
4
+ "esnext",
5
+ "dom",
6
+ "dom.Iterable"
9
7
  ],
10
- "target": "es2015",
11
- "module": "CommonJS",
12
- "jsx": "react",
13
- "allowJs": true,
14
- "composite": true,
8
+ "target": "es2020",
9
+ "module": "es2020",
10
+ "jsx": "react-jsx",
15
11
  "declaration": true,
16
12
  "sourceMap": true,
17
- "skipLibCheck": true,
18
13
  "experimentalDecorators": true,
19
- "outDir": "dist",
14
+ "skipLibCheck": true,
20
15
  "moduleResolution": "node",
21
16
  "esModuleInterop": true,
22
- "rootDir": ".",
23
17
  "resolveJsonModule": true,
24
- "emitDeclarationOnly": true,
25
- "emitDecoratorMetadata": true,
26
- "allowSyntheticDefaultImports": true,
27
- "strictPropertyInitialization": false,
28
- "strict": true,
29
- "noImplicitAny": false,
30
- "preserveConstEnums": true
18
+ "allowJs": true,
19
+ "outDir": "dist",
20
+ "emitDeclarationOnly": true
31
21
  },
32
22
  "exclude": [
23
+ "artifacts",
24
+ "public",
33
25
  "dist",
26
+ "node_modules",
27
+ "package.json",
34
28
  "esm.mjs",
35
- "package.json"
29
+ "**/*.cjs",
30
+ "./dist"
36
31
  ],
37
32
  "include": [
38
33
  "**/*",
package/types/asset.d.ts CHANGED
@@ -5,12 +5,12 @@ declare module '*.png' {
5
5
  declare module '*.svg' {
6
6
  import type { FunctionComponent, SVGProps } from 'react';
7
7
 
8
- export const ReactComponent: FunctionComponent<SVGProps<SVGSVGElement> & { title?: string }>;
8
+ export const ReactComponent: FunctionComponent<
9
+ SVGProps<SVGSVGElement> & { title?: string }
10
+ >;
9
11
  const src: string;
10
12
  export default src;
11
13
  }
12
-
13
- // @TODO Gilad
14
14
  declare module '*.jpg' {
15
15
  const value: any;
16
16
  export = value;
@@ -27,3 +27,15 @@ declare module '*.bmp' {
27
27
  const value: any;
28
28
  export = value;
29
29
  }
30
+ declare module '*.otf' {
31
+ const value: any;
32
+ export = value;
33
+ }
34
+ declare module '*.woff' {
35
+ const value: any;
36
+ export = value;
37
+ }
38
+ declare module '*.woff2' {
39
+ const value: any;
40
+ export = value;
41
+ }