npm - @teambit/merging - Versions diffs - 0.0.172 → 0.0.174 - Mend

@teambit/merging 0.0.172 → 0.0.174

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 (6) hide show

package/dist/merging.main.runtime.js +8 -2
package/dist/merging.main.runtime.js.map +1 -1
package/package-tar/teambit-merging-0.0.174.tgz +0 -0
package/package.json +9 -9
/package/{preview-1663472005837.js → preview-1663693322588.js} +0 -0
package/package-tar/teambit-merging-0.0.172.tgz +0 -0

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

@@ -595,8 +595,14 @@ class MergingMain {
       const mainHead = modelComponent.head;
       if (divergeData.err instanceof _noCommonSnap().NoCommonSnap && options !== null && options !== void 0 && options.resolveUnrelated && mainHead) {
-        const hasResolvedLocally = divergeData.snapsOnLocalOnly.find(snap => mainHead.isEqual(snap));
-        const hasResolvedRemotely = divergeData.snapsOnRemoteOnly.find(snap => mainHead.isEqual(snap));
+        const hasResolvedFromMain = async hashToCompare => {
+          const divergeDataFromMain = await (0, _getDivergeData().getDivergeData)(repo, modelComponent, mainHead, hashToCompare, false);
+          if (!divergeDataFromMain.err) return true;
+          return !(divergeDataFromMain.err instanceof _noCommonSnap().NoCommonSnap);
+        };
+        const hasResolvedLocally = await hasResolvedFromMain(localHead);
+        const hasResolvedRemotely = await hasResolvedFromMain(otherLaneHead);
         if (!hasResolvedLocally && !hasResolvedRemotely) {
           return returnUnmerged(`unable to traverse ${currentComponent.id.toString()} history. the main-head ${mainHead.toString()} doesn't appear in both lanes, it was probably created in each lane separately`);

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

	@@ -1 +1 @@
1	- {"version":3,"names":["MergingMain","constructor","workspace","install","snapping","checkout","consumer","merge","values","mergeStrategy","abort","resolve","noSnap","message","build","skipDependencyInstallation","ConsumerNotFound","mergeResults","firstValue","R","head","resolveMerge","abortMerge","BitId","isValidVersion","bitIds","getComponentsToMerge","mergeComponentsFromRemote","version","ids","tail","mergeVersion","onDestroy","snapMessage","currentLaneId","getCurrentLaneId","currentLaneObject","getCurrentLaneObject","allComponentsStatus","getAllComponentsStatus","failedComponents","filter","c","unmergedMessage","unmergedLegitimately","length","failureMsgs","map","failedComponent","chalk","bold","id","toString","red","join","BitError","mergeSnaps","laneId","localLane","tag","componentWithConflict","find","component","hasConflicts","getMergeStrategyInteractive","componentStatus","failureMessage","unchangedLegitimately","succeededComponents","componentsResults","mapSeries","currentComponent","resolvedUnrelated","modelComponent","scope","getModelComponent","updatedLaneId","isDefault","LaneId","from","name","applyVersion","remoteHead","getRef","leftUnresolvedConflicts","undefined","dedupe","updateExisting","import","objects","add","persist","unmergedComponents","write","getSnapOrTagResults","idsToTag","results","tagAllLaneComponent","taggedComponents","autoTaggedResults","snappedComponents","autoSnappedResults","snapResolvedComponents","mergeSnapResults","components","getComponentMergeStatus","otherLaneName","options","returnUnmerged","msg","getModelComponentIfExist","unmerged","getEntry","toStringWithoutVersion","repo","otherLaneHead","existingBitMapId","bitMap","getBitIdIfExist","ignoreVersion","componentOnLane","loadVersion","isRemoved","getCurrentId","idOnLane","getComponent","changeVersion","getHeadAsTagIfExist","currentId","divergeData","getDivergeData","componentFromModel","getCurrentComponent","loadComponent","getConsumerComponent","isModified","componentModificationStatus","getComponentStatusById","modified","baseComponent","ignoreConfigChanges","isComponentSourceCodeModified","isComponentModified","laneHeadIsDifferentThanCheckedOut","laneHeadLocal","localHead","Ref","Error","err","mainHead","NoCommonSnap","resolveUnrelated","hasResolvedLocally","snapsOnLocalOnly","snap","isEqual","hasResolvedRemotely","snapsOnRemoteOnly","versionToSaveInLane","resolvedRef","strategy","isDiverged","isLocalAhead","isRemoteAhead","baseSnap","commonSnapBeforeDiverge","otherComponent","currentLaneName","toLaneId","threeWayMerge","otherLabel","currentLabel","filesStatus","unmergedComponent","remote","lane","handleResolveUnrelated","addComponent","unrelated","addEntry","markAllFilesAsUnchanged","files","forEach","file","pathNormalizeToLinux","relative","FileStatus","unchanged","MergeOptions","ours","remoteId","idToLoad","theirs","componentWithDependencies","loadComponentWithDependenciesFromModel","updated","modifiedStatus","modifiedFiles","applyModifiedVersion","manyComponentsWriter","ManyComponentsWriter","componentsWithDependencies","installNpmPackages","override","writeConfig","verbose","writeAll","manual","unmergedPaths","f","conflict","filePath","setHead","markVersionAsLocal","getIdsForUnmerged","reset","removeComponent","fullName","abortedComponents","legacyBitIds","BitIds","fromArray","_legacy","resolvedComponents","localLaneObject","tmp","Tmp","componentsStatus","Promise","all","bitId","remoteScopeName","remoteLaneId","remoteLanes","laneIdStr","clear","getComponents","logger","debug","r","tagMessage","unmodified","idsStr","componentIds","resolveMultipleComponentIds","entry","GeneralError","unresolvedComponents","u","ComponentID","fromLegacy","hasWildcard","componentsList","ComponentsList","listComponentsByIdsWithWildcard","getParsedId","provider","cli","merging","register","MergeCmd","CLIAspect","WorkspaceAspect","SnappingAspect","CheckoutAspect","InstallAspect","MainRuntime","MergingAspect","addRuntime"],"sources":["merging.main.runtime.ts"],"sourcesContent":["import { CLIAspect, CLIMain, MainRuntime } from '@teambit/cli';\nimport WorkspaceAspect, { Workspace } from '@teambit/workspace';\nimport R from 'ramda';\nimport { Consumer } from '@teambit/legacy/dist/consumer';\nimport ComponentsList from '@teambit/legacy/dist/consumer/component/components-list';\nimport {\n ApplyVersionResults,\n MergeStrategy,\n mergeVersion,\n ApplyVersionResult,\n FailedComponents,\n FileStatus,\n getMergeStrategyInteractive,\n MergeOptions,\n} from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport { ConsumerNotFound } from '@teambit/legacy/dist/consumer/exceptions';\nimport SnappingAspect, { SnappingMain } from '@teambit/snapping';\nimport hasWildcard from '@teambit/legacy/dist/utils/string/has-wildcard';\nimport mapSeries from 'p-map-series';\nimport { BitId, BitIds } from '@teambit/legacy/dist/bit-id';\nimport { BitError } from '@teambit/bit-error';\nimport GeneralError from '@teambit/legacy/dist/error/general-error';\nimport { LaneId } from '@teambit/lane-id';\nimport logger from '@teambit/legacy/dist/logger/logger';\nimport { AutoTagResult } from '@teambit/legacy/dist/scope/component-ops/auto-tag';\nimport { getDivergeData } from '@teambit/legacy/dist/scope/component-ops/get-diverge-data';\nimport { UnmergedComponent } from '@teambit/legacy/dist/scope/lanes/unmerged-components';\nimport { Lane, Version } from '@teambit/legacy/dist/scope/models';\nimport { Ref } from '@teambit/legacy/dist/scope/objects';\nimport chalk from 'chalk';\nimport { Tmp } from '@teambit/legacy/dist/scope/repositories';\nimport { pathNormalizeToLinux } from '@teambit/legacy/dist/utils';\nimport ManyComponentsWriter from '@teambit/legacy/dist/consumer/component-ops/many-components-writer';\nimport ConsumerComponent from '@teambit/legacy/dist/consumer/component/consumer-component';\nimport { applyModifiedVersion } from '@teambit/legacy/dist/consumer/versions-ops/checkout-version';\nimport threeWayMerge, {\n MergeResultsThreeWay,\n} from '@teambit/legacy/dist/consumer/versions-ops/merge-version/three-way-merge';\nimport { NoCommonSnap } from '@teambit/legacy/dist/scope/exceptions/no-common-snap';\nimport { CheckoutAspect, CheckoutMain } from '@teambit/checkout';\nimport { ComponentID } from '@teambit/component-id';\nimport { DivergeData } from '@teambit/legacy/dist/scope/component-ops/diverge-data';\nimport { TagResults } from '@teambit/legacy/dist/api/consumer/lib/tag';\nimport { InstallMain, InstallAspect } from '@teambit/install';\nimport { MergeCmd } from './merge-cmd';\nimport { MergingAspect } from './merging.aspect';\n\ntype ResolveUnrelatedData = { strategy: MergeStrategy; head: Ref };\n\nexport type ComponentMergeStatus = {\n currentComponent?: ConsumerComponent \| null;\n componentFromModel?: Version;\n id: BitId;\n unmergedMessage?: string;\n unmergedLegitimately?: boolean; // failed to merge but for a legitimate reason, such as, up-to-date\n mergeResults?: MergeResultsThreeWay \| null;\n divergeData?: DivergeData;\n resolvedUnrelated?: ResolveUnrelatedData;\n};\n\nexport class MergingMain {\n private consumer: Consumer;\n constructor(\n private workspace: Workspace,\n private install: InstallMain,\n private snapping: SnappingMain,\n private checkout: CheckoutMain\n ) {\n this.consumer = this.workspace?.consumer;\n }\n\n /*\n merge components according to the \"values\" param.\n * if the first param is a version, then merge the component ids to that version.\n * otherwise, merge from the remote head to the local.\n /\n async merge(\n values: string[],\n mergeStrategy: MergeStrategy,\n abort: boolean,\n resolve: boolean,\n noSnap: boolean,\n message: string,\n build: boolean,\n skipDependencyInstallation: boolean\n ): Promise<ApplyVersionResults> {\n if (!this.workspace) throw new ConsumerNotFound();\n const consumer: Consumer = this.workspace.consumer;\n let mergeResults;\n const firstValue = R.head(values);\n if (resolve) {\n mergeResults = await this.resolveMerge(values, message, build);\n } else if (abort) {\n mergeResults = await this.abortMerge(values);\n } else if (!BitId.isValidVersion(firstValue)) {\n const bitIds = this.getComponentsToMerge(consumer, values);\n // @todo: version could be the lane only or remote/lane\n mergeResults = await this.mergeComponentsFromRemote(\n consumer,\n bitIds,\n mergeStrategy,\n noSnap,\n message,\n build,\n skipDependencyInstallation\n );\n } else {\n const version = firstValue;\n const ids = R.tail(values);\n const bitIds = this.getComponentsToMerge(consumer, ids);\n mergeResults = await mergeVersion(consumer, version, bitIds, mergeStrategy);\n }\n await consumer.onDestroy();\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: BitId[],\n mergeStrategy: MergeStrategy,\n noSnap: 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(bitIds, currentLaneId, currentLaneObject);\n const failedComponents = allComponentsStatus.filter((c) => c.unmergedMessage && !c.unmergedLegitimately);\n if (failedComponents.length) {\n const failureMsgs = failedComponents\n .map(\n (failedComponent) =>\n `${chalk.bold(failedComponent.id.toString())} - ${chalk.red(failedComponent.unmergedMessage as string)}`\n )\n .join('\\n');\n throw new BitError(`unable to merge due to the following failures:\\n${failureMsgs}`);\n }\n\n return this.mergeSnaps({\n mergeStrategy,\n allComponentsStatus,\n laneId: currentLaneId,\n localLane: currentLaneObject,\n noSnap,\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 laneId,\n localLane,\n noSnap,\n tag,\n snapMessage,\n build,\n skipDependencyInstallation,\n }: {\n mergeStrategy: MergeStrategy;\n allComponentsStatus: ComponentMergeStatus[];\n laneId: LaneId;\n localLane: Lane \| null;\n noSnap: boolean;\n tag?: boolean;\n snapMessage: string;\n build: boolean;\n skipDependencyInstallation?: boolean;\n }): Promise<ApplyVersionResults> {\n const consumer = this.workspace.consumer;\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.unmergedMessage)\n .map((componentStatus) => ({\n id: componentStatus.id,\n failureMessage: componentStatus.unmergedMessage as string,\n unchangedLegitimately: componentStatus.unmergedLegitimately,\n }));\n const succeededComponents = allComponentsStatus.filter((componentStatus) => !componentStatus.unmergedMessage);\n // do not use Promise.all for applyVersion. otherwise, it'll write all components in parallel,\n // which can be an issue when some components are also dependencies of others\n const componentsResults = await mapSeries(\n succeededComponents,\n async ({ currentComponent, id, mergeResults, resolvedUnrelated }) => {\n const modelComponent = await consumer.scope.getModelComponent(id);\n const updatedLaneId = laneId.isDefault() ? LaneId.from(laneId.name, id.scope as string) : laneId;\n return this.applyVersion({\n currentComponent,\n id,\n mergeResults,\n mergeStrategy,\n remoteHead: modelComponent.getRef(id.version as string) as Ref,\n laneId: updatedLaneId,\n localLane,\n resolvedUnrelated,\n });\n }\n );\n\n const leftUnresolvedConflicts = componentWithConflict && mergeStrategy === 'manual';\n\n if (!skipDependencyInstallation && !leftUnresolvedConflicts) {\n await this.install.install(undefined, {\n dedupe: true,\n updateExisting: false,\n import: false,\n });\n }\n\n if (localLane) consumer.scope.objects.add(localLane);\n\n await consumer.scope.objects.persist(); // persist anyway, if localLane is null it should save all main heads\n\n await consumer.scope.objects.unmergedComponents.write();\n\n const getSnapOrTagResults = async () => {\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 (noSnap \|\| leftUnresolvedConflicts) {\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 } = results;\n return { snappedComponents: taggedComponents, autoSnappedResults: autoTaggedResults };\n }\n return this.snapResolvedComponents(consumer, snapMessage, build);\n };\n const mergeSnapResults = await getSnapOrTagResults();\n\n return {\n components: componentsResults,\n failedComponents,\n mergeSnapResults,\n leftUnresolvedConflicts,\n };\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 * @param id\n * @param localLane\n * @param otherLaneName\n * @param existingOnWorkspaceOnly\n * @returns\n */\n async getComponentMergeStatus(\n id: BitId, // the id.version is the version we want to merge to the current component\n localLane: Lane \| null, // currently checked out lane. if on main, then it's null.\n otherLaneName: string, // the lane name we want to merged to our lane. (can be also \"main\").\n options?: { resolveUnrelated?: MergeStrategy; ignoreConfigChanges?: boolean }\n ): Promise<ComponentMergeStatus> {\n const consumer = this.workspace.consumer;\n const componentStatus: ComponentMergeStatus = { id };\n const returnUnmerged = (msg: string, unmergedLegitimately = false) => {\n componentStatus.unmergedMessage = msg;\n componentStatus.unmergedLegitimately = unmergedLegitimately;\n return componentStatus;\n };\n const modelComponent = await consumer.scope.getModelComponentIfExist(id);\n if (!modelComponent) {\n return returnUnmerged(\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 = consumer.scope.objects.unmergedComponents.getEntry(id.name);\n if (unmerged) {\n return returnUnmerged(\n `component ${id.toStringWithoutVersion()} is in during-merge state a previous merge, please snap/tag it first (or use bit merge --resolve/--abort)`\n );\n }\n const repo = consumer.scope.objects;\n const version = id.version as string;\n const otherLaneHead = modelComponent.getRef(version);\n const existingBitMapId = consumer.bitMap.getBitIdIfExist(id, { ignoreVersion: true });\n const componentOnLane: Version = await modelComponent.loadVersion(version, consumer.scope.objects);\n if (componentOnLane.isRemoved()) {\n return returnUnmerged(`component has been removed`, true);\n }\n const getCurrentId = () => {\n if (existingBitMapId) return existingBitMapId;\n if (localLane) {\n const idOnLane = localLane.getComponent(id);\n if (!idOnLane) return null;\n return idOnLane.id.changeVersion(idOnLane.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, otherLaneHead, null, false);\n return { currentComponent: null, componentFromModel: componentOnLane, id, mergeResults: null, divergeData };\n }\n const getCurrentComponent = () => {\n if (existingBitMapId) return consumer.loadComponent(existingBitMapId);\n return consumer.scope.getConsumerComponent(currentId);\n };\n const currentComponent = await getCurrentComponent();\n const isModified = async () => {\n const componentModificationStatus = await consumer.getComponentStatusById(currentComponent.id);\n if (!componentModificationStatus.modified) return false;\n if (!existingBitMapId) return false;\n const baseComponent = await modelComponent.loadVersion(\n existingBitMapId.version as string,\n consumer.scope.objects\n );\n return options?.ignoreConfigChanges\n ? consumer.isComponentSourceCodeModified(baseComponent, currentComponent)\n : true;\n };\n\n const isComponentModified = await isModified();\n\n if (isComponentModified) {\n return returnUnmerged(`component is modified, please snap/tag it first`);\n }\n const laneHeadIsDifferentThanCheckedOut =\n localLane && existingBitMapId?.version && modelComponent.laneHeadLocal?.toString() !== existingBitMapId?.version;\n const localHead = laneHeadIsDifferentThanCheckedOut ? Ref.from(existingBitMapId.version) : null;\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(repo, modelComponent, otherLaneHead, localHead, false);\n if (divergeData.err) {\n const mainHead = modelComponent.head;\n if (divergeData.err instanceof NoCommonSnap && options?.resolveUnrelated && mainHead) {\n const hasResolvedLocally = divergeData.snapsOnLocalOnly.find((snap) => mainHead.isEqual(snap));\n const hasResolvedRemotely = divergeData.snapsOnRemoteOnly.find((snap) => mainHead.isEqual(snap));\n if (!hasResolvedLocally && !hasResolvedRemotely) {\n return returnUnmerged(\n `unable to traverse ${currentComponent.id.toString()} history. the main-head ${mainHead.toString()} doesn't appear in both lanes, it was probably created in each lane separately`\n );\n }\n const versionToSaveInLane = hasResolvedLocally ? currentComponent.id.version : id.version;\n const resolvedRef = modelComponent.getRef(versionToSaveInLane as string);\n if (!resolvedRef) throw new Error(`unable to get ref of \"${versionToSaveInLane}\" for \"${id.toString()}\"`);\n if (options?.resolveUnrelated === 'theirs') {\n // just override with the model data\n return {\n currentComponent,\n componentFromModel: componentOnLane,\n id,\n mergeResults: null,\n divergeData,\n resolvedUnrelated: { strategy: 'theirs', head: resolvedRef },\n };\n }\n if (options?.resolveUnrelated === 'ours') {\n return {\n currentComponent,\n id,\n mergeResults: null,\n divergeData,\n resolvedUnrelated: { strategy: 'ours', head: resolvedRef },\n };\n }\n throw new Error(\n `unsupported strategy \"${options?.resolveUnrelated}\" of resolve-unrelated. supported strategies are: [ours, theirs]`\n );\n }\n return returnUnmerged(\n `unable to traverse ${currentComponent.id.toString()} history. error: ${divergeData.err.message}`\n );\n }\n if (!divergeData.isDiverged()) {\n if (divergeData.isLocalAhead()) {\n // do nothing!\n return returnUnmerged(`component ${currentComponent.id.toString()} is ahead, nothing to merge`, true);\n }\n if (divergeData.isRemoteAhead()) {\n // just override with the model data\n return {\n currentComponent,\n componentFromModel: componentOnLane,\n id,\n mergeResults: null,\n divergeData,\n };\n }\n // we know that localHead and remoteHead are set, so if none of them is ahead they must be equal\n return returnUnmerged(`component ${currentComponent.id.toString()} is already merged`, true);\n }\n const baseSnap = divergeData.commonSnapBeforeDiverge as Ref; // must be set when isTrueMerge\n const baseComponent: Version = await modelComponent.loadVersion(baseSnap.toString(), repo);\n const otherComponent: Version = await modelComponent.loadVersion(otherLaneHead.toString(), repo);\n const currentLaneName = localLane?.toLaneId().toString() \|\| 'main';\n const mergeResults = await threeWayMerge({\n consumer,\n otherComponent,\n otherLabel: `${otherLaneHead.toString()} (${otherLaneName})`,\n currentComponent,\n currentLabel: `${currentId.version} (${currentLaneName})`,\n baseComponent,\n });\n return { currentComponent, id, mergeResults, divergeData };\n }\n\n private async applyVersion({\n currentComponent,\n id,\n mergeResults,\n mergeStrategy,\n remoteHead,\n laneId,\n localLane,\n resolvedUnrelated,\n }: {\n currentComponent: ConsumerComponent \| null \| undefined;\n id: BitId;\n mergeResults: MergeResultsThreeWay \| null \| undefined;\n mergeStrategy: MergeStrategy;\n remoteHead: Ref;\n laneId: LaneId;\n localLane: Lane \| null;\n resolvedUnrelated?: ResolveUnrelatedData;\n }): Promise<ApplyVersionResult> {\n const consumer = this.workspace.consumer;\n let filesStatus = {};\n const unmergedComponent: UnmergedComponent = {\n // @ts-ignore\n id: { name: id.name, scope: id.scope },\n head: remoteHead,\n remote: laneId.scope, // @todo: remove. it has been deprecated around 0.0.832\n lane: laneId.name, // @todo: remove. it has been deprecated around 0.0.832\n laneId,\n };\n id = currentComponent ? currentComponent.id : id;\n\n const modelComponent = await consumer.scope.getModelComponent(id);\n const handleResolveUnrelated = () => {\n if (!currentComponent) throw new Error('currentComponent must be defined when resolvedUnrelated');\n if (!localLane) throw new Error('localLane must be defined when resolvedUnrelated');\n if (!resolvedUnrelated?.head) throw new Error('resolvedUnrelated must have head prop');\n localLane.addComponent({ id, head: resolvedUnrelated.head });\n const head = modelComponent.getRef(currentComponent.id.version as string);\n if (!head) throw new Error(`unable to get the head for resolved-unrelated ${id.toString()}`);\n unmergedComponent.laneId = localLane.toLaneId();\n unmergedComponent.head = head;\n unmergedComponent.unrelated = true;\n consumer.scope.objects.unmergedComponents.addEntry(unmergedComponent);\n return { id, filesStatus };\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 consumer.scope.objects.unmergedComponents.addEntry(unmergedComponent);\n return { id, filesStatus };\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 componentWithDependencies = await consumer.loadComponentWithDependenciesFromModel(idToLoad);\n const files = componentWithDependencies.component.files;\n files.forEach((file) => {\n // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n filesStatus[pathNormalizeToLinux(file.relative)] = FileStatus.updated;\n });\n\n if (mergeResults) {\n // update files according to the merge results\n const { filesStatus: modifiedStatus, modifiedFiles } = applyModifiedVersion(files, mergeResults, mergeStrategy);\n componentWithDependencies.component.files = modifiedFiles;\n filesStatus = { ...filesStatus, ...modifiedStatus };\n }\n\n const manyComponentsWriter = new ManyComponentsWriter({\n consumer,\n componentsWithDependencies: [componentWithDependencies],\n installNpmPackages: false,\n override: true,\n writeConfig: false, // @todo: should write if config exists before, needs to figure out how to do it.\n verbose: false, // @todo: do we need a flag here?\n });\n await manyComponentsWriter.writeAll();\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 consumer.scope.objects.unmergedComponents.addEntry(unmergedComponent);\n } else if (localLane) {\n if (resolvedUnrelated) {\n // must be \"theirs\"\n return handleResolveUnrelated();\n }\n localLane.addComponent({ id, head: remoteHead });\n } else {\n // this is main\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 consumer.scope.objects.add(modelComponent);\n }\n\n return { id, filesStatus };\n }\n\n private async abortMerge(values: string[]): Promise<ApplyVersionResults> {\n const consumer = this.workspace.consumer;\n const ids = await this.getIdsForUnmerged(values);\n const results = await this.checkout.checkout({ ids, reset: true });\n ids.forEach((id) => consumer.scope.objects.unmergedComponents.removeComponent(id.fullName));\n await consumer.scope.objects.unmergedComponents.write();\n return { abortedComponents: results.components };\n }\n\n private async resolveMerge(values: string[], snapMessage: string, build: boolean): Promise<ApplyVersionResults> {\n const ids = await this.getIdsForUnmerged(values);\n // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n const { snappedComponents } = await this.snapping.snap({\n legacyBitIds: BitIds.fromArray(ids.map((id) => id._legacy)),\n build,\n message: snapMessage,\n });\n return { resolvedComponents: snappedComponents };\n }\n\n private async getAllComponentsStatus(\n bitIds: BitId[],\n laneId: LaneId,\n localLaneObject: Lane \| null\n ): Promise<ComponentMergeStatus[]> {\n const tmp = new Tmp(this.consumer.scope);\n try {\n const componentsStatus = 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.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 return this.getComponentMergeStatus(bitId.changeVersion(remoteHead.toString()), localLaneObject, laneIdStr);\n })\n );\n await tmp.clear();\n return componentsStatus;\n } catch (err: any) {\n await tmp.clear();\n throw err;\n }\n }\n\n private async snapResolvedComponents(\n consumer: Consumer,\n snapMessage: string,\n build: boolean\n ): Promise<null \| { snappedComponents: ConsumerComponent[]; autoSnappedResults: AutoTagResult[] }> {\n const unmergedComponents = consumer.scope.objects.unmergedComponents.getComponents();\n logger.debug(`merge-snaps, snapResolvedComponents, total ${unmergedComponents.length.toString()} components`);\n if (!unmergedComponents.length) return null;\n const ids = BitIds.fromArray(unmergedComponents.map((r) => new BitId(r.id)));\n return this.snapping.snap({\n legacyBitIds: ids,\n build,\n message: snapMessage,\n });\n }\n\n private async tagAllLaneComponent(idsToTag: BitId[], tagMessage: string, build: boolean): Promise<TagResults \| null> {\n const ids = idsToTag.map((id) => {\n return id.toStringWithoutVersion();\n });\n 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(idsStr?: string[]): Promise<ComponentID[]> {\n if (idsStr && idsStr.length) {\n const componentIds = await this.workspace.resolveMultipleComponentIds(idsStr);\n componentIds.forEach((id) => {\n const entry = this.workspace.consumer.scope.objects.unmergedComponents.getEntry(id.fullName);\n if (!entry) {\n throw new GeneralError(`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 GeneralError(`all components are resolved already, nothing to do`);\n return unresolvedComponents.map((u) => ComponentID.fromLegacy(new BitId(u.id)));\n }\n\n private getComponentsToMerge(consumer: Consumer, ids: string[]): BitId[] {\n if (hasWildcard(ids)) {\n const componentsList = new ComponentsList(consumer);\n return componentsList.listComponentsByIdsWithWildcard(ids);\n }\n return ids.map((id) => consumer.getParsedId(id));\n }\n\n static slots = [];\n static dependencies = [CLIAspect, WorkspaceAspect, SnappingAspect, CheckoutAspect, InstallAspect];\n static runtime = MainRuntime;\n static async provider([cli, workspace, snapping, checkout, install]: [\n CLIMain,\n Workspace,\n SnappingMain,\n CheckoutMain,\n InstallMain\n ]) {\n const merging = new MergingMain(workspace, install, snapping, checkout);\n cli.register(new MergeCmd(merging));\n return merging;\n }\n}\n\nMergingAspect.addRuntime(MergingMain);\n"],"mappings":"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"}
1	+ {"version":3,"names":["MergingMain","constructor","workspace","install","snapping","checkout","consumer","merge","values","mergeStrategy","abort","resolve","noSnap","message","build","skipDependencyInstallation","ConsumerNotFound","mergeResults","firstValue","R","head","resolveMerge","abortMerge","BitId","isValidVersion","bitIds","getComponentsToMerge","mergeComponentsFromRemote","version","ids","tail","mergeVersion","onDestroy","snapMessage","currentLaneId","getCurrentLaneId","currentLaneObject","getCurrentLaneObject","allComponentsStatus","getAllComponentsStatus","failedComponents","filter","c","unmergedMessage","unmergedLegitimately","length","failureMsgs","map","failedComponent","chalk","bold","id","toString","red","join","BitError","mergeSnaps","laneId","localLane","tag","componentWithConflict","find","component","hasConflicts","getMergeStrategyInteractive","componentStatus","failureMessage","unchangedLegitimately","succeededComponents","componentsResults","mapSeries","currentComponent","resolvedUnrelated","modelComponent","scope","getModelComponent","updatedLaneId","isDefault","LaneId","from","name","applyVersion","remoteHead","getRef","leftUnresolvedConflicts","undefined","dedupe","updateExisting","import","objects","add","persist","unmergedComponents","write","getSnapOrTagResults","idsToTag","results","tagAllLaneComponent","taggedComponents","autoTaggedResults","snappedComponents","autoSnappedResults","snapResolvedComponents","mergeSnapResults","components","getComponentMergeStatus","otherLaneName","options","returnUnmerged","msg","getModelComponentIfExist","unmerged","getEntry","toStringWithoutVersion","repo","otherLaneHead","existingBitMapId","bitMap","getBitIdIfExist","ignoreVersion","componentOnLane","loadVersion","isRemoved","getCurrentId","idOnLane","getComponent","changeVersion","getHeadAsTagIfExist","currentId","divergeData","getDivergeData","componentFromModel","getCurrentComponent","loadComponent","getConsumerComponent","isModified","componentModificationStatus","getComponentStatusById","modified","baseComponent","ignoreConfigChanges","isComponentSourceCodeModified","isComponentModified","laneHeadIsDifferentThanCheckedOut","laneHeadLocal","localHead","Ref","Error","err","mainHead","NoCommonSnap","resolveUnrelated","hasResolvedFromMain","hashToCompare","divergeDataFromMain","hasResolvedLocally","hasResolvedRemotely","versionToSaveInLane","resolvedRef","strategy","isDiverged","isLocalAhead","isRemoteAhead","baseSnap","commonSnapBeforeDiverge","otherComponent","currentLaneName","toLaneId","threeWayMerge","otherLabel","currentLabel","filesStatus","unmergedComponent","remote","lane","handleResolveUnrelated","addComponent","unrelated","addEntry","markAllFilesAsUnchanged","files","forEach","file","pathNormalizeToLinux","relative","FileStatus","unchanged","MergeOptions","ours","remoteId","idToLoad","theirs","componentWithDependencies","loadComponentWithDependenciesFromModel","updated","modifiedStatus","modifiedFiles","applyModifiedVersion","manyComponentsWriter","ManyComponentsWriter","componentsWithDependencies","installNpmPackages","override","writeConfig","verbose","writeAll","manual","unmergedPaths","f","conflict","filePath","setHead","markVersionAsLocal","getIdsForUnmerged","reset","removeComponent","fullName","abortedComponents","snap","legacyBitIds","BitIds","fromArray","_legacy","resolvedComponents","localLaneObject","tmp","Tmp","componentsStatus","Promise","all","bitId","remoteScopeName","remoteLaneId","remoteLanes","laneIdStr","clear","getComponents","logger","debug","r","tagMessage","unmodified","idsStr","componentIds","resolveMultipleComponentIds","entry","GeneralError","unresolvedComponents","u","ComponentID","fromLegacy","hasWildcard","componentsList","ComponentsList","listComponentsByIdsWithWildcard","getParsedId","provider","cli","merging","register","MergeCmd","CLIAspect","WorkspaceAspect","SnappingAspect","CheckoutAspect","InstallAspect","MainRuntime","MergingAspect","addRuntime"],"sources":["merging.main.runtime.ts"],"sourcesContent":["import { CLIAspect, CLIMain, MainRuntime } from '@teambit/cli';\nimport WorkspaceAspect, { Workspace } from '@teambit/workspace';\nimport R from 'ramda';\nimport { Consumer } from '@teambit/legacy/dist/consumer';\nimport ComponentsList from '@teambit/legacy/dist/consumer/component/components-list';\nimport {\n ApplyVersionResults,\n MergeStrategy,\n mergeVersion,\n ApplyVersionResult,\n FailedComponents,\n FileStatus,\n getMergeStrategyInteractive,\n MergeOptions,\n} from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport { ConsumerNotFound } from '@teambit/legacy/dist/consumer/exceptions';\nimport SnappingAspect, { SnappingMain } from '@teambit/snapping';\nimport hasWildcard from '@teambit/legacy/dist/utils/string/has-wildcard';\nimport mapSeries from 'p-map-series';\nimport { BitId, BitIds } from '@teambit/legacy/dist/bit-id';\nimport { BitError } from '@teambit/bit-error';\nimport GeneralError from '@teambit/legacy/dist/error/general-error';\nimport { LaneId } from '@teambit/lane-id';\nimport logger from '@teambit/legacy/dist/logger/logger';\nimport { AutoTagResult } from '@teambit/legacy/dist/scope/component-ops/auto-tag';\nimport { getDivergeData } from '@teambit/legacy/dist/scope/component-ops/get-diverge-data';\nimport { UnmergedComponent } from '@teambit/legacy/dist/scope/lanes/unmerged-components';\nimport { Lane, Version } from '@teambit/legacy/dist/scope/models';\nimport { Ref } from '@teambit/legacy/dist/scope/objects';\nimport chalk from 'chalk';\nimport { Tmp } from '@teambit/legacy/dist/scope/repositories';\nimport { pathNormalizeToLinux } from '@teambit/legacy/dist/utils';\nimport ManyComponentsWriter from '@teambit/legacy/dist/consumer/component-ops/many-components-writer';\nimport ConsumerComponent from '@teambit/legacy/dist/consumer/component/consumer-component';\nimport { applyModifiedVersion } from '@teambit/legacy/dist/consumer/versions-ops/checkout-version';\nimport threeWayMerge, {\n MergeResultsThreeWay,\n} from '@teambit/legacy/dist/consumer/versions-ops/merge-version/three-way-merge';\nimport { NoCommonSnap } from '@teambit/legacy/dist/scope/exceptions/no-common-snap';\nimport { CheckoutAspect, CheckoutMain } from '@teambit/checkout';\nimport { ComponentID } from '@teambit/component-id';\nimport { DivergeData } from '@teambit/legacy/dist/scope/component-ops/diverge-data';\nimport { TagResults } from '@teambit/legacy/dist/api/consumer/lib/tag';\nimport { InstallMain, InstallAspect } from '@teambit/install';\nimport { MergeCmd } from './merge-cmd';\nimport { MergingAspect } from './merging.aspect';\n\ntype ResolveUnrelatedData = { strategy: MergeStrategy; head: Ref };\n\nexport type ComponentMergeStatus = {\n currentComponent?: ConsumerComponent \| null;\n componentFromModel?: Version;\n id: BitId;\n unmergedMessage?: string;\n unmergedLegitimately?: boolean; // failed to merge but for a legitimate reason, such as, up-to-date\n mergeResults?: MergeResultsThreeWay \| null;\n divergeData?: DivergeData;\n resolvedUnrelated?: ResolveUnrelatedData;\n};\n\nexport class MergingMain {\n private consumer: Consumer;\n constructor(\n private workspace: Workspace,\n private install: InstallMain,\n private snapping: SnappingMain,\n private checkout: CheckoutMain\n ) {\n this.consumer = this.workspace?.consumer;\n }\n\n /*\n merge components according to the \"values\" param.\n * if the first param is a version, then merge the component ids to that version.\n * otherwise, merge from the remote head to the local.\n /\n async merge(\n values: string[],\n mergeStrategy: MergeStrategy,\n abort: boolean,\n resolve: boolean,\n noSnap: boolean,\n message: string,\n build: boolean,\n skipDependencyInstallation: boolean\n ): Promise<ApplyVersionResults> {\n if (!this.workspace) throw new ConsumerNotFound();\n const consumer: Consumer = this.workspace.consumer;\n let mergeResults;\n const firstValue = R.head(values);\n if (resolve) {\n mergeResults = await this.resolveMerge(values, message, build);\n } else if (abort) {\n mergeResults = await this.abortMerge(values);\n } else if (!BitId.isValidVersion(firstValue)) {\n const bitIds = this.getComponentsToMerge(consumer, values);\n // @todo: version could be the lane only or remote/lane\n mergeResults = await this.mergeComponentsFromRemote(\n consumer,\n bitIds,\n mergeStrategy,\n noSnap,\n message,\n build,\n skipDependencyInstallation\n );\n } else {\n const version = firstValue;\n const ids = R.tail(values);\n const bitIds = this.getComponentsToMerge(consumer, ids);\n mergeResults = await mergeVersion(consumer, version, bitIds, mergeStrategy);\n }\n await consumer.onDestroy();\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: BitId[],\n mergeStrategy: MergeStrategy,\n noSnap: 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(bitIds, currentLaneId, currentLaneObject);\n const failedComponents = allComponentsStatus.filter((c) => c.unmergedMessage && !c.unmergedLegitimately);\n if (failedComponents.length) {\n const failureMsgs = failedComponents\n .map(\n (failedComponent) =>\n `${chalk.bold(failedComponent.id.toString())} - ${chalk.red(failedComponent.unmergedMessage as string)}`\n )\n .join('\\n');\n throw new BitError(`unable to merge due to the following failures:\\n${failureMsgs}`);\n }\n\n return this.mergeSnaps({\n mergeStrategy,\n allComponentsStatus,\n laneId: currentLaneId,\n localLane: currentLaneObject,\n noSnap,\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 laneId,\n localLane,\n noSnap,\n tag,\n snapMessage,\n build,\n skipDependencyInstallation,\n }: {\n mergeStrategy: MergeStrategy;\n allComponentsStatus: ComponentMergeStatus[];\n laneId: LaneId;\n localLane: Lane \| null;\n noSnap: boolean;\n tag?: boolean;\n snapMessage: string;\n build: boolean;\n skipDependencyInstallation?: boolean;\n }): Promise<ApplyVersionResults> {\n const consumer = this.workspace.consumer;\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.unmergedMessage)\n .map((componentStatus) => ({\n id: componentStatus.id,\n failureMessage: componentStatus.unmergedMessage as string,\n unchangedLegitimately: componentStatus.unmergedLegitimately,\n }));\n const succeededComponents = allComponentsStatus.filter((componentStatus) => !componentStatus.unmergedMessage);\n // do not use Promise.all for applyVersion. otherwise, it'll write all components in parallel,\n // which can be an issue when some components are also dependencies of others\n const componentsResults = await mapSeries(\n succeededComponents,\n async ({ currentComponent, id, mergeResults, resolvedUnrelated }) => {\n const modelComponent = await consumer.scope.getModelComponent(id);\n const updatedLaneId = laneId.isDefault() ? LaneId.from(laneId.name, id.scope as string) : laneId;\n return this.applyVersion({\n currentComponent,\n id,\n mergeResults,\n mergeStrategy,\n remoteHead: modelComponent.getRef(id.version as string) as Ref,\n laneId: updatedLaneId,\n localLane,\n resolvedUnrelated,\n });\n }\n );\n\n const leftUnresolvedConflicts = componentWithConflict && mergeStrategy === 'manual';\n\n if (!skipDependencyInstallation && !leftUnresolvedConflicts) {\n await this.install.install(undefined, {\n dedupe: true,\n updateExisting: false,\n import: false,\n });\n }\n\n if (localLane) consumer.scope.objects.add(localLane);\n\n await consumer.scope.objects.persist(); // persist anyway, if localLane is null it should save all main heads\n\n await consumer.scope.objects.unmergedComponents.write();\n\n const getSnapOrTagResults = async () => {\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 (noSnap \|\| leftUnresolvedConflicts) {\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 } = results;\n return { snappedComponents: taggedComponents, autoSnappedResults: autoTaggedResults };\n }\n return this.snapResolvedComponents(consumer, snapMessage, build);\n };\n const mergeSnapResults = await getSnapOrTagResults();\n\n return {\n components: componentsResults,\n failedComponents,\n mergeSnapResults,\n leftUnresolvedConflicts,\n };\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 * @param id\n * @param localLane\n * @param otherLaneName\n * @param existingOnWorkspaceOnly\n * @returns\n */\n async getComponentMergeStatus(\n id: BitId, // the id.version is the version we want to merge to the current component\n localLane: Lane \| null, // currently checked out lane. if on main, then it's null.\n otherLaneName: string, // the lane name we want to merged to our lane. (can be also \"main\").\n options?: { resolveUnrelated?: MergeStrategy; ignoreConfigChanges?: boolean }\n ): Promise<ComponentMergeStatus> {\n const consumer = this.workspace.consumer;\n const componentStatus: ComponentMergeStatus = { id };\n const returnUnmerged = (msg: string, unmergedLegitimately = false) => {\n componentStatus.unmergedMessage = msg;\n componentStatus.unmergedLegitimately = unmergedLegitimately;\n return componentStatus;\n };\n const modelComponent = await consumer.scope.getModelComponentIfExist(id);\n if (!modelComponent) {\n return returnUnmerged(\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 = consumer.scope.objects.unmergedComponents.getEntry(id.name);\n if (unmerged) {\n return returnUnmerged(\n `component ${id.toStringWithoutVersion()} is in during-merge state a previous merge, please snap/tag it first (or use bit merge --resolve/--abort)`\n );\n }\n const repo = consumer.scope.objects;\n const version = id.version as string;\n const otherLaneHead = modelComponent.getRef(version);\n const existingBitMapId = consumer.bitMap.getBitIdIfExist(id, { ignoreVersion: true });\n const componentOnLane: Version = await modelComponent.loadVersion(version, consumer.scope.objects);\n if (componentOnLane.isRemoved()) {\n return returnUnmerged(`component has been removed`, true);\n }\n const getCurrentId = () => {\n if (existingBitMapId) return existingBitMapId;\n if (localLane) {\n const idOnLane = localLane.getComponent(id);\n if (!idOnLane) return null;\n return idOnLane.id.changeVersion(idOnLane.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, otherLaneHead, null, false);\n return { currentComponent: null, componentFromModel: componentOnLane, id, mergeResults: null, divergeData };\n }\n const getCurrentComponent = () => {\n if (existingBitMapId) return consumer.loadComponent(existingBitMapId);\n return consumer.scope.getConsumerComponent(currentId);\n };\n const currentComponent = await getCurrentComponent();\n const isModified = async () => {\n const componentModificationStatus = await consumer.getComponentStatusById(currentComponent.id);\n if (!componentModificationStatus.modified) return false;\n if (!existingBitMapId) return false;\n const baseComponent = await modelComponent.loadVersion(\n existingBitMapId.version as string,\n consumer.scope.objects\n );\n return options?.ignoreConfigChanges\n ? consumer.isComponentSourceCodeModified(baseComponent, currentComponent)\n : true;\n };\n\n const isComponentModified = await isModified();\n\n if (isComponentModified) {\n return returnUnmerged(`component is modified, please snap/tag it first`);\n }\n const laneHeadIsDifferentThanCheckedOut =\n localLane && existingBitMapId?.version && modelComponent.laneHeadLocal?.toString() !== existingBitMapId?.version;\n const localHead = laneHeadIsDifferentThanCheckedOut ? Ref.from(existingBitMapId.version) : null;\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(repo, modelComponent, otherLaneHead, localHead, false);\n if (divergeData.err) {\n const mainHead = modelComponent.head;\n if (divergeData.err instanceof NoCommonSnap && options?.resolveUnrelated && mainHead) {\n const hasResolvedFromMain = async (hashToCompare: Ref \| null) => {\n const divergeDataFromMain = await getDivergeData(repo, modelComponent, mainHead, hashToCompare, false);\n if (!divergeDataFromMain.err) return true;\n return !(divergeDataFromMain.err instanceof NoCommonSnap);\n };\n const hasResolvedLocally = await hasResolvedFromMain(localHead);\n const hasResolvedRemotely = await hasResolvedFromMain(otherLaneHead);\n if (!hasResolvedLocally && !hasResolvedRemotely) {\n return returnUnmerged(\n `unable to traverse ${currentComponent.id.toString()} history. the main-head ${mainHead.toString()} doesn't appear in both lanes, it was probably created in each lane separately`\n );\n }\n const versionToSaveInLane = hasResolvedLocally ? currentComponent.id.version : id.version;\n const resolvedRef = modelComponent.getRef(versionToSaveInLane as string);\n if (!resolvedRef) throw new Error(`unable to get ref of \"${versionToSaveInLane}\" for \"${id.toString()}\"`);\n if (options?.resolveUnrelated === 'theirs') {\n // just override with the model data\n return {\n currentComponent,\n componentFromModel: componentOnLane,\n id,\n mergeResults: null,\n divergeData,\n resolvedUnrelated: { strategy: 'theirs', head: resolvedRef },\n };\n }\n if (options?.resolveUnrelated === 'ours') {\n return {\n currentComponent,\n id,\n mergeResults: null,\n divergeData,\n resolvedUnrelated: { strategy: 'ours', head: resolvedRef },\n };\n }\n throw new Error(\n `unsupported strategy \"${options?.resolveUnrelated}\" of resolve-unrelated. supported strategies are: [ours, theirs]`\n );\n }\n return returnUnmerged(\n `unable to traverse ${currentComponent.id.toString()} history. error: ${divergeData.err.message}`\n );\n }\n if (!divergeData.isDiverged()) {\n if (divergeData.isLocalAhead()) {\n // do nothing!\n return returnUnmerged(`component ${currentComponent.id.toString()} is ahead, nothing to merge`, true);\n }\n if (divergeData.isRemoteAhead()) {\n // just override with the model data\n return {\n currentComponent,\n componentFromModel: componentOnLane,\n id,\n mergeResults: null,\n divergeData,\n };\n }\n // we know that localHead and remoteHead are set, so if none of them is ahead they must be equal\n return returnUnmerged(`component ${currentComponent.id.toString()} is already merged`, true);\n }\n const baseSnap = divergeData.commonSnapBeforeDiverge as Ref; // must be set when isTrueMerge\n const baseComponent: Version = await modelComponent.loadVersion(baseSnap.toString(), repo);\n const otherComponent: Version = await modelComponent.loadVersion(otherLaneHead.toString(), repo);\n const currentLaneName = localLane?.toLaneId().toString() \|\| 'main';\n const mergeResults = await threeWayMerge({\n consumer,\n otherComponent,\n otherLabel: `${otherLaneHead.toString()} (${otherLaneName})`,\n currentComponent,\n currentLabel: `${currentId.version} (${currentLaneName})`,\n baseComponent,\n });\n return { currentComponent, id, mergeResults, divergeData };\n }\n\n private async applyVersion({\n currentComponent,\n id,\n mergeResults,\n mergeStrategy,\n remoteHead,\n laneId,\n localLane,\n resolvedUnrelated,\n }: {\n currentComponent: ConsumerComponent \| null \| undefined;\n id: BitId;\n mergeResults: MergeResultsThreeWay \| null \| undefined;\n mergeStrategy: MergeStrategy;\n remoteHead: Ref;\n laneId: LaneId;\n localLane: Lane \| null;\n resolvedUnrelated?: ResolveUnrelatedData;\n }): Promise<ApplyVersionResult> {\n const consumer = this.workspace.consumer;\n let filesStatus = {};\n const unmergedComponent: UnmergedComponent = {\n // @ts-ignore\n id: { name: id.name, scope: id.scope },\n head: remoteHead,\n remote: laneId.scope, // @todo: remove. it has been deprecated around 0.0.832\n lane: laneId.name, // @todo: remove. it has been deprecated around 0.0.832\n laneId,\n };\n id = currentComponent ? currentComponent.id : id;\n\n const modelComponent = await consumer.scope.getModelComponent(id);\n const handleResolveUnrelated = () => {\n if (!currentComponent) throw new Error('currentComponent must be defined when resolvedUnrelated');\n if (!localLane) throw new Error('localLane must be defined when resolvedUnrelated');\n if (!resolvedUnrelated?.head) throw new Error('resolvedUnrelated must have head prop');\n localLane.addComponent({ id, head: resolvedUnrelated.head });\n const head = modelComponent.getRef(currentComponent.id.version as string);\n if (!head) throw new Error(`unable to get the head for resolved-unrelated ${id.toString()}`);\n unmergedComponent.laneId = localLane.toLaneId();\n unmergedComponent.head = head;\n unmergedComponent.unrelated = true;\n consumer.scope.objects.unmergedComponents.addEntry(unmergedComponent);\n return { id, filesStatus };\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 consumer.scope.objects.unmergedComponents.addEntry(unmergedComponent);\n return { id, filesStatus };\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 componentWithDependencies = await consumer.loadComponentWithDependenciesFromModel(idToLoad);\n const files = componentWithDependencies.component.files;\n files.forEach((file) => {\n // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n filesStatus[pathNormalizeToLinux(file.relative)] = FileStatus.updated;\n });\n\n if (mergeResults) {\n // update files according to the merge results\n const { filesStatus: modifiedStatus, modifiedFiles } = applyModifiedVersion(files, mergeResults, mergeStrategy);\n componentWithDependencies.component.files = modifiedFiles;\n filesStatus = { ...filesStatus, ...modifiedStatus };\n }\n\n const manyComponentsWriter = new ManyComponentsWriter({\n consumer,\n componentsWithDependencies: [componentWithDependencies],\n installNpmPackages: false,\n override: true,\n writeConfig: false, // @todo: should write if config exists before, needs to figure out how to do it.\n verbose: false, // @todo: do we need a flag here?\n });\n await manyComponentsWriter.writeAll();\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 consumer.scope.objects.unmergedComponents.addEntry(unmergedComponent);\n } else if (localLane) {\n if (resolvedUnrelated) {\n // must be \"theirs\"\n return handleResolveUnrelated();\n }\n localLane.addComponent({ id, head: remoteHead });\n } else {\n // this is main\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 consumer.scope.objects.add(modelComponent);\n }\n\n return { id, filesStatus };\n }\n\n private async abortMerge(values: string[]): Promise<ApplyVersionResults> {\n const consumer = this.workspace.consumer;\n const ids = await this.getIdsForUnmerged(values);\n const results = await this.checkout.checkout({ ids, reset: true });\n ids.forEach((id) => consumer.scope.objects.unmergedComponents.removeComponent(id.fullName));\n await consumer.scope.objects.unmergedComponents.write();\n return { abortedComponents: results.components };\n }\n\n private async resolveMerge(values: string[], snapMessage: string, build: boolean): Promise<ApplyVersionResults> {\n const ids = await this.getIdsForUnmerged(values);\n // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n const { snappedComponents } = await this.snapping.snap({\n legacyBitIds: BitIds.fromArray(ids.map((id) => id._legacy)),\n build,\n message: snapMessage,\n });\n return { resolvedComponents: snappedComponents };\n }\n\n private async getAllComponentsStatus(\n bitIds: BitId[],\n laneId: LaneId,\n localLaneObject: Lane \| null\n ): Promise<ComponentMergeStatus[]> {\n const tmp = new Tmp(this.consumer.scope);\n try {\n const componentsStatus = 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.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 return this.getComponentMergeStatus(bitId.changeVersion(remoteHead.toString()), localLaneObject, laneIdStr);\n })\n );\n await tmp.clear();\n return componentsStatus;\n } catch (err: any) {\n await tmp.clear();\n throw err;\n }\n }\n\n private async snapResolvedComponents(\n consumer: Consumer,\n snapMessage: string,\n build: boolean\n ): Promise<null \| { snappedComponents: ConsumerComponent[]; autoSnappedResults: AutoTagResult[] }> {\n const unmergedComponents = consumer.scope.objects.unmergedComponents.getComponents();\n logger.debug(`merge-snaps, snapResolvedComponents, total ${unmergedComponents.length.toString()} components`);\n if (!unmergedComponents.length) return null;\n const ids = BitIds.fromArray(unmergedComponents.map((r) => new BitId(r.id)));\n return this.snapping.snap({\n legacyBitIds: ids,\n build,\n message: snapMessage,\n });\n }\n\n private async tagAllLaneComponent(idsToTag: BitId[], tagMessage: string, build: boolean): Promise<TagResults \| null> {\n const ids = idsToTag.map((id) => {\n return id.toStringWithoutVersion();\n });\n 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(idsStr?: string[]): Promise<ComponentID[]> {\n if (idsStr && idsStr.length) {\n const componentIds = await this.workspace.resolveMultipleComponentIds(idsStr);\n componentIds.forEach((id) => {\n const entry = this.workspace.consumer.scope.objects.unmergedComponents.getEntry(id.fullName);\n if (!entry) {\n throw new GeneralError(`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 GeneralError(`all components are resolved already, nothing to do`);\n return unresolvedComponents.map((u) => ComponentID.fromLegacy(new BitId(u.id)));\n }\n\n private getComponentsToMerge(consumer: Consumer, ids: string[]): BitId[] {\n if (hasWildcard(ids)) {\n const componentsList = new ComponentsList(consumer);\n return componentsList.listComponentsByIdsWithWildcard(ids);\n }\n return ids.map((id) => consumer.getParsedId(id));\n }\n\n static slots = [];\n static dependencies = [CLIAspect, WorkspaceAspect, SnappingAspect, CheckoutAspect, InstallAspect];\n static runtime = MainRuntime;\n static async provider([cli, workspace, snapping, checkout, install]: [\n CLIMain,\n Workspace,\n SnappingMain,\n CheckoutMain,\n InstallMain\n ]) {\n const merging = new MergingMain(workspace, install, snapping, checkout);\n cli.register(new MergeCmd(merging));\n return merging;\n }\n}\n\nMergingAspect.addRuntime(MergingMain);\n"],"mappings":"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"}

package/package-tar/teambit-merging-0.0.174.tgz ADDED Viewed

Binary file

package/package.json CHANGED Viewed

@@ -1,12 +1,12 @@
 {
   "name": "@teambit/merging",
-  "version": "0.0.172",
+  "version": "0.0.174",
   "homepage": "https://bit.dev/teambit/component/merging",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.component",
     "name": "merging",
-    "version": "0.0.172"
+    "version": "0.0.174"
   },
   "dependencies": {
     "chalk": "2.4.2",
@@ -17,13 +17,13 @@
     "core-js": "^3.0.0",
     "@teambit/harmony": "0.3.3",
     "@teambit/bit-error": "0.0.400",
-    "@teambit/cli": "0.0.569",
-    "@teambit/checkout": "0.0.26",
+    "@teambit/cli": "0.0.571",
+    "@teambit/checkout": "0.0.28",
     "@teambit/component-id": "0.0.417",
-    "@teambit/install": "0.0.7",
-    "@teambit/lane-id": "0.0.88",
-    "@teambit/snapping": "0.0.172",
-    "@teambit/workspace": "0.0.857"
+    "@teambit/install": "0.0.8",
+    "@teambit/lane-id": "0.0.89",
+    "@teambit/snapping": "0.0.174",
+    "@teambit/workspace": "0.0.859"
   },
   "devDependencies": {
     "@types/lodash": "4.14.165",
@@ -35,7 +35,7 @@
     "@types/node": "12.20.4"
   },
   "peerDependencies": {
-    "@teambit/legacy": "1.0.350",
+    "@teambit/legacy": "1.0.351",
     "react-dom": "^16.8.0 || ^17.0.0",
     "react": "^16.8.0 || ^17.0.0"
   },

/package/{preview-1663472005837.js → preview-1663693322588.js} RENAMED Viewed

File without changes

package/package-tar/teambit-merging-0.0.172.tgz DELETED Viewed

Binary file