npm - @teambit/merging - Versions diffs - 1.0.511 → 1.0.512 - Mend

@teambit/merging 1.0.511 → 1.0.512

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.

Files changed (10) hide show

package/artifacts/__bit_junit.xml +1 -1
package/dist/merge-status-provider.d.ts +1 -1
package/dist/merge-status-provider.js.map +1 -1
package/dist/merge-version/three-way-merge.d.ts +1 -1
package/dist/merge-version/three-way-merge.js.map +1 -1
package/dist/merging.main.runtime.d.ts +1 -1
package/dist/merging.main.runtime.js.map +1 -1
package/merge-version/three-way-merge.ts +1 -1
package/package.json +25 -25
/package/dist/{preview-1736711473672.js → preview-1736824735631.js} +0 -0

package/artifacts/__bit_junit.xml CHANGED Viewed

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <testsuites tests="0" failures="0" errors="0" skipped="0">
-  <testsuite name="teambit.component/merging@1.0.511" tests="0" failures="0" errors="0" skipped="0"/>
+  <testsuite name="teambit.component/merging@1.0.512" tests="0" failures="0" errors="0" skipped="0"/>
 </testsuites>

package/dist/merge-status-provider.d.ts CHANGED Viewed

@@ -1,6 +1,6 @@
 import { Workspace } from '@teambit/workspace';
 import { ComponentID } from '@teambit/component-id';
-import { Lane } from '@teambit/scope.objects';
+import { Lane } from '@teambit/objects';
 import { ImporterMain } from '@teambit/importer';
 import { Logger } from '@teambit/logger';
 import { ScopeMain } from '@teambit/scope';

