@teambit/merge-lanes 1.0.309 → 1.0.311
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.
- package/artifacts/__bit_junit.xml +1 -1
- package/artifacts/schema.json +22 -21
- package/dist/merge-lane-from-scope.cmd.d.ts +1 -1
- package/dist/merge-lanes.main.runtime.d.ts +6 -6
- package/dist/merge-lanes.main.runtime.js.map +1 -1
- package/package.json +15 -15
- /package/dist/{preview-1718767379753.js → preview-1719137078208.js} +0 -0
@@ -1,6 +1,6 @@
|
|
1
1
|
<?xml version="1.0" encoding="UTF-8"?>
|
2
2
|
<testsuites tests="1" failures="0" errors="0" skipped="0">
|
3
|
-
<testsuite name="teambit.lanes/merge-lanes@1.0.
|
3
|
+
<testsuite name="teambit.lanes/merge-lanes@1.0.311" tests="1" failures="0" errors="0" skipped="0">
|
4
4
|
<testcase classname="dist/merge-lane.spec.js" name="should merge successfully the specified pattern only"/>
|
5
5
|
</testsuite>
|
6
6
|
</testsuites>
|
package/artifacts/schema.json
CHANGED
@@ -1241,7 +1241,7 @@
|
|
1241
1241
|
"line": 40,
|
1242
1242
|
"character": 1
|
1243
1243
|
},
|
1244
|
-
"signature": "type MergeLaneOptions = {\n mergeStrategy: MergeStrategy;\n ours?: boolean | undefined;\n theirs?: boolean | undefined;\n noSnap
|
1244
|
+
"signature": "type MergeLaneOptions = {\n mergeStrategy: MergeStrategy;\n ours?: boolean | undefined;\n theirs?: boolean | undefined;\n noSnap?: boolean | undefined;\n snapMessage?: string | undefined;\n existingOnWorkspaceOnly?: boolean | undefined;\n ... 14 more ...;\n fetchCurrent?: boolean | undefined;\n}",
|
1245
1245
|
"name": "MergeLaneOptions",
|
1246
1246
|
"type": {
|
1247
1247
|
"__schema": "TypeLiteralSchema",
|
@@ -1319,18 +1319,18 @@
|
|
1319
1319
|
"line": 44,
|
1320
1320
|
"character": 3
|
1321
1321
|
},
|
1322
|
-
"signature": "(property) noSnap
|
1322
|
+
"signature": "(property) noSnap?: boolean | undefined",
|
1323
1323
|
"name": "noSnap",
|
1324
1324
|
"type": {
|
1325
1325
|
"__schema": "KeywordTypeSchema",
|
1326
1326
|
"location": {
|
1327
1327
|
"filePath": "merge-lanes.main.runtime.ts",
|
1328
1328
|
"line": 44,
|
1329
|
-
"character":
|
1329
|
+
"character": 12
|
1330
1330
|
},
|
1331
1331
|
"name": "boolean"
|
1332
1332
|
},
|
1333
|
-
"isOptional":
|
1333
|
+
"isOptional": true
|
1334
1334
|
},
|
1335
1335
|
{
|
1336
1336
|
"__schema": "VariableLikeSchema",
|
@@ -1339,18 +1339,18 @@
|
|
1339
1339
|
"line": 45,
|
1340
1340
|
"character": 3
|
1341
1341
|
},
|
1342
|
-
"signature": "(property) snapMessage
|
1342
|
+
"signature": "(property) snapMessage?: string | undefined",
|
1343
1343
|
"name": "snapMessage",
|
1344
1344
|
"type": {
|
1345
1345
|
"__schema": "KeywordTypeSchema",
|
1346
1346
|
"location": {
|
1347
1347
|
"filePath": "merge-lanes.main.runtime.ts",
|
1348
1348
|
"line": 45,
|
1349
|
-
"character":
|
1349
|
+
"character": 17
|
1350
1350
|
},
|
1351
1351
|
"name": "string"
|
1352
1352
|
},
|
1353
|
-
"isOptional":
|
1353
|
+
"isOptional": true
|
1354
1354
|
},
|
1355
1355
|
{
|
1356
1356
|
"__schema": "VariableLikeSchema",
|
@@ -1359,18 +1359,18 @@
|
|
1359
1359
|
"line": 46,
|
1360
1360
|
"character": 3
|
1361
1361
|
},
|
1362
|
-
"signature": "(property) existingOnWorkspaceOnly
|
1362
|
+
"signature": "(property) existingOnWorkspaceOnly?: boolean | undefined",
|
1363
1363
|
"name": "existingOnWorkspaceOnly",
|
1364
1364
|
"type": {
|
1365
1365
|
"__schema": "KeywordTypeSchema",
|
1366
1366
|
"location": {
|
1367
1367
|
"filePath": "merge-lanes.main.runtime.ts",
|
1368
1368
|
"line": 46,
|
1369
|
-
"character":
|
1369
|
+
"character": 29
|
1370
1370
|
},
|
1371
1371
|
"name": "boolean"
|
1372
1372
|
},
|
1373
|
-
"isOptional":
|
1373
|
+
"isOptional": true
|
1374
1374
|
},
|
1375
1375
|
{
|
1376
1376
|
"__schema": "VariableLikeSchema",
|
@@ -1379,18 +1379,18 @@
|
|
1379
1379
|
"line": 47,
|
1380
1380
|
"character": 3
|
1381
1381
|
},
|
1382
|
-
"signature": "(property) build
|
1382
|
+
"signature": "(property) build?: boolean | undefined",
|
1383
1383
|
"name": "build",
|
1384
1384
|
"type": {
|
1385
1385
|
"__schema": "KeywordTypeSchema",
|
1386
1386
|
"location": {
|
1387
1387
|
"filePath": "merge-lanes.main.runtime.ts",
|
1388
1388
|
"line": 47,
|
1389
|
-
"character":
|
1389
|
+
"character": 11
|
1390
1390
|
},
|
1391
1391
|
"name": "boolean"
|
1392
1392
|
},
|
1393
|
-
"isOptional":
|
1393
|
+
"isOptional": true
|
1394
1394
|
},
|
1395
1395
|
{
|
1396
1396
|
"__schema": "VariableLikeSchema",
|
@@ -1399,18 +1399,18 @@
|
|
1399
1399
|
"line": 48,
|
1400
1400
|
"character": 3
|
1401
1401
|
},
|
1402
|
-
"signature": "(property) keepReadme
|
1402
|
+
"signature": "(property) keepReadme?: boolean | undefined",
|
1403
1403
|
"name": "keepReadme",
|
1404
1404
|
"type": {
|
1405
1405
|
"__schema": "KeywordTypeSchema",
|
1406
1406
|
"location": {
|
1407
1407
|
"filePath": "merge-lanes.main.runtime.ts",
|
1408
1408
|
"line": 48,
|
1409
|
-
"character":
|
1409
|
+
"character": 16
|
1410
1410
|
},
|
1411
1411
|
"name": "boolean"
|
1412
1412
|
},
|
1413
|
-
"isOptional":
|
1413
|
+
"isOptional": true
|
1414
1414
|
},
|
1415
1415
|
{
|
1416
1416
|
"__schema": "VariableLikeSchema",
|
@@ -1439,18 +1439,18 @@
|
|
1439
1439
|
"line": 50,
|
1440
1440
|
"character": 3
|
1441
1441
|
},
|
1442
|
-
"signature": "(property) noSquash
|
1442
|
+
"signature": "(property) noSquash?: boolean | undefined",
|
1443
1443
|
"name": "noSquash",
|
1444
1444
|
"type": {
|
1445
1445
|
"__schema": "KeywordTypeSchema",
|
1446
1446
|
"location": {
|
1447
1447
|
"filePath": "merge-lanes.main.runtime.ts",
|
1448
1448
|
"line": 50,
|
1449
|
-
"character":
|
1449
|
+
"character": 14
|
1450
1450
|
},
|
1451
1451
|
"name": "boolean"
|
1452
1452
|
},
|
1453
|
-
"isOptional":
|
1453
|
+
"isOptional": true
|
1454
1454
|
},
|
1455
1455
|
{
|
1456
1456
|
"__schema": "VariableLikeSchema",
|
@@ -3648,7 +3648,8 @@
|
|
3648
3648
|
"character": 1
|
3649
3649
|
},
|
3650
3650
|
"raw": "/**\n * returns Version object if it was modified. otherwise, returns undefined\n */",
|
3651
|
-
"comment": "returns Version object if it was modified. otherwise, returns undefined"
|
3651
|
+
"comment": "returns Version object if it was modified. otherwise, returns undefined",
|
3652
|
+
"tags": []
|
3652
3653
|
},
|
3653
3654
|
"signature": "function squashOneComp(currentLaneName: string, otherLaneId: LaneId, id: ComponentID, divergeData: SnapsDistance, log: Log, scope: LegacyScope, componentFromModel?: Version, messageTitle?: string): Promise<Version | undefined>",
|
3654
3655
|
"name": "squashOneComp",
|
@@ -3924,7 +3925,7 @@
|
|
3924
3925
|
"componentId": {
|
3925
3926
|
"scope": "teambit.lanes",
|
3926
3927
|
"name": "merge-lanes",
|
3927
|
-
"version": "1.0.
|
3928
|
+
"version": "1.0.311"
|
3928
3929
|
},
|
3929
3930
|
"taggedModuleExports": []
|
3930
3931
|
}
|
@@ -18,13 +18,13 @@ export type MergeLaneOptions = {
|
|
18
18
|
mergeStrategy: MergeStrategy;
|
19
19
|
ours?: boolean;
|
20
20
|
theirs?: boolean;
|
21
|
-
noSnap
|
22
|
-
snapMessage
|
23
|
-
existingOnWorkspaceOnly
|
24
|
-
build
|
25
|
-
keepReadme
|
21
|
+
noSnap?: boolean;
|
22
|
+
snapMessage?: string;
|
23
|
+
existingOnWorkspaceOnly?: boolean;
|
24
|
+
build?: boolean;
|
25
|
+
keepReadme?: boolean;
|
26
26
|
squash?: boolean;
|
27
|
-
noSquash
|
27
|
+
noSquash?: boolean;
|
28
28
|
tag?: boolean;
|
29
29
|
pattern?: string;
|
30
30
|
includeDeps?: boolean;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"names":["_bitError","data","require","_path","_interopRequireDefault","_cli","_importer","_lanes","_merging","_workspace","_basicLog","_componentId","_pMapSeries","_mergeVersion","_scope","_laneId","_logger","_checkout","_remove","_lodash","_export","_globalConfig","_mergeLanes","_mergeLane","_mergeLaneFromScope","_missingCompsToMerge","_mergeAbort","_lastMerged","_mergeMove","e","__esModule","default","ownKeys","r","t","Object","keys","getOwnPropertySymbols","o","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","defineProperty","_toPropertyKey","value","configurable","writable","i","_toPrimitive","Symbol","toPrimitive","call","TypeError","String","Number","MergeLanesMain","constructor","workspace","merging","lanes","logger","remove","scope","exporter","importer","checkout","mergeLaneByCLI","laneName","options","BitError","currentLaneId","consumer","getCurrentLaneId","otherLaneId","getParsedLaneId","mergeLane","mergeStrategy","noSnap","tag","snapMessage","existingOnWorkspaceOnly","build","keepReadme","squash","noSquash","pattern","includeDeps","skipDependencyInstallation","resolveUnrelated","ignoreConfigChanges","skipFetch","excludeNonLaneComps","shouldIncludeUpdateDependents","throwIfNotUpToDate","fetchCurrent","legacyScope","isDefault","toString","isEqual","fetchLaneWithItsComponents","currentLane","undefined","loadLane","isDefaultLane","ids","getMainIdsToMerge","compIdList","ComponentIdList","fromArray","toVersionLatest","importObjectsFromMainIfExist","laneToFetchArtifactsFrom","getOtherLane","lane","shouldFetch","isNew","otherLane","getBitIds","modelComponents","Promise","all","map","id","getModelComponent","compact","c","head","toComponentId","changeVersion","Error","toComponentIdsIncludeUpdateDependents","toComponentIds","idsToMerge","debug","shouldSquash","allComponentsStatus","getMergeStatus","componentIds","compIdsFromPattern","filterIdsFromPoolIdsByPattern","filterComponentsStatus","bitId","find","isEqualWithoutVersion","unchangedLegitimately","unchangedMessage","workspaceIds","listIds","throwForFailures","succeededComponents","squashSnaps","importHeadArtifactsFromLane","lastMerged","LastMerged","snapshot","takeSnapshot","mergeResults","mergeSnaps","persistSnapshot","mergedSuccessfully","failedComponents","every","failedComponent","deleteResults","readmeComponent","readmeComponentId","hash","removeLocallyByIds","reasonForRemoval","readmeResult","configMergeResults","configMergeResult","componentsWithConfigConflicts","hasConflicts","compIdStr","conflicts","mergedSuccessfullyIds","components","files","filesStatus","f","FileStatus","manual","binaryConflict","config","includes","toStringWithoutVersion","onDestroy","name","mergeMove","newLaneName","OutsideWorkspaceError","lastMerge","restoreLaneObjectFromLastMerged","newLaneResult","createLane","abortLaneMerge","checkoutProps","mergeAbortOpts","getCurrentLane","compDirsToRemove","restoreFromLastMerged","_reloadConsumer","objects","unmergedComponents","removeAllComponents","write","configMergeFile","getConflictMergeFile","delete","checkoutResults","checkoutError","restoreMissingComponents","err","error","restoredItems","path","basename","bitMap","mapPath","join","includeNonLaneComps","includeUpdateDependents","DEFAULT_LANE","laneIds","isExported","mainNotOnLane","laneId","mergeFromScope","fromLane","toLane","fromLaneId","parseLaneId","toLaneId","getDefaultLaneId","LaneId","parse","exportIfNeeded","idsToExport","laneToExport","compIdsList","exported","exportMany","idsWithFutureScope","laneObject","allVersions","exportHeadsOnly","throwForMissingArtifacts","exportOrigin","setCurrentLaneId","mergeSnapResults","mergeSnapError","generateMergeConflictFile","snappedIds","snappedComponents","exportedIds","mergedNow","mergedPreviously","compIsAlreadyMergedMsg","unmerged","reason","status","diffStatus","skipChanges","compsNotUpToDate","componentsStatus","s","upToDate","componentId","provider","cli","loggerMain","globalConfig","createLogger","MergeLanesAspect","lanesCommand","getCommand","mergeLanesMain","commands","MergeLaneCmd","MergeAbortLaneCmd","MergeMoveLaneCmd","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","pMapSeries","compId","fromStatus","divergeData","targetVersions","snapsOnTargetOnly","modelComponent","headOnTarget","getComponent","toImport","v","flat","scopeImporter","importWithoutDeps","cache","includeVersionHistory","remoteVersion","versionObj","loadVersion","flattenedDeps","getAllFlattenedDependencies","depsNotIncludeInPattern","depsOnLane","dep","isOnLane","isIdOnLane","depsOnLaneStr","MissingCompsToMerge","uniq","depsWithoutVersion","d","depsUniqWithoutVersion","uniqFromArray","getLogForSquash","basicLog","getBasicLog","log","message","messageTitle","currentLaneName","componentFromModel","modifiedComp","squashOneComp","add","versionHistory","updateRebasedVersionHistory","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 {\n MergingAspect,\n MergingMain,\n ComponentMergeStatus,\n ApplyVersionResults,\n compIsAlreadyMergedMsg,\n} 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 { FileStatus, MergeStrategy } from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport { ScopeAspect, ScopeMain } from '@teambit/scope';\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 { Ref } from '@teambit/legacy/dist/scope/objects';\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';\nimport { MergeMoveLaneCmd } from './merge-move.cmd';\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 shouldIncludeUpdateDependents?: boolean;\n throwIfNotUpToDate?: boolean; // relevant when merging from a scope\n fetchCurrent?: boolean; // needed when merging from a bare-scope (because it's empty)\n};\nexport type ConflictPerId = { id: ComponentID; files: string[]; config?: boolean };\nexport type MergeFromScopeResult = {\n mergedNow: ComponentID[];\n exportedIds: ComponentID[];\n unmerged: { id: ComponentID; reason: string }[]; // reasons currently are: ahead / already-merge / removed\n conflicts?: ConflictPerId[]; // relevant in case of diverge (currently possible only when merging from main to a lane)\n snappedIds?: ComponentID[]; // relevant in case of diverge (currently possible only when merging from main to a lane)\n mergedPreviously: ComponentID[];\n mergeSnapError?: Error;\n};\n\nexport class MergeLanesMain {\n constructor(\n private workspace: Workspace | undefined,\n private merging: MergingMain,\n readonly 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 async mergeLaneByCLI(laneName: string, options: MergeLaneOptions) {\n if (!this.workspace) {\n throw new BitError(`unable to merge a lane outside of Bit workspace`);\n }\n const currentLaneId = this.workspace.consumer.getCurrentLaneId();\n const otherLaneId = await this.workspace.consumer.getParsedLaneId(laneName);\n return this.mergeLane(otherLaneId, currentLaneId, options);\n }\n\n // eslint-disable-next-line complexity\n async mergeLane(\n otherLaneId: LaneId,\n currentLaneId: LaneId,\n options: MergeLaneOptions\n ): Promise<{\n mergeResults: ApplyVersionResults;\n deleteResults: any;\n configMergeResults: ConfigMergeResult[];\n mergedSuccessfullyIds: ComponentID[];\n conflicts: ConflictPerId[];\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 shouldIncludeUpdateDependents,\n throwIfNotUpToDate,\n fetchCurrent,\n } = options;\n const legacyScope = this.scope.legacyScope;\n if (tag && !currentLaneId.isDefault()) {\n throw new BitError(`--tag only possible when on main. currently checked out to ${currentLaneId.toString()}`);\n }\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 if (fetchCurrent && !currentLaneId.isDefault()) {\n // if current is default, it'll be fetch later on\n await this.lanes.fetchLaneWithItsComponents(currentLaneId);\n }\n const currentLane = currentLaneId.isDefault() ? undefined : await legacyScope.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 legacyScope.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, shouldIncludeUpdateDependents);\n laneToFetchArtifactsFrom = otherLane;\n lane = await legacyScope.loadLane(otherLaneId);\n }\n return lane;\n };\n const otherLane = isDefaultLane ? undefined : await getOtherLane();\n if (fetchCurrent && otherLane && currentLaneId.isDefault()) {\n const ids = await this.getMainIdsToMerge(otherLane, false, shouldIncludeUpdateDependents);\n const compIdList = ComponentIdList.fromArray(ids).toVersionLatest();\n await this.importer.importObjectsFromMainIfExist(compIdList);\n }\n const getBitIds = async () => {\n if (isDefaultLane) {\n const ids = await this.getMainIdsToMerge(currentLane, !excludeNonLaneComps, shouldIncludeUpdateDependents);\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 shouldIncludeUpdateDependents\n ? otherLane.toComponentIdsIncludeUpdateDependents()\n : otherLane.toComponentIds();\n };\n const idsToMerge = await getBitIds();\n\n if (throwIfNotUpToDate) await this.throwIfNotUpToDate(otherLaneId, currentLaneId);\n\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 = idsToMerge;\n const compIdsFromPattern = await (this.workspace || this.scope).filterIdsFromPoolIdsByPattern(\n pattern,\n componentIds\n );\n allComponentsStatus = await filterComponentsStatus(\n allComponentsStatus,\n compIdsFromPattern,\n idsToMerge,\n legacyScope,\n includeDeps,\n otherLane,\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 && this.workspace) {\n const workspaceIds = 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 legacyScope,\n includeDeps,\n otherLane,\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 const succeededComponents = allComponentsStatus.filter((c) => !c.unchangedMessage);\n if (shouldSquash) {\n await squashSnaps(succeededComponents, currentLaneId, otherLaneId, legacyScope, options.snapMessage);\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 = consumer ? new LastMerged(this.scope, consumer, this.logger) : undefined;\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 if (snapshot) 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 = compact(allComponentsStatus.map((c) => c.configMergeResult));\n\n const componentsWithConfigConflicts = configMergeResults.filter((c) => c.hasConflicts()).map((c) => c.compIdStr);\n const conflicts: ConflictPerId[] = [];\n const mergedSuccessfullyIds: ComponentID[] = [];\n mergeResults.components?.forEach((c) => {\n const files = Object.keys(c.filesStatus).filter(\n (f) => c.filesStatus[f] === FileStatus.manual || c.filesStatus[f] === FileStatus.binaryConflict\n );\n const config = componentsWithConfigConflicts.includes(c.id.toStringWithoutVersion());\n if (files.length || config) {\n conflicts.push({ id: c.id, files, config });\n } else mergedSuccessfullyIds.push(c.id);\n });\n\n await this.workspace?.consumer.onDestroy(`lane-merge (${otherLaneId.name})`);\n\n return { mergeResults, deleteResults, configMergeResults, mergedSuccessfullyIds, conflicts };\n }\n\n async mergeMove(newLaneName: string, options: { scope?: string }) {\n if (!this.workspace) throw new OutsideWorkspaceError();\n const lastMerge = new LastMerged(this.scope, this.workspace.consumer, this.logger);\n await lastMerge.restoreLaneObjectFromLastMerged();\n const newLaneResult = await this.lanes.createLane(newLaneName, { scope: options.scope });\n return newLaneResult;\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 = 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, includeUpdateDependents = false) {\n if (!lane) throw new Error(`unable to merge ${DEFAULT_LANE}, the current lane was not found`);\n const laneIds = includeUpdateDependents ? lane.toComponentIdsIncludeUpdateDependents() : lane.toComponentIds();\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 = 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<MergeFromScopeResult> {\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 = await this.lanes.parseLaneId(fromLane);\n const toLaneId = toLane === DEFAULT_LANE ? this.lanes.getDefaultLaneId() : LaneId.parse(toLane);\n const shouldIncludeUpdateDependents = toLaneId.isDefault();\n\n const exportIfNeeded = async (idsToExport: ComponentID[], laneToExport?: Lane): Promise<ComponentID[]> => {\n if (!options.push) return [];\n const shouldSquash = toLaneId.isDefault() && !options.noSquash; // only when merging to main we squash.\n const compIdsList = ComponentIdList.fromArray(idsToExport);\n const { exported } = await this.exporter.exportMany({\n scope: this.scope.legacyScope,\n ids: compIdsList,\n idsWithFutureScope: compIdsList,\n laneObject: laneToExport,\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 // @todo: if we merge main to a lane, then no need to export all main history, it'll be fetched later by fetchMissingHistory.\n // once a change is done in the exporter about this, uncomment the next line.\n // exportHeadsOnly: shouldSquash || fromLaneId.isDefault(),\n exportHeadsOnly: shouldSquash,\n // all artifacts must be pushed. otherwise, they'll be missing from the component-scopes.\n // unless this is a merge from main to a lane, in which case it's not necessary to export the artifacts as\n // the user importing them will get them from main.\n throwForMissingArtifacts: !fromLaneId.isDefault(),\n exportOrigin: 'lane-merge',\n });\n return exported;\n };\n\n // current -> target (to)\n // other -> source (from)\n options.mergeStrategy = 'manual';\n options.excludeNonLaneComps = true;\n options.skipDependencyInstallation = true;\n options.shouldIncludeUpdateDependents = shouldIncludeUpdateDependents;\n options.throwIfNotUpToDate = !fromLaneId.isDefault();\n options.fetchCurrent = true;\n this.scope.legacyScope.setCurrentLaneId(toLaneId);\n\n const { mergeResults, configMergeResults, conflicts, mergedSuccessfullyIds } = await this.mergeLane(\n fromLaneId,\n toLaneId,\n options as MergeLaneOptions\n );\n\n const { mergeSnapResults, failedComponents, mergeSnapError } = mergeResults;\n\n if (configMergeResults.length) {\n this.logger.debug(\n `found the following config conflicts: ${configMergeResults\n .map((c) => `\\n${c.compIdStr}\\n${c.generateMergeConflictFile()}`)\n .join('\\n')}`\n );\n }\n\n const snappedIds = mergeSnapResults?.snappedComponents.map((c) => c.id) || [];\n\n const laneToExport = toLaneId.isDefault() ? undefined : await this.lanes.loadLane(toLaneId); // needs to be loaded again after the merge as it changed\n const exportedIds =\n conflicts.length || mergeSnapError\n ? []\n : await exportIfNeeded(\n mergedSuccessfullyIds.map((id) => id.changeVersion(undefined)),\n laneToExport\n );\n\n return {\n mergedNow: mergedSuccessfullyIds,\n mergedPreviously:\n failedComponents\n ?.filter(({ unchangedMessage }) => unchangedMessage === compIsAlreadyMergedMsg)\n .map((c) => c.id) || [],\n exportedIds,\n unmerged: failedComponents?.map((c) => ({ id: c.id, reason: c.unchangedMessage })) || [],\n conflicts,\n snappedIds,\n mergeSnapError,\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 lanesCommand?.commands?.push(new MergeMoveLaneCmd(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 legacyScope: LegacyScope,\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 legacyScope.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 legacyScope.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(), legacyScope.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 legacyScope.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(\n succeededComponents: ComponentMergeStatus[],\n currentLaneId: LaneId,\n otherLaneId: LaneId,\n scope: LegacyScope,\n messageTitle?: string\n) {\n const currentLaneName = currentLaneId.name;\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 scope,\n componentFromModel,\n messageTitle\n );\n if (modifiedComp) {\n scope.objects.add(modifiedComp);\n const modelComponent = await scope.getModelComponent(id);\n const versionHistory = await modelComponent.updateRebasedVersionHistory(scope.objects, [modifiedComp]);\n if (versionHistory) 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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","ignoreList":[]}
|
1
|
+
{"version":3,"names":["_bitError","data","require","_path","_interopRequireDefault","_cli","_importer","_lanes","_merging","_workspace","_basicLog","_componentId","_pMapSeries","_mergeVersion","_scope","_laneId","_logger","_checkout","_remove","_lodash","_export","_globalConfig","_mergeLanes","_mergeLane","_mergeLaneFromScope","_missingCompsToMerge","_mergeAbort","_lastMerged","_mergeMove","e","__esModule","default","ownKeys","r","t","Object","keys","getOwnPropertySymbols","o","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","defineProperty","_toPropertyKey","value","configurable","writable","i","_toPrimitive","Symbol","toPrimitive","call","TypeError","String","Number","MergeLanesMain","constructor","workspace","merging","lanes","logger","remove","scope","exporter","importer","checkout","mergeLaneByCLI","laneName","options","BitError","currentLaneId","consumer","getCurrentLaneId","otherLaneId","getParsedLaneId","mergeLane","mergeStrategy","noSnap","tag","snapMessage","existingOnWorkspaceOnly","build","keepReadme","squash","noSquash","pattern","includeDeps","skipDependencyInstallation","resolveUnrelated","ignoreConfigChanges","skipFetch","excludeNonLaneComps","shouldIncludeUpdateDependents","throwIfNotUpToDate","fetchCurrent","legacyScope","isDefault","toString","isEqual","fetchLaneWithItsComponents","currentLane","undefined","loadLane","isDefaultLane","ids","getMainIdsToMerge","compIdList","ComponentIdList","fromArray","toVersionLatest","importObjectsFromMainIfExist","laneToFetchArtifactsFrom","getOtherLane","lane","shouldFetch","isNew","otherLane","getBitIds","modelComponents","Promise","all","map","id","getModelComponent","compact","c","head","toComponentId","changeVersion","Error","toComponentIdsIncludeUpdateDependents","toComponentIds","idsToMerge","debug","shouldSquash","allComponentsStatus","getMergeStatus","componentIds","compIdsFromPattern","filterIdsFromPoolIdsByPattern","filterComponentsStatus","bitId","find","isEqualWithoutVersion","unchangedLegitimately","unchangedMessage","workspaceIds","listIds","throwForFailures","succeededComponents","squashSnaps","importHeadArtifactsFromLane","lastMerged","LastMerged","snapshot","takeSnapshot","mergeResults","mergeSnaps","persistSnapshot","mergedSuccessfully","failedComponents","every","failedComponent","deleteResults","readmeComponent","readmeComponentId","hash","removeLocallyByIds","reasonForRemoval","readmeResult","configMergeResults","configMergeResult","componentsWithConfigConflicts","hasConflicts","compIdStr","conflicts","mergedSuccessfullyIds","components","files","filesStatus","f","FileStatus","manual","binaryConflict","config","includes","toStringWithoutVersion","onDestroy","name","mergeMove","newLaneName","OutsideWorkspaceError","lastMerge","restoreLaneObjectFromLastMerged","newLaneResult","createLane","abortLaneMerge","checkoutProps","mergeAbortOpts","getCurrentLane","compDirsToRemove","restoreFromLastMerged","_reloadConsumer","objects","unmergedComponents","removeAllComponents","write","configMergeFile","getConflictMergeFile","delete","checkoutResults","checkoutError","restoreMissingComponents","err","error","restoredItems","path","basename","bitMap","mapPath","join","includeNonLaneComps","includeUpdateDependents","DEFAULT_LANE","laneIds","isExported","mainNotOnLane","laneId","mergeFromScope","fromLane","toLane","fromLaneId","parseLaneId","toLaneId","getDefaultLaneId","LaneId","parse","exportIfNeeded","idsToExport","laneToExport","compIdsList","exported","exportMany","idsWithFutureScope","laneObject","allVersions","exportHeadsOnly","throwForMissingArtifacts","exportOrigin","setCurrentLaneId","mergeSnapResults","mergeSnapError","generateMergeConflictFile","snappedIds","snappedComponents","exportedIds","mergedNow","mergedPreviously","compIsAlreadyMergedMsg","unmerged","reason","status","diffStatus","skipChanges","compsNotUpToDate","componentsStatus","s","upToDate","componentId","provider","cli","loggerMain","globalConfig","createLogger","MergeLanesAspect","lanesCommand","getCommand","mergeLanesMain","commands","MergeLaneCmd","MergeAbortLaneCmd","MergeMoveLaneCmd","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","pMapSeries","compId","fromStatus","divergeData","targetVersions","snapsOnTargetOnly","modelComponent","headOnTarget","getComponent","toImport","v","flat","scopeImporter","importWithoutDeps","cache","includeVersionHistory","remoteVersion","versionObj","loadVersion","flattenedDeps","getAllFlattenedDependencies","depsNotIncludeInPattern","depsOnLane","dep","isOnLane","isIdOnLane","depsOnLaneStr","MissingCompsToMerge","uniq","depsWithoutVersion","d","depsUniqWithoutVersion","uniqFromArray","getLogForSquash","basicLog","getBasicLog","log","message","messageTitle","currentLaneName","componentFromModel","modifiedComp","squashOneComp","add","versionHistory","updateRebasedVersionHistory","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 {\n MergingAspect,\n MergingMain,\n ComponentMergeStatus,\n ApplyVersionResults,\n compIsAlreadyMergedMsg,\n} 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 { FileStatus, MergeStrategy } from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport { ScopeAspect, ScopeMain } from '@teambit/scope';\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 { Ref } from '@teambit/legacy/dist/scope/objects';\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';\nimport { MergeMoveLaneCmd } from './merge-move.cmd';\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 shouldIncludeUpdateDependents?: boolean;\n throwIfNotUpToDate?: boolean; // relevant when merging from a scope\n fetchCurrent?: boolean; // needed when merging from a bare-scope (because it's empty)\n};\nexport type ConflictPerId = { id: ComponentID; files: string[]; config?: boolean };\nexport type MergeFromScopeResult = {\n mergedNow: ComponentID[];\n exportedIds: ComponentID[];\n unmerged: { id: ComponentID; reason: string }[]; // reasons currently are: ahead / already-merge / removed\n conflicts?: ConflictPerId[]; // relevant in case of diverge (currently possible only when merging from main to a lane)\n snappedIds?: ComponentID[]; // relevant in case of diverge (currently possible only when merging from main to a lane)\n mergedPreviously: ComponentID[];\n mergeSnapError?: Error;\n};\n\nexport class MergeLanesMain {\n constructor(\n private workspace: Workspace | undefined,\n private merging: MergingMain,\n readonly 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 async mergeLaneByCLI(laneName: string, options: MergeLaneOptions) {\n if (!this.workspace) {\n throw new BitError(`unable to merge a lane outside of Bit workspace`);\n }\n const currentLaneId = this.workspace.consumer.getCurrentLaneId();\n const otherLaneId = await this.workspace.consumer.getParsedLaneId(laneName);\n return this.mergeLane(otherLaneId, currentLaneId, options);\n }\n\n // eslint-disable-next-line complexity\n async mergeLane(\n otherLaneId: LaneId,\n currentLaneId: LaneId,\n options: MergeLaneOptions\n ): Promise<{\n mergeResults: ApplyVersionResults;\n deleteResults: any;\n configMergeResults: ConfigMergeResult[];\n mergedSuccessfullyIds: ComponentID[];\n conflicts: ConflictPerId[];\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 shouldIncludeUpdateDependents,\n throwIfNotUpToDate,\n fetchCurrent,\n } = options;\n const legacyScope = this.scope.legacyScope;\n if (tag && !currentLaneId.isDefault()) {\n throw new BitError(`--tag only possible when on main. currently checked out to ${currentLaneId.toString()}`);\n }\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 if (fetchCurrent && !currentLaneId.isDefault()) {\n // if current is default, it'll be fetch later on\n await this.lanes.fetchLaneWithItsComponents(currentLaneId);\n }\n const currentLane = currentLaneId.isDefault() ? undefined : await legacyScope.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 legacyScope.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, shouldIncludeUpdateDependents);\n laneToFetchArtifactsFrom = otherLane;\n lane = await legacyScope.loadLane(otherLaneId);\n }\n return lane;\n };\n const otherLane = isDefaultLane ? undefined : await getOtherLane();\n if (fetchCurrent && otherLane && currentLaneId.isDefault()) {\n const ids = await this.getMainIdsToMerge(otherLane, false, shouldIncludeUpdateDependents);\n const compIdList = ComponentIdList.fromArray(ids).toVersionLatest();\n await this.importer.importObjectsFromMainIfExist(compIdList);\n }\n const getBitIds = async () => {\n if (isDefaultLane) {\n const ids = await this.getMainIdsToMerge(currentLane, !excludeNonLaneComps, shouldIncludeUpdateDependents);\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 shouldIncludeUpdateDependents\n ? otherLane.toComponentIdsIncludeUpdateDependents()\n : otherLane.toComponentIds();\n };\n const idsToMerge = await getBitIds();\n\n if (throwIfNotUpToDate) await this.throwIfNotUpToDate(otherLaneId, currentLaneId);\n\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 = idsToMerge;\n const compIdsFromPattern = await (this.workspace || this.scope).filterIdsFromPoolIdsByPattern(\n pattern,\n componentIds\n );\n allComponentsStatus = await filterComponentsStatus(\n allComponentsStatus,\n compIdsFromPattern,\n idsToMerge,\n legacyScope,\n includeDeps,\n otherLane,\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 && this.workspace) {\n const workspaceIds = 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 legacyScope,\n includeDeps,\n otherLane,\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 const succeededComponents = allComponentsStatus.filter((c) => !c.unchangedMessage);\n if (shouldSquash) {\n await squashSnaps(succeededComponents, currentLaneId, otherLaneId, legacyScope, options.snapMessage);\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 = consumer ? new LastMerged(this.scope, consumer, this.logger) : undefined;\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 if (snapshot) 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 = compact(allComponentsStatus.map((c) => c.configMergeResult));\n\n const componentsWithConfigConflicts = configMergeResults.filter((c) => c.hasConflicts()).map((c) => c.compIdStr);\n const conflicts: ConflictPerId[] = [];\n const mergedSuccessfullyIds: ComponentID[] = [];\n mergeResults.components?.forEach((c) => {\n const files = Object.keys(c.filesStatus).filter(\n (f) => c.filesStatus[f] === FileStatus.manual || c.filesStatus[f] === FileStatus.binaryConflict\n );\n const config = componentsWithConfigConflicts.includes(c.id.toStringWithoutVersion());\n if (files.length || config) {\n conflicts.push({ id: c.id, files, config });\n } else mergedSuccessfullyIds.push(c.id);\n });\n\n await this.workspace?.consumer.onDestroy(`lane-merge (${otherLaneId.name})`);\n\n return { mergeResults, deleteResults, configMergeResults, mergedSuccessfullyIds, conflicts };\n }\n\n async mergeMove(newLaneName: string, options: { scope?: string }) {\n if (!this.workspace) throw new OutsideWorkspaceError();\n const lastMerge = new LastMerged(this.scope, this.workspace.consumer, this.logger);\n await lastMerge.restoreLaneObjectFromLastMerged();\n const newLaneResult = await this.lanes.createLane(newLaneName, { scope: options.scope });\n return newLaneResult;\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 = 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, includeUpdateDependents = false) {\n if (!lane) throw new Error(`unable to merge ${DEFAULT_LANE}, the current lane was not found`);\n const laneIds = includeUpdateDependents ? lane.toComponentIdsIncludeUpdateDependents() : lane.toComponentIds();\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 = 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<MergeFromScopeResult> {\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 = await this.lanes.parseLaneId(fromLane);\n const toLaneId = toLane === DEFAULT_LANE ? this.lanes.getDefaultLaneId() : LaneId.parse(toLane);\n const shouldIncludeUpdateDependents = toLaneId.isDefault();\n\n const exportIfNeeded = async (idsToExport: ComponentID[], laneToExport?: Lane): Promise<ComponentID[]> => {\n if (!options.push) return [];\n const shouldSquash = toLaneId.isDefault() && !options.noSquash; // only when merging to main we squash.\n const compIdsList = ComponentIdList.fromArray(idsToExport);\n const { exported } = await this.exporter.exportMany({\n scope: this.scope.legacyScope,\n ids: compIdsList,\n idsWithFutureScope: compIdsList,\n laneObject: laneToExport,\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 // @todo: if we merge main to a lane, then no need to export all main history, it'll be fetched later by fetchMissingHistory.\n // once a change is done in the exporter about this, uncomment the next line.\n // exportHeadsOnly: shouldSquash || fromLaneId.isDefault(),\n exportHeadsOnly: shouldSquash,\n // all artifacts must be pushed. otherwise, they'll be missing from the component-scopes.\n // unless this is a merge from main to a lane, in which case it's not necessary to export the artifacts as\n // the user importing them will get them from main.\n throwForMissingArtifacts: !fromLaneId.isDefault(),\n exportOrigin: 'lane-merge',\n });\n return exported;\n };\n\n // current -> target (to)\n // other -> source (from)\n options.mergeStrategy = 'manual';\n options.excludeNonLaneComps = true;\n options.skipDependencyInstallation = true;\n options.shouldIncludeUpdateDependents = shouldIncludeUpdateDependents;\n options.throwIfNotUpToDate = !fromLaneId.isDefault();\n options.fetchCurrent = true;\n this.scope.legacyScope.setCurrentLaneId(toLaneId);\n\n const { mergeResults, configMergeResults, conflicts, mergedSuccessfullyIds } = await this.mergeLane(\n fromLaneId,\n toLaneId,\n options as MergeLaneOptions\n );\n\n const { mergeSnapResults, failedComponents, mergeSnapError } = mergeResults;\n\n if (configMergeResults.length) {\n this.logger.debug(\n `found the following config conflicts: ${configMergeResults\n .map((c) => `\\n${c.compIdStr}\\n${c.generateMergeConflictFile()}`)\n .join('\\n')}`\n );\n }\n\n const snappedIds = mergeSnapResults?.snappedComponents.map((c) => c.id) || [];\n\n const laneToExport = toLaneId.isDefault() ? undefined : await this.lanes.loadLane(toLaneId); // needs to be loaded again after the merge as it changed\n const exportedIds =\n conflicts.length || mergeSnapError\n ? []\n : await exportIfNeeded(\n mergedSuccessfullyIds.map((id) => id.changeVersion(undefined)),\n laneToExport\n );\n\n return {\n mergedNow: mergedSuccessfullyIds,\n mergedPreviously:\n failedComponents\n ?.filter(({ unchangedMessage }) => unchangedMessage === compIsAlreadyMergedMsg)\n .map((c) => c.id) || [],\n exportedIds,\n unmerged: failedComponents?.map((c) => ({ id: c.id, reason: c.unchangedMessage })) || [],\n conflicts,\n snappedIds,\n mergeSnapError,\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 lanesCommand?.commands?.push(new MergeMoveLaneCmd(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 legacyScope: LegacyScope,\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 legacyScope.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 legacyScope.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(), legacyScope.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 legacyScope.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(\n succeededComponents: ComponentMergeStatus[],\n currentLaneId: LaneId,\n otherLaneId: LaneId,\n scope: LegacyScope,\n messageTitle?: string\n) {\n const currentLaneName = currentLaneId.name;\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 scope,\n componentFromModel,\n messageTitle\n );\n if (modifiedComp) {\n scope.objects.add(modifiedComp);\n const modelComponent = await scope.getModelComponent(id);\n const versionHistory = await modelComponent.updateRebasedVersionHistory(scope.objects, [modifiedComp]);\n if (versionHistory) 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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","ignoreList":[]}
|
package/package.json
CHANGED
@@ -1,12 +1,12 @@
|
|
1
1
|
{
|
2
2
|
"name": "@teambit/merge-lanes",
|
3
|
-
"version": "1.0.
|
3
|
+
"version": "1.0.311",
|
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.
|
9
|
+
"version": "1.0.311"
|
10
10
|
},
|
11
11
|
"dependencies": {
|
12
12
|
"chalk": "2.4.2",
|
@@ -19,18 +19,18 @@
|
|
19
19
|
"@teambit/lane-id": "0.0.311",
|
20
20
|
"@teambit/harmony": "0.4.6",
|
21
21
|
"@teambit/component-id": "1.2.0",
|
22
|
-
"@teambit/logger": "0.0.
|
23
|
-
"@teambit/scope": "1.0.
|
24
|
-
"@teambit/checkout": "1.0.
|
25
|
-
"@teambit/cli": "0.0.
|
26
|
-
"@teambit/global-config": "0.0.
|
27
|
-
"@teambit/merging": "1.0.
|
28
|
-
"@teambit/remove": "1.0.
|
29
|
-
"@teambit/config-merger": "0.0.
|
30
|
-
"@teambit/export": "1.0.
|
31
|
-
"@teambit/importer": "1.0.
|
32
|
-
"@teambit/lanes": "1.0.
|
33
|
-
"@teambit/workspace": "1.0.
|
22
|
+
"@teambit/logger": "0.0.981",
|
23
|
+
"@teambit/scope": "1.0.311",
|
24
|
+
"@teambit/checkout": "1.0.311",
|
25
|
+
"@teambit/cli": "0.0.888",
|
26
|
+
"@teambit/global-config": "0.0.891",
|
27
|
+
"@teambit/merging": "1.0.311",
|
28
|
+
"@teambit/remove": "1.0.311",
|
29
|
+
"@teambit/config-merger": "0.0.178",
|
30
|
+
"@teambit/export": "1.0.311",
|
31
|
+
"@teambit/importer": "1.0.311",
|
32
|
+
"@teambit/lanes": "1.0.311",
|
33
|
+
"@teambit/workspace": "1.0.311"
|
34
34
|
},
|
35
35
|
"devDependencies": {
|
36
36
|
"@types/fs-extra": "9.0.7",
|
@@ -41,7 +41,7 @@
|
|
41
41
|
"@teambit/harmony.envs.core-aspect-env": "0.0.39",
|
42
42
|
"@teambit/component.testing.mock-components": "0.0.205",
|
43
43
|
"@teambit/harmony.testing.load-aspect": "0.0.200",
|
44
|
-
"@teambit/snapping": "1.0.
|
44
|
+
"@teambit/snapping": "1.0.311",
|
45
45
|
"@teambit/workspace.testing.mock-workspace": "0.0.27"
|
46
46
|
},
|
47
47
|
"peerDependencies": {
|
File without changes
|