@teambit/merge-lanes 0.0.39 → 0.0.41
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/dist/merge-lane-from-scope.cmd.js +8 -3
- package/dist/merge-lane-from-scope.cmd.js.map +1 -1
- package/dist/merge-lanes.main.runtime.d.ts +1 -0
- package/dist/merge-lanes.main.runtime.js +16 -17
- package/dist/merge-lanes.main.runtime.js.map +1 -1
- package/package-tar/teambit-merge-lanes-0.0.41.tgz +0 -0
- package/package.json +12 -12
- /package/{preview-1663904275528.js → preview-1664249775979.js} +0 -0
- package/package-tar/teambit-merge-lanes-0.0.39.tgz +0 -0
@@ -80,7 +80,8 @@ the lane must be up-to-date with main, otherwise, conflicts might occur which ar
|
|
80
80
|
|
81
81
|
const {
|
82
82
|
mergedNow,
|
83
|
-
mergedPreviously
|
83
|
+
mergedPreviously,
|
84
|
+
exportedIds
|
84
85
|
} = await this.mergeLanes.mergeFromScope(name, {
|
85
86
|
push,
|
86
87
|
keepReadme,
|
@@ -95,8 +96,12 @@ the lane must be up-to-date with main, otherwise, conflicts might occur which ar
|
|
95
96
|
|
96
97
|
const nonMergedTitle = _chalk().default.bold(`the following ${mergedPreviously.length} components were already merged before, they were left intact`);
|
97
98
|
|
98
|
-
const nonMergedOutput = mergedPreviously.length ?
|
99
|
-
|
99
|
+
const nonMergedOutput = mergedPreviously.length ? `\n${nonMergedTitle}\n${mergedPreviously.join('\n')}` : '';
|
100
|
+
|
101
|
+
const exportedTitle = _chalk().default.green(`successfully exported ${exportedIds.length} components`);
|
102
|
+
|
103
|
+
const exportedOutput = exportedIds.length ? `\n${exportedTitle}\n${exportedIds.join('\n')}` : '';
|
104
|
+
return mergedOutput + nonMergedOutput + exportedOutput;
|
100
105
|
}
|
101
106
|
|
102
107
|
}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"names":["MergeLaneFromScopeCmd","constructor","mergeLanes","name","description","report","pattern","push","keepReadme","noSquash","includeDeps","BitError","mergedNow","mergedPreviously","mergeFromScope","mergedTitle","chalk","green","length","mergedOutput","join","nonMergedTitle","bold","nonMergedOutput"],"sources":["merge-lane-from-scope.cmd.ts"],"sourcesContent":["import chalk from 'chalk';\nimport { Command, CommandOptions } from '@teambit/cli';\nimport { BitError } from '@teambit/bit-error';\nimport { MergeLanesMain } from './merge-lanes.main.runtime';\n\n/**\n * private command. the underscore prefix is intended.\n */\nexport class MergeLaneFromScopeCmd implements Command {\n name = '_merge-lane <lane> [pattern]';\n description = `merge a remote lane into main via a bare-scope (not workspace)`;\n extendedDescription = `to merge from a workspace, use \"bit lane merge\" command.\nthis is intended to use from the UI, which will have a button to merge an existing lane into main.\nthe lane must be up-to-date with main, otherwise, conflicts might occur which are not handled in this command`;\n arguments = [\n {\n name: 'lane',\n description: 'lane-id to merge to main',\n },\n {\n name: 'pattern',\n description: 'EXPERIMENTAL. partially merge the lane with the specified component-pattern',\n },\n ];\n alias = '';\n options = [\n ['', 'push', 'export the updated objects to the original scopes once done'],\n ['', 'keep-readme', 'skip deleting the lane readme component after merging'],\n ['', 'no-squash', 'EXPERIMENTAL. relevant for merging lanes into main, which by default squash.'],\n // ['', 'verbose', 'show details of components that were not merged legitimately'],\n ['', 'include-deps', 'EXPERIMENTAL. relevant for \"--pattern\". merge also dependencies of the given components'],\n ] as CommandOptions;\n loader = true;\n private = true;\n migration = true;\n remoteOp = true;\n\n constructor(private mergeLanes: MergeLanesMain) {}\n\n async report(\n [name, pattern]: [string, string],\n {\n push = false,\n keepReadme = false,\n noSquash = false,\n includeDeps = false,\n }: // verbose = false,\n {\n push?: boolean;\n keepReadme?: boolean;\n noSquash: boolean;\n includeDeps?: boolean;\n // verbose?: boolean;\n }\n ): Promise<string> {\n if (includeDeps && !pattern) {\n throw new BitError(`\"--include-deps\" flag is relevant only for --pattern flag`);\n }\n const { mergedNow, mergedPreviously } = await this.mergeLanes.mergeFromScope(name, {\n push,\n keepReadme,\n noSquash,\n pattern,\n includeDeps,\n });\n\n const mergedTitle = chalk.green(`successfully merged ${mergedNow.length} components from ${name} to main`);\n const mergedOutput = mergedNow.length ? `${mergedTitle}\\n${mergedNow.join('\\n')}` : '';\n\n const nonMergedTitle = chalk.bold(\n `the following ${mergedPreviously.length} components were already merged before, they were left intact`\n );\n const nonMergedOutput = mergedPreviously.length ?
|
1
|
+
{"version":3,"names":["MergeLaneFromScopeCmd","constructor","mergeLanes","name","description","report","pattern","push","keepReadme","noSquash","includeDeps","BitError","mergedNow","mergedPreviously","exportedIds","mergeFromScope","mergedTitle","chalk","green","length","mergedOutput","join","nonMergedTitle","bold","nonMergedOutput","exportedTitle","exportedOutput"],"sources":["merge-lane-from-scope.cmd.ts"],"sourcesContent":["import chalk from 'chalk';\nimport { Command, CommandOptions } from '@teambit/cli';\nimport { BitError } from '@teambit/bit-error';\nimport { MergeLanesMain } from './merge-lanes.main.runtime';\n\n/**\n * private command. the underscore prefix is intended.\n */\nexport class MergeLaneFromScopeCmd implements Command {\n name = '_merge-lane <lane> [pattern]';\n description = `merge a remote lane into main via a bare-scope (not workspace)`;\n extendedDescription = `to merge from a workspace, use \"bit lane merge\" command.\nthis is intended to use from the UI, which will have a button to merge an existing lane into main.\nthe lane must be up-to-date with main, otherwise, conflicts might occur which are not handled in this command`;\n arguments = [\n {\n name: 'lane',\n description: 'lane-id to merge to main',\n },\n {\n name: 'pattern',\n description: 'EXPERIMENTAL. partially merge the lane with the specified component-pattern',\n },\n ];\n alias = '';\n options = [\n ['', 'push', 'export the updated objects to the original scopes once done'],\n ['', 'keep-readme', 'skip deleting the lane readme component after merging'],\n ['', 'no-squash', 'EXPERIMENTAL. relevant for merging lanes into main, which by default squash.'],\n // ['', 'verbose', 'show details of components that were not merged legitimately'],\n ['', 'include-deps', 'EXPERIMENTAL. relevant for \"--pattern\". merge also dependencies of the given components'],\n ] as CommandOptions;\n loader = true;\n private = true;\n migration = true;\n remoteOp = true;\n\n constructor(private mergeLanes: MergeLanesMain) {}\n\n async report(\n [name, pattern]: [string, string],\n {\n push = false,\n keepReadme = false,\n noSquash = false,\n includeDeps = false,\n }: // verbose = false,\n {\n push?: boolean;\n keepReadme?: boolean;\n noSquash: boolean;\n includeDeps?: boolean;\n // verbose?: boolean;\n }\n ): Promise<string> {\n if (includeDeps && !pattern) {\n throw new BitError(`\"--include-deps\" flag is relevant only for --pattern flag`);\n }\n const { mergedNow, mergedPreviously, exportedIds } = await this.mergeLanes.mergeFromScope(name, {\n push,\n keepReadme,\n noSquash,\n pattern,\n includeDeps,\n });\n\n const mergedTitle = chalk.green(`successfully merged ${mergedNow.length} components from ${name} to main`);\n const mergedOutput = mergedNow.length ? `${mergedTitle}\\n${mergedNow.join('\\n')}` : '';\n\n const nonMergedTitle = chalk.bold(\n `the following ${mergedPreviously.length} components were already merged before, they were left intact`\n );\n const nonMergedOutput = mergedPreviously.length ? `\\n${nonMergedTitle}\\n${mergedPreviously.join('\\n')}` : '';\n\n const exportedTitle = chalk.green(`successfully exported ${exportedIds.length} components`);\n const exportedOutput = exportedIds.length ? `\\n${exportedTitle}\\n${exportedIds.join('\\n')}` : '';\n\n return mergedOutput + nonMergedOutput + exportedOutput;\n }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AAAA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AAEA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AAGA;AACA;AACA;AACO,MAAMA,qBAAN,CAA+C;EA6BpDC,WAAW,CAASC,UAAT,EAAqC;IAAA,KAA5BA,UAA4B,GAA5BA,UAA4B;IAAA,8CA5BzC,8BA4ByC;IAAA,qDA3BjC,gEA2BiC;IAAA,6DA1BzB;AACzB;AACA,8GAwBkD;IAAA,mDAvBpC,CACV;MACEC,IAAI,EAAE,MADR;MAEEC,WAAW,EAAE;IAFf,CADU,EAKV;MACED,IAAI,EAAE,SADR;MAEEC,WAAW,EAAE;IAFf,CALU,CAuBoC;IAAA,+CAbxC,EAawC;IAAA,iDAZtC,CACR,CAAC,EAAD,EAAK,MAAL,EAAa,6DAAb,CADQ,EAER,CAAC,EAAD,EAAK,aAAL,EAAoB,uDAApB,CAFQ,EAGR,CAAC,EAAD,EAAK,WAAL,EAAkB,8EAAlB,CAHQ,EAIR;IACA,CAAC,EAAD,EAAK,cAAL,EAAqB,yFAArB,CALQ,CAYsC;IAAA,gDALvC,IAKuC;IAAA,iDAJtC,IAIsC;IAAA,mDAHpC,IAGoC;IAAA,kDAFrC,IAEqC;EAAE;;EAEtC,MAANC,MAAM,CACV,CAACF,IAAD,EAAOG,OAAP,CADU,EAEV;IACEC,IAAI,GAAG,KADT;IAEEC,UAAU,GAAG,KAFf;IAGEC,QAAQ,GAAG,KAHb;IAIEC,WAAW,GAAG;EAJhB,CAFU,EAeO;IACjB,IAAIA,WAAW,IAAI,CAACJ,OAApB,EAA6B;MAC3B,MAAM,KAAIK,oBAAJ,EAAc,2DAAd,CAAN;IACD;;IACD,MAAM;MAAEC,SAAF;MAAaC,gBAAb;MAA+BC;IAA/B,IAA+C,MAAM,KAAKZ,UAAL,CAAgBa,cAAhB,CAA+BZ,IAA/B,EAAqC;MAC9FI,IAD8F;MAE9FC,UAF8F;MAG9FC,QAH8F;MAI9FH,OAJ8F;MAK9FI;IAL8F,CAArC,CAA3D;;IAQA,MAAMM,WAAW,GAAGC,gBAAA,CAAMC,KAAN,CAAa,uBAAsBN,SAAS,CAACO,MAAO,oBAAmBhB,IAAK,UAA5E,CAApB;;IACA,MAAMiB,YAAY,GAAGR,SAAS,CAACO,MAAV,GAAoB,GAAEH,WAAY,KAAIJ,SAAS,CAACS,IAAV,CAAe,IAAf,CAAqB,EAA3D,GAA+D,EAApF;;IAEA,MAAMC,cAAc,GAAGL,gBAAA,CAAMM,IAAN,CACpB,iBAAgBV,gBAAgB,CAACM,MAAO,+DADpB,CAAvB;;IAGA,MAAMK,eAAe,GAAGX,gBAAgB,CAACM,MAAjB,GAA2B,KAAIG,cAAe,KAAIT,gBAAgB,CAACQ,IAAjB,CAAsB,IAAtB,CAA4B,EAA9E,GAAkF,EAA1G;;IAEA,MAAMI,aAAa,GAAGR,gBAAA,CAAMC,KAAN,CAAa,yBAAwBJ,WAAW,CAACK,MAAO,aAAxD,CAAtB;;IACA,MAAMO,cAAc,GAAGZ,WAAW,CAACK,MAAZ,GAAsB,KAAIM,aAAc,KAAIX,WAAW,CAACO,IAAZ,CAAiB,IAAjB,CAAuB,EAAnE,GAAuE,EAA9F;IAEA,OAAOD,YAAY,GAAGI,eAAf,GAAiCE,cAAxC;EACD;;AAtEmD"}
|
@@ -448,29 +448,28 @@ class MergeLanesMain {
|
|
448
448
|
});
|
449
449
|
const bitObjects = (0, _lodash().compact)(bitObjectsPerComp).map(b => b.objects);
|
450
450
|
await repo.writeObjectsToTheFS(bitObjects.flat());
|
451
|
+
let exportedIds = [];
|
451
452
|
|
452
453
|
if (options.push) {
|
453
|
-
const
|
454
|
-
|
455
|
-
|
456
|
-
|
457
|
-
|
458
|
-
|
459
|
-
}
|
460
|
-
|
461
|
-
|
462
|
-
|
463
|
-
|
464
|
-
|
465
|
-
|
466
|
-
};
|
467
|
-
}));
|
468
|
-
await this.exporter.exportObjectList(manyObjectsPerRemote, scopeRemotes);
|
454
|
+
const ids = (0, _lodash().compact)(bitObjectsPerComp).map(b => b.id);
|
455
|
+
|
456
|
+
const bitIds = _bitId().BitIds.fromArray(ids);
|
457
|
+
|
458
|
+
const {
|
459
|
+
exported
|
460
|
+
} = await this.exporter.exportMany({
|
461
|
+
scope: this.scope.legacyScope,
|
462
|
+
ids: bitIds,
|
463
|
+
idsWithFutureScope: bitIds,
|
464
|
+
allVersions: false
|
465
|
+
});
|
466
|
+
exportedIds = exported.map(id => id.toString());
|
469
467
|
}
|
470
468
|
|
471
469
|
return {
|
472
470
|
mergedPreviously: mergedPreviously.map(id => id.toString()),
|
473
|
-
mergedNow: mergedNow.map(id => id.toString())
|
471
|
+
mergedNow: mergedNow.map(id => id.toString()),
|
472
|
+
exportedIds
|
474
473
|
};
|
475
474
|
}
|
476
475
|
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"names":["MergeLanesMain","constructor","workspace","merging","lanes","logger","remove","scope","exporter","mergeLane","laneName","options","BitError","consumer","mergeStrategy","noSnap","tag","snapMessage","existingOnWorkspaceOnly","build","keepReadme","noSquash","pattern","includeDeps","skipDependencyInstallation","resolveUnrelated","ignoreConfigChanges","remote","currentLaneId","getCurrentLaneId","isDefault","toString","otherLaneId","getParsedLaneId","isEqual","currentLane","loadLane","isDefaultLane","getOtherLane","undefined","lane","fetchLaneWithItsComponents","otherLane","getBitIds","Error","DEFAULT_LANE","getDefaultLaneIdsFromLane","toBitIds","bitIds","debug","otherLaneName","getAllComponentsStatus","tmp","Tmp","componentsStatus","Promise","all","map","bitId","getComponentMergeStatus","clear","err","allComponentsStatus","componentIds","resolveMultipleComponentIds","compIdsFromPattern","filterIdsFromPoolIdsByPattern","filterComponentsStatus","forEach","find","c","id","isEqualWithoutVersion","push","unmergedLegitimately","unmergedMessage","workspaceIds","listIds","filter","_legacy","throwForFailures","squashSnaps","mergeResults","mergeSnaps","laneId","localLane","mergedSuccessfully","failedComponents","length","every","failedComponent","unchangedLegitimately","deleteResults","readmeComponent","readmeComponentId","changeVersion","head","hash","componentsPattern","force","track","deleteFiles","fromLane","readmeResult","name","onDestroy","failureMsgs","chalk","bold","red","join","mergeFromScope","LaneId","parse","importLaneObject","laneIds","scopeComponentsImporter","ScopeComponentsImporter","getInstance","legacyScope","importManyDeltaWithoutDeps","toVersionLatest","repo","objects","mergedPreviously","mergedNow","bitObjectsPerComp","pMapSeries","modelComponent","getModelComponent","versionObj","loadVersion","version","laneHead","getRef","mainHead","divergeData","getDivergeData","modifiedVersion","squashOneComp","setHead","bitObjects","compact","b","writeObjectsToTheFS","flat","scopeRemotes","_legacyRemotes","grouped","reduce","acc","current","scopeName","manyObjectsPerRemote","Object","keys","resolve","objectList","ObjectList","fromBitObjects","exportObjectList","provider","cli","loggerMain","createLogger","MergeLanesAspect","lanesCommand","getCommand","mergeLanesMain","commands","MergeLaneCmd","register","MergeLaneFromScopeCmd","LanesAspect","CLIAspect","WorkspaceAspect","MergingAspect","LoggerAspect","RemoveAspect","ScopeAspect","ExportAspect","MainRuntime","compIdsToKeep","allBitIds","bitIdsFromPattern","BitIds","fromArray","bitIdsNotFromPattern","hasWithoutVersion","filteredComponentStatus","depsToAdd","compId","fromStatus","remoteVersions","snapsOnRemoteOnly","remoteVersion","flattenedDeps","getAllFlattenedDependencies","depsNotIncludeInPattern","depsOnLane","dep","isOnLane","isIdOnLane","d","depsUniq","uniqFromArray","currentLaneName","succeededComponents","componentFromModel","modifiedComp","add","isDiverged","isLocalAhead","isRemoteAhead","remoteSnaps","currentParents","parents","commonSnapBeforeDiverge","addAsOnlyParent","ref","removeParent","setSquashed","previousParents","addRuntime"],"sources":["merge-lanes.main.runtime.ts"],"sourcesContent":["import { BitError } from '@teambit/bit-error';\nimport { CLIAspect, CLIMain, MainRuntime } from '@teambit/cli';\nimport { LanesAspect, LanesMain } from '@teambit/lanes';\nimport MergingAspect, { MergingMain, ComponentMergeStatus } from '@teambit/merging';\nimport WorkspaceAspect, { Workspace } from '@teambit/workspace';\nimport chalk from 'chalk';\nimport { BitId } from '@teambit/legacy-bit-id';\nimport pMapSeries from 'p-map-series';\nimport { Consumer } from '@teambit/legacy/dist/consumer';\nimport { MergeStrategy, ApplyVersionResults } from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport { BitIds } from '@teambit/legacy/dist/bit-id';\nimport { ScopeAspect, ScopeMain } from '@teambit/scope';\nimport ScopeComponentsImporter from '@teambit/legacy/dist/scope/component-ops/scope-components-importer';\nimport { ComponentID } from '@teambit/component-id';\nimport { DEFAULT_LANE, LaneId } from '@teambit/lane-id';\nimport { Lane, Version } from '@teambit/legacy/dist/scope/models';\nimport { Tmp } from '@teambit/legacy/dist/scope/repositories';\nimport { Logger, LoggerAspect, LoggerMain } from '@teambit/logger';\nimport { DivergeData } from '@teambit/legacy/dist/scope/component-ops/diverge-data';\nimport { RemoveAspect, RemoveMain } from '@teambit/remove';\nimport { compact } from 'lodash';\nimport { ExportAspect, ExportMain, ObjectList } from '@teambit/export';\nimport { BitObject } 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';\n\nexport type MergeLaneOptions = {\n mergeStrategy: MergeStrategy;\n noSnap: boolean;\n snapMessage: string;\n existingOnWorkspaceOnly: boolean;\n build: boolean;\n keepReadme: boolean;\n noSquash: boolean;\n tag?: boolean;\n pattern?: string;\n includeDeps?: boolean;\n skipDependencyInstallation?: boolean;\n resolveUnrelated?: MergeStrategy;\n ignoreConfigChanges?: boolean;\n remote?: boolean;\n};\n\nexport class MergeLanesMain {\n constructor(\n private workspace: Workspace | undefined,\n private merging: MergingMain,\n private lanes: LanesMain,\n private logger: Logger,\n private remove: RemoveMain,\n private scope: ScopeMain,\n private exporter: ExportMain\n ) {}\n\n async mergeLane(\n laneName: string,\n options: MergeLaneOptions\n ): Promise<{ mergeResults: ApplyVersionResults; deleteResults: any }> {\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 noSquash,\n pattern,\n includeDeps,\n skipDependencyInstallation,\n resolveUnrelated,\n ignoreConfigChanges,\n remote,\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 const currentLane = currentLaneId.isDefault() ? null : await consumer.scope.loadLane(currentLaneId);\n const isDefaultLane = otherLaneId.isDefault();\n const getOtherLane = async () => {\n if (isDefaultLane) {\n return undefined;\n }\n const lane = await consumer.scope.loadLane(otherLaneId);\n if (remote || !lane) {\n return this.lanes.fetchLaneWithItsComponents(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 consumer.scope.getDefaultLaneIdsFromLane(currentLane);\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 const otherLaneName = isDefaultLane ? DEFAULT_LANE : otherLaneId.toString();\n\n const getAllComponentsStatus = async (): Promise<ComponentMergeStatus[]> => {\n const tmp = new Tmp(consumer.scope);\n try {\n const componentsStatus = await Promise.all(\n bitIds.map((bitId) =>\n this.merging.getComponentMergeStatus(bitId, currentLane, otherLaneName, {\n resolveUnrelated,\n ignoreConfigChanges,\n })\n )\n );\n await tmp.clear();\n return componentsStatus;\n } catch (err: any) {\n await tmp.clear();\n throw err;\n }\n };\n let allComponentsStatus = await getAllComponentsStatus();\n\n if (pattern) {\n const componentIds = await this.workspace.resolveMultipleComponentIds(bitIds);\n const compIdsFromPattern = this.workspace.scope.filterIdsFromPoolIdsByPattern(pattern, componentIds);\n allComponentsStatus = await filterComponentsStatus(\n allComponentsStatus,\n compIdsFromPattern,\n bitIds,\n this.workspace,\n includeDeps,\n otherLane || undefined\n );\n bitIds.forEach((bitId) => {\n if (!allComponentsStatus.find((c) => c.id.isEqualWithoutVersion(bitId))) {\n allComponentsStatus.push({ id: bitId, unmergedLegitimately: true, unmergedMessage: `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._legacy))\n );\n allComponentsStatus = await filterComponentsStatus(\n allComponentsStatus,\n compIdsFromPattern,\n bitIds,\n this.workspace,\n includeDeps\n );\n bitIds.forEach((bitId) => {\n if (!allComponentsStatus.find((c) => c.id.isEqualWithoutVersion(bitId))) {\n allComponentsStatus.push({ id: bitId, unmergedLegitimately: true, unmergedMessage: `not in the workspace` });\n }\n });\n }\n\n throwForFailures();\n\n if (currentLaneId.isDefault() && !noSquash) {\n squashSnaps(allComponentsStatus, otherLaneId, consumer);\n }\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 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\n .changeVersion(otherLane.readmeComponent?.head?.hash)\n .toString();\n\n deleteResults = await this.remove.remove({\n componentsPattern: readmeComponentId,\n force: false,\n remote: false,\n track: false,\n deleteFiles: true,\n fromLane: false,\n });\n } else if (otherLane && !otherLane.readmeComponent) {\n deleteResults = { readmeResult: `\\nlane ${otherLane.name} doesn't have a readme component` };\n }\n\n await this.workspace.consumer.onDestroy();\n\n return { mergeResults, deleteResults };\n\n function throwForFailures() {\n const failedComponents = allComponentsStatus.filter((c) => c.unmergedMessage && !c.unmergedLegitimately);\n if (failedComponents.length) {\n const failureMsgs = failedComponents\n .map(\n (failedComponent) =>\n `${chalk.bold(failedComponent.id.toString())} - ${chalk.red(failedComponent.unmergedMessage as string)}`\n )\n .join('\\n');\n throw new BitError(`unable to merge due to the following failures:\\n${failureMsgs}`);\n }\n }\n }\n\n async mergeFromScope(\n laneName: string,\n options: Partial<MergeLaneOptions> & { push?: boolean }\n ): Promise<{\n mergedPreviously: string[];\n mergedNow: 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 const laneId = LaneId.parse(laneName);\n const lane = await this.lanes.importLaneObject(laneId);\n const laneIds = lane.toBitIds();\n const scopeComponentsImporter = ScopeComponentsImporter.getInstance(this.scope.legacyScope);\n await scopeComponentsImporter.importManyDeltaWithoutDeps(laneIds, true, lane, true);\n // get their main as well\n await scopeComponentsImporter.importManyDeltaWithoutDeps(laneIds.toVersionLatest(), true, undefined, true);\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: BitId[] = [];\n const mergedNow: BitId[] = [];\n const bitObjectsPerComp = await pMapSeries(laneIds, async (id) => {\n const modelComponent = await this.scope.legacyScope.getModelComponent(id);\n const versionObj = await modelComponent.loadVersion(id.version as string, repo);\n const laneHead = modelComponent.getRef(id.version as string);\n if (!laneHead) throw new Error(`lane head must be defined for ${id.toString()}`);\n const mainHead = modelComponent.head || null;\n if (mainHead?.isEqual(laneHead)) {\n mergedPreviously.push(id);\n return undefined;\n }\n const divergeData = await getDivergeData(repo, modelComponent, laneHead, mainHead);\n const modifiedVersion = squashOneComp(DEFAULT_LANE, laneId, id, divergeData, versionObj);\n modelComponent.setHead(laneHead);\n const objects = [modelComponent, modifiedVersion];\n mergedNow.push(id);\n return { id, objects };\n });\n const bitObjects = compact(bitObjectsPerComp).map((b) => b.objects);\n await repo.writeObjectsToTheFS(bitObjects.flat() as BitObject[]);\n\n if (options.push) {\n const scopeRemotes = await this.scope._legacyRemotes();\n const grouped: { [scopeName: string]: BitObject[] } = compact(bitObjectsPerComp).reduce((acc, current) => {\n const scopeName = current.id.scope;\n if (!scopeName) throw new Error(`${current.id.toString()} has no scope-name`);\n (acc[scopeName] ||= []).push(...current.objects);\n return acc;\n }, {});\n const manyObjectsPerRemote = await Promise.all(\n Object.keys(grouped).map(async (scopeName) => {\n const remote = await scopeRemotes.resolve(scopeName, this.scope.legacyScope);\n const objectList = await ObjectList.fromBitObjects(grouped[scopeName]);\n return { remote, objectList };\n })\n );\n await this.exporter.exportObjectList(manyObjectsPerRemote, scopeRemotes);\n }\n\n return {\n mergedPreviously: mergedPreviously.map((id) => id.toString()),\n mergedNow: mergedNow.map((id) => id.toString()),\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 ];\n static runtime = MainRuntime;\n\n static async provider([lanes, cli, workspace, merging, loggerMain, remove, scope, exporter]: [\n LanesMain,\n CLIMain,\n Workspace,\n MergingMain,\n LoggerMain,\n RemoveMain,\n ScopeMain,\n ExportMain\n ]) {\n const logger = loggerMain.createLogger(MergeLanesAspect.id);\n const lanesCommand = cli.getCommand('lane');\n const mergeLanesMain = new MergeLanesMain(workspace, merging, lanes, logger, remove, scope, exporter);\n lanesCommand?.commands?.push(new MergeLaneCmd(mergeLanesMain));\n cli.register(new MergeLaneFromScopeCmd(mergeLanesMain));\n return mergeLanesMain;\n }\n}\n\nasync function filterComponentsStatus(\n allComponentsStatus: ComponentMergeStatus[],\n compIdsToKeep: ComponentID[],\n allBitIds: BitId[],\n workspace: Workspace,\n includeDeps = false,\n lane?: Lane\n): Promise<ComponentMergeStatus[]> {\n const bitIdsFromPattern = BitIds.fromArray(compIdsToKeep.map((c) => c._legacy));\n const bitIdsNotFromPattern = allBitIds.filter((bitId) => !bitIdsFromPattern.hasWithoutVersion(bitId));\n const filteredComponentStatus: ComponentMergeStatus[] = [];\n const depsToAdd: BitId[] = [];\n await pMapSeries(compIdsToKeep, async (compId) => {\n const fromStatus = allComponentsStatus.find((c) => c.id.isEqualWithoutVersion(compId._legacy));\n if (!fromStatus) {\n throw new Error(`filterComponentsStatus: unable to find ${compId.toString()} in component-status`);\n }\n filteredComponentStatus.push(fromStatus);\n if (fromStatus.unmergedMessage) {\n return;\n }\n const { divergeData } = fromStatus;\n if (!divergeData) {\n throw new Error(`filterComponentsStatus: unable to find divergeData for ${compId.toString()}`);\n }\n const remoteVersions = divergeData.snapsOnRemoteOnly;\n if (!remoteVersions.length) {\n return;\n }\n const modelComponent = await workspace.consumer.scope.getModelComponent(compId._legacy);\n // optimization suggestion: if squash is given, check only the last version.\n await pMapSeries(remoteVersions, 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: BitId[] = [];\n await Promise.all(\n depsNotIncludeInPattern.map(async (dep) => {\n const isOnLane = await workspace.consumer.scope.isIdOnLane(dep, lane);\n if (isOnLane) {\n depsOnLane.push(dep);\n }\n })\n );\n if (!depsOnLane.length) {\n return;\n }\n if (!includeDeps) {\n throw new BitError(`unable to merge ${compId.toString()}.\nit has (in version ${remoteVersion.toString()}) the following dependencies which were not included in the pattern. consider adding \"--include-deps\" flag\n${depsOnLane.map((d) => d.toString()).join('\\n')}`);\n }\n depsToAdd.push(...depsOnLane);\n });\n });\n if (depsToAdd.length) {\n const depsUniq = BitIds.uniqFromArray(depsToAdd);\n depsUniq.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\nfunction squashSnaps(allComponentsStatus: ComponentMergeStatus[], otherLaneId: LaneId, consumer: Consumer) {\n const currentLaneName = consumer.getCurrentLaneId().name;\n const succeededComponents = allComponentsStatus.filter((c) => !c.unmergedMessage);\n succeededComponents.forEach(({ id, divergeData, componentFromModel }) => {\n if (!divergeData) {\n throw new Error(`unable to squash. divergeData is missing from ${id.toString()}`);\n }\n const modifiedComp = squashOneComp(currentLaneName, otherLaneId, id, divergeData, componentFromModel);\n if (modifiedComp) consumer.scope.objects.add(modifiedComp);\n });\n}\n\n/**\n * returns Version object if it was modified. otherwise, returns undefined\n */\nfunction squashOneComp(\n currentLaneName: string,\n otherLaneId: LaneId,\n id: BitId,\n divergeData: DivergeData,\n componentFromModel?: Version\n): 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.isLocalAhead()) {\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.isRemoteAhead()) {\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.snapsOnRemoteOnly;\n if (remoteSnaps.length === 0) {\n throw new Error(`remote is ahead but it has no snaps. it's impossible`);\n }\n // no need to check this case. even if it has only one snap ahead, we want to do the \"squash\", and run \"addAsOnlyParent\"\n // to make sure it doesn't not have two parents.\n // if (remoteSnaps.length === 1) {\n // // nothing to squash. it has only one commit.\n // return;\n // }\n if (!componentFromModel) {\n throw new Error('unable to squash, the componentFromModel is missing');\n }\n\n const currentParents = componentFromModel.parents;\n\n // do the squash.\n if (divergeData.commonSnapBeforeDiverge) {\n componentFromModel.addAsOnlyParent(divergeData.commonSnapBeforeDiverge);\n } else {\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 componentFromModel.setSquashed({ previousParents: currentParents, laneId: otherLaneId });\n return componentFromModel;\n}\n\nMergeLanesAspect.addRuntime(MergeLanesMain);\n\nexport default MergeLanesMain;\n"],"mappings":"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"}
|
1
|
+
{"version":3,"names":["MergeLanesMain","constructor","workspace","merging","lanes","logger","remove","scope","exporter","mergeLane","laneName","options","BitError","consumer","mergeStrategy","noSnap","tag","snapMessage","existingOnWorkspaceOnly","build","keepReadme","noSquash","pattern","includeDeps","skipDependencyInstallation","resolveUnrelated","ignoreConfigChanges","remote","currentLaneId","getCurrentLaneId","isDefault","toString","otherLaneId","getParsedLaneId","isEqual","currentLane","loadLane","isDefaultLane","getOtherLane","undefined","lane","fetchLaneWithItsComponents","otherLane","getBitIds","Error","DEFAULT_LANE","getDefaultLaneIdsFromLane","toBitIds","bitIds","debug","otherLaneName","getAllComponentsStatus","tmp","Tmp","componentsStatus","Promise","all","map","bitId","getComponentMergeStatus","clear","err","allComponentsStatus","componentIds","resolveMultipleComponentIds","compIdsFromPattern","filterIdsFromPoolIdsByPattern","filterComponentsStatus","forEach","find","c","id","isEqualWithoutVersion","push","unmergedLegitimately","unmergedMessage","workspaceIds","listIds","filter","_legacy","throwForFailures","squashSnaps","mergeResults","mergeSnaps","laneId","localLane","mergedSuccessfully","failedComponents","length","every","failedComponent","unchangedLegitimately","deleteResults","readmeComponent","readmeComponentId","changeVersion","head","hash","componentsPattern","force","track","deleteFiles","fromLane","readmeResult","name","onDestroy","failureMsgs","chalk","bold","red","join","mergeFromScope","LaneId","parse","importLaneObject","laneIds","scopeComponentsImporter","ScopeComponentsImporter","getInstance","legacyScope","importManyDeltaWithoutDeps","toVersionLatest","repo","objects","mergedPreviously","mergedNow","bitObjectsPerComp","pMapSeries","modelComponent","getModelComponent","versionObj","loadVersion","version","laneHead","getRef","mainHead","divergeData","getDivergeData","modifiedVersion","squashOneComp","setHead","bitObjects","compact","b","writeObjectsToTheFS","flat","exportedIds","ids","BitIds","fromArray","exported","exportMany","idsWithFutureScope","allVersions","provider","cli","loggerMain","createLogger","MergeLanesAspect","lanesCommand","getCommand","mergeLanesMain","commands","MergeLaneCmd","register","MergeLaneFromScopeCmd","LanesAspect","CLIAspect","WorkspaceAspect","MergingAspect","LoggerAspect","RemoveAspect","ScopeAspect","ExportAspect","MainRuntime","compIdsToKeep","allBitIds","bitIdsFromPattern","bitIdsNotFromPattern","hasWithoutVersion","filteredComponentStatus","depsToAdd","compId","fromStatus","remoteVersions","snapsOnRemoteOnly","remoteVersion","flattenedDeps","getAllFlattenedDependencies","depsNotIncludeInPattern","depsOnLane","dep","isOnLane","isIdOnLane","d","depsUniq","uniqFromArray","currentLaneName","succeededComponents","componentFromModel","modifiedComp","add","isDiverged","isLocalAhead","isRemoteAhead","remoteSnaps","currentParents","parents","commonSnapBeforeDiverge","addAsOnlyParent","ref","removeParent","setSquashed","previousParents","addRuntime"],"sources":["merge-lanes.main.runtime.ts"],"sourcesContent":["import { BitError } from '@teambit/bit-error';\nimport { CLIAspect, CLIMain, MainRuntime } from '@teambit/cli';\nimport { LanesAspect, LanesMain } from '@teambit/lanes';\nimport MergingAspect, { MergingMain, ComponentMergeStatus } from '@teambit/merging';\nimport WorkspaceAspect, { Workspace } from '@teambit/workspace';\nimport chalk from 'chalk';\nimport { BitId } from '@teambit/legacy-bit-id';\nimport pMapSeries from 'p-map-series';\nimport { Consumer } from '@teambit/legacy/dist/consumer';\nimport { MergeStrategy, ApplyVersionResults } from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport { BitIds } from '@teambit/legacy/dist/bit-id';\nimport { ScopeAspect, ScopeMain } from '@teambit/scope';\nimport ScopeComponentsImporter from '@teambit/legacy/dist/scope/component-ops/scope-components-importer';\nimport { ComponentID } from '@teambit/component-id';\nimport { DEFAULT_LANE, LaneId } from '@teambit/lane-id';\nimport { Lane, Version } from '@teambit/legacy/dist/scope/models';\nimport { Tmp } from '@teambit/legacy/dist/scope/repositories';\nimport { Logger, LoggerAspect, LoggerMain } from '@teambit/logger';\nimport { DivergeData } from '@teambit/legacy/dist/scope/component-ops/diverge-data';\nimport { RemoveAspect, RemoveMain } from '@teambit/remove';\nimport { compact } from 'lodash';\nimport { ExportAspect, ExportMain } from '@teambit/export';\nimport { BitObject } 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';\n\nexport type MergeLaneOptions = {\n mergeStrategy: MergeStrategy;\n noSnap: boolean;\n snapMessage: string;\n existingOnWorkspaceOnly: boolean;\n build: boolean;\n keepReadme: boolean;\n noSquash: boolean;\n tag?: boolean;\n pattern?: string;\n includeDeps?: boolean;\n skipDependencyInstallation?: boolean;\n resolveUnrelated?: MergeStrategy;\n ignoreConfigChanges?: boolean;\n remote?: boolean;\n};\n\nexport class MergeLanesMain {\n constructor(\n private workspace: Workspace | undefined,\n private merging: MergingMain,\n private lanes: LanesMain,\n private logger: Logger,\n private remove: RemoveMain,\n private scope: ScopeMain,\n private exporter: ExportMain\n ) {}\n\n async mergeLane(\n laneName: string,\n options: MergeLaneOptions\n ): Promise<{ mergeResults: ApplyVersionResults; deleteResults: any }> {\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 noSquash,\n pattern,\n includeDeps,\n skipDependencyInstallation,\n resolveUnrelated,\n ignoreConfigChanges,\n remote,\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 const currentLane = currentLaneId.isDefault() ? null : await consumer.scope.loadLane(currentLaneId);\n const isDefaultLane = otherLaneId.isDefault();\n const getOtherLane = async () => {\n if (isDefaultLane) {\n return undefined;\n }\n const lane = await consumer.scope.loadLane(otherLaneId);\n if (remote || !lane) {\n return this.lanes.fetchLaneWithItsComponents(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 consumer.scope.getDefaultLaneIdsFromLane(currentLane);\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 const otherLaneName = isDefaultLane ? DEFAULT_LANE : otherLaneId.toString();\n\n const getAllComponentsStatus = async (): Promise<ComponentMergeStatus[]> => {\n const tmp = new Tmp(consumer.scope);\n try {\n const componentsStatus = await Promise.all(\n bitIds.map((bitId) =>\n this.merging.getComponentMergeStatus(bitId, currentLane, otherLaneName, {\n resolveUnrelated,\n ignoreConfigChanges,\n })\n )\n );\n await tmp.clear();\n return componentsStatus;\n } catch (err: any) {\n await tmp.clear();\n throw err;\n }\n };\n let allComponentsStatus = await getAllComponentsStatus();\n\n if (pattern) {\n const componentIds = await this.workspace.resolveMultipleComponentIds(bitIds);\n const compIdsFromPattern = this.workspace.scope.filterIdsFromPoolIdsByPattern(pattern, componentIds);\n allComponentsStatus = await filterComponentsStatus(\n allComponentsStatus,\n compIdsFromPattern,\n bitIds,\n this.workspace,\n includeDeps,\n otherLane || undefined\n );\n bitIds.forEach((bitId) => {\n if (!allComponentsStatus.find((c) => c.id.isEqualWithoutVersion(bitId))) {\n allComponentsStatus.push({ id: bitId, unmergedLegitimately: true, unmergedMessage: `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._legacy))\n );\n allComponentsStatus = await filterComponentsStatus(\n allComponentsStatus,\n compIdsFromPattern,\n bitIds,\n this.workspace,\n includeDeps\n );\n bitIds.forEach((bitId) => {\n if (!allComponentsStatus.find((c) => c.id.isEqualWithoutVersion(bitId))) {\n allComponentsStatus.push({ id: bitId, unmergedLegitimately: true, unmergedMessage: `not in the workspace` });\n }\n });\n }\n\n throwForFailures();\n\n if (currentLaneId.isDefault() && !noSquash) {\n squashSnaps(allComponentsStatus, otherLaneId, consumer);\n }\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 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\n .changeVersion(otherLane.readmeComponent?.head?.hash)\n .toString();\n\n deleteResults = await this.remove.remove({\n componentsPattern: readmeComponentId,\n force: false,\n remote: false,\n track: false,\n deleteFiles: true,\n fromLane: false,\n });\n } else if (otherLane && !otherLane.readmeComponent) {\n deleteResults = { readmeResult: `\\nlane ${otherLane.name} doesn't have a readme component` };\n }\n\n await this.workspace.consumer.onDestroy();\n\n return { mergeResults, deleteResults };\n\n function throwForFailures() {\n const failedComponents = allComponentsStatus.filter((c) => c.unmergedMessage && !c.unmergedLegitimately);\n if (failedComponents.length) {\n const failureMsgs = failedComponents\n .map(\n (failedComponent) =>\n `${chalk.bold(failedComponent.id.toString())} - ${chalk.red(failedComponent.unmergedMessage as string)}`\n )\n .join('\\n');\n throw new BitError(`unable to merge due to the following failures:\\n${failureMsgs}`);\n }\n }\n }\n\n async mergeFromScope(\n laneName: 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 const laneId = LaneId.parse(laneName);\n const lane = await this.lanes.importLaneObject(laneId);\n const laneIds = lane.toBitIds();\n const scopeComponentsImporter = ScopeComponentsImporter.getInstance(this.scope.legacyScope);\n await scopeComponentsImporter.importManyDeltaWithoutDeps(laneIds, true, lane, true);\n // get their main as well\n await scopeComponentsImporter.importManyDeltaWithoutDeps(laneIds.toVersionLatest(), true, undefined, true);\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: BitId[] = [];\n const mergedNow: BitId[] = [];\n const bitObjectsPerComp = await pMapSeries(laneIds, async (id) => {\n const modelComponent = await this.scope.legacyScope.getModelComponent(id);\n const versionObj = await modelComponent.loadVersion(id.version as string, repo);\n const laneHead = modelComponent.getRef(id.version as string);\n if (!laneHead) throw new Error(`lane head must be defined for ${id.toString()}`);\n const mainHead = modelComponent.head || null;\n if (mainHead?.isEqual(laneHead)) {\n mergedPreviously.push(id);\n return undefined;\n }\n const divergeData = await getDivergeData(repo, modelComponent, laneHead, mainHead);\n const modifiedVersion = squashOneComp(DEFAULT_LANE, laneId, id, divergeData, versionObj);\n modelComponent.setHead(laneHead);\n const objects = [modelComponent, modifiedVersion];\n mergedNow.push(id);\n return { id, objects };\n });\n const bitObjects = compact(bitObjectsPerComp).map((b) => b.objects);\n await repo.writeObjectsToTheFS(bitObjects.flat() as BitObject[]);\n let exportedIds: string[] = [];\n if (options.push) {\n const ids = compact(bitObjectsPerComp).map((b) => b.id);\n const bitIds = BitIds.fromArray(ids);\n const { exported } = await this.exporter.exportMany({\n scope: this.scope.legacyScope,\n ids: bitIds,\n idsWithFutureScope: bitIds,\n allVersions: false,\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\n static slots = [];\n static dependencies = [\n LanesAspect,\n CLIAspect,\n WorkspaceAspect,\n MergingAspect,\n LoggerAspect,\n RemoveAspect,\n ScopeAspect,\n ExportAspect,\n ];\n static runtime = MainRuntime;\n\n static async provider([lanes, cli, workspace, merging, loggerMain, remove, scope, exporter]: [\n LanesMain,\n CLIMain,\n Workspace,\n MergingMain,\n LoggerMain,\n RemoveMain,\n ScopeMain,\n ExportMain\n ]) {\n const logger = loggerMain.createLogger(MergeLanesAspect.id);\n const lanesCommand = cli.getCommand('lane');\n const mergeLanesMain = new MergeLanesMain(workspace, merging, lanes, logger, remove, scope, exporter);\n lanesCommand?.commands?.push(new MergeLaneCmd(mergeLanesMain));\n cli.register(new MergeLaneFromScopeCmd(mergeLanesMain));\n return mergeLanesMain;\n }\n}\n\nasync function filterComponentsStatus(\n allComponentsStatus: ComponentMergeStatus[],\n compIdsToKeep: ComponentID[],\n allBitIds: BitId[],\n workspace: Workspace,\n includeDeps = false,\n lane?: Lane\n): Promise<ComponentMergeStatus[]> {\n const bitIdsFromPattern = BitIds.fromArray(compIdsToKeep.map((c) => c._legacy));\n const bitIdsNotFromPattern = allBitIds.filter((bitId) => !bitIdsFromPattern.hasWithoutVersion(bitId));\n const filteredComponentStatus: ComponentMergeStatus[] = [];\n const depsToAdd: BitId[] = [];\n await pMapSeries(compIdsToKeep, async (compId) => {\n const fromStatus = allComponentsStatus.find((c) => c.id.isEqualWithoutVersion(compId._legacy));\n if (!fromStatus) {\n throw new Error(`filterComponentsStatus: unable to find ${compId.toString()} in component-status`);\n }\n filteredComponentStatus.push(fromStatus);\n if (fromStatus.unmergedMessage) {\n return;\n }\n const { divergeData } = fromStatus;\n if (!divergeData) {\n throw new Error(`filterComponentsStatus: unable to find divergeData for ${compId.toString()}`);\n }\n const remoteVersions = divergeData.snapsOnRemoteOnly;\n if (!remoteVersions.length) {\n return;\n }\n const modelComponent = await workspace.consumer.scope.getModelComponent(compId._legacy);\n // optimization suggestion: if squash is given, check only the last version.\n await pMapSeries(remoteVersions, 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: BitId[] = [];\n await Promise.all(\n depsNotIncludeInPattern.map(async (dep) => {\n const isOnLane = await workspace.consumer.scope.isIdOnLane(dep, lane);\n if (isOnLane) {\n depsOnLane.push(dep);\n }\n })\n );\n if (!depsOnLane.length) {\n return;\n }\n if (!includeDeps) {\n throw new BitError(`unable to merge ${compId.toString()}.\nit has (in version ${remoteVersion.toString()}) the following dependencies which were not included in the pattern. consider adding \"--include-deps\" flag\n${depsOnLane.map((d) => d.toString()).join('\\n')}`);\n }\n depsToAdd.push(...depsOnLane);\n });\n });\n if (depsToAdd.length) {\n const depsUniq = BitIds.uniqFromArray(depsToAdd);\n depsUniq.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\nfunction squashSnaps(allComponentsStatus: ComponentMergeStatus[], otherLaneId: LaneId, consumer: Consumer) {\n const currentLaneName = consumer.getCurrentLaneId().name;\n const succeededComponents = allComponentsStatus.filter((c) => !c.unmergedMessage);\n succeededComponents.forEach(({ id, divergeData, componentFromModel }) => {\n if (!divergeData) {\n throw new Error(`unable to squash. divergeData is missing from ${id.toString()}`);\n }\n const modifiedComp = squashOneComp(currentLaneName, otherLaneId, id, divergeData, componentFromModel);\n if (modifiedComp) consumer.scope.objects.add(modifiedComp);\n });\n}\n\n/**\n * returns Version object if it was modified. otherwise, returns undefined\n */\nfunction squashOneComp(\n currentLaneName: string,\n otherLaneId: LaneId,\n id: BitId,\n divergeData: DivergeData,\n componentFromModel?: Version\n): 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.isLocalAhead()) {\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.isRemoteAhead()) {\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.snapsOnRemoteOnly;\n if (remoteSnaps.length === 0) {\n throw new Error(`remote is ahead but it has no snaps. it's impossible`);\n }\n // no need to check this case. even if it has only one snap ahead, we want to do the \"squash\", and run \"addAsOnlyParent\"\n // to make sure it doesn't not have two parents.\n // if (remoteSnaps.length === 1) {\n // // nothing to squash. it has only one commit.\n // return;\n // }\n if (!componentFromModel) {\n throw new Error('unable to squash, the componentFromModel is missing');\n }\n\n const currentParents = componentFromModel.parents;\n\n // do the squash.\n if (divergeData.commonSnapBeforeDiverge) {\n componentFromModel.addAsOnlyParent(divergeData.commonSnapBeforeDiverge);\n } else {\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 componentFromModel.setSquashed({ previousParents: currentParents, laneId: otherLaneId });\n return componentFromModel;\n}\n\nMergeLanesAspect.addRuntime(MergeLanesMain);\n\nexport default MergeLanesMain;\n"],"mappings":"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"}
|
Binary file
|
package/package.json
CHANGED
@@ -1,12 +1,12 @@
|
|
1
1
|
{
|
2
2
|
"name": "@teambit/merge-lanes",
|
3
|
-
"version": "0.0.
|
3
|
+
"version": "0.0.41",
|
4
4
|
"homepage": "https://bit.dev/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": "0.0.
|
9
|
+
"version": "0.0.41"
|
10
10
|
},
|
11
11
|
"dependencies": {
|
12
12
|
"chalk": "2.4.2",
|
@@ -16,17 +16,17 @@
|
|
16
16
|
"core-js": "^3.0.0",
|
17
17
|
"@teambit/harmony": "0.3.3",
|
18
18
|
"@teambit/bit-error": "0.0.400",
|
19
|
-
"@teambit/cli": "0.0.
|
20
|
-
"@teambit/merging": "0.0.
|
19
|
+
"@teambit/cli": "0.0.575",
|
20
|
+
"@teambit/merging": "0.0.179",
|
21
21
|
"@teambit/component-id": "0.0.417",
|
22
|
-
"@teambit/export": "0.0.
|
23
|
-
"@teambit/lane-id": "0.0.
|
24
|
-
"@teambit/lanes": "0.0.
|
22
|
+
"@teambit/export": "0.0.864",
|
23
|
+
"@teambit/lane-id": "0.0.93",
|
24
|
+
"@teambit/lanes": "0.0.436",
|
25
25
|
"@teambit/legacy-bit-id": "0.0.414",
|
26
|
-
"@teambit/logger": "0.0.
|
27
|
-
"@teambit/remove": "0.0.
|
28
|
-
"@teambit/scope": "0.0.
|
29
|
-
"@teambit/workspace": "0.0.
|
26
|
+
"@teambit/logger": "0.0.668",
|
27
|
+
"@teambit/remove": "0.0.41",
|
28
|
+
"@teambit/scope": "0.0.864",
|
29
|
+
"@teambit/workspace": "0.0.864"
|
30
30
|
},
|
31
31
|
"devDependencies": {
|
32
32
|
"@types/lodash": "4.14.165",
|
@@ -38,7 +38,7 @@
|
|
38
38
|
"@types/node": "12.20.4"
|
39
39
|
},
|
40
40
|
"peerDependencies": {
|
41
|
-
"@teambit/legacy": "1.0.
|
41
|
+
"@teambit/legacy": "1.0.356",
|
42
42
|
"react-dom": "^16.8.0 || ^17.0.0",
|
43
43
|
"react": "^16.8.0 || ^17.0.0"
|
44
44
|
},
|
File without changes
|
Binary file
|