package/dist/merge-status-provider.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"names":["_pMapSeries","data","_interopRequireDefault","require","_componentId","_laneId","_component","_legacy","_lodash","_configMerger","_mergeVersion","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","compIsAlreadyMergedMsg","exports","MergeStatusProvider","constructor","scope","logger","importer","options","workspace","currentLane","otherLane","getStatus","bitIds","importObjectsFromMainIfExist","toBitIds","toVersionLatest","componentStatusBeforeMergeAttempt","mapSeries","id","getComponentStatusBeforeMergeAttempt","shouldImportHistoryOfOtherLane","shouldSquash","toImport","map","compStatus","divergeData","versionsToImport","commonSnapBeforeDiverge","snapsOnTargetOnly","compact","v","changeVersion","toString","flat","reason","legacyScope","scopeImporter","importWithoutDeps","ComponentIdList","fromArray","lane","cache","includeVersionHistory","compStatusNotNeedMerge","c","mergeProps","compStatusNeedMerge","getComponentsStatusNeedMerge","tmp","Tmp","componentsStatus","Promise","all","getComponentMergeStatus","clear","err","results","componentMergeStatusBeforeMergeAttempt","currentComponent","Error","otherLaneHead","currentId","modelComponent","repo","objects","baseSnap","debug","toStringWithoutVersion","version","baseComponent","loadVersion","otherComponent","currentLaneName","toLaneId","otherLaneName","DEFAULT_LANE","currentLabel","otherLabel","workspaceIds","listIds","toComponentIds","configMerger","ComponentConfigMerger","extensions","mergeStrategy","configMergeResult","merge","mergeResults","threeWayMerge","returnUnmerged","msg","unmergedLegitimately","componentStatus","unchangedMessage","unchangedLegitimately","consumer","getModelComponentIfExist","unmerged","unmergedComponents","getEntry","getRef","existingBitMapId","bitMap","getComponentIdIfExist","ignoreVersion","componentOnOther","idOnCurrentLane","getComponent","isRemoved","shouldMerge","shouldRemoveFromMain","head","shouldBeRemoved","getCurrentId","getHeadAsTagIfExist","getDivergeData","targetHead","throws","componentFromModel","componentMap","getComponentIfExist","isLocallyRemoved","getCurrentComponent","loadComponent","getConsumerComponent","isTargetNotAhead","isTargetAhead","shouldIgnore","isModified","undefined","componentModificationStatus","getComponentStatusById","modified","isSourceCodeModified","isComponentSourceCodeModified","modifiedType","ignoreConfigChanges","sourceHead","NoCommonSnap","resolveUnrelated","message","handleNoCommonSnap","detachHead","commonSnapId","commonSnapComp","isDiverged","isSourceAhead","handleTargetAheadAsDiverged","mainHead","returnAccordingToOurs","headToSaveInLane","unrelatedHead","unrelatedLaneId","resolvedUnrelated","strategy","headOnCurrentLane","returnAccordingToTheirs","resolvedRef","unrelatedHeadRef","currentVersionRef","otherVersionRef","hasResolvedFromMain","hashToCompare","divergeDataFromMain","hasResolvedLocally","getHeadRegardlessOfLane","hasResolvedRemotely","refToSaveInLane"],"sources":["merge-status-provider.ts"],"sourcesContent":["import { Workspace } from '@teambit/workspace';\nimport mapSeries from 'p-map-series';\nimport { ComponentID, ComponentIdList } from '@teambit/component-id';\nimport { DEFAULT_LANE, LaneId } from '@teambit/lane-id';\nimport { getDivergeData, SnapsDistance } from '@teambit/component.snap-distance';\nimport { Lane, ModelComponent, Version, Ref } from '@teambit/scope.objects';\nimport { NoCommonSnap, Tmp } from '@teambit/legacy.scope';\nimport { ConsumerComponent } from '@teambit/legacy.consumer-component';\nimport { ImporterMain } from '@teambit/importer';\nimport { Logger } from '@teambit/logger';\nimport { compact } from 'lodash';\nimport { ComponentConfigMerger } from '@teambit/config-merger';\nimport { ScopeMain } from '@teambit/scope';\nimport { threeWayMerge, MergeStrategy } from './merge-version';\nimport { ComponentMergeStatus, ComponentMergeStatusBeforeMergeAttempt } from './merging.main.runtime';\n\nexport type MergeStatusProviderOptions = {\n resolveUnrelated?: MergeStrategy;\n mergeStrategy: MergeStrategy;\n ignoreConfigChanges?: boolean;\n shouldSquash?: boolean;\n handleTargetAheadAsDiverged?: boolean;\n detachHead?: boolean;\n};\n\nexport const compIsAlreadyMergedMsg = 'component is already merged';\nexport class MergeStatusProvider {\n constructor(\n private scope: ScopeMain,\n private logger: Logger,\n private importer: ImporterMain,\n private options: MergeStatusProviderOptions,\n private workspace?: Workspace,\n private currentLane?: Lane, // currently checked out lane. if on main, then it's undefined.\n private otherLane?: Lane // the lane we want to merged to our lane. (undefined if it's \"main\").\n ) {}\n\n async getStatus(\n bitIds: ComponentID[] // the id.version is the version we want to merge to the current component\n ): Promise<ComponentMergeStatus[]> {\n if (!this.currentLane && this.otherLane) {\n await this.importer.importObjectsFromMainIfExist(this.otherLane.toBitIds().toVersionLatest());\n }\n const componentStatusBeforeMergeAttempt = await mapSeries(bitIds, (id) =>\n this.getComponentStatusBeforeMergeAttempt(id)\n );\n // whether or not we need to import the gap between the common-snap and the other lane.\n // the common-snap itself we need anyway in order to get the files hash/content for checking conflicts.\n const shouldImportHistoryOfOtherLane =\n !this.options?.shouldSquash && // when squashing, no need for all history, only the head is going to be pushed\n (!this.currentLane \|\| // on main. we need all history in order to push each component to its remote\n this.currentLane.scope !== this.otherLane?.scope); // on lane, but the other lane is from a different scope. we need all history in order to push to the current lane's scope\n const toImport = componentStatusBeforeMergeAttempt\n .map((compStatus) => {\n if (!compStatus.divergeData) return [];\n const versionsToImport = [compStatus.divergeData.commonSnapBeforeDiverge];\n if (shouldImportHistoryOfOtherLane) {\n versionsToImport.push(...compStatus.divergeData.snapsOnTargetOnly);\n }\n return compact(versionsToImport).map((v) => compStatus.id.changeVersion(v.toString()));\n })\n .flat();\n const reason = shouldImportHistoryOfOtherLane\n ? `for filling the gap between the common-snap and the head of ${this.otherLane?.id() \|\| 'main'}`\n : `for getting the common-snap between ${this.currentLane?.id() \|\| 'main'} and ${this.otherLane?.id() \|\| 'main'}`;\n await this.scope.legacyScope.scopeImporter.importWithoutDeps(ComponentIdList.fromArray(toImport), {\n lane: this.otherLane,\n cache: true,\n includeVersionHistory: false,\n reason,\n });\n\n const compStatusNotNeedMerge = componentStatusBeforeMergeAttempt.filter(\n (c) => !c.mergeProps\n ) as ComponentMergeStatus[];\n const compStatusNeedMerge = componentStatusBeforeMergeAttempt.filter((c) => c.mergeProps);\n\n const getComponentsStatusNeedMerge = async (): Promise<ComponentMergeStatus[]> => {\n const tmp = new Tmp(this.scope.legacyScope);\n try {\n const componentsStatus = await Promise.all(\n compStatusNeedMerge.map((compStatus) => this.getComponentMergeStatus(compStatus))\n );\n await tmp.clear();\n return componentsStatus;\n } catch (err: any) {\n await tmp.clear();\n throw err;\n }\n };\n const results = await getComponentsStatusNeedMerge();\n\n results.push(...compStatusNotNeedMerge);\n return results;\n }\n\n private async getComponentMergeStatus(\n componentMergeStatusBeforeMergeAttempt: ComponentMergeStatusBeforeMergeAttempt\n ) {\n const { id, divergeData, currentComponent, mergeProps } = componentMergeStatusBeforeMergeAttempt;\n if (!mergeProps) throw new Error(`getDivergedMergeStatus, mergeProps is missing for ${id.toString()}`);\n const { otherLaneHead, currentId, modelComponent } = mergeProps;\n const repo = this.scope.legacyScope.objects;\n if (!divergeData) throw new Error(`getDivergedMergeStatus, divergeData is missing for ${id.toString()}`);\n if (!currentComponent) throw new Error(`getDivergedMergeStatus, currentComponent is missing for ${id.toString()}`);\n\n const baseSnap = divergeData.commonSnapBeforeDiverge as unknown as Ref; // must be set when isTrueMerge\n this.logger.debug(`merging snaps details:\nid: ${id.toStringWithoutVersion()}\nbase: ${baseSnap.toString()}\ncurrent: ${currentId.version}\nother: ${otherLaneHead.toString()}`);\n const baseComponent: Version = await modelComponent.loadVersion(baseSnap.toString(), repo);\n const otherComponent: Version = await modelComponent.loadVersion(otherLaneHead.toString(), repo);\n\n const currentLaneName = this.currentLane?.toLaneId().toString() \|\| 'main';\n const otherLaneName = this.otherLane ? this.otherLane.toLaneId().toString() : DEFAULT_LANE;\n const currentLabel = `${currentId.version} (${currentLaneName === otherLaneName ? 'current' : currentLaneName})`;\n const otherLabel = `${otherLaneHead.toString()} (${\n otherLaneName === currentLaneName ? 'incoming' : otherLaneName\n })`;\n const workspaceIds = this.workspace?.listIds() \|\| this.currentLane?.toComponentIds() \|\| [];\n const configMerger = new ComponentConfigMerger(\n id.toStringWithoutVersion(),\n workspaceIds,\n this.otherLane,\n currentComponent.extensions,\n baseComponent.extensions,\n otherComponent.extensions,\n currentLabel,\n otherLabel,\n this.logger,\n this.options.mergeStrategy\n );\n const configMergeResult = configMerger.merge();\n\n const mergeResults = await threeWayMerge({\n scope: this.scope.legacyScope,\n otherComponent,\n otherLabel,\n currentComponent,\n currentLabel,\n baseComponent,\n });\n return {\n currentComponent,\n id,\n mergeResults,\n divergeData,\n configMergeResult,\n };\n }\n\n private returnUnmerged(\n id: ComponentID,\n msg: string,\n unmergedLegitimately = false\n ): ComponentMergeStatusBeforeMergeAttempt {\n const componentStatus: ComponentMergeStatusBeforeMergeAttempt = { id };\n componentStatus.unchangedMessage = msg;\n componentStatus.unchangedLegitimately = unmergedLegitimately;\n return componentStatus;\n }\n\n // eslint-disable-next-line complexity\n private async getComponentStatusBeforeMergeAttempt(\n id: ComponentID // the id.version is the version we want to merge to the current component\n ): Promise<ComponentMergeStatusBeforeMergeAttempt> {\n const consumer = this.workspace?.consumer;\n const componentStatus: ComponentMergeStatusBeforeMergeAttempt = { id };\n const modelComponent = await this.scope.legacyScope.getModelComponentIfExist(id);\n if (!modelComponent) {\n return this.returnUnmerged(\n id,\n `component ${id.toString()} is on the lane/main but its objects were not found, please re-import the lane`\n );\n }\n const unmerged = this.scope.legacyScope.objects.unmergedComponents.getEntry(id);\n if (unmerged) {\n return this.returnUnmerged(\n id,\n `component ${id.toStringWithoutVersion()} is in during-merge state a previous merge, please snap/tag it first (or use bit merge --resolve/--abort/ bit lane merge-abort)`\n );\n }\n const repo = this.scope.legacyScope.objects;\n const version = id.version as string;\n const otherLaneHead = modelComponent.getRef(version);\n const existingBitMapId = consumer?.bitMap.getComponentIdIfExist(id, { ignoreVersion: true });\n const componentOnOther: Version = await modelComponent.loadVersion(version, this.scope.legacyScope.objects);\n const idOnCurrentLane = this.currentLane?.getComponent(id);\n\n if (componentOnOther.isRemoved()) {\n // if exist in current lane, we want the current lane to get the soft-remove update.\n // or if it was removed with --update-main, we want to merge it so then main will get the update.\n // (unless this component does not exist on main, in which case, we don't want to merge it).\n const shouldMerge = idOnCurrentLane \|\| (componentOnOther.shouldRemoveFromMain() && modelComponent.head);\n if (shouldMerge) {\n // remove the component from the workspace if exist.\n componentStatus.shouldBeRemoved = true;\n } else {\n // on main, don't merge soft-removed components unless it's marked with removeOnMain.\n // on lane, if it's not part of the current lane, don't merge it.\n return this.returnUnmerged(id, `component has been removed`, true);\n }\n }\n const getCurrentId = () => {\n if (existingBitMapId) return existingBitMapId;\n if (this.currentLane) {\n if (!idOnCurrentLane) return null;\n return idOnCurrentLane.id.changeVersion(idOnCurrentLane.head.toString());\n }\n // it's on main\n const head = modelComponent.getHeadAsTagIfExist();\n if (head) {\n return id.changeVersion(head);\n }\n return null;\n };\n const currentId = getCurrentId();\n if (!currentId) {\n const divergeData = await getDivergeData({ repo, modelComponent, targetHead: otherLaneHead, throws: false });\n return { ...componentStatus, componentFromModel: componentOnOther, divergeData };\n }\n const componentMap = consumer?.bitMap.getComponentIfExist(currentId, { ignoreVersion: true });\n const isLocallyRemoved = componentMap?.isRemoved();\n if (isLocallyRemoved) {\n return this.returnUnmerged(\n id,\n `component is locally deleted, please snap and export first or undo by bit recover`\n );\n }\n const getCurrentComponent = () => {\n // eslint-disable-next-line @typescript-eslint/no-non-null-assertion\n if (existingBitMapId) return consumer!.loadComponent(existingBitMapId);\n return this.scope.legacyScope.getConsumerComponent(currentId);\n };\n const currentComponent = await getCurrentComponent();\n if (currentComponent.isRemoved()) {\n // we have a few options:\n // 1. \"other\" is main. in this case, we don't care what happens on main, we want the component to stay deleted on\n // this lane. (even when main is ahead, we don't want to merge it).\n // 2. other is ahead. in this case, other recovered the component. so we can continue with the merge.\n // it is possible that it is diverged, in which case, still continue with the merge, and later on, the\n // merge-config will show a config conflict of the remove aspect.\n // 3. other is not ahead. in this case, just ignore this component, no point to merge it, we want it removed.\n const divergeData = await getDivergeData({ repo, modelComponent, targetHead: otherLaneHead, throws: false });\n const isTargetNotAhead = !divergeData.err && !divergeData.isTargetAhead();\n const shouldIgnore = this.otherLane\n ? isTargetNotAhead // option #2 and #3 above\n : true; // it's main. option #1 above.\n if (shouldIgnore) {\n return this.returnUnmerged(id, `component has been removed`, true);\n }\n }\n\n const isModified = async (): Promise<undefined \| 'code' \| 'config'> => {\n if (!consumer \|\| !this.workspace) return undefined;\n const componentModificationStatus = await this.workspace.getComponentStatusById(currentComponent.id);\n if (!componentModificationStatus.modified) return undefined;\n if (!existingBitMapId) return undefined;\n const baseComponent = await modelComponent.loadVersion(\n existingBitMapId.version as string,\n consumer.scope.objects\n );\n const isSourceCodeModified = await consumer.isComponentSourceCodeModified(baseComponent, currentComponent);\n if (isSourceCodeModified) return 'code';\n return 'config';\n };\n\n const modifiedType = await isModified();\n if (modifiedType === 'config' && !this.options?.ignoreConfigChanges) {\n return this.returnUnmerged(\n id,\n `component has config changes, please snap/tag it first. alternatively, use --ignore-config-changes flag to bypass`\n );\n }\n if (modifiedType === 'code') {\n return this.returnUnmerged(id, `component is modified, please snap/tag it first`);\n }\n\n if (!otherLaneHead) {\n throw new Error(`merging: unable finding a hash for the version ${version} of ${id.toString()}`);\n }\n const divergeData = await getDivergeData({\n repo,\n modelComponent,\n sourceHead: this.workspace ? undefined : modelComponent.getRef(currentId.version as string), // not sure if needs to check for this.workspace\n targetHead: otherLaneHead,\n throws: false,\n });\n if (divergeData.err) {\n if (!(divergeData.err instanceof NoCommonSnap) \|\| !this.options?.resolveUnrelated) {\n return this.returnUnmerged(id, `unable to traverse history. error: ${divergeData.err.message}`);\n }\n return this.handleNoCommonSnap(\n modelComponent,\n id,\n otherLaneHead,\n currentComponent,\n componentOnOther,\n divergeData\n );\n }\n if (this.options.detachHead && divergeData.commonSnapBeforeDiverge) {\n // just override with the model data\n const commonSnapId = id.changeVersion(divergeData.commonSnapBeforeDiverge.toString());\n const commonSnapComp = await this.scope.legacyScope.getConsumerComponent(commonSnapId);\n return {\n ...componentStatus,\n currentComponent: commonSnapComp,\n componentFromModel: componentOnOther,\n divergeData,\n };\n }\n if (!divergeData.isDiverged()) {\n if (divergeData.isSourceAhead()) {\n // component is ahead nothing to merge.\n return this.returnUnmerged(id, compIsAlreadyMergedMsg, true);\n }\n if (!divergeData.isTargetAhead()) {\n // we know that localHead and remoteHead are set, so if none of them is ahead they must be equal\n return this.returnUnmerged(id, compIsAlreadyMergedMsg, true);\n }\n // target is ahead.\n if (!this.options.handleTargetAheadAsDiverged \|\| !divergeData.commonSnapBeforeDiverge) {\n // just override with the model data\n return {\n ...componentStatus,\n currentComponent,\n componentFromModel: componentOnOther,\n divergeData,\n };\n }\n // target is ahead and we want to treat it as diverged, continue.\n }\n\n // it's diverged and needs merge operation\n const mergeProps = {\n otherLaneHead,\n currentId,\n modelComponent,\n };\n\n return { ...componentStatus, currentComponent, mergeProps, divergeData };\n }\n\n private async handleNoCommonSnap(\n modelComponent: ModelComponent,\n id: ComponentID,\n otherLaneHead: Ref,\n currentComponent: ConsumerComponent,\n componentOnOther?: Version,\n divergeData?: SnapsDistance\n ): Promise<ComponentMergeStatusBeforeMergeAttempt> {\n let { resolveUnrelated } = this.options \|\| {};\n if (currentComponent.isRemoved()) {\n resolveUnrelated = 'theirs';\n }\n if (!resolveUnrelated) throw new Error(`handleNoCommonSnap expects resolveUnrelated to be set`);\n const repo = this.scope.legacyScope.objects;\n const mainHead = modelComponent.head;\n\n const returnAccordingToOurs = (\n headToSaveInLane: Ref,\n unrelatedHead: Ref,\n unrelatedLaneId: LaneId\n ): ComponentMergeStatusBeforeMergeAttempt => {\n return {\n currentComponent,\n id,\n divergeData,\n resolvedUnrelated: {\n strategy: 'ours',\n headOnCurrentLane: headToSaveInLane,\n unrelatedHead,\n unrelatedLaneId,\n },\n };\n };\n const returnAccordingToTheirs = (\n resolvedRef: Ref,\n unrelatedHeadRef: Ref,\n unrelatedLaneId: LaneId\n ): ComponentMergeStatusBeforeMergeAttempt => {\n // just override with the model data\n return {\n currentComponent,\n componentFromModel: componentOnOther,\n id,\n divergeData,\n resolvedUnrelated: {\n strategy: 'theirs',\n headOnCurrentLane: resolvedRef,\n unrelatedHead: unrelatedHeadRef,\n unrelatedLaneId,\n },\n };\n };\n\n const currentVersionRef = modelComponent.getRef(currentComponent.id.version as string);\n if (!currentVersionRef)\n throw new Error(\n `handleNoCommonSnap, unable to get ref of current version \"${\n currentComponent.id.version\n }\" for \"${id.toString()}\"`\n );\n const otherVersionRef = modelComponent.getRef(id.version as string);\n if (!otherVersionRef)\n throw new Error(`handleNoCommonSnap, unable to get ref of other version \"${id.version}\" for \"${id.toString()}\"`);\n\n if (mainHead) {\n const hasResolvedFromMain = async (hashToCompare: Ref \| null) => {\n const divergeDataFromMain = await getDivergeData({\n repo,\n modelComponent,\n sourceHead: hashToCompare,\n targetHead: mainHead,\n throws: false,\n });\n if (!divergeDataFromMain.err) return true;\n return !(divergeDataFromMain.err instanceof NoCommonSnap);\n };\n const hasResolvedLocally = await hasResolvedFromMain(modelComponent.getHeadRegardlessOfLane() as Ref);\n const hasResolvedRemotely = await hasResolvedFromMain(otherLaneHead);\n if (!hasResolvedLocally && !hasResolvedRemotely) {\n return this.returnUnmerged(\n id,\n `unable to traverse ${currentComponent.id.toString()} history. the main-head ${mainHead.toString()} doesn't appear in both lanes.\nit was probably created in each lane separately and it also exists on main. please merge main first to one of these lanes`\n );\n }\n const refToSaveInLane = hasResolvedLocally ? currentVersionRef : otherVersionRef;\n const unrelatedHeadRef = hasResolvedLocally ? otherVersionRef : currentVersionRef;\n if (resolveUnrelated === 'ours') {\n return returnAccordingToOurs(refToSaveInLane, unrelatedHeadRef, this.currentLane?.toLaneId() as LaneId);\n }\n if (resolveUnrelated === 'theirs') {\n return returnAccordingToTheirs(refToSaveInLane, unrelatedHeadRef, this.currentLane?.toLaneId() as LaneId);\n }\n throw new Error(\n `unsupported strategy \"${resolveUnrelated}\" of resolve-unrelated. supported strategies are: [ours, theirs]`\n );\n }\n\n const refToSaveInLane = resolveUnrelated === 'ours' ? currentVersionRef : otherVersionRef;\n const unrelatedHeadRef = resolveUnrelated === 'ours' ? otherVersionRef : currentVersionRef;\n if (resolveUnrelated === 'ours') {\n return returnAccordingToOurs(refToSaveInLane, unrelatedHeadRef, this.otherLane?.toLaneId() as LaneId);\n }\n if (resolveUnrelated === 'theirs') {\n return returnAccordingToTheirs(refToSaveInLane, unrelatedHeadRef, this.currentLane?.toLaneId() as LaneId);\n }\n throw new Error(\n `unsupported strategy \"${resolveUnrelated}\" of resolve-unrelated. supported strategies are: [ours, theirs]`\n );\n }\n}\n"],"mappings":"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","ignoreList":[]}
1	+ {"version":3,"names":["_pMapSeries","data","_interopRequireDefault","require","_componentId","_laneId","_component","_legacy","_lodash","_configMerger","_mergeVersion","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","compIsAlreadyMergedMsg","exports","MergeStatusProvider","constructor","scope","logger","importer","options","workspace","currentLane","otherLane","getStatus","bitIds","importObjectsFromMainIfExist","toBitIds","toVersionLatest","componentStatusBeforeMergeAttempt","mapSeries","id","getComponentStatusBeforeMergeAttempt","shouldImportHistoryOfOtherLane","shouldSquash","toImport","map","compStatus","divergeData","versionsToImport","commonSnapBeforeDiverge","snapsOnTargetOnly","compact","v","changeVersion","toString","flat","reason","legacyScope","scopeImporter","importWithoutDeps","ComponentIdList","fromArray","lane","cache","includeVersionHistory","compStatusNotNeedMerge","c","mergeProps","compStatusNeedMerge","getComponentsStatusNeedMerge","tmp","Tmp","componentsStatus","Promise","all","getComponentMergeStatus","clear","err","results","componentMergeStatusBeforeMergeAttempt","currentComponent","Error","otherLaneHead","currentId","modelComponent","repo","objects","baseSnap","debug","toStringWithoutVersion","version","baseComponent","loadVersion","otherComponent","currentLaneName","toLaneId","otherLaneName","DEFAULT_LANE","currentLabel","otherLabel","workspaceIds","listIds","toComponentIds","configMerger","ComponentConfigMerger","extensions","mergeStrategy","configMergeResult","merge","mergeResults","threeWayMerge","returnUnmerged","msg","unmergedLegitimately","componentStatus","unchangedMessage","unchangedLegitimately","consumer","getModelComponentIfExist","unmerged","unmergedComponents","getEntry","getRef","existingBitMapId","bitMap","getComponentIdIfExist","ignoreVersion","componentOnOther","idOnCurrentLane","getComponent","isRemoved","shouldMerge","shouldRemoveFromMain","head","shouldBeRemoved","getCurrentId","getHeadAsTagIfExist","getDivergeData","targetHead","throws","componentFromModel","componentMap","getComponentIfExist","isLocallyRemoved","getCurrentComponent","loadComponent","getConsumerComponent","isTargetNotAhead","isTargetAhead","shouldIgnore","isModified","undefined","componentModificationStatus","getComponentStatusById","modified","isSourceCodeModified","isComponentSourceCodeModified","modifiedType","ignoreConfigChanges","sourceHead","NoCommonSnap","resolveUnrelated","message","handleNoCommonSnap","detachHead","commonSnapId","commonSnapComp","isDiverged","isSourceAhead","handleTargetAheadAsDiverged","mainHead","returnAccordingToOurs","headToSaveInLane","unrelatedHead","unrelatedLaneId","resolvedUnrelated","strategy","headOnCurrentLane","returnAccordingToTheirs","resolvedRef","unrelatedHeadRef","currentVersionRef","otherVersionRef","hasResolvedFromMain","hashToCompare","divergeDataFromMain","hasResolvedLocally","getHeadRegardlessOfLane","hasResolvedRemotely","refToSaveInLane"],"sources":["merge-status-provider.ts"],"sourcesContent":["import { Workspace } from '@teambit/workspace';\nimport mapSeries from 'p-map-series';\nimport { ComponentID, ComponentIdList } from '@teambit/component-id';\nimport { DEFAULT_LANE, LaneId } from '@teambit/lane-id';\nimport { getDivergeData, SnapsDistance } from '@teambit/component.snap-distance';\nimport { Lane, ModelComponent, Version, Ref } from '@teambit/objects';\nimport { NoCommonSnap, Tmp } from '@teambit/legacy.scope';\nimport { ConsumerComponent } from '@teambit/legacy.consumer-component';\nimport { ImporterMain } from '@teambit/importer';\nimport { Logger } from '@teambit/logger';\nimport { compact } from 'lodash';\nimport { ComponentConfigMerger } from '@teambit/config-merger';\nimport { ScopeMain } from '@teambit/scope';\nimport { threeWayMerge, MergeStrategy } from './merge-version';\nimport { ComponentMergeStatus, ComponentMergeStatusBeforeMergeAttempt } from './merging.main.runtime';\n\nexport type MergeStatusProviderOptions = {\n resolveUnrelated?: MergeStrategy;\n mergeStrategy: MergeStrategy;\n ignoreConfigChanges?: boolean;\n shouldSquash?: boolean;\n handleTargetAheadAsDiverged?: boolean;\n detachHead?: boolean;\n};\n\nexport const compIsAlreadyMergedMsg = 'component is already merged';\nexport class MergeStatusProvider {\n constructor(\n private scope: ScopeMain,\n private logger: Logger,\n private importer: ImporterMain,\n private options: MergeStatusProviderOptions,\n private workspace?: Workspace,\n private currentLane?: Lane, // currently checked out lane. if on main, then it's undefined.\n private otherLane?: Lane // the lane we want to merged to our lane. (undefined if it's \"main\").\n ) {}\n\n async getStatus(\n bitIds: ComponentID[] // the id.version is the version we want to merge to the current component\n ): Promise<ComponentMergeStatus[]> {\n if (!this.currentLane && this.otherLane) {\n await this.importer.importObjectsFromMainIfExist(this.otherLane.toBitIds().toVersionLatest());\n }\n const componentStatusBeforeMergeAttempt = await mapSeries(bitIds, (id) =>\n this.getComponentStatusBeforeMergeAttempt(id)\n );\n // whether or not we need to import the gap between the common-snap and the other lane.\n // the common-snap itself we need anyway in order to get the files hash/content for checking conflicts.\n const shouldImportHistoryOfOtherLane =\n !this.options?.shouldSquash && // when squashing, no need for all history, only the head is going to be pushed\n (!this.currentLane \|\| // on main. we need all history in order to push each component to its remote\n this.currentLane.scope !== this.otherLane?.scope); // on lane, but the other lane is from a different scope. we need all history in order to push to the current lane's scope\n const toImport = componentStatusBeforeMergeAttempt\n .map((compStatus) => {\n if (!compStatus.divergeData) return [];\n const versionsToImport = [compStatus.divergeData.commonSnapBeforeDiverge];\n if (shouldImportHistoryOfOtherLane) {\n versionsToImport.push(...compStatus.divergeData.snapsOnTargetOnly);\n }\n return compact(versionsToImport).map((v) => compStatus.id.changeVersion(v.toString()));\n })\n .flat();\n const reason = shouldImportHistoryOfOtherLane\n ? `for filling the gap between the common-snap and the head of ${this.otherLane?.id() \|\| 'main'}`\n : `for getting the common-snap between ${this.currentLane?.id() \|\| 'main'} and ${this.otherLane?.id() \|\| 'main'}`;\n await this.scope.legacyScope.scopeImporter.importWithoutDeps(ComponentIdList.fromArray(toImport), {\n lane: this.otherLane,\n cache: true,\n includeVersionHistory: false,\n reason,\n });\n\n const compStatusNotNeedMerge = componentStatusBeforeMergeAttempt.filter(\n (c) => !c.mergeProps\n ) as ComponentMergeStatus[];\n const compStatusNeedMerge = componentStatusBeforeMergeAttempt.filter((c) => c.mergeProps);\n\n const getComponentsStatusNeedMerge = async (): Promise<ComponentMergeStatus[]> => {\n const tmp = new Tmp(this.scope.legacyScope);\n try {\n const componentsStatus = await Promise.all(\n compStatusNeedMerge.map((compStatus) => this.getComponentMergeStatus(compStatus))\n );\n await tmp.clear();\n return componentsStatus;\n } catch (err: any) {\n await tmp.clear();\n throw err;\n }\n };\n const results = await getComponentsStatusNeedMerge();\n\n results.push(...compStatusNotNeedMerge);\n return results;\n }\n\n private async getComponentMergeStatus(\n componentMergeStatusBeforeMergeAttempt: ComponentMergeStatusBeforeMergeAttempt\n ) {\n const { id, divergeData, currentComponent, mergeProps } = componentMergeStatusBeforeMergeAttempt;\n if (!mergeProps) throw new Error(`getDivergedMergeStatus, mergeProps is missing for ${id.toString()}`);\n const { otherLaneHead, currentId, modelComponent } = mergeProps;\n const repo = this.scope.legacyScope.objects;\n if (!divergeData) throw new Error(`getDivergedMergeStatus, divergeData is missing for ${id.toString()}`);\n if (!currentComponent) throw new Error(`getDivergedMergeStatus, currentComponent is missing for ${id.toString()}`);\n\n const baseSnap = divergeData.commonSnapBeforeDiverge as unknown as Ref; // must be set when isTrueMerge\n this.logger.debug(`merging snaps details:\nid: ${id.toStringWithoutVersion()}\nbase: ${baseSnap.toString()}\ncurrent: ${currentId.version}\nother: ${otherLaneHead.toString()}`);\n const baseComponent: Version = await modelComponent.loadVersion(baseSnap.toString(), repo);\n const otherComponent: Version = await modelComponent.loadVersion(otherLaneHead.toString(), repo);\n\n const currentLaneName = this.currentLane?.toLaneId().toString() \|\| 'main';\n const otherLaneName = this.otherLane ? this.otherLane.toLaneId().toString() : DEFAULT_LANE;\n const currentLabel = `${currentId.version} (${currentLaneName === otherLaneName ? 'current' : currentLaneName})`;\n const otherLabel = `${otherLaneHead.toString()} (${\n otherLaneName === currentLaneName ? 'incoming' : otherLaneName\n })`;\n const workspaceIds = this.workspace?.listIds() \|\| this.currentLane?.toComponentIds() \|\| [];\n const configMerger = new ComponentConfigMerger(\n id.toStringWithoutVersion(),\n workspaceIds,\n this.otherLane,\n currentComponent.extensions,\n baseComponent.extensions,\n otherComponent.extensions,\n currentLabel,\n otherLabel,\n this.logger,\n this.options.mergeStrategy\n );\n const configMergeResult = configMerger.merge();\n\n const mergeResults = await threeWayMerge({\n scope: this.scope.legacyScope,\n otherComponent,\n otherLabel,\n currentComponent,\n currentLabel,\n baseComponent,\n });\n return {\n currentComponent,\n id,\n mergeResults,\n divergeData,\n configMergeResult,\n };\n }\n\n private returnUnmerged(\n id: ComponentID,\n msg: string,\n unmergedLegitimately = false\n ): ComponentMergeStatusBeforeMergeAttempt {\n const componentStatus: ComponentMergeStatusBeforeMergeAttempt = { id };\n componentStatus.unchangedMessage = msg;\n componentStatus.unchangedLegitimately = unmergedLegitimately;\n return componentStatus;\n }\n\n // eslint-disable-next-line complexity\n private async getComponentStatusBeforeMergeAttempt(\n id: ComponentID // the id.version is the version we want to merge to the current component\n ): Promise<ComponentMergeStatusBeforeMergeAttempt> {\n const consumer = this.workspace?.consumer;\n const componentStatus: ComponentMergeStatusBeforeMergeAttempt = { id };\n const modelComponent = await this.scope.legacyScope.getModelComponentIfExist(id);\n if (!modelComponent) {\n return this.returnUnmerged(\n id,\n `component ${id.toString()} is on the lane/main but its objects were not found, please re-import the lane`\n );\n }\n const unmerged = this.scope.legacyScope.objects.unmergedComponents.getEntry(id);\n if (unmerged) {\n return this.returnUnmerged(\n id,\n `component ${id.toStringWithoutVersion()} is in during-merge state a previous merge, please snap/tag it first (or use bit merge --resolve/--abort/ bit lane merge-abort)`\n );\n }\n const repo = this.scope.legacyScope.objects;\n const version = id.version as string;\n const otherLaneHead = modelComponent.getRef(version);\n const existingBitMapId = consumer?.bitMap.getComponentIdIfExist(id, { ignoreVersion: true });\n const componentOnOther: Version = await modelComponent.loadVersion(version, this.scope.legacyScope.objects);\n const idOnCurrentLane = this.currentLane?.getComponent(id);\n\n if (componentOnOther.isRemoved()) {\n // if exist in current lane, we want the current lane to get the soft-remove update.\n // or if it was removed with --update-main, we want to merge it so then main will get the update.\n // (unless this component does not exist on main, in which case, we don't want to merge it).\n const shouldMerge = idOnCurrentLane \|\| (componentOnOther.shouldRemoveFromMain() && modelComponent.head);\n if (shouldMerge) {\n // remove the component from the workspace if exist.\n componentStatus.shouldBeRemoved = true;\n } else {\n // on main, don't merge soft-removed components unless it's marked with removeOnMain.\n // on lane, if it's not part of the current lane, don't merge it.\n return this.returnUnmerged(id, `component has been removed`, true);\n }\n }\n const getCurrentId = () => {\n if (existingBitMapId) return existingBitMapId;\n if (this.currentLane) {\n if (!idOnCurrentLane) return null;\n return idOnCurrentLane.id.changeVersion(idOnCurrentLane.head.toString());\n }\n // it's on main\n const head = modelComponent.getHeadAsTagIfExist();\n if (head) {\n return id.changeVersion(head);\n }\n return null;\n };\n const currentId = getCurrentId();\n if (!currentId) {\n const divergeData = await getDivergeData({ repo, modelComponent, targetHead: otherLaneHead, throws: false });\n return { ...componentStatus, componentFromModel: componentOnOther, divergeData };\n }\n const componentMap = consumer?.bitMap.getComponentIfExist(currentId, { ignoreVersion: true });\n const isLocallyRemoved = componentMap?.isRemoved();\n if (isLocallyRemoved) {\n return this.returnUnmerged(\n id,\n `component is locally deleted, please snap and export first or undo by bit recover`\n );\n }\n const getCurrentComponent = () => {\n // eslint-disable-next-line @typescript-eslint/no-non-null-assertion\n if (existingBitMapId) return consumer!.loadComponent(existingBitMapId);\n return this.scope.legacyScope.getConsumerComponent(currentId);\n };\n const currentComponent = await getCurrentComponent();\n if (currentComponent.isRemoved()) {\n // we have a few options:\n // 1. \"other\" is main. in this case, we don't care what happens on main, we want the component to stay deleted on\n // this lane. (even when main is ahead, we don't want to merge it).\n // 2. other is ahead. in this case, other recovered the component. so we can continue with the merge.\n // it is possible that it is diverged, in which case, still continue with the merge, and later on, the\n // merge-config will show a config conflict of the remove aspect.\n // 3. other is not ahead. in this case, just ignore this component, no point to merge it, we want it removed.\n const divergeData = await getDivergeData({ repo, modelComponent, targetHead: otherLaneHead, throws: false });\n const isTargetNotAhead = !divergeData.err && !divergeData.isTargetAhead();\n const shouldIgnore = this.otherLane\n ? isTargetNotAhead // option #2 and #3 above\n : true; // it's main. option #1 above.\n if (shouldIgnore) {\n return this.returnUnmerged(id, `component has been removed`, true);\n }\n }\n\n const isModified = async (): Promise<undefined \| 'code' \| 'config'> => {\n if (!consumer \|\| !this.workspace) return undefined;\n const componentModificationStatus = await this.workspace.getComponentStatusById(currentComponent.id);\n if (!componentModificationStatus.modified) return undefined;\n if (!existingBitMapId) return undefined;\n const baseComponent = await modelComponent.loadVersion(\n existingBitMapId.version as string,\n consumer.scope.objects\n );\n const isSourceCodeModified = await consumer.isComponentSourceCodeModified(baseComponent, currentComponent);\n if (isSourceCodeModified) return 'code';\n return 'config';\n };\n\n const modifiedType = await isModified();\n if (modifiedType === 'config' && !this.options?.ignoreConfigChanges) {\n return this.returnUnmerged(\n id,\n `component has config changes, please snap/tag it first. alternatively, use --ignore-config-changes flag to bypass`\n );\n }\n if (modifiedType === 'code') {\n return this.returnUnmerged(id, `component is modified, please snap/tag it first`);\n }\n\n if (!otherLaneHead) {\n throw new Error(`merging: unable finding a hash for the version ${version} of ${id.toString()}`);\n }\n const divergeData = await getDivergeData({\n repo,\n modelComponent,\n sourceHead: this.workspace ? undefined : modelComponent.getRef(currentId.version as string), // not sure if needs to check for this.workspace\n targetHead: otherLaneHead,\n throws: false,\n });\n if (divergeData.err) {\n if (!(divergeData.err instanceof NoCommonSnap) \|\| !this.options?.resolveUnrelated) {\n return this.returnUnmerged(id, `unable to traverse history. error: ${divergeData.err.message}`);\n }\n return this.handleNoCommonSnap(\n modelComponent,\n id,\n otherLaneHead,\n currentComponent,\n componentOnOther,\n divergeData\n );\n }\n if (this.options.detachHead && divergeData.commonSnapBeforeDiverge) {\n // just override with the model data\n const commonSnapId = id.changeVersion(divergeData.commonSnapBeforeDiverge.toString());\n const commonSnapComp = await this.scope.legacyScope.getConsumerComponent(commonSnapId);\n return {\n ...componentStatus,\n currentComponent: commonSnapComp,\n componentFromModel: componentOnOther,\n divergeData,\n };\n }\n if (!divergeData.isDiverged()) {\n if (divergeData.isSourceAhead()) {\n // component is ahead nothing to merge.\n return this.returnUnmerged(id, compIsAlreadyMergedMsg, true);\n }\n if (!divergeData.isTargetAhead()) {\n // we know that localHead and remoteHead are set, so if none of them is ahead they must be equal\n return this.returnUnmerged(id, compIsAlreadyMergedMsg, true);\n }\n // target is ahead.\n if (!this.options.handleTargetAheadAsDiverged \|\| !divergeData.commonSnapBeforeDiverge) {\n // just override with the model data\n return {\n ...componentStatus,\n currentComponent,\n componentFromModel: componentOnOther,\n divergeData,\n };\n }\n // target is ahead and we want to treat it as diverged, continue.\n }\n\n // it's diverged and needs merge operation\n const mergeProps = {\n otherLaneHead,\n currentId,\n modelComponent,\n };\n\n return { ...componentStatus, currentComponent, mergeProps, divergeData };\n }\n\n private async handleNoCommonSnap(\n modelComponent: ModelComponent,\n id: ComponentID,\n otherLaneHead: Ref,\n currentComponent: ConsumerComponent,\n componentOnOther?: Version,\n divergeData?: SnapsDistance\n ): Promise<ComponentMergeStatusBeforeMergeAttempt> {\n let { resolveUnrelated } = this.options \|\| {};\n if (currentComponent.isRemoved()) {\n resolveUnrelated = 'theirs';\n }\n if (!resolveUnrelated) throw new Error(`handleNoCommonSnap expects resolveUnrelated to be set`);\n const repo = this.scope.legacyScope.objects;\n const mainHead = modelComponent.head;\n\n const returnAccordingToOurs = (\n headToSaveInLane: Ref,\n unrelatedHead: Ref,\n unrelatedLaneId: LaneId\n ): ComponentMergeStatusBeforeMergeAttempt => {\n return {\n currentComponent,\n id,\n divergeData,\n resolvedUnrelated: {\n strategy: 'ours',\n headOnCurrentLane: headToSaveInLane,\n unrelatedHead,\n unrelatedLaneId,\n },\n };\n };\n const returnAccordingToTheirs = (\n resolvedRef: Ref,\n unrelatedHeadRef: Ref,\n unrelatedLaneId: LaneId\n ): ComponentMergeStatusBeforeMergeAttempt => {\n // just override with the model data\n return {\n currentComponent,\n componentFromModel: componentOnOther,\n id,\n divergeData,\n resolvedUnrelated: {\n strategy: 'theirs',\n headOnCurrentLane: resolvedRef,\n unrelatedHead: unrelatedHeadRef,\n unrelatedLaneId,\n },\n };\n };\n\n const currentVersionRef = modelComponent.getRef(currentComponent.id.version as string);\n if (!currentVersionRef)\n throw new Error(\n `handleNoCommonSnap, unable to get ref of current version \"${\n currentComponent.id.version\n }\" for \"${id.toString()}\"`\n );\n const otherVersionRef = modelComponent.getRef(id.version as string);\n if (!otherVersionRef)\n throw new Error(`handleNoCommonSnap, unable to get ref of other version \"${id.version}\" for \"${id.toString()}\"`);\n\n if (mainHead) {\n const hasResolvedFromMain = async (hashToCompare: Ref \| null) => {\n const divergeDataFromMain = await getDivergeData({\n repo,\n modelComponent,\n sourceHead: hashToCompare,\n targetHead: mainHead,\n throws: false,\n });\n if (!divergeDataFromMain.err) return true;\n return !(divergeDataFromMain.err instanceof NoCommonSnap);\n };\n const hasResolvedLocally = await hasResolvedFromMain(modelComponent.getHeadRegardlessOfLane() as Ref);\n const hasResolvedRemotely = await hasResolvedFromMain(otherLaneHead);\n if (!hasResolvedLocally && !hasResolvedRemotely) {\n return this.returnUnmerged(\n id,\n `unable to traverse ${currentComponent.id.toString()} history. the main-head ${mainHead.toString()} doesn't appear in both lanes.\nit was probably created in each lane separately and it also exists on main. please merge main first to one of these lanes`\n );\n }\n const refToSaveInLane = hasResolvedLocally ? currentVersionRef : otherVersionRef;\n const unrelatedHeadRef = hasResolvedLocally ? otherVersionRef : currentVersionRef;\n if (resolveUnrelated === 'ours') {\n return returnAccordingToOurs(refToSaveInLane, unrelatedHeadRef, this.currentLane?.toLaneId() as LaneId);\n }\n if (resolveUnrelated === 'theirs') {\n return returnAccordingToTheirs(refToSaveInLane, unrelatedHeadRef, this.currentLane?.toLaneId() as LaneId);\n }\n throw new Error(\n `unsupported strategy \"${resolveUnrelated}\" of resolve-unrelated. supported strategies are: [ours, theirs]`\n );\n }\n\n const refToSaveInLane = resolveUnrelated === 'ours' ? currentVersionRef : otherVersionRef;\n const unrelatedHeadRef = resolveUnrelated === 'ours' ? otherVersionRef : currentVersionRef;\n if (resolveUnrelated === 'ours') {\n return returnAccordingToOurs(refToSaveInLane, unrelatedHeadRef, this.otherLane?.toLaneId() as LaneId);\n }\n if (resolveUnrelated === 'theirs') {\n return returnAccordingToTheirs(refToSaveInLane, unrelatedHeadRef, this.currentLane?.toLaneId() as LaneId);\n }\n throw new Error(\n `unsupported strategy \"${resolveUnrelated}\" of resolve-unrelated. supported strategies are: [ours, theirs]`\n );\n }\n}\n"],"mappings":"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","ignoreList":[]}

package/dist/merge-version/three-way-merge.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import { Version, SourceFileModel } from '@teambit/scope.objects';
+import { Version, SourceFileModel } from '@teambit/objects';
 import { PathLinux } from '@teambit/toolbox.path.path';
 import { ConsumerComponent as Component } from '@teambit/legacy.consumer-component';
 import { SourceFile } from '@teambit/component.sources';

package/dist/merge-version/three-way-merge.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"names":["_bitError","data","require","_toolboxCrypto","_toolboxPath","eol","_interopRequireWildcard","_mergeFiles","_component","_legacy","_lodash","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","threeWayMerge","scope","otherComponent","otherLabel","currentComponent","currentLabel","baseComponent","baseFiles","files","otherFiles","currentFiles","cloneFilesWithSharedDir","forEach","fsFile","contents","lf","results","addFiles","removeFiles","remainDeletedFiles","deletedConflictFiles","modifiedFiles","unModifiedFiles","overrideFiles","updatedFiles","hasConflicts","getFileResult","baseFile","otherFile","filePath","pathNormalizeToLinux","relative","fsFileHash","sha1","push","baseFileHash","file","hash","otherFileHash","content","load","objects","label","output","conflict","Promise","all","map","relativePath","find","fsFilesPaths","baseFilesPaths","isOtherSameAsBase","Error","deletedFromFs","filter","includes","deletedAndModified","addedOnOther","SourceFile","loadFromSourceFileModel","isEmpty","conflictResults","getMergeResults","conflictResult","modifiedFile","BitError","isBinaryConflict","tmp","Tmp","conflictResultsP","fsFilePathP","save","writeFile","toString","baseFilePathP","otherFilePathP","fsFilePath","baseFilePath","otherFilePath","mergeFilesParams","currentFile","path","mergeFiles"],"sources":["three-way-merge.ts"],"sourcesContent":["import { BitError } from '@teambit/bit-error';\nimport { Source, Version, SourceFileModel } from '@teambit/scope.objects';\nimport { sha1 } from '@teambit/toolbox.crypto.sha1';\nimport { PathLinux, pathNormalizeToLinux, PathOsBased } from '@teambit/toolbox.path.path';\nimport * as eol from '@teambit/toolbox.string.eol';\nimport { mergeFiles, MergeFileParams, MergeFileResult } from '../merge-files';\nimport { ConsumerComponent as Component } from '@teambit/legacy.consumer-component';\nimport { SourceFile } from '@teambit/component.sources';\nimport { Tmp, Scope } from '@teambit/legacy.scope';\nimport { isEmpty } from 'lodash';\n\nexport type MergeResultsThreeWay = {\n addFiles: Array<{\n filePath: PathLinux;\n fsFile: SourceFile;\n }>;\n removeFiles: Array<{\n filePath: PathLinux;\n }>;\n remainDeletedFiles: Array<{\n filePath: PathLinux;\n }>;\n deletedConflictFiles: Array<{\n filePath: PathLinux;\n fsFile?: SourceFile;\n }>;\n modifiedFiles: Array<{\n filePath: PathLinux;\n fsFile: SourceFile;\n baseFile?: SourceFileModel;\n otherFile: SourceFileModel;\n output: string \| null \| undefined;\n conflict: string \| null \| undefined;\n isBinaryConflict?: boolean;\n }>;\n unModifiedFiles: Array<{\n filePath: PathLinux;\n fsFile: SourceFile;\n }>;\n overrideFiles: Array<{\n filePath: PathLinux;\n fsFile: SourceFile;\n }>;\n updatedFiles: Array<{\n filePath: PathLinux;\n otherFile: SourceFileModel;\n content: Buffer;\n }>;\n hasConflicts: boolean;\n};\n\n/*\n to do the actual merge we use git, specifically `merge-file` command, so we try to use the same\n * terminology as git. From the command help:\n * `git merge-file <current-file> <base-file> <other-file>\n * git merge-file incorporates all changes that lead from the <base-file> to <other-file> into\n * <current-file>. The result ordinarily goes into <current-file>.`\n \n see checkout-version.getBaseVersion() for a case when a component is modified and then the base-file is not the\n * common file before other-file and current-file.\n * otherwise, Git terminology pretty much reflects what we do here. current-file is the one that is currently written\n * to the filesystem. other-file is the one the user wants to checkout to. base-file is the original file where both:\n * base-file and other-file were originated from.\n */\nexport async function threeWayMerge({\n scope,\n otherComponent,\n otherLabel,\n currentComponent,\n currentLabel,\n baseComponent,\n}: {\n scope: Scope;\n otherComponent: Version;\n otherLabel: string;\n currentComponent: Component;\n currentLabel: string;\n baseComponent: Version;\n}): Promise<MergeResultsThreeWay> {\n // baseFiles and currentFiles come from the model, therefore their paths include the\n // sharedOriginallyDir. fsFiles come from the Fs, therefore their paths don't include the\n // sharedOriginallyDir.\n // option 1) strip sharedOriginallyDir from baseFiles and currentFiles. the problem is that the\n // sharedDir can be different if the dependencies were changes for example, as a result, it won't\n // be possible to compare between the files as the paths are different.\n // in the previous it was implemented this way and caused a bug, which now has an e2e-test to\n // block it. see https://github.com/teambit/bit/pull/2070 PR.\n // option 2) add sharedOriginallyDir to the fsFiles. we must go with this option.\n // one thing we have to change is the end-of-line, it should be set as LF, same way we do before\n // saving the file as an object.\n const baseFiles: SourceFileModel[] = baseComponent.files;\n const otherFiles: SourceFileModel[] = otherComponent.files;\n const currentFiles: SourceFile[] = currentComponent.cloneFilesWithSharedDir();\n currentFiles.forEach((fsFile) => {\n fsFile.contents = eol.lf(fsFile.contents) as Buffer;\n });\n const results: MergeResultsThreeWay = {\n addFiles: [],\n removeFiles: [],\n remainDeletedFiles: [],\n deletedConflictFiles: [],\n modifiedFiles: [],\n unModifiedFiles: [],\n overrideFiles: [],\n updatedFiles: [],\n hasConflicts: false,\n };\n const getFileResult = async (fsFile: SourceFile, baseFile?: SourceFileModel, otherFile?: SourceFileModel) => {\n const filePath: PathLinux = pathNormalizeToLinux(fsFile.relative);\n // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n const fsFileHash = sha1(fsFile.contents);\n if (!otherFile) {\n // if !otherFile && !baseFile, the file was created after the last tag, no need to do any\n // calculation, the file should be added\n if (!baseFile) {\n results.addFiles.push({ filePath, fsFile });\n return;\n }\n const baseFileHash = baseFile.file.hash;\n if (fsFileHash === baseFileHash) {\n results.removeFiles.push({ filePath });\n return;\n }\n results.deletedConflictFiles.push({ filePath });\n return;\n }\n const otherFileHash = otherFile.file.hash;\n if (fsFileHash === otherFileHash) {\n // if fs === other, no need to take any action (regardless the base)\n results.unModifiedFiles.push({ filePath, fsFile });\n return;\n }\n if (baseFile && fsFileHash === baseFile.file.hash) {\n // the file has no local modification.\n // the file currently in the fs, is not the same as the file we want to write (other).\n // but no need to check whether it has conflicts because we always want to write the other.\n const content = (await otherFile.file.load(scope.objects)) as Source;\n results.updatedFiles.push({ filePath, otherFile, content: content.contents });\n return;\n }\n // it was changed in both, there is a chance for conflict. (regardless the base)\n fsFile.label = currentLabel;\n // @ts-ignore it's a hack to pass the data, version is not a valid attribute.\n otherFile.label = otherLabel;\n results.modifiedFiles.push({ filePath, fsFile, baseFile, otherFile, output: null, conflict: null });\n };\n\n await Promise.all(\n currentFiles.map(async (fsFile) => {\n const relativePath = pathNormalizeToLinux(fsFile.relative);\n const baseFile = baseFiles.find((file) => file.relativePath === relativePath);\n const otherFile = otherFiles.find((file) => file.relativePath === relativePath);\n await getFileResult(fsFile, baseFile, otherFile);\n })\n );\n const fsFilesPaths = currentFiles.map((fsFile) => pathNormalizeToLinux(fsFile.relative));\n const baseFilesPaths = baseFiles.map((baseFile) => baseFile.relativePath);\n const isOtherSameAsBase = (otherFile: SourceFileModel) => {\n const baseFile = baseFiles.find((file) => file.relativePath === otherFile.relativePath);\n if (!baseFile) throw new Error('isOtherSameAsBase expect the base to be there');\n return baseFile.file.hash === otherFile.file.hash;\n };\n const deletedFromFs = otherFiles.filter(\n (otherFile) =>\n !fsFilesPaths.includes(otherFile.relativePath) &&\n baseFilesPaths.includes(otherFile.relativePath) &&\n isOtherSameAsBase(otherFile)\n );\n const deletedAndModified = otherFiles.filter(\n (otherFile) =>\n !fsFilesPaths.includes(otherFile.relativePath) &&\n baseFilesPaths.includes(otherFile.relativePath) &&\n !isOtherSameAsBase(otherFile)\n );\n const addedOnOther = otherFiles.filter(\n (otherFile) => !fsFilesPaths.includes(otherFile.relativePath) && !baseFilesPaths.includes(otherFile.relativePath)\n );\n deletedFromFs.forEach((file) => results.remainDeletedFiles.push({ filePath: file.relativePath }));\n deletedAndModified.forEach((file) => results.deletedConflictFiles.push({ filePath: file.relativePath }));\n\n await Promise.all(\n addedOnOther.map(async (file) => {\n const fsFile = await SourceFile.loadFromSourceFileModel(file, scope.objects);\n results.addFiles.push({ filePath: file.relativePath, fsFile });\n })\n );\n await Promise.all(\n deletedAndModified.map(async (file) => {\n const fsFile = await SourceFile.loadFromSourceFileModel(file, scope.objects);\n results.deletedConflictFiles.push({ filePath: file.relativePath, fsFile });\n })\n );\n if (isEmpty(results.modifiedFiles)) return results;\n\n const conflictResults = await getMergeResults(scope, results.modifiedFiles);\n conflictResults.forEach((conflictResult: MergeFileResult) => {\n const modifiedFile = results.modifiedFiles.find((file) => file.filePath === conflictResult.filePath);\n if (!modifiedFile) throw new BitError(`unable to find ${conflictResult.filePath} in modified files array`);\n modifiedFile.output = conflictResult.output;\n modifiedFile.conflict = conflictResult.conflict;\n modifiedFile.isBinaryConflict = conflictResult.isBinaryConflict;\n if (conflictResult.conflict \|\| conflictResult.isBinaryConflict) results.hasConflicts = true;\n });\n\n return results;\n}\n\nasync function getMergeResults(\n scope: Scope,\n modifiedFiles: MergeResultsThreeWay['modifiedFiles']\n): Promise<MergeFileResult[]> {\n const tmp = new Tmp(scope);\n const conflictResultsP = modifiedFiles.map(async (modifiedFile) => {\n // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n const fsFilePathP = tmp.save(modifiedFile.fsFile.contents);\n const writeFile = async (file: SourceFileModel): Promise<PathOsBased> => {\n const content = await file.file.load(scope.objects);\n // @ts-ignore\n return tmp.save(content.contents.toString());\n };\n const baseFilePathP = modifiedFile.baseFile ? writeFile(modifiedFile.baseFile) : tmp.save('');\n const otherFilePathP = writeFile(modifiedFile.otherFile);\n const [fsFilePath, baseFilePath, otherFilePath] = await Promise.all([fsFilePathP, baseFilePathP, otherFilePathP]);\n const mergeFilesParams: MergeFileParams = {\n filePath: modifiedFile.filePath,\n currentFile: {\n label: modifiedFile.fsFile.label,\n path: fsFilePath,\n },\n baseFile: {\n path: baseFilePath,\n },\n otherFile: {\n // @ts-ignore\n label: modifiedFile.otherFile.label,\n path: otherFilePath,\n },\n };\n return mergeFiles(mergeFilesParams);\n });\n return Promise.all(conflictResultsP);\n}\n"],"mappings":"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","ignoreList":[]}
1	+ {"version":3,"names":["_bitError","data","require","_toolboxCrypto","_toolboxPath","eol","_interopRequireWildcard","_mergeFiles","_component","_legacy","_lodash","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","threeWayMerge","scope","otherComponent","otherLabel","currentComponent","currentLabel","baseComponent","baseFiles","files","otherFiles","currentFiles","cloneFilesWithSharedDir","forEach","fsFile","contents","lf","results","addFiles","removeFiles","remainDeletedFiles","deletedConflictFiles","modifiedFiles","unModifiedFiles","overrideFiles","updatedFiles","hasConflicts","getFileResult","baseFile","otherFile","filePath","pathNormalizeToLinux","relative","fsFileHash","sha1","push","baseFileHash","file","hash","otherFileHash","content","load","objects","label","output","conflict","Promise","all","map","relativePath","find","fsFilesPaths","baseFilesPaths","isOtherSameAsBase","Error","deletedFromFs","filter","includes","deletedAndModified","addedOnOther","SourceFile","loadFromSourceFileModel","isEmpty","conflictResults","getMergeResults","conflictResult","modifiedFile","BitError","isBinaryConflict","tmp","Tmp","conflictResultsP","fsFilePathP","save","writeFile","toString","baseFilePathP","otherFilePathP","fsFilePath","baseFilePath","otherFilePath","mergeFilesParams","currentFile","path","mergeFiles"],"sources":["three-way-merge.ts"],"sourcesContent":["import { BitError } from '@teambit/bit-error';\nimport { Source, Version, SourceFileModel } from '@teambit/objects';\nimport { sha1 } from '@teambit/toolbox.crypto.sha1';\nimport { PathLinux, pathNormalizeToLinux, PathOsBased } from '@teambit/toolbox.path.path';\nimport * as eol from '@teambit/toolbox.string.eol';\nimport { mergeFiles, MergeFileParams, MergeFileResult } from '../merge-files';\nimport { ConsumerComponent as Component } from '@teambit/legacy.consumer-component';\nimport { SourceFile } from '@teambit/component.sources';\nimport { Tmp, Scope } from '@teambit/legacy.scope';\nimport { isEmpty } from 'lodash';\n\nexport type MergeResultsThreeWay = {\n addFiles: Array<{\n filePath: PathLinux;\n fsFile: SourceFile;\n }>;\n removeFiles: Array<{\n filePath: PathLinux;\n }>;\n remainDeletedFiles: Array<{\n filePath: PathLinux;\n }>;\n deletedConflictFiles: Array<{\n filePath: PathLinux;\n fsFile?: SourceFile;\n }>;\n modifiedFiles: Array<{\n filePath: PathLinux;\n fsFile: SourceFile;\n baseFile?: SourceFileModel;\n otherFile: SourceFileModel;\n output: string \| null \| undefined;\n conflict: string \| null \| undefined;\n isBinaryConflict?: boolean;\n }>;\n unModifiedFiles: Array<{\n filePath: PathLinux;\n fsFile: SourceFile;\n }>;\n overrideFiles: Array<{\n filePath: PathLinux;\n fsFile: SourceFile;\n }>;\n updatedFiles: Array<{\n filePath: PathLinux;\n otherFile: SourceFileModel;\n content: Buffer;\n }>;\n hasConflicts: boolean;\n};\n\n/*\n to do the actual merge we use git, specifically `merge-file` command, so we try to use the same\n * terminology as git. From the command help:\n * `git merge-file <current-file> <base-file> <other-file>\n * git merge-file incorporates all changes that lead from the <base-file> to <other-file> into\n * <current-file>. The result ordinarily goes into <current-file>.`\n \n see checkout-version.getBaseVersion() for a case when a component is modified and then the base-file is not the\n * common file before other-file and current-file.\n * otherwise, Git terminology pretty much reflects what we do here. current-file is the one that is currently written\n * to the filesystem. other-file is the one the user wants to checkout to. base-file is the original file where both:\n * base-file and other-file were originated from.\n */\nexport async function threeWayMerge({\n scope,\n otherComponent,\n otherLabel,\n currentComponent,\n currentLabel,\n baseComponent,\n}: {\n scope: Scope;\n otherComponent: Version;\n otherLabel: string;\n currentComponent: Component;\n currentLabel: string;\n baseComponent: Version;\n}): Promise<MergeResultsThreeWay> {\n // baseFiles and currentFiles come from the model, therefore their paths include the\n // sharedOriginallyDir. fsFiles come from the Fs, therefore their paths don't include the\n // sharedOriginallyDir.\n // option 1) strip sharedOriginallyDir from baseFiles and currentFiles. the problem is that the\n // sharedDir can be different if the dependencies were changes for example, as a result, it won't\n // be possible to compare between the files as the paths are different.\n // in the previous it was implemented this way and caused a bug, which now has an e2e-test to\n // block it. see https://github.com/teambit/bit/pull/2070 PR.\n // option 2) add sharedOriginallyDir to the fsFiles. we must go with this option.\n // one thing we have to change is the end-of-line, it should be set as LF, same way we do before\n // saving the file as an object.\n const baseFiles: SourceFileModel[] = baseComponent.files;\n const otherFiles: SourceFileModel[] = otherComponent.files;\n const currentFiles: SourceFile[] = currentComponent.cloneFilesWithSharedDir();\n currentFiles.forEach((fsFile) => {\n fsFile.contents = eol.lf(fsFile.contents) as Buffer;\n });\n const results: MergeResultsThreeWay = {\n addFiles: [],\n removeFiles: [],\n remainDeletedFiles: [],\n deletedConflictFiles: [],\n modifiedFiles: [],\n unModifiedFiles: [],\n overrideFiles: [],\n updatedFiles: [],\n hasConflicts: false,\n };\n const getFileResult = async (fsFile: SourceFile, baseFile?: SourceFileModel, otherFile?: SourceFileModel) => {\n const filePath: PathLinux = pathNormalizeToLinux(fsFile.relative);\n // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n const fsFileHash = sha1(fsFile.contents);\n if (!otherFile) {\n // if !otherFile && !baseFile, the file was created after the last tag, no need to do any\n // calculation, the file should be added\n if (!baseFile) {\n results.addFiles.push({ filePath, fsFile });\n return;\n }\n const baseFileHash = baseFile.file.hash;\n if (fsFileHash === baseFileHash) {\n results.removeFiles.push({ filePath });\n return;\n }\n results.deletedConflictFiles.push({ filePath });\n return;\n }\n const otherFileHash = otherFile.file.hash;\n if (fsFileHash === otherFileHash) {\n // if fs === other, no need to take any action (regardless the base)\n results.unModifiedFiles.push({ filePath, fsFile });\n return;\n }\n if (baseFile && fsFileHash === baseFile.file.hash) {\n // the file has no local modification.\n // the file currently in the fs, is not the same as the file we want to write (other).\n // but no need to check whether it has conflicts because we always want to write the other.\n const content = (await otherFile.file.load(scope.objects)) as Source;\n results.updatedFiles.push({ filePath, otherFile, content: content.contents });\n return;\n }\n // it was changed in both, there is a chance for conflict. (regardless the base)\n fsFile.label = currentLabel;\n // @ts-ignore it's a hack to pass the data, version is not a valid attribute.\n otherFile.label = otherLabel;\n results.modifiedFiles.push({ filePath, fsFile, baseFile, otherFile, output: null, conflict: null });\n };\n\n await Promise.all(\n currentFiles.map(async (fsFile) => {\n const relativePath = pathNormalizeToLinux(fsFile.relative);\n const baseFile = baseFiles.find((file) => file.relativePath === relativePath);\n const otherFile = otherFiles.find((file) => file.relativePath === relativePath);\n await getFileResult(fsFile, baseFile, otherFile);\n })\n );\n const fsFilesPaths = currentFiles.map((fsFile) => pathNormalizeToLinux(fsFile.relative));\n const baseFilesPaths = baseFiles.map((baseFile) => baseFile.relativePath);\n const isOtherSameAsBase = (otherFile: SourceFileModel) => {\n const baseFile = baseFiles.find((file) => file.relativePath === otherFile.relativePath);\n if (!baseFile) throw new Error('isOtherSameAsBase expect the base to be there');\n return baseFile.file.hash === otherFile.file.hash;\n };\n const deletedFromFs = otherFiles.filter(\n (otherFile) =>\n !fsFilesPaths.includes(otherFile.relativePath) &&\n baseFilesPaths.includes(otherFile.relativePath) &&\n isOtherSameAsBase(otherFile)\n );\n const deletedAndModified = otherFiles.filter(\n (otherFile) =>\n !fsFilesPaths.includes(otherFile.relativePath) &&\n baseFilesPaths.includes(otherFile.relativePath) &&\n !isOtherSameAsBase(otherFile)\n );\n const addedOnOther = otherFiles.filter(\n (otherFile) => !fsFilesPaths.includes(otherFile.relativePath) && !baseFilesPaths.includes(otherFile.relativePath)\n );\n deletedFromFs.forEach((file) => results.remainDeletedFiles.push({ filePath: file.relativePath }));\n deletedAndModified.forEach((file) => results.deletedConflictFiles.push({ filePath: file.relativePath }));\n\n await Promise.all(\n addedOnOther.map(async (file) => {\n const fsFile = await SourceFile.loadFromSourceFileModel(file, scope.objects);\n results.addFiles.push({ filePath: file.relativePath, fsFile });\n })\n );\n await Promise.all(\n deletedAndModified.map(async (file) => {\n const fsFile = await SourceFile.loadFromSourceFileModel(file, scope.objects);\n results.deletedConflictFiles.push({ filePath: file.relativePath, fsFile });\n })\n );\n if (isEmpty(results.modifiedFiles)) return results;\n\n const conflictResults = await getMergeResults(scope, results.modifiedFiles);\n conflictResults.forEach((conflictResult: MergeFileResult) => {\n const modifiedFile = results.modifiedFiles.find((file) => file.filePath === conflictResult.filePath);\n if (!modifiedFile) throw new BitError(`unable to find ${conflictResult.filePath} in modified files array`);\n modifiedFile.output = conflictResult.output;\n modifiedFile.conflict = conflictResult.conflict;\n modifiedFile.isBinaryConflict = conflictResult.isBinaryConflict;\n if (conflictResult.conflict \|\| conflictResult.isBinaryConflict) results.hasConflicts = true;\n });\n\n return results;\n}\n\nasync function getMergeResults(\n scope: Scope,\n modifiedFiles: MergeResultsThreeWay['modifiedFiles']\n): Promise<MergeFileResult[]> {\n const tmp = new Tmp(scope);\n const conflictResultsP = modifiedFiles.map(async (modifiedFile) => {\n // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n const fsFilePathP = tmp.save(modifiedFile.fsFile.contents);\n const writeFile = async (file: SourceFileModel): Promise<PathOsBased> => {\n const content = await file.file.load(scope.objects);\n // @ts-ignore\n return tmp.save(content.contents.toString());\n };\n const baseFilePathP = modifiedFile.baseFile ? writeFile(modifiedFile.baseFile) : tmp.save('');\n const otherFilePathP = writeFile(modifiedFile.otherFile);\n const [fsFilePath, baseFilePath, otherFilePath] = await Promise.all([fsFilePathP, baseFilePathP, otherFilePathP]);\n const mergeFilesParams: MergeFileParams = {\n filePath: modifiedFile.filePath,\n currentFile: {\n label: modifiedFile.fsFile.label,\n path: fsFilePath,\n },\n baseFile: {\n path: baseFilePath,\n },\n otherFile: {\n // @ts-ignore\n label: modifiedFile.otherFile.label,\n path: otherFilePath,\n },\n };\n return mergeFiles(mergeFilesParams);\n });\n return Promise.all(conflictResultsP);\n}\n"],"mappings":";;;;;;AAAA,SAAAA,UAAA;EAAA,MAAAC,IAAA,GAAAC,OAAA;EAAAF,SAAA,YAAAA,CAAA;IAAA,OAAAC,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAEA,SAAAE,eAAA;EAAA,MAAAF,IAAA,GAAAC,OAAA;EAAAC,cAAA,YAAAA,CAAA;IAAA,OAAAF,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAG,aAAA;EAAA,MAAAH,IAAA,GAAAC,OAAA;EAAAE,YAAA,YAAAA,CAAA;IAAA,OAAAH,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAI,IAAA;EAAA,MAAAJ,IAAA,GAAAK,uBAAA,CAAAJ,OAAA;EAAAG,GAAA,YAAAA,CAAA;IAAA,OAAAJ,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAM,YAAA;EAAA,MAAAN,IAAA,GAAAC,OAAA;EAAAK,WAAA,YAAAA,CAAA;IAAA,OAAAN,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAEA,SAAAO,WAAA;EAAA,MAAAP,IAAA,GAAAC,OAAA;EAAAM,UAAA,YAAAA,CAAA;IAAA,OAAAP,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAQ,QAAA;EAAA,MAAAR,IAAA,GAAAC,OAAA;EAAAO,OAAA,YAAAA,CAAA;IAAA,OAAAR,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAS,QAAA;EAAA,MAAAT,IAAA,GAAAC,OAAA;EAAAQ,OAAA,YAAAA,CAAA;IAAA,OAAAT,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAAiC,SAAAU,yBAAAC,CAAA,6BAAAC,OAAA,mBAAAC,CAAA,OAAAD,OAAA,IAAAE,CAAA,OAAAF,OAAA,YAAAF,wBAAA,YAAAA,CAAAC,CAAA,WAAAA,CAAA,GAAAG,CAAA,GAAAD,CAAA,KAAAF,CAAA;AAAA,SAAAN,wBAAAM,CAAA,EAAAE,CAAA,SAAAA,CAAA,IAAAF,CAAA,IAAAA,CAAA,CAAAI,UAAA,SAAAJ,CAAA,eAAAA,CAAA,uBAAAA,CAAA,yBAAAA,CAAA,WAAAK,OAAA,EAAAL,CAAA,QAAAG,CAAA,GAAAJ,wBAAA,CAAAG,CAAA,OAAAC,CAAA,IAAAA,CAAA,CAAAG,GAAA,CAAAN,CAAA,UAAAG,CAAA,CAAAI,GAAA,CAAAP,CAAA,OAAAQ,CAAA,KAAAC,SAAA,UAAAC,CAAA,GAAAC,MAAA,CAAAC,cAAA,IAAAD,MAAA,CAAAE,wBAAA,WAAAC,CAAA,IAAAd,CAAA,oBAAAc,CAAA,OAAAC,cAAA,CAAAC,IAAA,CAAAhB,CAAA,EAAAc,CAAA,SAAAG,CAAA,GAAAP,CAAA,GAAAC,MAAA,CAAAE,wBAAA,CAAAb,CAAA,EAAAc,CAAA,UAAAG,CAAA,KAAAA,CAAA,CAAAV,GAAA,IAAAU,CAAA,CAAAC,GAAA,IAAAP,MAAA,CAAAC,cAAA,CAAAJ,CAAA,EAAAM,CAAA,EAAAG,CAAA,IAAAT,CAAA,CAAAM,CAAA,IAAAd,CAAA,CAAAc,CAAA,YAAAN,CAAA,CAAAH,OAAA,GAAAL,CAAA,EAAAG,CAAA,IAAAA,CAAA,CAAAe,GAAA,CAAAlB,CAAA,EAAAQ,CAAA,GAAAA,CAAA;AA0CjC;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,eAAeW,aAAaA,CAAC;EAClCC,KAAK;EACLC,cAAc;EACdC,UAAU;EACVC,gBAAgB;EAChBC,YAAY;EACZC;AAQF,CAAC,EAAiC;EAChC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA,MAAMC,SAA4B,GAAGD,aAAa,CAACE,KAAK;EACxD,MAAMC,UAA6B,GAAGP,cAAc,CAACM,KAAK;EAC1D,MAAME,YAA0B,GAAGN,gBAAgB,CAACO,uBAAuB,CAAC,CAAC;EAC7ED,YAAY,CAACE,OAAO,CAAEC,MAAM,IAAK;IAC/BA,MAAM,CAACC,QAAQ,GAAGxC,GAAG,CAAD,CAAC,CAACyC,EAAE,CAACF,MAAM,CAACC,QAAQ,CAAW;EACrD,CAAC,CAAC;EACF,MAAME,OAA6B,GAAG;IACpCC,QAAQ,EAAE,EAAE;IACZC,WAAW,EAAE,EAAE;IACfC,kBAAkB,EAAE,EAAE;IACtBC,oBAAoB,EAAE,EAAE;IACxBC,aAAa,EAAE,EAAE;IACjBC,eAAe,EAAE,EAAE;IACnBC,aAAa,EAAE,EAAE;IACjBC,YAAY,EAAE,EAAE;IAChBC,YAAY,EAAE;EAChB,CAAC;EACD,MAAMC,aAAa,GAAG,MAAAA,CAAOb,MAAkB,EAAEc,QAA0B,EAAEC,SAA2B,KAAK;IAC3G,MAAMC,QAAmB,GAAG,IAAAC,mCAAoB,EAACjB,MAAM,CAACkB,QAAQ,CAAC;IACjE;IACA,MAAMC,UAAU,GAAG,IAAAC,qBAAI,EAACpB,MAAM,CAACC,QAAQ,CAAC;IACxC,IAAI,CAACc,SAAS,EAAE;MACd;MACA;MACA,IAAI,CAACD,QAAQ,EAAE;QACbX,OAAO,CAACC,QAAQ,CAACiB,IAAI,CAAC;UAAEL,QAAQ;UAAEhB;QAAO,CAAC,CAAC;QAC3C;MACF;MACA,MAAMsB,YAAY,GAAGR,QAAQ,CAACS,IAAI,CAACC,IAAI;MACvC,IAAIL,UAAU,KAAKG,YAAY,EAAE;QAC/BnB,OAAO,CAACE,WAAW,CAACgB,IAAI,CAAC;UAAEL;QAAS,CAAC,CAAC;QACtC;MACF;MACAb,OAAO,CAACI,oBAAoB,CAACc,IAAI,CAAC;QAAEL;MAAS,CAAC,CAAC;MAC/C;IACF;IACA,MAAMS,aAAa,GAAGV,SAAS,CAACQ,IAAI,CAACC,IAAI;IACzC,IAAIL,UAAU,KAAKM,aAAa,EAAE;MAChC;MACAtB,OAAO,CAACM,eAAe,CAACY,IAAI,CAAC;QAAEL,QAAQ;QAAEhB;MAAO,CAAC,CAAC;MAClD;IACF;IACA,IAAIc,QAAQ,IAAIK,UAAU,KAAKL,QAAQ,CAACS,IAAI,CAACC,IAAI,EAAE;MACjD;MACA;MACA;MACA,MAAME,OAAO,GAAI,MAAMX,SAAS,CAACQ,IAAI,CAACI,IAAI,CAACvC,KAAK,CAACwC,OAAO,CAAY;MACpEzB,OAAO,CAACQ,YAAY,CAACU,IAAI,CAAC;QAAEL,QAAQ;QAAED,SAAS;QAAEW,OAAO,EAAEA,OAAO,CAACzB;MAAS,CAAC,CAAC;MAC7E;IACF;IACA;IACAD,MAAM,CAAC6B,KAAK,GAAGrC,YAAY;IAC3B;IACAuB,SAAS,CAACc,KAAK,GAAGvC,UAAU;IAC5Ba,OAAO,CAACK,aAAa,CAACa,IAAI,CAAC;MAAEL,QAAQ;MAAEhB,MAAM;MAAEc,QAAQ;MAAEC,SAAS;MAAEe,MAAM,EAAE,IAAI;MAAEC,QAAQ,EAAE;IAAK,CAAC,CAAC;EACrG,CAAC;EAED,MAAMC,OAAO,CAACC,GAAG,CACfpC,YAAY,CAACqC,GAAG,CAAC,MAAOlC,MAAM,IAAK;IACjC,MAAMmC,YAAY,GAAG,IAAAlB,mCAAoB,EAACjB,MAAM,CAACkB,QAAQ,CAAC;IAC1D,MAAMJ,QAAQ,GAAGpB,SAAS,CAAC0C,IAAI,CAAEb,IAAI,IAAKA,IAAI,CAACY,YAAY,KAAKA,YAAY,CAAC;IAC7E,MAAMpB,SAAS,GAAGnB,UAAU,CAACwC,IAAI,CAAEb,IAAI,IAAKA,IAAI,CAACY,YAAY,KAAKA,YAAY,CAAC;IAC/E,MAAMtB,aAAa,CAACb,MAAM,EAAEc,QAAQ,EAAEC,SAAS,CAAC;EAClD,CAAC,CACH,CAAC;EACD,MAAMsB,YAAY,GAAGxC,YAAY,CAACqC,GAAG,CAAElC,MAAM,IAAK,IAAAiB,mCAAoB,EAACjB,MAAM,CAACkB,QAAQ,CAAC,CAAC;EACxF,MAAMoB,cAAc,GAAG5C,SAAS,CAACwC,GAAG,CAAEpB,QAAQ,IAAKA,QAAQ,CAACqB,YAAY,CAAC;EACzE,MAAMI,iBAAiB,GAAIxB,SAA0B,IAAK;IACxD,MAAMD,QAAQ,GAAGpB,SAAS,CAAC0C,IAAI,CAAEb,IAAI,IAAKA,IAAI,CAACY,YAAY,KAAKpB,SAAS,CAACoB,YAAY,CAAC;IACvF,IAAI,CAACrB,QAAQ,EAAE,MAAM,IAAI0B,KAAK,CAAC,+CAA+C,CAAC;IAC/E,OAAO1B,QAAQ,CAACS,IAAI,CAACC,IAAI,KAAKT,SAAS,CAACQ,IAAI,CAACC,IAAI;EACnD,CAAC;EACD,MAAMiB,aAAa,GAAG7C,UAAU,CAAC8C,MAAM,CACpC3B,SAAS,IACR,CAACsB,YAAY,CAACM,QAAQ,CAAC5B,SAAS,CAACoB,YAAY,CAAC,IAC9CG,cAAc,CAACK,QAAQ,CAAC5B,SAAS,CAACoB,YAAY,CAAC,IAC/CI,iBAAiB,CAACxB,SAAS,CAC/B,CAAC;EACD,MAAM6B,kBAAkB,GAAGhD,UAAU,CAAC8C,MAAM,CACzC3B,SAAS,IACR,CAACsB,YAAY,CAACM,QAAQ,CAAC5B,SAAS,CAACoB,YAAY,CAAC,IAC9CG,cAAc,CAACK,QAAQ,CAAC5B,SAAS,CAACoB,YAAY,CAAC,IAC/C,CAACI,iBAAiB,CAACxB,SAAS,CAChC,CAAC;EACD,MAAM8B,YAAY,GAAGjD,UAAU,CAAC8C,MAAM,CACnC3B,SAAS,IAAK,CAACsB,YAAY,CAACM,QAAQ,CAAC5B,SAAS,CAACoB,YAAY,CAAC,IAAI,CAACG,cAAc,CAACK,QAAQ,CAAC5B,SAAS,CAACoB,YAAY,CAClH,CAAC;EACDM,aAAa,CAAC1C,OAAO,CAAEwB,IAAI,IAAKpB,OAAO,CAACG,kBAAkB,CAACe,IAAI,CAAC;IAAEL,QAAQ,EAAEO,IAAI,CAACY;EAAa,CAAC,CAAC,CAAC;EACjGS,kBAAkB,CAAC7C,OAAO,CAAEwB,IAAI,IAAKpB,OAAO,CAACI,oBAAoB,CAACc,IAAI,CAAC;IAAEL,QAAQ,EAAEO,IAAI,CAACY;EAAa,CAAC,CAAC,CAAC;EAExG,MAAMH,OAAO,CAACC,GAAG,CACfY,YAAY,CAACX,GAAG,CAAC,MAAOX,IAAI,IAAK;IAC/B,MAAMvB,MAAM,GAAG,MAAM8C,uBAAU,CAACC,uBAAuB,CAACxB,IAAI,EAAEnC,KAAK,CAACwC,OAAO,CAAC;IAC5EzB,OAAO,CAACC,QAAQ,CAACiB,IAAI,CAAC;MAAEL,QAAQ,EAAEO,IAAI,CAACY,YAAY;MAAEnC;IAAO,CAAC,CAAC;EAChE,CAAC,CACH,CAAC;EACD,MAAMgC,OAAO,CAACC,GAAG,CACfW,kBAAkB,CAACV,GAAG,CAAC,MAAOX,IAAI,IAAK;IACrC,MAAMvB,MAAM,GAAG,MAAM8C,uBAAU,CAACC,uBAAuB,CAACxB,IAAI,EAAEnC,KAAK,CAACwC,OAAO,CAAC;IAC5EzB,OAAO,CAACI,oBAAoB,CAACc,IAAI,CAAC;MAAEL,QAAQ,EAAEO,IAAI,CAACY,YAAY;MAAEnC;IAAO,CAAC,CAAC;EAC5E,CAAC,CACH,CAAC;EACD,IAAI,IAAAgD,iBAAO,EAAC7C,OAAO,CAACK,aAAa,CAAC,EAAE,OAAOL,OAAO;EAElD,MAAM8C,eAAe,GAAG,MAAMC,eAAe,CAAC9D,KAAK,EAAEe,OAAO,CAACK,aAAa,CAAC;EAC3EyC,eAAe,CAAClD,OAAO,CAAEoD,cAA+B,IAAK;IAC3D,MAAMC,YAAY,GAAGjD,OAAO,CAACK,aAAa,CAAC4B,IAAI,CAAEb,IAAI,IAAKA,IAAI,CAACP,QAAQ,KAAKmC,cAAc,CAACnC,QAAQ,CAAC;IACpG,IAAI,CAACoC,YAAY,EAAE,MAAM,KAAIC,oBAAQ,EAAC,kBAAkBF,cAAc,CAACnC,QAAQ,0BAA0B,CAAC;IAC1GoC,YAAY,CAACtB,MAAM,GAAGqB,cAAc,CAACrB,MAAM;IAC3CsB,YAAY,CAACrB,QAAQ,GAAGoB,cAAc,CAACpB,QAAQ;IAC/CqB,YAAY,CAACE,gBAAgB,GAAGH,cAAc,CAACG,gBAAgB;IAC/D,IAAIH,cAAc,CAACpB,QAAQ,IAAIoB,cAAc,CAACG,gBAAgB,EAAEnD,OAAO,CAACS,YAAY,GAAG,IAAI;EAC7F,CAAC,CAAC;EAEF,OAAOT,OAAO;AAChB;AAEA,eAAe+C,eAAeA,CAC5B9D,KAAY,EACZoB,aAAoD,EACxB;EAC5B,MAAM+C,GAAG,GAAG,KAAIC,aAAG,EAACpE,KAAK,CAAC;EAC1B,MAAMqE,gBAAgB,GAAGjD,aAAa,CAAC0B,GAAG,CAAC,MAAOkB,YAAY,IAAK;IACjE;IACA,MAAMM,WAAW,GAAGH,GAAG,CAACI,IAAI,CAACP,YAAY,CAACpD,MAAM,CAACC,QAAQ,CAAC;IAC1D,MAAM2D,SAAS,GAAG,MAAOrC,IAAqB,IAA2B;MACvE,MAAMG,OAAO,GAAG,MAAMH,IAAI,CAACA,IAAI,CAACI,IAAI,CAACvC,KAAK,CAACwC,OAAO,CAAC;MACnD;MACA,OAAO2B,GAAG,CAACI,IAAI,CAACjC,OAAO,CAACzB,QAAQ,CAAC4D,QAAQ,CAAC,CAAC,CAAC;IAC9C,CAAC;IACD,MAAMC,aAAa,GAAGV,YAAY,CAACtC,QAAQ,GAAG8C,SAAS,CAACR,YAAY,CAACtC,QAAQ,CAAC,GAAGyC,GAAG,CAACI,IAAI,CAAC,EAAE,CAAC;IAC7F,MAAMI,cAAc,GAAGH,SAAS,CAACR,YAAY,CAACrC,SAAS,CAAC;IACxD,MAAM,CAACiD,UAAU,EAAEC,YAAY,EAAEC,aAAa,CAAC,GAAG,MAAMlC,OAAO,CAACC,GAAG,CAAC,CAACyB,WAAW,EAAEI,aAAa,EAAEC,cAAc,CAAC,CAAC;IACjH,MAAMI,gBAAiC,GAAG;MACxCnD,QAAQ,EAAEoC,YAAY,CAACpC,QAAQ;MAC/BoD,WAAW,EAAE;QACXvC,KAAK,EAAEuB,YAAY,CAACpD,MAAM,CAAC6B,KAAK;QAChCwC,IAAI,EAAEL;MACR,CAAC;MACDlD,QAAQ,EAAE;QACRuD,IAAI,EAAEJ;MACR,CAAC;MACDlD,SAAS,EAAE;QACT;QACAc,KAAK,EAAEuB,YAAY,CAACrC,SAAS,CAACc,KAAK;QACnCwC,IAAI,EAAEH;MACR;IACF,CAAC;IACD,OAAO,IAAAI,wBAAU,EAACH,gBAAgB,CAAC;EACrC,CAAC,CAAC;EACF,OAAOnC,OAAO,CAACC,GAAG,CAACwB,gBAAgB,CAAC;AACtC","ignoreList":[]}

package/dist/merging.main.runtime.d.ts CHANGED Viewed

@@ -5,7 +5,7 @@ import { ComponentsList } from '@teambit/legacy.component-list';
 import { SnappingMain } from '@teambit/snapping';
 import { ComponentID, ComponentIdList } from '@teambit/component-id';
 import { LaneId } from '@teambit/lane-id';
-import { Ref, Lane, ModelComponent } from '@teambit/scope.objects';
+import { Ref, Lane, ModelComponent } from '@teambit/objects';
 import { ConfigMain } from '@teambit/config';
 import { RemoveMain } from '@teambit/remove';
 import { ComponentWriterMain } from '@teambit/component-writer';

package/dist/merging.main.runtime.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"names":["_cli","data","require","_workspace","_legacy","_snapping","_pMapSeries","_interopRequireDefault","_componentId","_bitError","_laneId","_chalk","_config","_remove","_toolboxPath","_pkgModules","_componentWriter","_importer","_logger","_globalConfig","_lodash","_checkout","_configMerger","_dependencyResolver","_install","_scope","_mergeCmd","_merging","_mergeStatusProvider","_mergeVersion","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","MergingMain","constructor","workspace","scope","install","snapping","checkout","logger","componentWriter","importer","config","remove","configMerger","depResolver","merge","pattern","mergeStrategy","abort","resolve","noAutoSnap","message","build","skipDependencyInstallation","OutsideWorkspaceError","consumer","mergeResults","resolveMerge","abortMerge","bitIds","getComponentsToMerge","mergeComponentsFromRemote","onDestroy","snapMessage","currentLaneId","getCurrentLaneId","currentLaneObject","getCurrentLaneObject","allComponentsStatus","getAllComponentsStatus","failedComponents","c","unchangedMessage","unchangedLegitimately","failureMsgs","map","failedComponent","chalk","bold","id","toString","red","join","BitError","mergeSnaps","otherLaneId","currentLane","noSnap","tag","detachHead","legacyScope","componentWithConflict","find","component","hasConflicts","getMergeStrategyInteractive","componentStatus","shouldBeRemoved","componentIdsToRemove","changeVersion","undefined","succeededComponents","currentLaneIdsBeforeMerge","toComponentIds","componentsResults","applyVersionMultiple","allConfigMerge","compact","configMergeResult","workspaceDepsUpdates","workspaceDepsConflicts","workspaceDepsUnchanged","updateWorkspaceJsoncWithDepsIfNeeded","workspaceConfigConflictWriteError","writeWorkspaceJsoncWithConflictsGracefully","generateConfigMergeConflictFileForAll","objects","add","persist","unmergedComponents","write","writeBitMap","removeFromWsJsonPolicyIfExists","compBitIdsToRemove","ComponentIdList","fromArray","deleteComponentsFiles","cleanFromBitMap","componentsHasConfigMergeConflicts","some","leftUnresolvedConflicts","dedupe","updateExisting","import","err","error","consoleFailure","getSnapOrTagResults","idsToTag","results","tagAllLaneComponent","taggedComponents","autoTaggedResults","removedComponents","snappedComponents","autoSnappedResults","snapResolvedComponents","toLaneId","mergeSnapResults","mergeSnapError","bitMapSnapshot","bitMap","takeSnapshot","restoreFromSnapshot","components","applyVersionResult","workspaceConfigUpdateResult","newlyIntroducedIds","hasWithoutVersion","newlyIntroducedComponentIds","legacyCompToWrite","packages","componentIdToPackageName","isRemoved","removeFromRootPolicy","persistConfig","getMergeStatus","options","otherLane","mergeStatusProvider","MergeStatusProvider","getStatus","mapSeries","currentComponent","resolvedUnrelated","modelComponent","getModelComponent","updatedLaneId","isDefault","LaneId","from","name","applyVersion","remoteHead","getRef","version","compsToWrite","manyComponentsWriterOpts","writeConfig","reasonForBitmapChange","writeMany","filesStatus","unmergedComponent","fullName","head","laneId","addToCurrentLane","Error","isPartOfLane","isEqualWithoutVersion","addComponent","handleResolveUnrelated","headOnCurrentLane","unrelated","unrelatedHead","unrelatedLaneId","addEntry","markAllFilesAsUnchanged","files","file","pathNormalizeToLinux","relative","FileStatus","unchanged","MergeOptions","ours","strategy","remoteId","idToLoad","theirs","legacyComponent","loadComponentFromModelImportIfNeeded","getConsumerComponent","updateFileStatus","modifiedStatus","modifiedFiles","applyModifiedVersion","removeFilesIfNeeded","successfullyMergedConfig","getSuccessfullyMergedConfig","mergedConfig","manual","unmergedPaths","f","conflict","filePath","detachedHeads","setHead","markVersionAsLocal","ids","getIdsForUnmerged","reset","removeComponent","abortedComponents","snap","legacyBitIds","resolvedComponents","localLaneObject","Promise","all","bitId","remoteScopeName","remoteLaneId","remoteLanes","laneIdStr","toStringWithoutVersion","shouldSquash","getComponents","debug","ComponentID","fromObject","snapFromScope","componentId","lane","tagMessage","unmodified","componentIds","idsByPattern","entry","getEntry","unresolvedComponents","u","mergePending","listMergePendingComponents","componentsList","ComponentsList","allIds","getAllIdsAvailableOnLaneIncludeRemoved","componentsFromModel","getModelComponents","duringMergeComps","listDuringMergeStateComponents","mergePendingComponents","toComponentId","divergedData","getDivergeDataForMergePending","isDiverged","diverge","provider","cli","loggerMain","compWriter","globalConfig","createLogger","MergingAspect","merging","register","MergeCmd","exports","CLIAspect","WorkspaceAspect","ScopeAspect","SnappingAspect","CheckoutAspect","InstallAspect","LoggerAspect","ComponentWriterAspect","ImporterAspect","ConfigAspect","RemoveAspect","GlobalConfigAspect","ConfigMergerAspect","DependencyResolverAspect","MainRuntime","addRuntime"],"sources":["merging.main.runtime.ts"],"sourcesContent":["import { CLIAspect, CLIMain, MainRuntime } from '@teambit/cli';\nimport { WorkspaceAspect, OutsideWorkspaceError, Workspace, AutoTagResult } from '@teambit/workspace';\nimport { Consumer } from '@teambit/legacy.consumer';\nimport { ComponentsList } from '@teambit/legacy.component-list';\nimport { SnappingAspect, SnappingMain, TagResults } from '@teambit/snapping';\nimport mapSeries from 'p-map-series';\nimport { ComponentID, ComponentIdList } from '@teambit/component-id';\nimport { BitError } from '@teambit/bit-error';\nimport { LaneId } from '@teambit/lane-id';\nimport { UnmergedComponent } from '@teambit/legacy.scope';\nimport { Ref, Lane, ModelComponent } from '@teambit/scope.objects';\nimport chalk from 'chalk';\nimport { ConfigAspect, ConfigMain } from '@teambit/config';\nimport { RemoveAspect, RemoveMain, deleteComponentsFiles } from '@teambit/remove';\nimport { pathNormalizeToLinux } from '@teambit/toolbox.path.path';\nimport { componentIdToPackageName } from '@teambit/pkg.modules.component-package-name';\nimport { ComponentWriterAspect, ComponentWriterMain } from '@teambit/component-writer';\nimport { ConsumerComponent } from '@teambit/legacy.consumer-component';\nimport { ImporterAspect, ImporterMain } from '@teambit/importer';\nimport { Logger, LoggerAspect, LoggerMain } from '@teambit/logger';\nimport { GlobalConfigAspect, GlobalConfigMain } from '@teambit/global-config';\nimport { compact } from 'lodash';\nimport {\n ApplyVersionWithComps,\n CheckoutAspect,\n CheckoutMain,\n ComponentStatusBase,\n applyModifiedVersion,\n removeFilesIfNeeded,\n updateFileStatus,\n} from '@teambit/checkout';\nimport {\n ConfigMergerAspect,\n ConfigMergerMain,\n ConfigMergeResult,\n WorkspaceConfigUpdateResult,\n} from '@teambit/config-merger';\nimport { SnapsDistance } from '@teambit/component.snap-distance';\nimport { DependencyResolverAspect, DependencyResolverMain } from '@teambit/dependency-resolver';\nimport { InstallMain, InstallAspect } from '@teambit/install';\nimport { ScopeAspect, ScopeMain } from '@teambit/scope';\nimport { MergeCmd } from './merge-cmd';\nimport { MergingAspect } from './merging.aspect';\nimport { MergeStatusProvider, MergeStatusProviderOptions } from './merge-status-provider';\nimport {\n MergeStrategy,\n FileStatus,\n getMergeStrategyInteractive,\n MergeResultsThreeWay,\n MergeOptions,\n} from './merge-version';\n\ntype ResolveUnrelatedData = {\n strategy: MergeStrategy;\n headOnCurrentLane: Ref;\n unrelatedHead: Ref;\n unrelatedLaneId: LaneId;\n};\n\nexport type DivergedComponent = { id: ComponentID; diverge: SnapsDistance };\n\nexport type ComponentMergeStatus = ComponentStatusBase & {\n mergeResults?: MergeResultsThreeWay \| null;\n divergeData?: SnapsDistance;\n resolvedUnrelated?: ResolveUnrelatedData;\n configMergeResult?: ConfigMergeResult;\n};\n\nexport type ComponentMergeStatusBeforeMergeAttempt = ComponentStatusBase & {\n divergeData?: SnapsDistance;\n resolvedUnrelated?: ResolveUnrelatedData;\n mergeProps?: {\n otherLaneHead: Ref;\n currentId: ComponentID;\n modelComponent: ModelComponent;\n };\n};\n\nexport type FailedComponents = { id: ComponentID; unchangedMessage: string; unchangedLegitimately?: boolean };\n\n// fileName is PathLinux. TS doesn't let anything else in the keys other than string and number\nexport type FilesStatus = { [fileName: string]: keyof typeof FileStatus };\n\nexport type MergeSnapResults = {\n snappedComponents: ConsumerComponent[];\n autoSnappedResults: AutoTagResult[];\n removedComponents?: ComponentIdList;\n exportedIds?: ComponentID[];\n} \| null;\n\nexport type ApplyVersionResult = { id: ComponentID; filesStatus: FilesStatus };\n\nexport type ApplyVersionResults = {\n components?: ApplyVersionResult[];\n version?: string;\n failedComponents?: FailedComponents[];\n removedComponents?: ComponentID[];\n addedComponents?: ComponentID[]; // relevant when restoreMissingComponents is true (e.g. bit lane merge-abort)\n newComponents?: ComponentID[]; // relevant for \"bit stash load\". (stashedBitmapEntries is populated)\n resolvedComponents?: ConsumerComponent[]; // relevant for bit merge --resolve\n abortedComponents?: ApplyVersionResult[]; // relevant for bit merge --abort\n mergeSnapResults?: MergeSnapResults;\n mergeSnapError?: Error;\n leftUnresolvedConflicts?: boolean;\n verbose?: boolean;\n newFromLane?: string[];\n newFromLaneAdded?: boolean;\n installationError?: Error; // in case the package manager failed, it won't throw, instead, it'll return error here\n compilationError?: Error; // in case the compiler failed, it won't throw, instead, it'll return error here\n workspaceConfigUpdateResult?: WorkspaceConfigUpdateResult;\n};\n\nexport class MergingMain {\n constructor(\n private workspace: Workspace,\n private scope: ScopeMain,\n private install: InstallMain,\n private snapping: SnappingMain,\n private checkout: CheckoutMain,\n private logger: Logger,\n private componentWriter: ComponentWriterMain,\n private importer: ImporterMain,\n private config: ConfigMain,\n private remove: RemoveMain,\n private configMerger: ConfigMergerMain,\n private depResolver: DependencyResolverMain\n ) {}\n\n async merge(\n pattern: string,\n mergeStrategy: MergeStrategy,\n abort: boolean,\n resolve: boolean,\n noAutoSnap: boolean,\n message: string,\n build: boolean,\n skipDependencyInstallation: boolean\n ): Promise<ApplyVersionResults> {\n if (!this.workspace) throw new OutsideWorkspaceError();\n const consumer: Consumer = this.workspace.consumer;\n let mergeResults;\n if (resolve) {\n mergeResults = await this.resolveMerge(pattern, message, build);\n } else if (abort) {\n mergeResults = await this.abortMerge(pattern);\n } else {\n const bitIds = await this.getComponentsToMerge(pattern);\n mergeResults = await this.mergeComponentsFromRemote(\n consumer,\n bitIds,\n mergeStrategy,\n noAutoSnap,\n message,\n build,\n skipDependencyInstallation\n );\n }\n await consumer.onDestroy('merge');\n return mergeResults;\n }\n\n /*\n when user is on main, it merges the remote main components into local.\n * when user is on a lane, it merges the remote lane components into the local lane.\n /\n async mergeComponentsFromRemote(\n consumer: Consumer,\n bitIds: ComponentID[],\n mergeStrategy: MergeStrategy,\n noAutoSnap: boolean,\n snapMessage: string,\n build: boolean,\n skipDependencyInstallation: boolean\n ): Promise<ApplyVersionResults> {\n const currentLaneId = consumer.getCurrentLaneId();\n const currentLaneObject = await consumer.getCurrentLaneObject();\n const allComponentsStatus = await this.getAllComponentsStatus(\n bitIds,\n currentLaneId,\n currentLaneObject,\n mergeStrategy\n );\n const failedComponents = allComponentsStatus.filter((c) => c.unchangedMessage && !c.unchangedLegitimately);\n if (failedComponents.length) {\n const failureMsgs = failedComponents\n .map(\n (failedComponent) =>\n `${chalk.bold(failedComponent.id.toString())} - ${chalk.red(failedComponent.unchangedMessage as string)}`\n )\n .join('\\n');\n throw new BitError(`unable to merge due to the following failures:\\n${failureMsgs}`);\n }\n\n return this.mergeSnaps({\n mergeStrategy,\n allComponentsStatus,\n otherLaneId: currentLaneId,\n currentLane: currentLaneObject,\n noAutoSnap: noAutoSnap,\n snapMessage,\n build,\n skipDependencyInstallation,\n });\n }\n\n /\n merge multiple components according to the \"allComponentsStatus\".\n /\n async mergeSnaps({\n mergeStrategy,\n allComponentsStatus,\n otherLaneId,\n currentLane,\n noAutoSnap,\n noSnap,\n tag,\n snapMessage,\n build,\n skipDependencyInstallation,\n detachHead,\n }: {\n mergeStrategy: MergeStrategy;\n allComponentsStatus: ComponentMergeStatus[];\n otherLaneId: LaneId;\n currentLane?: Lane;\n noAutoSnap?: boolean;\n noSnap?: boolean;\n tag?: boolean;\n snapMessage?: string;\n build?: boolean;\n skipDependencyInstallation?: boolean;\n detachHead?: boolean;\n }): Promise<ApplyVersionResults> {\n const consumer = this.workspace?.consumer;\n const legacyScope = this.scope.legacyScope;\n const componentWithConflict = allComponentsStatus.find(\n (component) => component.mergeResults && component.mergeResults.hasConflicts\n );\n if (componentWithConflict && !mergeStrategy) {\n mergeStrategy = await getMergeStrategyInteractive();\n }\n const failedComponents: FailedComponents[] = allComponentsStatus\n .filter((componentStatus) => componentStatus.unchangedMessage)\n .filter((componentStatus) => !componentStatus.shouldBeRemoved)\n .map((componentStatus) => ({\n id: componentStatus.id,\n unchangedMessage: componentStatus.unchangedMessage as string,\n unchangedLegitimately: componentStatus.unchangedLegitimately,\n }));\n\n const componentIdsToRemove = allComponentsStatus\n .filter((componentStatus) => componentStatus.shouldBeRemoved)\n .map((c) => c.id.changeVersion(undefined));\n\n const succeededComponents = allComponentsStatus.filter((componentStatus) => !componentStatus.unchangedMessage);\n\n const currentLaneIdsBeforeMerge = currentLane?.toComponentIds();\n\n const componentsResults = await this.applyVersionMultiple(\n succeededComponents,\n otherLaneId,\n mergeStrategy,\n currentLane,\n detachHead\n );\n\n const allConfigMerge = compact(succeededComponents.map((c) => c.configMergeResult));\n\n const { workspaceDepsUpdates, workspaceDepsConflicts, workspaceDepsUnchanged } = this.workspace\n ? await this.configMerger.updateWorkspaceJsoncWithDepsIfNeeded(allConfigMerge)\n : { workspaceDepsUpdates: undefined, workspaceDepsConflicts: undefined, workspaceDepsUnchanged: undefined };\n\n let workspaceConfigConflictWriteError: Error \| undefined;\n if (workspaceDepsConflicts) {\n workspaceConfigConflictWriteError =\n await this.configMerger.writeWorkspaceJsoncWithConflictsGracefully(workspaceDepsConflicts);\n }\n if (this.workspace) await this.configMerger.generateConfigMergeConflictFileForAll(allConfigMerge);\n\n if (currentLane) legacyScope.objects.add(currentLane);\n\n await legacyScope.objects.persist(); // persist anyway, if currentLane is null it should save all main heads\n\n await legacyScope.objects.unmergedComponents.write();\n\n if (this.workspace) {\n await consumer.writeBitMap(`merge ${otherLaneId.toString()}`);\n await this.removeFromWsJsonPolicyIfExists(componentsResults, currentLane, currentLaneIdsBeforeMerge);\n }\n\n if (componentIdsToRemove.length && this.workspace) {\n const compBitIdsToRemove = ComponentIdList.fromArray(componentIdsToRemove);\n await deleteComponentsFiles(consumer, compBitIdsToRemove);\n await consumer.cleanFromBitMap(compBitIdsToRemove);\n }\n\n const componentsHasConfigMergeConflicts = allComponentsStatus.some((c) => c.configMergeResult?.hasConflicts());\n const leftUnresolvedConflicts = componentWithConflict && mergeStrategy === 'manual';\n if (!skipDependencyInstallation && !leftUnresolvedConflicts && !componentsHasConfigMergeConflicts) {\n try {\n await this.install.install(undefined, {\n dedupe: true,\n updateExisting: false,\n import: false,\n });\n } catch (err: any) {\n this.logger.error(`failed installing packages`, err);\n this.logger.consoleFailure(\n `failed installing packages, see the log for full stacktrace. error: ${err.message}`\n );\n }\n }\n\n const getSnapOrTagResults = async (): Promise<MergeSnapResults> => {\n // if one of the component has conflict, don't snap-merge. otherwise, some of the components would be snap-merged\n // and some not. besides the fact that it could by mistake tag dependent, it's a confusing state. better not snap.\n if (noAutoSnap \|\| noSnap \|\| leftUnresolvedConflicts \|\| componentsHasConfigMergeConflicts) {\n return null;\n }\n if (tag) {\n const idsToTag = allComponentsStatus.map((c) => c.id);\n const results = await this.tagAllLaneComponent(idsToTag, snapMessage, build);\n if (!results) return null;\n const { taggedComponents, autoTaggedResults, removedComponents } = results;\n return { snappedComponents: taggedComponents, autoSnappedResults: autoTaggedResults, removedComponents };\n }\n return this.snapResolvedComponents(snapMessage, build, currentLane?.toLaneId());\n };\n let mergeSnapResults: MergeSnapResults = null;\n let mergeSnapError: Error \| undefined;\n const bitMapSnapshot = this.workspace ? this.workspace.bitMap.takeSnapshot() : null;\n try {\n mergeSnapResults = await getSnapOrTagResults();\n } catch (err: any) {\n this.logger.error('failed running snap. mergeSnapError:', err);\n mergeSnapError = err;\n if (bitMapSnapshot) this.workspace.bitMap.restoreFromSnapshot(bitMapSnapshot);\n }\n\n return {\n components: componentsResults.map((c) => c.applyVersionResult),\n failedComponents,\n removedComponents: [...componentIdsToRemove, ...(mergeSnapResults?.removedComponents \|\| [])],\n mergeSnapResults,\n mergeSnapError,\n workspaceConfigUpdateResult: {\n workspaceDepsUpdates,\n workspaceDepsConflicts,\n workspaceDepsUnchanged,\n workspaceConfigConflictWriteError,\n },\n leftUnresolvedConflicts,\n };\n }\n\n async removeFromWsJsonPolicyIfExists(\n componentsResults: ApplyVersionWithComps[],\n currentLane?: Lane,\n currentLaneIdsBeforeMerge?: ComponentIdList\n ) {\n const newlyIntroducedIds = currentLane\n ?.toComponentIds()\n .filter((id) => !currentLaneIdsBeforeMerge?.hasWithoutVersion(id));\n const newlyIntroducedComponentIds = ComponentIdList.fromArray(newlyIntroducedIds \|\| []);\n const components = compact(\n componentsResults\n .map((c) => c.legacyCompToWrite)\n .filter((c) => c && newlyIntroducedComponentIds.hasWithoutVersion(c.id))\n );\n const packages = components.map((c) => componentIdToPackageName(c));\n const isRemoved = this.depResolver.removeFromRootPolicy(packages);\n if (isRemoved) await this.depResolver.persistConfig('merge (remove packages)');\n }\n\n /\n this function gets called from two different commands:\n * 1. \"bit merge <ids...>\", when merging a component from a remote to the local.\n * in this case, the remote and local are on the same lane or both on main.\n * 2. \"bit lane merge\", when merging from one lane to another.\n */\n async getMergeStatus(\n bitIds: ComponentID[], // the id.version is the version we want to merge to the current component\n options: MergeStatusProviderOptions,\n currentLane?: Lane, // currently checked out lane. if on main, then it's null.\n otherLane?: Lane // the lane we want to merged to our lane. (null if it's \"main\").\n ): Promise<ComponentMergeStatus[]> {\n const mergeStatusProvider = new MergeStatusProvider(\n this.scope,\n this.logger,\n this.importer,\n options,\n this.workspace,\n currentLane,\n otherLane\n );\n return mergeStatusProvider.getStatus(bitIds);\n }\n\n private async applyVersionMultiple(\n succeededComponents: ComponentMergeStatus[],\n otherLaneId: LaneId,\n mergeStrategy: MergeStrategy,\n currentLane?: Lane,\n detachHead?: boolean\n ): Promise<ApplyVersionWithComps[]> {\n const componentsResults = await mapSeries(\n succeededComponents,\n async ({ currentComponent, id, mergeResults, resolvedUnrelated, configMergeResult }) => {\n const modelComponent = await this.scope.legacyScope.getModelComponent(id);\n const updatedLaneId = otherLaneId.isDefault() ? LaneId.from(otherLaneId.name, id.scope as string) : otherLaneId;\n return this.applyVersion({\n currentComponent,\n id,\n mergeResults,\n mergeStrategy,\n remoteHead: modelComponent.getRef(id.version as string) as Ref,\n otherLaneId: updatedLaneId,\n currentLane,\n resolvedUnrelated,\n configMergeResult,\n detachHead,\n });\n }\n );\n\n if (this.workspace) {\n const compsToWrite = compact(componentsResults.map((c) => c.legacyCompToWrite));\n const manyComponentsWriterOpts = {\n consumer: this.workspace.consumer,\n components: compsToWrite,\n skipDependencyInstallation: true,\n writeConfig: false, // @todo: should write if config exists before, needs to figure out how to do it.\n reasonForBitmapChange: 'merge',\n };\n await this.componentWriter.writeMany(manyComponentsWriterOpts);\n }\n\n return componentsResults;\n }\n\n private async applyVersion({\n currentComponent,\n id,\n mergeResults,\n mergeStrategy,\n remoteHead,\n otherLaneId,\n currentLane,\n resolvedUnrelated,\n configMergeResult,\n detachHead,\n }: {\n currentComponent: ConsumerComponent \| null \| undefined;\n id: ComponentID;\n mergeResults: MergeResultsThreeWay \| null \| undefined;\n mergeStrategy: MergeStrategy;\n remoteHead: Ref;\n otherLaneId: LaneId;\n currentLane?: Lane;\n resolvedUnrelated?: ResolveUnrelatedData;\n configMergeResult?: ConfigMergeResult;\n detachHead?: boolean;\n }): Promise<ApplyVersionWithComps> {\n const legacyScope = this.scope.legacyScope;\n let filesStatus = {};\n const unmergedComponent: UnmergedComponent = {\n id: { name: id.fullName, scope: id.scope },\n head: remoteHead,\n laneId: otherLaneId,\n };\n id = currentComponent ? currentComponent.id : id;\n const modelComponent = await legacyScope.getModelComponent(id);\n\n const addToCurrentLane = (head: Ref) => {\n if (!currentLane) throw new Error('currentLane must be defined when adding to the lane');\n if (otherLaneId.isDefault()) {\n const isPartOfLane = currentLane.components.find((c) => c.id.isEqualWithoutVersion(id));\n if (!isPartOfLane) return;\n }\n currentLane.addComponent({ id, head });\n };\n\n const handleResolveUnrelated = (legacyCompToWrite?: ConsumerComponent) => {\n if (!currentComponent) throw new Error('currentComponent must be defined when resolvedUnrelated');\n // because when on a main, we don't allow merging lanes with unrelated. we asks users to switch to the lane\n // first and then merge with --resolve-unrelated\n if (!currentLane) throw new Error('currentLane must be defined when resolvedUnrelated');\n if (!resolvedUnrelated) throw new Error('resolvedUnrelated must be populated');\n addToCurrentLane(resolvedUnrelated.headOnCurrentLane);\n unmergedComponent.unrelated = {\n unrelatedHead: resolvedUnrelated.unrelatedHead,\n headOnCurrentLane: resolvedUnrelated.headOnCurrentLane,\n unrelatedLaneId: resolvedUnrelated.unrelatedLaneId,\n };\n legacyScope.objects.unmergedComponents.addEntry(unmergedComponent);\n return { applyVersionResult: { id, filesStatus }, component: currentComponent, legacyCompToWrite };\n };\n\n const markAllFilesAsUnchanged = () => {\n if (!currentComponent) throw new Error(`applyVersion expect to get currentComponent for ${id.toString()}`);\n currentComponent.files.forEach((file) => {\n filesStatus[pathNormalizeToLinux(file.relative)] = FileStatus.unchanged;\n });\n };\n if (mergeResults && mergeResults.hasConflicts && mergeStrategy === MergeOptions.ours) {\n markAllFilesAsUnchanged();\n legacyScope.objects.unmergedComponents.addEntry(unmergedComponent);\n return { applyVersionResult: { id, filesStatus }, component: currentComponent \|\| undefined };\n }\n if (resolvedUnrelated?.strategy === 'ours') {\n markAllFilesAsUnchanged();\n return handleResolveUnrelated();\n }\n const remoteId = id.changeVersion(remoteHead.toString());\n const idToLoad = !mergeResults \|\| mergeStrategy === MergeOptions.theirs ? remoteId : id;\n const legacyComponent = this.workspace\n ? await this.workspace.consumer.loadComponentFromModelImportIfNeeded(idToLoad)\n : await legacyScope.getConsumerComponent(idToLoad); // when loading from the scope, we import all needed components first, so it should be fine. otherwise, change the code to import it here\n if (mergeResults && mergeStrategy === MergeOptions.theirs) {\n // in this case, we don't want to update .bitmap with the version of the remote. we want to keep the same version\n legacyComponent.version = id.version;\n }\n const files = legacyComponent.files;\n updateFileStatus(files, filesStatus, currentComponent \|\| undefined);\n\n if (mergeResults) {\n // update files according to the merge results\n const { filesStatus: modifiedStatus, modifiedFiles } = applyModifiedVersion(files, mergeResults, mergeStrategy);\n legacyComponent.files = modifiedFiles;\n filesStatus = { ...filesStatus, ...modifiedStatus };\n }\n\n if (this.workspace) await removeFilesIfNeeded(filesStatus, this.workspace.consumer, currentComponent \|\| undefined);\n\n if (configMergeResult) {\n const successfullyMergedConfig = configMergeResult.getSuccessfullyMergedConfig();\n if (successfullyMergedConfig) {\n unmergedComponent.mergedConfig = successfullyMergedConfig;\n // no need to `unmergedComponents.addEntry` here. it'll be added in the next lines inside `if (mergeResults)`.\n // because if `configMergeResult` is set, `mergeResults` must be set as well. both happen on diverge.\n }\n }\n\n // if mergeResults, the head snap is going to be updated on a later phase when snapping with two parents\n // otherwise, update the head of the current lane or main\n if (mergeResults) {\n if (mergeResults.hasConflicts && mergeStrategy === MergeOptions.manual) {\n unmergedComponent.unmergedPaths = mergeResults.modifiedFiles.filter((f) => f.conflict).map((f) => f.filePath);\n }\n legacyScope.objects.unmergedComponents.addEntry(unmergedComponent);\n } else if (currentLane) {\n if (resolvedUnrelated) {\n // must be \"theirs\"\n return handleResolveUnrelated(legacyComponent);\n }\n addToCurrentLane(remoteHead);\n } else {\n // this is main\n if (detachHead) {\n modelComponent.detachedHeads.setHead(remoteHead);\n } else {\n modelComponent.setHead(remoteHead);\n // mark it as local, otherwise, when importing this component from a remote, it'll override it.\n modelComponent.markVersionAsLocal(remoteHead.toString());\n }\n legacyScope.objects.add(modelComponent);\n }\n\n return {\n applyVersionResult: { id: idToLoad, filesStatus },\n component: currentComponent \|\| undefined,\n legacyCompToWrite: legacyComponent,\n };\n }\n\n private async abortMerge(pattern: string): Promise<ApplyVersionResults> {\n const consumer = this.workspace.consumer;\n const ids = await this.getIdsForUnmerged(pattern);\n const results = await this.checkout.checkout({ ids, reset: true });\n ids.forEach((id) => consumer.scope.objects.unmergedComponents.removeComponent(id));\n await consumer.scope.objects.unmergedComponents.write();\n return { abortedComponents: results.components };\n }\n\n private async resolveMerge(pattern: string, snapMessage: string, build: boolean): Promise<ApplyVersionResults> {\n const ids = await this.getIdsForUnmerged(pattern);\n // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n const { snappedComponents } = await this.snapping.snap({\n legacyBitIds: ComponentIdList.fromArray(ids.map((id) => id)),\n build,\n message: snapMessage,\n });\n return { resolvedComponents: snappedComponents };\n }\n\n private async getAllComponentsStatus(\n bitIds: ComponentID[],\n laneId: LaneId,\n localLaneObject: Lane \| undefined,\n mergeStrategy: MergeStrategy\n ): Promise<ComponentMergeStatus[]> {\n const ids = await Promise.all(\n bitIds.map(async (bitId) => {\n const remoteScopeName = laneId.isDefault() ? bitId.scope : laneId.scope;\n const remoteLaneId = LaneId.from(laneId.name, remoteScopeName as string);\n const remoteHead = await this.workspace.consumer.scope.objects.remoteLanes.getRef(remoteLaneId, bitId);\n const laneIdStr = remoteLaneId.toString();\n if (!remoteHead) {\n throw new BitError(`unable to find a remote head of \"${bitId.toStringWithoutVersion()}\" in \"${laneIdStr}\"`);\n }\n return bitId.changeVersion(remoteHead.toString());\n })\n );\n\n return this.getMergeStatus(ids, { shouldSquash: false, mergeStrategy }, localLaneObject, localLaneObject);\n }\n\n private async snapResolvedComponents(\n snapMessage?: string,\n build?: boolean,\n laneId?: LaneId\n ): Promise<MergeSnapResults> {\n const unmergedComponents = this.scope.legacyScope.objects.unmergedComponents.getComponents();\n this.logger.debug(`merge-snaps, snapResolvedComponents, total ${unmergedComponents.length.toString()} components`);\n if (!unmergedComponents.length) return null;\n const ids = ComponentIdList.fromArray(unmergedComponents.map((r) => ComponentID.fromObject(r.id)));\n if (!this.workspace) {\n const results = await this.snapping.snapFromScope(\n ids.map((id) => ({ componentId: id.toString() })),\n {\n message: snapMessage,\n build,\n lane: laneId?.toString(),\n }\n );\n return { ...results, autoSnappedResults: [] };\n }\n return this.snapping.snap({\n legacyBitIds: ids,\n build,\n message: snapMessage,\n });\n }\n\n private async tagAllLaneComponent(\n idsToTag: ComponentID[],\n tagMessage?: string,\n build?: boolean\n ): Promise<TagResults \| null> {\n const ids = idsToTag.map((id) => {\n return id.toStringWithoutVersion();\n });\n this.logger.debug(`merge-snaps, tagResolvedComponents, total ${idsToTag.length.toString()} components`);\n return this.snapping.tag({\n ids,\n build,\n message: tagMessage,\n unmodified: true,\n });\n }\n\n private async getIdsForUnmerged(pattern?: string): Promise<ComponentID[]> {\n if (pattern) {\n const componentIds = await this.workspace.idsByPattern(pattern);\n componentIds.forEach((id) => {\n const entry = this.workspace.consumer.scope.objects.unmergedComponents.getEntry(id);\n if (!entry) {\n throw new BitError(`unable to merge-resolve ${id.toString()}, it is not marked as unresolved`);\n }\n });\n return componentIds;\n }\n const unresolvedComponents = this.workspace.consumer.scope.objects.unmergedComponents.getComponents();\n if (!unresolvedComponents.length) throw new BitError(`all components are resolved already, nothing to do`);\n return unresolvedComponents.map((u) => ComponentID.fromObject(u.id));\n }\n\n private async getComponentsToMerge(pattern?: string): Promise<ComponentID[]> {\n if (pattern) {\n return this.workspace.idsByPattern(pattern);\n }\n const mergePending = await this.listMergePendingComponents();\n return mergePending.map((c) => c.id);\n }\n\n async listMergePendingComponents(componentsList?: ComponentsList): Promise<DivergedComponent[]> {\n const consumer = this.workspace.consumer;\n componentsList = componentsList \|\| new ComponentsList(this.workspace);\n const allIds = consumer.bitMap.getAllIdsAvailableOnLaneIncludeRemoved();\n const componentsFromModel = await componentsList.getModelComponents();\n const duringMergeComps = componentsList.listDuringMergeStateComponents();\n const mergePendingComponents = await Promise.all(\n allIds.map(async (componentId: ComponentID) => {\n const modelComponent = componentsFromModel.find((c) => c.toComponentId().isEqualWithoutVersion(componentId));\n if (!modelComponent \|\| duringMergeComps.hasWithoutVersion(componentId)) return null;\n const divergedData = await modelComponent.getDivergeDataForMergePending(consumer.scope.objects);\n if (!divergedData.isDiverged()) return null;\n return { id: modelComponent.toComponentId(), diverge: divergedData };\n })\n );\n return compact(mergePendingComponents);\n }\n\n static slots = [];\n static dependencies = [\n CLIAspect,\n WorkspaceAspect,\n ScopeAspect,\n SnappingAspect,\n CheckoutAspect,\n InstallAspect,\n LoggerAspect,\n ComponentWriterAspect,\n ImporterAspect,\n ConfigAspect,\n RemoveAspect,\n GlobalConfigAspect,\n ConfigMergerAspect,\n DependencyResolverAspect,\n ];\n static runtime = MainRuntime;\n static async provider([\n cli,\n workspace,\n scope,\n snapping,\n checkout,\n install,\n loggerMain,\n compWriter,\n importer,\n config,\n remove,\n globalConfig,\n configMerger,\n depResolver,\n ]: [\n CLIMain,\n Workspace,\n ScopeMain,\n SnappingMain,\n CheckoutMain,\n InstallMain,\n LoggerMain,\n ComponentWriterMain,\n ImporterMain,\n ConfigMain,\n RemoveMain,\n GlobalConfigMain,\n ConfigMergerMain,\n DependencyResolverMain,\n ]) {\n const logger = loggerMain.createLogger(MergingAspect.id);\n const merging = new MergingMain(\n workspace,\n scope,\n install,\n snapping,\n checkout,\n logger,\n compWriter,\n importer,\n config,\n remove,\n configMerger,\n depResolver\n );\n cli.register(new MergeCmd(merging, globalConfig));\n return merging;\n }\n}\n\nMergingAspect.addRuntime(MergingMain);\n"],"mappings":"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","ignoreList":[]}
1	+ {"version":3,"names":["_cli","data","require","_workspace","_legacy","_snapping","_pMapSeries","_interopRequireDefault","_componentId","_bitError","_laneId","_chalk","_config","_remove","_toolboxPath","_pkgModules","_componentWriter","_importer","_logger","_globalConfig","_lodash","_checkout","_configMerger","_dependencyResolver","_install","_scope","_mergeCmd","_merging","_mergeStatusProvider","_mergeVersion","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","MergingMain","constructor","workspace","scope","install","snapping","checkout","logger","componentWriter","importer","config","remove","configMerger","depResolver","merge","pattern","mergeStrategy","abort","resolve","noAutoSnap","message","build","skipDependencyInstallation","OutsideWorkspaceError","consumer","mergeResults","resolveMerge","abortMerge","bitIds","getComponentsToMerge","mergeComponentsFromRemote","onDestroy","snapMessage","currentLaneId","getCurrentLaneId","currentLaneObject","getCurrentLaneObject","allComponentsStatus","getAllComponentsStatus","failedComponents","c","unchangedMessage","unchangedLegitimately","failureMsgs","map","failedComponent","chalk","bold","id","toString","red","join","BitError","mergeSnaps","otherLaneId","currentLane","noSnap","tag","detachHead","legacyScope","componentWithConflict","find","component","hasConflicts","getMergeStrategyInteractive","componentStatus","shouldBeRemoved","componentIdsToRemove","changeVersion","undefined","succeededComponents","currentLaneIdsBeforeMerge","toComponentIds","componentsResults","applyVersionMultiple","allConfigMerge","compact","configMergeResult","workspaceDepsUpdates","workspaceDepsConflicts","workspaceDepsUnchanged","updateWorkspaceJsoncWithDepsIfNeeded","workspaceConfigConflictWriteError","writeWorkspaceJsoncWithConflictsGracefully","generateConfigMergeConflictFileForAll","objects","add","persist","unmergedComponents","write","writeBitMap","removeFromWsJsonPolicyIfExists","compBitIdsToRemove","ComponentIdList","fromArray","deleteComponentsFiles","cleanFromBitMap","componentsHasConfigMergeConflicts","some","leftUnresolvedConflicts","dedupe","updateExisting","import","err","error","consoleFailure","getSnapOrTagResults","idsToTag","results","tagAllLaneComponent","taggedComponents","autoTaggedResults","removedComponents","snappedComponents","autoSnappedResults","snapResolvedComponents","toLaneId","mergeSnapResults","mergeSnapError","bitMapSnapshot","bitMap","takeSnapshot","restoreFromSnapshot","components","applyVersionResult","workspaceConfigUpdateResult","newlyIntroducedIds","hasWithoutVersion","newlyIntroducedComponentIds","legacyCompToWrite","packages","componentIdToPackageName","isRemoved","removeFromRootPolicy","persistConfig","getMergeStatus","options","otherLane","mergeStatusProvider","MergeStatusProvider","getStatus","mapSeries","currentComponent","resolvedUnrelated","modelComponent","getModelComponent","updatedLaneId","isDefault","LaneId","from","name","applyVersion","remoteHead","getRef","version","compsToWrite","manyComponentsWriterOpts","writeConfig","reasonForBitmapChange","writeMany","filesStatus","unmergedComponent","fullName","head","laneId","addToCurrentLane","Error","isPartOfLane","isEqualWithoutVersion","addComponent","handleResolveUnrelated","headOnCurrentLane","unrelated","unrelatedHead","unrelatedLaneId","addEntry","markAllFilesAsUnchanged","files","file","pathNormalizeToLinux","relative","FileStatus","unchanged","MergeOptions","ours","strategy","remoteId","idToLoad","theirs","legacyComponent","loadComponentFromModelImportIfNeeded","getConsumerComponent","updateFileStatus","modifiedStatus","modifiedFiles","applyModifiedVersion","removeFilesIfNeeded","successfullyMergedConfig","getSuccessfullyMergedConfig","mergedConfig","manual","unmergedPaths","f","conflict","filePath","detachedHeads","setHead","markVersionAsLocal","ids","getIdsForUnmerged","reset","removeComponent","abortedComponents","snap","legacyBitIds","resolvedComponents","localLaneObject","Promise","all","bitId","remoteScopeName","remoteLaneId","remoteLanes","laneIdStr","toStringWithoutVersion","shouldSquash","getComponents","debug","ComponentID","fromObject","snapFromScope","componentId","lane","tagMessage","unmodified","componentIds","idsByPattern","entry","getEntry","unresolvedComponents","u","mergePending","listMergePendingComponents","componentsList","ComponentsList","allIds","getAllIdsAvailableOnLaneIncludeRemoved","componentsFromModel","getModelComponents","duringMergeComps","listDuringMergeStateComponents","mergePendingComponents","toComponentId","divergedData","getDivergeDataForMergePending","isDiverged","diverge","provider","cli","loggerMain","compWriter","globalConfig","createLogger","MergingAspect","merging","register","MergeCmd","exports","CLIAspect","WorkspaceAspect","ScopeAspect","SnappingAspect","CheckoutAspect","InstallAspect","LoggerAspect","ComponentWriterAspect","ImporterAspect","ConfigAspect","RemoveAspect","GlobalConfigAspect","ConfigMergerAspect","DependencyResolverAspect","MainRuntime","addRuntime"],"sources":["merging.main.runtime.ts"],"sourcesContent":["import { CLIAspect, CLIMain, MainRuntime } from '@teambit/cli';\nimport { WorkspaceAspect, OutsideWorkspaceError, Workspace, AutoTagResult } from '@teambit/workspace';\nimport { Consumer } from '@teambit/legacy.consumer';\nimport { ComponentsList } from '@teambit/legacy.component-list';\nimport { SnappingAspect, SnappingMain, TagResults } from '@teambit/snapping';\nimport mapSeries from 'p-map-series';\nimport { ComponentID, ComponentIdList } from '@teambit/component-id';\nimport { BitError } from '@teambit/bit-error';\nimport { LaneId } from '@teambit/lane-id';\nimport { UnmergedComponent } from '@teambit/legacy.scope';\nimport { Ref, Lane, ModelComponent } from '@teambit/objects';\nimport chalk from 'chalk';\nimport { ConfigAspect, ConfigMain } from '@teambit/config';\nimport { RemoveAspect, RemoveMain, deleteComponentsFiles } from '@teambit/remove';\nimport { pathNormalizeToLinux } from '@teambit/toolbox.path.path';\nimport { componentIdToPackageName } from '@teambit/pkg.modules.component-package-name';\nimport { ComponentWriterAspect, ComponentWriterMain } from '@teambit/component-writer';\nimport { ConsumerComponent } from '@teambit/legacy.consumer-component';\nimport { ImporterAspect, ImporterMain } from '@teambit/importer';\nimport { Logger, LoggerAspect, LoggerMain } from '@teambit/logger';\nimport { GlobalConfigAspect, GlobalConfigMain } from '@teambit/global-config';\nimport { compact } from 'lodash';\nimport {\n ApplyVersionWithComps,\n CheckoutAspect,\n CheckoutMain,\n ComponentStatusBase,\n applyModifiedVersion,\n removeFilesIfNeeded,\n updateFileStatus,\n} from '@teambit/checkout';\nimport {\n ConfigMergerAspect,\n ConfigMergerMain,\n ConfigMergeResult,\n WorkspaceConfigUpdateResult,\n} from '@teambit/config-merger';\nimport { SnapsDistance } from '@teambit/component.snap-distance';\nimport { DependencyResolverAspect, DependencyResolverMain } from '@teambit/dependency-resolver';\nimport { InstallMain, InstallAspect } from '@teambit/install';\nimport { ScopeAspect, ScopeMain } from '@teambit/scope';\nimport { MergeCmd } from './merge-cmd';\nimport { MergingAspect } from './merging.aspect';\nimport { MergeStatusProvider, MergeStatusProviderOptions } from './merge-status-provider';\nimport {\n MergeStrategy,\n FileStatus,\n getMergeStrategyInteractive,\n MergeResultsThreeWay,\n MergeOptions,\n} from './merge-version';\n\ntype ResolveUnrelatedData = {\n strategy: MergeStrategy;\n headOnCurrentLane: Ref;\n unrelatedHead: Ref;\n unrelatedLaneId: LaneId;\n};\n\nexport type DivergedComponent = { id: ComponentID; diverge: SnapsDistance };\n\nexport type ComponentMergeStatus = ComponentStatusBase & {\n mergeResults?: MergeResultsThreeWay \| null;\n divergeData?: SnapsDistance;\n resolvedUnrelated?: ResolveUnrelatedData;\n configMergeResult?: ConfigMergeResult;\n};\n\nexport type ComponentMergeStatusBeforeMergeAttempt = ComponentStatusBase & {\n divergeData?: SnapsDistance;\n resolvedUnrelated?: ResolveUnrelatedData;\n mergeProps?: {\n otherLaneHead: Ref;\n currentId: ComponentID;\n modelComponent: ModelComponent;\n };\n};\n\nexport type FailedComponents = { id: ComponentID; unchangedMessage: string; unchangedLegitimately?: boolean };\n\n// fileName is PathLinux. TS doesn't let anything else in the keys other than string and number\nexport type FilesStatus = { [fileName: string]: keyof typeof FileStatus };\n\nexport type MergeSnapResults = {\n snappedComponents: ConsumerComponent[];\n autoSnappedResults: AutoTagResult[];\n removedComponents?: ComponentIdList;\n exportedIds?: ComponentID[];\n} \| null;\n\nexport type ApplyVersionResult = { id: ComponentID; filesStatus: FilesStatus };\n\nexport type ApplyVersionResults = {\n components?: ApplyVersionResult[];\n version?: string;\n failedComponents?: FailedComponents[];\n removedComponents?: ComponentID[];\n addedComponents?: ComponentID[]; // relevant when restoreMissingComponents is true (e.g. bit lane merge-abort)\n newComponents?: ComponentID[]; // relevant for \"bit stash load\". (stashedBitmapEntries is populated)\n resolvedComponents?: ConsumerComponent[]; // relevant for bit merge --resolve\n abortedComponents?: ApplyVersionResult[]; // relevant for bit merge --abort\n mergeSnapResults?: MergeSnapResults;\n mergeSnapError?: Error;\n leftUnresolvedConflicts?: boolean;\n verbose?: boolean;\n newFromLane?: string[];\n newFromLaneAdded?: boolean;\n installationError?: Error; // in case the package manager failed, it won't throw, instead, it'll return error here\n compilationError?: Error; // in case the compiler failed, it won't throw, instead, it'll return error here\n workspaceConfigUpdateResult?: WorkspaceConfigUpdateResult;\n};\n\nexport class MergingMain {\n constructor(\n private workspace: Workspace,\n private scope: ScopeMain,\n private install: InstallMain,\n private snapping: SnappingMain,\n private checkout: CheckoutMain,\n private logger: Logger,\n private componentWriter: ComponentWriterMain,\n private importer: ImporterMain,\n private config: ConfigMain,\n private remove: RemoveMain,\n private configMerger: ConfigMergerMain,\n private depResolver: DependencyResolverMain\n ) {}\n\n async merge(\n pattern: string,\n mergeStrategy: MergeStrategy,\n abort: boolean,\n resolve: boolean,\n noAutoSnap: boolean,\n message: string,\n build: boolean,\n skipDependencyInstallation: boolean\n ): Promise<ApplyVersionResults> {\n if (!this.workspace) throw new OutsideWorkspaceError();\n const consumer: Consumer = this.workspace.consumer;\n let mergeResults;\n if (resolve) {\n mergeResults = await this.resolveMerge(pattern, message, build);\n } else if (abort) {\n mergeResults = await this.abortMerge(pattern);\n } else {\n const bitIds = await this.getComponentsToMerge(pattern);\n mergeResults = await this.mergeComponentsFromRemote(\n consumer,\n bitIds,\n mergeStrategy,\n noAutoSnap,\n message,\n build,\n skipDependencyInstallation\n );\n }\n await consumer.onDestroy('merge');\n return mergeResults;\n }\n\n /*\n when user is on main, it merges the remote main components into local.\n * when user is on a lane, it merges the remote lane components into the local lane.\n /\n async mergeComponentsFromRemote(\n consumer: Consumer,\n bitIds: ComponentID[],\n mergeStrategy: MergeStrategy,\n noAutoSnap: boolean,\n snapMessage: string,\n build: boolean,\n skipDependencyInstallation: boolean\n ): Promise<ApplyVersionResults> {\n const currentLaneId = consumer.getCurrentLaneId();\n const currentLaneObject = await consumer.getCurrentLaneObject();\n const allComponentsStatus = await this.getAllComponentsStatus(\n bitIds,\n currentLaneId,\n currentLaneObject,\n mergeStrategy\n );\n const failedComponents = allComponentsStatus.filter((c) => c.unchangedMessage && !c.unchangedLegitimately);\n if (failedComponents.length) {\n const failureMsgs = failedComponents\n .map(\n (failedComponent) =>\n `${chalk.bold(failedComponent.id.toString())} - ${chalk.red(failedComponent.unchangedMessage as string)}`\n )\n .join('\\n');\n throw new BitError(`unable to merge due to the following failures:\\n${failureMsgs}`);\n }\n\n return this.mergeSnaps({\n mergeStrategy,\n allComponentsStatus,\n otherLaneId: currentLaneId,\n currentLane: currentLaneObject,\n noAutoSnap: noAutoSnap,\n snapMessage,\n build,\n skipDependencyInstallation,\n });\n }\n\n /\n merge multiple components according to the \"allComponentsStatus\".\n /\n async mergeSnaps({\n mergeStrategy,\n allComponentsStatus,\n otherLaneId,\n currentLane,\n noAutoSnap,\n noSnap,\n tag,\n snapMessage,\n build,\n skipDependencyInstallation,\n detachHead,\n }: {\n mergeStrategy: MergeStrategy;\n allComponentsStatus: ComponentMergeStatus[];\n otherLaneId: LaneId;\n currentLane?: Lane;\n noAutoSnap?: boolean;\n noSnap?: boolean;\n tag?: boolean;\n snapMessage?: string;\n build?: boolean;\n skipDependencyInstallation?: boolean;\n detachHead?: boolean;\n }): Promise<ApplyVersionResults> {\n const consumer = this.workspace?.consumer;\n const legacyScope = this.scope.legacyScope;\n const componentWithConflict = allComponentsStatus.find(\n (component) => component.mergeResults && component.mergeResults.hasConflicts\n );\n if (componentWithConflict && !mergeStrategy) {\n mergeStrategy = await getMergeStrategyInteractive();\n }\n const failedComponents: FailedComponents[] = allComponentsStatus\n .filter((componentStatus) => componentStatus.unchangedMessage)\n .filter((componentStatus) => !componentStatus.shouldBeRemoved)\n .map((componentStatus) => ({\n id: componentStatus.id,\n unchangedMessage: componentStatus.unchangedMessage as string,\n unchangedLegitimately: componentStatus.unchangedLegitimately,\n }));\n\n const componentIdsToRemove = allComponentsStatus\n .filter((componentStatus) => componentStatus.shouldBeRemoved)\n .map((c) => c.id.changeVersion(undefined));\n\n const succeededComponents = allComponentsStatus.filter((componentStatus) => !componentStatus.unchangedMessage);\n\n const currentLaneIdsBeforeMerge = currentLane?.toComponentIds();\n\n const componentsResults = await this.applyVersionMultiple(\n succeededComponents,\n otherLaneId,\n mergeStrategy,\n currentLane,\n detachHead\n );\n\n const allConfigMerge = compact(succeededComponents.map((c) => c.configMergeResult));\n\n const { workspaceDepsUpdates, workspaceDepsConflicts, workspaceDepsUnchanged } = this.workspace\n ? await this.configMerger.updateWorkspaceJsoncWithDepsIfNeeded(allConfigMerge)\n : { workspaceDepsUpdates: undefined, workspaceDepsConflicts: undefined, workspaceDepsUnchanged: undefined };\n\n let workspaceConfigConflictWriteError: Error \| undefined;\n if (workspaceDepsConflicts) {\n workspaceConfigConflictWriteError =\n await this.configMerger.writeWorkspaceJsoncWithConflictsGracefully(workspaceDepsConflicts);\n }\n if (this.workspace) await this.configMerger.generateConfigMergeConflictFileForAll(allConfigMerge);\n\n if (currentLane) legacyScope.objects.add(currentLane);\n\n await legacyScope.objects.persist(); // persist anyway, if currentLane is null it should save all main heads\n\n await legacyScope.objects.unmergedComponents.write();\n\n if (this.workspace) {\n await consumer.writeBitMap(`merge ${otherLaneId.toString()}`);\n await this.removeFromWsJsonPolicyIfExists(componentsResults, currentLane, currentLaneIdsBeforeMerge);\n }\n\n if (componentIdsToRemove.length && this.workspace) {\n const compBitIdsToRemove = ComponentIdList.fromArray(componentIdsToRemove);\n await deleteComponentsFiles(consumer, compBitIdsToRemove);\n await consumer.cleanFromBitMap(compBitIdsToRemove);\n }\n\n const componentsHasConfigMergeConflicts = allComponentsStatus.some((c) => c.configMergeResult?.hasConflicts());\n const leftUnresolvedConflicts = componentWithConflict && mergeStrategy === 'manual';\n if (!skipDependencyInstallation && !leftUnresolvedConflicts && !componentsHasConfigMergeConflicts) {\n try {\n await this.install.install(undefined, {\n dedupe: true,\n updateExisting: false,\n import: false,\n });\n } catch (err: any) {\n this.logger.error(`failed installing packages`, err);\n this.logger.consoleFailure(\n `failed installing packages, see the log for full stacktrace. error: ${err.message}`\n );\n }\n }\n\n const getSnapOrTagResults = async (): Promise<MergeSnapResults> => {\n // if one of the component has conflict, don't snap-merge. otherwise, some of the components would be snap-merged\n // and some not. besides the fact that it could by mistake tag dependent, it's a confusing state. better not snap.\n if (noAutoSnap \|\| noSnap \|\| leftUnresolvedConflicts \|\| componentsHasConfigMergeConflicts) {\n return null;\n }\n if (tag) {\n const idsToTag = allComponentsStatus.map((c) => c.id);\n const results = await this.tagAllLaneComponent(idsToTag, snapMessage, build);\n if (!results) return null;\n const { taggedComponents, autoTaggedResults, removedComponents } = results;\n return { snappedComponents: taggedComponents, autoSnappedResults: autoTaggedResults, removedComponents };\n }\n return this.snapResolvedComponents(snapMessage, build, currentLane?.toLaneId());\n };\n let mergeSnapResults: MergeSnapResults = null;\n let mergeSnapError: Error \| undefined;\n const bitMapSnapshot = this.workspace ? this.workspace.bitMap.takeSnapshot() : null;\n try {\n mergeSnapResults = await getSnapOrTagResults();\n } catch (err: any) {\n this.logger.error('failed running snap. mergeSnapError:', err);\n mergeSnapError = err;\n if (bitMapSnapshot) this.workspace.bitMap.restoreFromSnapshot(bitMapSnapshot);\n }\n\n return {\n components: componentsResults.map((c) => c.applyVersionResult),\n failedComponents,\n removedComponents: [...componentIdsToRemove, ...(mergeSnapResults?.removedComponents \|\| [])],\n mergeSnapResults,\n mergeSnapError,\n workspaceConfigUpdateResult: {\n workspaceDepsUpdates,\n workspaceDepsConflicts,\n workspaceDepsUnchanged,\n workspaceConfigConflictWriteError,\n },\n leftUnresolvedConflicts,\n };\n }\n\n async removeFromWsJsonPolicyIfExists(\n componentsResults: ApplyVersionWithComps[],\n currentLane?: Lane,\n currentLaneIdsBeforeMerge?: ComponentIdList\n ) {\n const newlyIntroducedIds = currentLane\n ?.toComponentIds()\n .filter((id) => !currentLaneIdsBeforeMerge?.hasWithoutVersion(id));\n const newlyIntroducedComponentIds = ComponentIdList.fromArray(newlyIntroducedIds \|\| []);\n const components = compact(\n componentsResults\n .map((c) => c.legacyCompToWrite)\n .filter((c) => c && newlyIntroducedComponentIds.hasWithoutVersion(c.id))\n );\n const packages = components.map((c) => componentIdToPackageName(c));\n const isRemoved = this.depResolver.removeFromRootPolicy(packages);\n if (isRemoved) await this.depResolver.persistConfig('merge (remove packages)');\n }\n\n /\n this function gets called from two different commands:\n * 1. \"bit merge <ids...>\", when merging a component from a remote to the local.\n * in this case, the remote and local are on the same lane or both on main.\n * 2. \"bit lane merge\", when merging from one lane to another.\n */\n async getMergeStatus(\n bitIds: ComponentID[], // the id.version is the version we want to merge to the current component\n options: MergeStatusProviderOptions,\n currentLane?: Lane, // currently checked out lane. if on main, then it's null.\n otherLane?: Lane // the lane we want to merged to our lane. (null if it's \"main\").\n ): Promise<ComponentMergeStatus[]> {\n const mergeStatusProvider = new MergeStatusProvider(\n this.scope,\n this.logger,\n this.importer,\n options,\n this.workspace,\n currentLane,\n otherLane\n );\n return mergeStatusProvider.getStatus(bitIds);\n }\n\n private async applyVersionMultiple(\n succeededComponents: ComponentMergeStatus[],\n otherLaneId: LaneId,\n mergeStrategy: MergeStrategy,\n currentLane?: Lane,\n detachHead?: boolean\n ): Promise<ApplyVersionWithComps[]> {\n const componentsResults = await mapSeries(\n succeededComponents,\n async ({ currentComponent, id, mergeResults, resolvedUnrelated, configMergeResult }) => {\n const modelComponent = await this.scope.legacyScope.getModelComponent(id);\n const updatedLaneId = otherLaneId.isDefault() ? LaneId.from(otherLaneId.name, id.scope as string) : otherLaneId;\n return this.applyVersion({\n currentComponent,\n id,\n mergeResults,\n mergeStrategy,\n remoteHead: modelComponent.getRef(id.version as string) as Ref,\n otherLaneId: updatedLaneId,\n currentLane,\n resolvedUnrelated,\n configMergeResult,\n detachHead,\n });\n }\n );\n\n if (this.workspace) {\n const compsToWrite = compact(componentsResults.map((c) => c.legacyCompToWrite));\n const manyComponentsWriterOpts = {\n consumer: this.workspace.consumer,\n components: compsToWrite,\n skipDependencyInstallation: true,\n writeConfig: false, // @todo: should write if config exists before, needs to figure out how to do it.\n reasonForBitmapChange: 'merge',\n };\n await this.componentWriter.writeMany(manyComponentsWriterOpts);\n }\n\n return componentsResults;\n }\n\n private async applyVersion({\n currentComponent,\n id,\n mergeResults,\n mergeStrategy,\n remoteHead,\n otherLaneId,\n currentLane,\n resolvedUnrelated,\n configMergeResult,\n detachHead,\n }: {\n currentComponent: ConsumerComponent \| null \| undefined;\n id: ComponentID;\n mergeResults: MergeResultsThreeWay \| null \| undefined;\n mergeStrategy: MergeStrategy;\n remoteHead: Ref;\n otherLaneId: LaneId;\n currentLane?: Lane;\n resolvedUnrelated?: ResolveUnrelatedData;\n configMergeResult?: ConfigMergeResult;\n detachHead?: boolean;\n }): Promise<ApplyVersionWithComps> {\n const legacyScope = this.scope.legacyScope;\n let filesStatus = {};\n const unmergedComponent: UnmergedComponent = {\n id: { name: id.fullName, scope: id.scope },\n head: remoteHead,\n laneId: otherLaneId,\n };\n id = currentComponent ? currentComponent.id : id;\n const modelComponent = await legacyScope.getModelComponent(id);\n\n const addToCurrentLane = (head: Ref) => {\n if (!currentLane) throw new Error('currentLane must be defined when adding to the lane');\n if (otherLaneId.isDefault()) {\n const isPartOfLane = currentLane.components.find((c) => c.id.isEqualWithoutVersion(id));\n if (!isPartOfLane) return;\n }\n currentLane.addComponent({ id, head });\n };\n\n const handleResolveUnrelated = (legacyCompToWrite?: ConsumerComponent) => {\n if (!currentComponent) throw new Error('currentComponent must be defined when resolvedUnrelated');\n // because when on a main, we don't allow merging lanes with unrelated. we asks users to switch to the lane\n // first and then merge with --resolve-unrelated\n if (!currentLane) throw new Error('currentLane must be defined when resolvedUnrelated');\n if (!resolvedUnrelated) throw new Error('resolvedUnrelated must be populated');\n addToCurrentLane(resolvedUnrelated.headOnCurrentLane);\n unmergedComponent.unrelated = {\n unrelatedHead: resolvedUnrelated.unrelatedHead,\n headOnCurrentLane: resolvedUnrelated.headOnCurrentLane,\n unrelatedLaneId: resolvedUnrelated.unrelatedLaneId,\n };\n legacyScope.objects.unmergedComponents.addEntry(unmergedComponent);\n return { applyVersionResult: { id, filesStatus }, component: currentComponent, legacyCompToWrite };\n };\n\n const markAllFilesAsUnchanged = () => {\n if (!currentComponent) throw new Error(`applyVersion expect to get currentComponent for ${id.toString()}`);\n currentComponent.files.forEach((file) => {\n filesStatus[pathNormalizeToLinux(file.relative)] = FileStatus.unchanged;\n });\n };\n if (mergeResults && mergeResults.hasConflicts && mergeStrategy === MergeOptions.ours) {\n markAllFilesAsUnchanged();\n legacyScope.objects.unmergedComponents.addEntry(unmergedComponent);\n return { applyVersionResult: { id, filesStatus }, component: currentComponent \|\| undefined };\n }\n if (resolvedUnrelated?.strategy === 'ours') {\n markAllFilesAsUnchanged();\n return handleResolveUnrelated();\n }\n const remoteId = id.changeVersion(remoteHead.toString());\n const idToLoad = !mergeResults \|\| mergeStrategy === MergeOptions.theirs ? remoteId : id;\n const legacyComponent = this.workspace\n ? await this.workspace.consumer.loadComponentFromModelImportIfNeeded(idToLoad)\n : await legacyScope.getConsumerComponent(idToLoad); // when loading from the scope, we import all needed components first, so it should be fine. otherwise, change the code to import it here\n if (mergeResults && mergeStrategy === MergeOptions.theirs) {\n // in this case, we don't want to update .bitmap with the version of the remote. we want to keep the same version\n legacyComponent.version = id.version;\n }\n const files = legacyComponent.files;\n updateFileStatus(files, filesStatus, currentComponent \|\| undefined);\n\n if (mergeResults) {\n // update files according to the merge results\n const { filesStatus: modifiedStatus, modifiedFiles } = applyModifiedVersion(files, mergeResults, mergeStrategy);\n legacyComponent.files = modifiedFiles;\n filesStatus = { ...filesStatus, ...modifiedStatus };\n }\n\n if (this.workspace) await removeFilesIfNeeded(filesStatus, this.workspace.consumer, currentComponent \|\| undefined);\n\n if (configMergeResult) {\n const successfullyMergedConfig = configMergeResult.getSuccessfullyMergedConfig();\n if (successfullyMergedConfig) {\n unmergedComponent.mergedConfig = successfullyMergedConfig;\n // no need to `unmergedComponents.addEntry` here. it'll be added in the next lines inside `if (mergeResults)`.\n // because if `configMergeResult` is set, `mergeResults` must be set as well. both happen on diverge.\n }\n }\n\n // if mergeResults, the head snap is going to be updated on a later phase when snapping with two parents\n // otherwise, update the head of the current lane or main\n if (mergeResults) {\n if (mergeResults.hasConflicts && mergeStrategy === MergeOptions.manual) {\n unmergedComponent.unmergedPaths = mergeResults.modifiedFiles.filter((f) => f.conflict).map((f) => f.filePath);\n }\n legacyScope.objects.unmergedComponents.addEntry(unmergedComponent);\n } else if (currentLane) {\n if (resolvedUnrelated) {\n // must be \"theirs\"\n return handleResolveUnrelated(legacyComponent);\n }\n addToCurrentLane(remoteHead);\n } else {\n // this is main\n if (detachHead) {\n modelComponent.detachedHeads.setHead(remoteHead);\n } else {\n modelComponent.setHead(remoteHead);\n // mark it as local, otherwise, when importing this component from a remote, it'll override it.\n modelComponent.markVersionAsLocal(remoteHead.toString());\n }\n legacyScope.objects.add(modelComponent);\n }\n\n return {\n applyVersionResult: { id: idToLoad, filesStatus },\n component: currentComponent \|\| undefined,\n legacyCompToWrite: legacyComponent,\n };\n }\n\n private async abortMerge(pattern: string): Promise<ApplyVersionResults> {\n const consumer = this.workspace.consumer;\n const ids = await this.getIdsForUnmerged(pattern);\n const results = await this.checkout.checkout({ ids, reset: true });\n ids.forEach((id) => consumer.scope.objects.unmergedComponents.removeComponent(id));\n await consumer.scope.objects.unmergedComponents.write();\n return { abortedComponents: results.components };\n }\n\n private async resolveMerge(pattern: string, snapMessage: string, build: boolean): Promise<ApplyVersionResults> {\n const ids = await this.getIdsForUnmerged(pattern);\n // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n const { snappedComponents } = await this.snapping.snap({\n legacyBitIds: ComponentIdList.fromArray(ids.map((id) => id)),\n build,\n message: snapMessage,\n });\n return { resolvedComponents: snappedComponents };\n }\n\n private async getAllComponentsStatus(\n bitIds: ComponentID[],\n laneId: LaneId,\n localLaneObject: Lane \| undefined,\n mergeStrategy: MergeStrategy\n ): Promise<ComponentMergeStatus[]> {\n const ids = await Promise.all(\n bitIds.map(async (bitId) => {\n const remoteScopeName = laneId.isDefault() ? bitId.scope : laneId.scope;\n const remoteLaneId = LaneId.from(laneId.name, remoteScopeName as string);\n const remoteHead = await this.workspace.consumer.scope.objects.remoteLanes.getRef(remoteLaneId, bitId);\n const laneIdStr = remoteLaneId.toString();\n if (!remoteHead) {\n throw new BitError(`unable to find a remote head of \"${bitId.toStringWithoutVersion()}\" in \"${laneIdStr}\"`);\n }\n return bitId.changeVersion(remoteHead.toString());\n })\n );\n\n return this.getMergeStatus(ids, { shouldSquash: false, mergeStrategy }, localLaneObject, localLaneObject);\n }\n\n private async snapResolvedComponents(\n snapMessage?: string,\n build?: boolean,\n laneId?: LaneId\n ): Promise<MergeSnapResults> {\n const unmergedComponents = this.scope.legacyScope.objects.unmergedComponents.getComponents();\n this.logger.debug(`merge-snaps, snapResolvedComponents, total ${unmergedComponents.length.toString()} components`);\n if (!unmergedComponents.length) return null;\n const ids = ComponentIdList.fromArray(unmergedComponents.map((r) => ComponentID.fromObject(r.id)));\n if (!this.workspace) {\n const results = await this.snapping.snapFromScope(\n ids.map((id) => ({ componentId: id.toString() })),\n {\n message: snapMessage,\n build,\n lane: laneId?.toString(),\n }\n );\n return { ...results, autoSnappedResults: [] };\n }\n return this.snapping.snap({\n legacyBitIds: ids,\n build,\n message: snapMessage,\n });\n }\n\n private async tagAllLaneComponent(\n idsToTag: ComponentID[],\n tagMessage?: string,\n build?: boolean\n ): Promise<TagResults \| null> {\n const ids = idsToTag.map((id) => {\n return id.toStringWithoutVersion();\n });\n this.logger.debug(`merge-snaps, tagResolvedComponents, total ${idsToTag.length.toString()} components`);\n return this.snapping.tag({\n ids,\n build,\n message: tagMessage,\n unmodified: true,\n });\n }\n\n private async getIdsForUnmerged(pattern?: string): Promise<ComponentID[]> {\n if (pattern) {\n const componentIds = await this.workspace.idsByPattern(pattern);\n componentIds.forEach((id) => {\n const entry = this.workspace.consumer.scope.objects.unmergedComponents.getEntry(id);\n if (!entry) {\n throw new BitError(`unable to merge-resolve ${id.toString()}, it is not marked as unresolved`);\n }\n });\n return componentIds;\n }\n const unresolvedComponents = this.workspace.consumer.scope.objects.unmergedComponents.getComponents();\n if (!unresolvedComponents.length) throw new BitError(`all components are resolved already, nothing to do`);\n return unresolvedComponents.map((u) => ComponentID.fromObject(u.id));\n }\n\n private async getComponentsToMerge(pattern?: string): Promise<ComponentID[]> {\n if (pattern) {\n return this.workspace.idsByPattern(pattern);\n }\n const mergePending = await this.listMergePendingComponents();\n return mergePending.map((c) => c.id);\n }\n\n async listMergePendingComponents(componentsList?: ComponentsList): Promise<DivergedComponent[]> {\n const consumer = this.workspace.consumer;\n componentsList = componentsList \|\| new ComponentsList(this.workspace);\n const allIds = consumer.bitMap.getAllIdsAvailableOnLaneIncludeRemoved();\n const componentsFromModel = await componentsList.getModelComponents();\n const duringMergeComps = componentsList.listDuringMergeStateComponents();\n const mergePendingComponents = await Promise.all(\n allIds.map(async (componentId: ComponentID) => {\n const modelComponent = componentsFromModel.find((c) => c.toComponentId().isEqualWithoutVersion(componentId));\n if (!modelComponent \|\| duringMergeComps.hasWithoutVersion(componentId)) return null;\n const divergedData = await modelComponent.getDivergeDataForMergePending(consumer.scope.objects);\n if (!divergedData.isDiverged()) return null;\n return { id: modelComponent.toComponentId(), diverge: divergedData };\n })\n );\n return compact(mergePendingComponents);\n }\n\n static slots = [];\n static dependencies = [\n CLIAspect,\n WorkspaceAspect,\n ScopeAspect,\n SnappingAspect,\n CheckoutAspect,\n InstallAspect,\n LoggerAspect,\n ComponentWriterAspect,\n ImporterAspect,\n ConfigAspect,\n RemoveAspect,\n GlobalConfigAspect,\n ConfigMergerAspect,\n DependencyResolverAspect,\n ];\n static runtime = MainRuntime;\n static async provider([\n cli,\n workspace,\n scope,\n snapping,\n checkout,\n install,\n loggerMain,\n compWriter,\n importer,\n config,\n remove,\n globalConfig,\n configMerger,\n depResolver,\n ]: [\n CLIMain,\n Workspace,\n ScopeMain,\n SnappingMain,\n CheckoutMain,\n InstallMain,\n LoggerMain,\n ComponentWriterMain,\n ImporterMain,\n ConfigMain,\n RemoveMain,\n GlobalConfigMain,\n ConfigMergerMain,\n DependencyResolverMain,\n ]) {\n const logger = loggerMain.createLogger(MergingAspect.id);\n const merging = new MergingMain(\n workspace,\n scope,\n install,\n snapping,\n checkout,\n logger,\n compWriter,\n importer,\n config,\n remove,\n configMerger,\n depResolver\n );\n cli.register(new MergeCmd(merging, globalConfig));\n return merging;\n }\n}\n\nMergingAspect.addRuntime(MergingMain);\n"],"mappings":"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","ignoreList":[]}

package/merge-version/three-way-merge.ts CHANGED Viewed

@@ -1,5 +1,5 @@
 import { BitError } from '@teambit/bit-error';
-import { Source, Version, SourceFileModel } from '@teambit/scope.objects';
+import { Source, Version, SourceFileModel } from '@teambit/objects';
 import { sha1 } from '@teambit/toolbox.crypto.sha1';
 import { PathLinux, pathNormalizeToLinux, PathOsBased } from '@teambit/toolbox.path.path';
 import * as eol from '@teambit/toolbox.string.eol';

package/package.json CHANGED Viewed

@@ -1,12 +1,12 @@
 {
   "name": "@teambit/merging",
-  "version": "1.0.511",
+  "version": "1.0.512",
   "homepage": "https://bit.cloud/teambit/component/merging",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.component",
     "name": "merging",
-    "version": "1.0.511"
+    "version": "1.0.512"
   },
   "dependencies": {
     "chalk": "2.4.2",
@@ -15,36 +15,36 @@
     "p-map-series": "2.1.0",
     "@teambit/bit-error": "0.0.404",
     "@teambit/component-id": "1.2.2",
-    "@teambit/lane-id": "0.0.311",
+    "@teambit/lane-id": "0.0.312",
     "@teambit/harmony": "0.4.6",
-    "@teambit/cli": "0.0.1088",
-    "@teambit/config-merger": "0.0.378",
-    "@teambit/global-config": "0.0.1091",
+    "@teambit/cli": "0.0.1089",
+    "@teambit/config-merger": "0.0.379",
+    "@teambit/global-config": "0.0.1092",
     "@teambit/legacy.constants": "0.0.5",
     "@teambit/git.modules.git-executable": "0.0.6",
     "@teambit/legacy.logger": "0.0.7",
     "@teambit/legacy.utils": "0.0.13",
-    "@teambit/component.snap-distance": "0.0.19",
-    "@teambit/importer": "1.0.511",
-    "@teambit/legacy.consumer-component": "0.0.19",
-    "@teambit/legacy.scope": "0.0.18",
-    "@teambit/logger": "0.0.1181",
-    "@teambit/scope.objects": "0.0.18",
-    "@teambit/scope": "1.0.511",
-    "@teambit/workspace": "1.0.511",
-    "@teambit/checkout": "1.0.511",
-    "@teambit/component-writer": "1.0.511",
-    "@teambit/config": "0.0.1262",
-    "@teambit/dependency-resolver": "1.0.511",
-    "@teambit/install": "1.0.511",
-    "@teambit/legacy.component-list": "0.0.72",
-    "@teambit/legacy.consumer": "0.0.18",
-    "@teambit/pkg.modules.component-package-name": "0.0.25",
-    "@teambit/remove": "1.0.511",
-    "@teambit/snapping": "1.0.511",
+    "@teambit/component.snap-distance": "0.0.20",
+    "@teambit/importer": "1.0.512",
+    "@teambit/legacy.consumer-component": "0.0.20",
+    "@teambit/legacy.scope": "0.0.19",
+    "@teambit/logger": "0.0.1182",
+    "@teambit/objects": "0.0.19",
+    "@teambit/scope": "1.0.512",
+    "@teambit/workspace": "1.0.512",
+    "@teambit/checkout": "1.0.512",
+    "@teambit/component-writer": "1.0.512",
+    "@teambit/config": "0.0.1263",
+    "@teambit/dependency-resolver": "1.0.512",
+    "@teambit/install": "1.0.512",
+    "@teambit/legacy.component-list": "0.0.73",
+    "@teambit/legacy.consumer": "0.0.19",
+    "@teambit/pkg.modules.component-package-name": "0.0.26",
+    "@teambit/remove": "1.0.512",
+    "@teambit/snapping": "1.0.512",
     "@teambit/toolbox.path.path": "0.0.6",
     "@teambit/legacy.cli.prompts": "0.0.10",
-    "@teambit/component.sources": "0.0.70",
+    "@teambit/component.sources": "0.0.71",
     "@teambit/toolbox.crypto.sha1": "0.0.5",
     "@teambit/toolbox.string.eol": "0.0.3"
   },

/package/dist/{preview-1736711473672.js → preview-1736824735631.js} RENAMED Viewed

File without changes