@teambit/merging 1.0.41 → 1.0.43
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/config-merger.js +1 -2
- package/dist/config-merger.js.map +1 -1
- package/dist/index.js +1 -2
- package/dist/index.js.map +1 -1
- package/dist/merging.aspect.js +1 -2
- package/dist/merging.aspect.js.map +1 -1
- package/dist/merging.main.runtime.js +2 -2
- package/dist/merging.main.runtime.js.map +1 -1
- package/package.json +18 -18
- /package/dist/{preview-1698981534427.js → preview-1699369416537.js} +0 -0
package/dist/config-merger.js
CHANGED
|
@@ -59,8 +59,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
|
|
|
59
59
|
function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
|
|
60
60
|
function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
|
|
61
61
|
function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
|
|
62
|
-
const conflictIndicator = 'CONFLICT::';
|
|
63
|
-
exports.conflictIndicator = conflictIndicator;
|
|
62
|
+
const conflictIndicator = exports.conflictIndicator = 'CONFLICT::';
|
|
64
63
|
/**
|
|
65
64
|
* perform 3-way merge of component configuration (aspects).
|
|
66
65
|
* normally this is needed when merging one lane into another. the component may have different aspects config in each lane.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_semver","data","_interopRequireDefault","require","_builder","_componentVersion","_dependencyResolver","_envs","_lodash","_configMergeResult","obj","__esModule","default","ownKeys","e","r","t","Object","keys","getOwnPropertySymbols","o","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","defineProperty","key","value","_toPropertyKey","configurable","writable","arg","_toPrimitive","String","input","hint","prim","Symbol","toPrimitive","undefined","res","call","TypeError","Number","conflictIndicator","exports","ConfigMerger","constructor","compIdStr","workspaceIds","otherLane","currentAspects","baseAspects","otherAspects","currentLabel","otherLabel","logger","BuilderAspect","id","otherLaneIdsStr","toBitIds","map","toString","merge","debug","populateEnvs","results","currentExt","stringId","handledExtIds","includes","baseExt","findExtension","otherExt","mergePerStrategy","conflict","currentConfig","getConfig","otherConfig","otherAspectsNotHandledResults","extensionId","hasVersion","idFromWorkspace","getIdFromWorkspace","toStringWithoutVersion","existingExt","_legacy","mergedConfig","envResult","envStrategy","ConfigMergeResult","compact","getEnvId","ext","envsAspect","findCoreExtension","EnvsAspect","Error","env","config","currentEnv","otherEnv","baseEnv","currentEnvAspect","_currentEnvAspect$ext","version","otherEnvAspect","_otherEnvAspect$exten","baseEnvAspect","_baseEnvAspect$extens","mergeStrategyParams","_this$baseEnv","_this$baseEnv2","baseConfig","isIdInWorkspaceOrOtherLane","basicConfigMerge","areConfigsEqual","configA","configB","JSON","stringify","depResolverResult","depResolverStrategy","params","DependencyResolverAspect","trace","currentPolicy","getPolicy","otherPolicy","basePolicy","getAllDeps","_ext$findCoreExtensio","_ext$findCoreExtensio2","dependencies","policy","d","idWithoutVersion","__type","split","existingPolicy","find","p","dependencyId","getPolicyVer","getDataPolicy","_ext$findCoreExtensio3","getAutoDeps","allDeps","source","currentAutoData","currentAllData","currentDataPolicy","otherData","currentAndOtherData","uniqBy","concat","currentAndOtherComponentsData","c","baseData","getCompIdStrByPkgNameFromData","pkgName","found","packageName","getFromCurrentDataByPackageName","getFromCurrentDataPolicyByPackageName","mergedPolicy","devDependencies","peerDependencies","conflictedPolicy","hasConflict","lifecycleToDepType","runtime","dev","peer","handleConfigMerge","addVariantPolicyEntryToPolicy","dep","fromCurrentData","force","isHash","semver","satisfies","fromCurrentDataPolicy","depType","lifecycleType","name","currentAndOtherConfig","currentDep","otherDep","baseDep","currentVer","otherVer","baseVer","hasConfigForDep","depName","getDepIdAsPkgName","addSerializedDepToPolicy","lifecycle","join","depData","isEnv","currentId","versionOnOtherLane","Boolean","rawConfig","omit","VariantPolicy","fromConfigObject","entries"],"sources":["config-merger.ts"],"sourcesContent":["import { ComponentID } from '@teambit/component-id';\nimport semver from 'semver';\nimport { Logger } from '@teambit/logger';\nimport BuilderAspect from '@teambit/builder';\nimport { isHash } from '@teambit/component-version';\nimport {\n DependencyResolverAspect,\n SerializedDependency,\n VariantPolicy,\n VariantPolicyEntry,\n} from '@teambit/dependency-resolver';\nimport { Lane } from '@teambit/legacy/dist/scope/models';\nimport { EnvsAspect } from '@teambit/envs';\nimport { ExtensionDataEntry, ExtensionDataList } from '@teambit/legacy/dist/consumer/config/extension-data';\nimport { compact, omit, uniqBy } from 'lodash';\nimport { ConfigMergeResult } from './config-merge-result';\n\nexport type GenericConfigOrRemoved = Record<string, any> | '-';\n\ntype EnvData = { id: string; version?: string; config?: GenericConfigOrRemoved };\n\ntype SerializedDependencyWithPolicy = SerializedDependency & { policy?: string; packageName?: string };\n\nexport const conflictIndicator = 'CONFLICT::';\n\nexport type MergeStrategyResult = {\n id: string;\n mergedConfig?: GenericConfigOrRemoved;\n conflict?: Record<string, any>;\n};\ntype MergeStrategyParamsWithRemoved = {\n id: string;\n currentConfig: GenericConfigOrRemoved;\n otherConfig: GenericConfigOrRemoved;\n baseConfig?: GenericConfigOrRemoved;\n};\ntype MergeStrategyParams = {\n id: string;\n currentExt: ExtensionDataEntry;\n otherExt: ExtensionDataEntry;\n baseExt?: ExtensionDataEntry;\n};\n\n/**\n * perform 3-way merge of component configuration (aspects).\n * normally this is needed when merging one lane into another. the component may have different aspects config in each lane.\n * the baseAspects are the aspects of the component in the diversion point (the common ancestor of the two lanes).\n * the currentAspects are the aspects of the component in the current lane.\n * the otherAspects are the aspects of the component in the other lane. this is the lane we merge into the current lane.\n *\n * the basic merging strategy is a simple comparison between the aspect-configs, if they're different, we have a conflict.\n * we have two special cases:\n *\n * 1. dependency-resolver: we do a deeper check for the policy, we compare each dependency separately. also, we take\n * into account not only the config, but also the data. this is needed because some dependencies are automatically\n * added by Bit (from the import statements in the code) and they're not in the config. the final config has the deps\n * from both sources, the config and the data. The way we know to differentiate between them is by the \"force\" prop.\n * the config has always force: true.\n *\n * 2. envs: if we don't treat it specially, the user will need to make the change not only in the envs aspect, but also\n * in the deps-resolver (because the env is added as a devDependency) and also in the aspect itself (because\n * teambit.envs/env has only the id and not the version). to make it simpler, we ignore the envs in the deps-resolver\n * we ignore the individual aspect that is the env itself. we only show teambit.envs/env and we put the env id and\n * version. later, when the component is loaded, we split the id and the version and put them in the correct places.\n * see workspace.componentExtension / adjustEnvsOnConfigMerge for more details.\n */\nexport class ConfigMerger {\n private currentEnv: EnvData;\n private otherEnv: EnvData;\n private baseEnv?: EnvData;\n private handledExtIds: string[] = [BuilderAspect.id]; // don't try to merge builder, it's possible that at one end it wasn't built yet, so it's empty\n private otherLaneIdsStr: string[];\n constructor(\n private compIdStr: string,\n private workspaceIds: ComponentID[],\n otherLane: Lane | undefined,\n private currentAspects: ExtensionDataList,\n private baseAspects: ExtensionDataList,\n private otherAspects: ExtensionDataList,\n private currentLabel: string,\n private otherLabel: string,\n private logger: Logger\n ) {\n this.otherLaneIdsStr = otherLane?.toBitIds().map((id) => id.toString()) || [];\n }\n\n merge(): ConfigMergeResult {\n this.logger.debug(`\\n************** start config-merger for ${this.compIdStr} **************`);\n this.populateEnvs();\n const results = this.currentAspects.map((currentExt) => {\n const id = currentExt.stringId;\n if (this.handledExtIds.includes(id)) return null;\n this.handledExtIds.push(id);\n const baseExt = this.baseAspects.findExtension(id, true);\n const otherExt = this.otherAspects.findExtension(id, true);\n if (otherExt) {\n // try to 3-way-merge\n return this.mergePerStrategy({ id, currentExt, otherExt, baseExt });\n }\n // exist in current but not in other\n if (baseExt) {\n // was removed on other\n return { id, conflict: { currentConfig: this.getConfig(currentExt), otherConfig: '-' } };\n }\n // exist in current but not in other and base, so it got created on current. nothing to do.\n return null;\n });\n const otherAspectsNotHandledResults = this.otherAspects.map((otherExt) => {\n let id = otherExt.stringId;\n if (this.handledExtIds.includes(id)) return null;\n this.handledExtIds.push(id);\n if (otherExt.extensionId && otherExt.extensionId.hasVersion()) {\n // avoid using the id from the other lane if it exits in the workspace. prefer the id from the workspace.\n const idFromWorkspace = this.getIdFromWorkspace(otherExt.extensionId.toStringWithoutVersion());\n if (idFromWorkspace) {\n const existingExt = this.currentAspects.findExtension(otherExt.extensionId.toStringWithoutVersion(), true);\n if (existingExt) return null; // the aspect is set currently, no need to add it again.\n id = idFromWorkspace._legacy.toString();\n }\n }\n const baseExt = this.baseAspects.findExtension(id, true);\n if (baseExt) {\n // was removed on current\n return { id, conflict: { currentConfig: '-', otherConfig: this.getConfig(otherExt) } };\n }\n // exist in other but not in current and base, so it got created on other.\n return { id, mergedConfig: this.getConfig(otherExt) };\n });\n const envResult = [this.envStrategy()] || [];\n this.logger.debug(`*** end config-merger for ${this.compIdStr} ***\\n`);\n return new ConfigMergeResult(\n this.compIdStr,\n this.currentLabel,\n this.otherLabel,\n compact([...results, ...otherAspectsNotHandledResults, ...envResult])\n );\n }\n\n private populateEnvs() {\n // populate ids\n const getEnvId = (ext: ExtensionDataList) => {\n const envsAspect = ext.findCoreExtension(EnvsAspect.id);\n if (!envsAspect) throw new Error(`unable to find ${EnvsAspect.id} aspect for ${this.compIdStr}`);\n const env = envsAspect.config.env || envsAspect.data.id;\n if (!env)\n throw new Error(`unable to find env for ${this.compIdStr}, the config and data of ${EnvsAspect.id} are empty}`);\n return env;\n };\n const currentEnv = getEnvId(this.currentAspects);\n this.currentEnv = { id: currentEnv };\n const otherEnv = getEnvId(this.otherAspects);\n this.otherEnv = { id: otherEnv };\n const baseEnv = this.baseAspects ? getEnvId(this.baseAspects) : undefined;\n if (baseEnv) this.baseEnv = { id: baseEnv };\n\n // populate version\n const currentEnvAspect = this.currentAspects.findExtension(currentEnv, true);\n if (currentEnvAspect) {\n this.handledExtIds.push(currentEnvAspect.stringId);\n this.currentEnv.version = currentEnvAspect.extensionId?.version;\n this.currentEnv.config = this.getConfig(currentEnvAspect);\n }\n const otherEnvAspect = this.otherAspects.findExtension(otherEnv, true);\n if (otherEnvAspect) {\n this.handledExtIds.push(otherEnvAspect.stringId);\n this.otherEnv.version = otherEnvAspect.extensionId?.version;\n this.otherEnv.config = this.getConfig(otherEnvAspect);\n }\n if (this.baseEnv) {\n const baseEnvAspect = this.baseAspects.findExtension(baseEnv, true);\n if (baseEnvAspect) {\n this.baseEnv.version = baseEnvAspect.extensionId?.version;\n this.baseEnv.config = this.getConfig(baseEnvAspect);\n }\n }\n }\n\n private envStrategy(): MergeStrategyResult | null {\n const mergeStrategyParams: MergeStrategyParamsWithRemoved = {\n id: EnvsAspect.id,\n currentConfig: {\n env: this.currentEnv.version ? `${this.currentEnv.id}@${this.currentEnv.version}` : this.currentEnv.id,\n },\n otherConfig: { env: this.otherEnv.version ? `${this.otherEnv.id}@${this.otherEnv.version}` : this.otherEnv.id },\n };\n if (this.baseEnv) {\n mergeStrategyParams.baseConfig = {\n env: this.baseEnv?.version ? `${this.baseEnv.id}@${this.baseEnv.version}` : this.baseEnv?.id,\n };\n }\n if (this.currentEnv.id === this.otherEnv.id && this.currentEnv.version === this.otherEnv.version) {\n return null;\n }\n if (this.isIdInWorkspaceOrOtherLane(this.currentEnv.id, this.otherEnv.version)) {\n // the env currently used is part of the workspace, that's what the user needs. don't try to resolve anything.\n return null;\n }\n return this.basicConfigMerge(mergeStrategyParams);\n }\n\n private areConfigsEqual(configA: GenericConfigOrRemoved, configB: GenericConfigOrRemoved) {\n return JSON.stringify(configA) === JSON.stringify(configB);\n }\n\n private mergePerStrategy(mergeStrategyParams: MergeStrategyParams): MergeStrategyResult | null {\n const { id, currentExt, otherExt, baseExt } = mergeStrategyParams;\n const depResolverResult = this.depResolverStrategy(mergeStrategyParams);\n\n if (depResolverResult) {\n // if (depResolverResult.mergedConfig || depResolverResult?.conflict) console.log(\"\\n\\nDepResolverResult\", this.compIdStr, '\\n', JSON.stringify(depResolverResult, undefined, 2))\n return depResolverResult;\n }\n const currentConfig = this.getConfig(currentExt);\n const otherConfig = this.getConfig(otherExt);\n const baseConfig = baseExt ? this.getConfig(baseExt) : undefined;\n\n return this.basicConfigMerge({ id, currentConfig, otherConfig, baseConfig });\n }\n\n private basicConfigMerge(mergeStrategyParams: MergeStrategyParamsWithRemoved) {\n const { id, currentConfig, otherConfig, baseConfig } = mergeStrategyParams;\n if (this.areConfigsEqual(currentConfig, otherConfig)) {\n return null;\n }\n if (baseConfig && this.areConfigsEqual(baseConfig, otherConfig)) {\n // was changed on current\n return null;\n }\n if (baseConfig && this.areConfigsEqual(baseConfig, currentConfig)) {\n // was changed on other\n return { id, mergedConfig: otherConfig };\n }\n // either no baseConfig, or baseConfig is also different from both: other and local. that's a conflict.\n return { id, conflict: { currentConfig, otherConfig, baseConfig } };\n }\n\n private depResolverStrategy(params: MergeStrategyParams): MergeStrategyResult | undefined {\n if (params.id !== DependencyResolverAspect.id) return undefined;\n this.logger.trace(`start depResolverStrategy for ${this.compIdStr}`);\n const { currentExt, otherExt, baseExt } = params;\n\n const currentConfig = this.getConfig(currentExt);\n const currentPolicy = this.getPolicy(currentConfig);\n const otherConfig = this.getConfig(otherExt);\n const otherPolicy = this.getPolicy(otherConfig);\n\n const baseConfig = baseExt ? this.getConfig(baseExt) : undefined;\n const basePolicy = baseConfig ? this.getPolicy(baseConfig) : undefined;\n\n const getAllDeps = (ext: ExtensionDataList): SerializedDependencyWithPolicy[] => {\n const data = ext.findCoreExtension(DependencyResolverAspect.id)?.data.dependencies;\n if (!data) return [];\n const policy = ext.findCoreExtension(DependencyResolverAspect.id)?.data.policy || [];\n return data.map((d) => {\n const idWithoutVersion = d.__type === 'package' ? d.id : d.id.split('@')[0];\n const existingPolicy = policy.find((p) => p.dependencyId === idWithoutVersion);\n const getPolicyVer = () => {\n if (d.__type === 'package') return undefined; // for packages, the policy is already the version\n if (existingPolicy) return existingPolicy.value.version; // currently it's missing, will be implemented by @Gilad\n return d.version;\n // if (!semver.valid(d.version)) return d.version; // could be a hash\n // // default to `^` or ~ if starts with zero, until we save the policy from the workspace during tag/snap.\n // return d.version.startsWith('0.') ? `~${d.version}` : `^${d.version}`;\n };\n return {\n ...d,\n id: idWithoutVersion,\n policy: getPolicyVer(),\n };\n });\n };\n const getDataPolicy = (ext: ExtensionDataList): VariantPolicyEntry[] => {\n return ext.findCoreExtension(DependencyResolverAspect.id)?.data.policy || [];\n };\n\n const getAutoDeps = (ext: ExtensionDataList): SerializedDependencyWithPolicy[] => {\n const allDeps = getAllDeps(ext);\n return allDeps.filter((d) => d.source === 'auto');\n };\n\n const currentAutoData = getAutoDeps(this.currentAspects);\n const currentAllData = getAllDeps(this.currentAspects);\n const currentDataPolicy = getDataPolicy(this.currentAspects);\n const otherData = getAutoDeps(this.otherAspects);\n const currentAndOtherData = uniqBy(currentAutoData.concat(otherData), (d) => d.id);\n const currentAndOtherComponentsData = currentAndOtherData.filter((c) => c.__type === 'component');\n const baseData = getAutoDeps(this.baseAspects);\n\n const getCompIdStrByPkgNameFromData = (pkgName: string): string | undefined => {\n const found = currentAndOtherComponentsData.find((d) => d.packageName === pkgName);\n return found?.id;\n };\n\n const getFromCurrentDataByPackageName = (pkgName: string) => {\n return currentAllData.find((d) => {\n if (d.__type === 'package') return d.id === pkgName;\n return d.packageName === pkgName;\n });\n };\n\n const getFromCurrentDataPolicyByPackageName = (pkgName: string) => {\n return currentDataPolicy.find((d) => d.dependencyId === pkgName);\n };\n\n const mergedPolicy = {\n dependencies: [],\n devDependencies: [],\n peerDependencies: [],\n };\n const conflictedPolicy = {\n dependencies: [],\n devDependencies: [],\n peerDependencies: [],\n };\n let hasConflict = false;\n const lifecycleToDepType = {\n runtime: 'dependencies',\n dev: 'devDependencies',\n peer: 'peerDependencies',\n };\n const handleConfigMerge = () => {\n const addVariantPolicyEntryToPolicy = (dep: VariantPolicyEntry) => {\n const compIdStr = getCompIdStrByPkgNameFromData(dep.dependencyId);\n if (compIdStr && this.isIdInWorkspaceOrOtherLane(compIdStr, dep.value.version)) {\n // no need to add if the id exists in the workspace (regardless the version)\n return;\n }\n const fromCurrentData = getFromCurrentDataByPackageName(dep.dependencyId);\n if (fromCurrentData && !dep.force) {\n if (fromCurrentData.version === dep.value.version) return;\n if (\n !isHash(fromCurrentData.version) &&\n !isHash(dep.value.version) &&\n semver.satisfies(fromCurrentData.version, dep.value.version)\n ) {\n return;\n }\n }\n const fromCurrentDataPolicy = getFromCurrentDataPolicyByPackageName(dep.dependencyId);\n if (fromCurrentDataPolicy && fromCurrentDataPolicy.value.version === dep.value.version) {\n // that's a bug. if it's in the data.policy, it should be in data.dependencies.\n return;\n }\n const depType = lifecycleToDepType[dep.lifecycleType];\n mergedPolicy[depType].push({\n name: dep.dependencyId,\n version: dep.value.version,\n force: dep.force,\n });\n };\n\n if (this.areConfigsEqual(currentConfig, otherConfig)) {\n return;\n }\n if (baseConfig && this.areConfigsEqual(baseConfig, otherConfig)) {\n // was changed on current\n return;\n }\n if (currentConfig === '-' || otherConfig === '-') {\n throw new Error('not implemented. Is it possible to have it as minus?');\n }\n if (baseConfig && this.areConfigsEqual(baseConfig, currentConfig)) {\n // was changed on other\n if (otherPolicy.length) {\n otherPolicy.forEach((dep) => {\n addVariantPolicyEntryToPolicy(dep);\n });\n }\n return;\n }\n\n // either no baseConfig, or baseConfig is also different from both: other and local. that's a conflict.\n if (!currentConfig.policy && !otherConfig.policy) return;\n const currentAndOtherConfig = uniqBy(currentPolicy.concat(otherPolicy), (d) => d.dependencyId);\n currentAndOtherConfig.forEach((dep) => {\n const depType = lifecycleToDepType[dep.lifecycleType];\n const currentDep = currentPolicy.find((d) => d.dependencyId === dep.dependencyId);\n const otherDep = otherPolicy.find((d) => d.dependencyId === dep.dependencyId);\n const baseDep = basePolicy?.find((d) => d.dependencyId === dep.dependencyId);\n\n if (!otherDep) {\n return;\n }\n if (!currentDep) {\n // only on other\n addVariantPolicyEntryToPolicy(otherDep);\n return;\n }\n const currentVer = currentDep.value.version;\n const otherVer = otherDep.value.version;\n if (currentVer === otherVer) {\n return;\n }\n const baseVer = baseDep?.value.version;\n if (baseVer && baseVer === otherVer) {\n return;\n }\n if (baseVer && baseVer === currentVer) {\n addVariantPolicyEntryToPolicy(otherDep);\n return;\n }\n const compIdStr = getCompIdStrByPkgNameFromData(dep.dependencyId);\n if (compIdStr && this.isIdInWorkspaceOrOtherLane(compIdStr, otherVer)) {\n // no need to add if the id exists in the workspace (regardless the version)\n return;\n }\n\n hasConflict = true;\n conflictedPolicy[depType].push({\n name: currentDep.dependencyId,\n version: `${conflictIndicator}${currentVer}::${otherVer}::`,\n force: currentDep.force,\n });\n });\n };\n\n handleConfigMerge();\n\n const hasConfigForDep = (depType: string, depName: string) => mergedPolicy[depType].find((d) => d.name === depName);\n const getDepIdAsPkgName = (dep: SerializedDependencyWithPolicy) => {\n if (dep.__type !== 'component') {\n return dep.id;\n }\n // @ts-ignore\n return dep.packageName;\n };\n\n const addSerializedDepToPolicy = (dep: SerializedDependencyWithPolicy) => {\n const depType = lifecycleToDepType[dep.lifecycle];\n if (dep.__type === 'component' && this.isIdInWorkspaceOrOtherLane(dep.id, dep.version)) {\n return;\n }\n if (hasConfigForDep(depType, dep.id)) {\n return; // there is already config for it.\n }\n mergedPolicy[depType].push({\n name: getDepIdAsPkgName(dep),\n version: dep.policy || dep.version,\n force: false,\n });\n };\n\n this.logger.debug(\n `currentData, ${currentAllData.length}\\n${currentAllData\n .map((d) => `${d.__type} ${d.id} ${d.version}`)\n .join('\\n')}`\n );\n this.logger.debug(\n `otherData, ${otherData.length}\\n${otherData.map((d) => `${d.__type} ${d.id} ${d.version}`).join('\\n')}`\n );\n this.logger.debug(\n `baseData, ${baseData.length}\\n${baseData.map((d) => `${d.__type} ${d.id} ${d.version}`).join('\\n')}`\n );\n\n // eslint-disable-next-line complexity\n currentAndOtherData.forEach((depData) => {\n this.logger.trace(`depData.id, ${depData.id}`);\n if (this.isEnv(depData.id)) {\n // ignore the envs\n return;\n }\n const currentDep = currentAllData.find((d) => d.id === depData.id);\n const otherDep = otherData.find((d) => d.id === depData.id);\n const baseDep = baseData.find((d) => d.id === depData.id);\n\n this.logger.trace(`currentDep`, currentDep);\n this.logger.trace(`otherDep`, otherDep);\n this.logger.trace(`baseDep`, baseDep);\n if (!otherDep) {\n return;\n }\n if (!currentDep) {\n if (baseDep) {\n // exists in other and base, so it was removed from current\n return;\n }\n // only on other\n addSerializedDepToPolicy(otherDep);\n return;\n }\n\n if (currentDep.policy && otherDep.policy) {\n if (semver.satisfies(currentDep.version, otherDep.policy)) {\n return;\n }\n if (semver.satisfies(otherDep.version, currentDep.policy)) {\n return;\n }\n }\n\n const currentVer = currentDep.policy || currentDep.version;\n const otherVer = otherDep.policy || otherDep.version;\n if (currentVer === otherVer) {\n return;\n }\n const baseVer = baseDep?.policy || baseDep?.version;\n if (baseVer && baseVer === otherVer) {\n return;\n }\n const currentId = currentDep.id;\n if (currentDep.__type === 'component' && this.isIdInWorkspaceOrOtherLane(currentId, otherDep.version)) {\n // dependencies that exist in the workspace, should be ignored. they'll be resolved later to the version in the ws.\n return;\n }\n const depType = lifecycleToDepType[currentDep.lifecycle];\n if (hasConfigForDep(depType, currentDep.id)) {\n return; // there is already config for it.\n }\n if (baseVer && baseVer === currentVer) {\n addSerializedDepToPolicy(otherDep);\n return;\n }\n hasConflict = true;\n conflictedPolicy[depType].push({\n name: getDepIdAsPkgName(currentDep),\n version: `${conflictIndicator}${currentVer}::${otherVer}::`,\n force: false,\n });\n });\n\n ['dependencies', 'devDependencies', 'peerDependencies'].forEach((depType) => {\n if (!mergedPolicy[depType].length) delete mergedPolicy[depType];\n if (!conflictedPolicy[depType].length) delete conflictedPolicy[depType];\n });\n\n const config = Object.keys(mergedPolicy).length ? { policy: mergedPolicy } : undefined;\n const conflict = hasConflict ? conflictedPolicy : undefined;\n\n this.logger.debug('final mergedConfig', config);\n this.logger.debug('final conflict', conflict);\n\n return { id: params.id, mergedConfig: config, conflict };\n }\n\n private isIdInWorkspaceOrOtherLane(id: string, versionOnOtherLane?: string): boolean {\n return Boolean(this.getIdFromWorkspace(id)) || this.otherLaneIdsStr.includes(`${id}@${versionOnOtherLane}`);\n }\n\n private getIdFromWorkspace(id: string): ComponentID | undefined {\n return this.workspaceIds.find((c) => c.toStringWithoutVersion() === id);\n }\n\n private isEnv(id: string) {\n return id === this.currentEnv.id || id === this.otherEnv.id;\n }\n\n private getConfig(ext: ExtensionDataEntry): GenericConfigOrRemoved {\n if (ext.rawConfig === '-') return ext.rawConfig;\n return omit(ext.rawConfig, ['__specific']);\n }\n\n private getPolicy(config): VariantPolicyEntry[] {\n if (!config.policy) return [];\n return VariantPolicy.fromConfigObject(config.policy).entries;\n }\n}\n"],"mappings":"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"}
|
|
1
|
+
{"version":3,"names":["_semver","data","_interopRequireDefault","require","_builder","_componentVersion","_dependencyResolver","_envs","_lodash","_configMergeResult","obj","__esModule","default","ownKeys","e","r","t","Object","keys","getOwnPropertySymbols","o","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","defineProperty","key","value","_toPropertyKey","configurable","writable","arg","_toPrimitive","String","input","hint","prim","Symbol","toPrimitive","undefined","res","call","TypeError","Number","conflictIndicator","exports","ConfigMerger","constructor","compIdStr","workspaceIds","otherLane","currentAspects","baseAspects","otherAspects","currentLabel","otherLabel","logger","BuilderAspect","id","otherLaneIdsStr","toBitIds","map","toString","merge","debug","populateEnvs","results","currentExt","stringId","handledExtIds","includes","baseExt","findExtension","otherExt","mergePerStrategy","conflict","currentConfig","getConfig","otherConfig","otherAspectsNotHandledResults","extensionId","hasVersion","idFromWorkspace","getIdFromWorkspace","toStringWithoutVersion","existingExt","_legacy","mergedConfig","envResult","envStrategy","ConfigMergeResult","compact","getEnvId","ext","envsAspect","findCoreExtension","EnvsAspect","Error","env","config","currentEnv","otherEnv","baseEnv","currentEnvAspect","_currentEnvAspect$ext","version","otherEnvAspect","_otherEnvAspect$exten","baseEnvAspect","_baseEnvAspect$extens","mergeStrategyParams","_this$baseEnv","_this$baseEnv2","baseConfig","isIdInWorkspaceOrOtherLane","basicConfigMerge","areConfigsEqual","configA","configB","JSON","stringify","depResolverResult","depResolverStrategy","params","DependencyResolverAspect","trace","currentPolicy","getPolicy","otherPolicy","basePolicy","getAllDeps","_ext$findCoreExtensio","_ext$findCoreExtensio2","dependencies","policy","d","idWithoutVersion","__type","split","existingPolicy","find","p","dependencyId","getPolicyVer","getDataPolicy","_ext$findCoreExtensio3","getAutoDeps","allDeps","source","currentAutoData","currentAllData","currentDataPolicy","otherData","currentAndOtherData","uniqBy","concat","currentAndOtherComponentsData","c","baseData","getCompIdStrByPkgNameFromData","pkgName","found","packageName","getFromCurrentDataByPackageName","getFromCurrentDataPolicyByPackageName","mergedPolicy","devDependencies","peerDependencies","conflictedPolicy","hasConflict","lifecycleToDepType","runtime","dev","peer","handleConfigMerge","addVariantPolicyEntryToPolicy","dep","fromCurrentData","force","isHash","semver","satisfies","fromCurrentDataPolicy","depType","lifecycleType","name","currentAndOtherConfig","currentDep","otherDep","baseDep","currentVer","otherVer","baseVer","hasConfigForDep","depName","getDepIdAsPkgName","addSerializedDepToPolicy","lifecycle","join","depData","isEnv","currentId","versionOnOtherLane","Boolean","rawConfig","omit","VariantPolicy","fromConfigObject","entries"],"sources":["config-merger.ts"],"sourcesContent":["import { ComponentID } from '@teambit/component-id';\nimport semver from 'semver';\nimport { Logger } from '@teambit/logger';\nimport BuilderAspect from '@teambit/builder';\nimport { isHash } from '@teambit/component-version';\nimport {\n DependencyResolverAspect,\n SerializedDependency,\n VariantPolicy,\n VariantPolicyEntry,\n} from '@teambit/dependency-resolver';\nimport { Lane } from '@teambit/legacy/dist/scope/models';\nimport { EnvsAspect } from '@teambit/envs';\nimport { ExtensionDataEntry, ExtensionDataList } from '@teambit/legacy/dist/consumer/config/extension-data';\nimport { compact, omit, uniqBy } from 'lodash';\nimport { ConfigMergeResult } from './config-merge-result';\n\nexport type GenericConfigOrRemoved = Record<string, any> | '-';\n\ntype EnvData = { id: string; version?: string; config?: GenericConfigOrRemoved };\n\ntype SerializedDependencyWithPolicy = SerializedDependency & { policy?: string; packageName?: string };\n\nexport const conflictIndicator = 'CONFLICT::';\n\nexport type MergeStrategyResult = {\n id: string;\n mergedConfig?: GenericConfigOrRemoved;\n conflict?: Record<string, any>;\n};\ntype MergeStrategyParamsWithRemoved = {\n id: string;\n currentConfig: GenericConfigOrRemoved;\n otherConfig: GenericConfigOrRemoved;\n baseConfig?: GenericConfigOrRemoved;\n};\ntype MergeStrategyParams = {\n id: string;\n currentExt: ExtensionDataEntry;\n otherExt: ExtensionDataEntry;\n baseExt?: ExtensionDataEntry;\n};\n\n/**\n * perform 3-way merge of component configuration (aspects).\n * normally this is needed when merging one lane into another. the component may have different aspects config in each lane.\n * the baseAspects are the aspects of the component in the diversion point (the common ancestor of the two lanes).\n * the currentAspects are the aspects of the component in the current lane.\n * the otherAspects are the aspects of the component in the other lane. this is the lane we merge into the current lane.\n *\n * the basic merging strategy is a simple comparison between the aspect-configs, if they're different, we have a conflict.\n * we have two special cases:\n *\n * 1. dependency-resolver: we do a deeper check for the policy, we compare each dependency separately. also, we take\n * into account not only the config, but also the data. this is needed because some dependencies are automatically\n * added by Bit (from the import statements in the code) and they're not in the config. the final config has the deps\n * from both sources, the config and the data. The way we know to differentiate between them is by the \"force\" prop.\n * the config has always force: true.\n *\n * 2. envs: if we don't treat it specially, the user will need to make the change not only in the envs aspect, but also\n * in the deps-resolver (because the env is added as a devDependency) and also in the aspect itself (because\n * teambit.envs/env has only the id and not the version). to make it simpler, we ignore the envs in the deps-resolver\n * we ignore the individual aspect that is the env itself. we only show teambit.envs/env and we put the env id and\n * version. later, when the component is loaded, we split the id and the version and put them in the correct places.\n * see workspace.componentExtension / adjustEnvsOnConfigMerge for more details.\n */\nexport class ConfigMerger {\n private currentEnv: EnvData;\n private otherEnv: EnvData;\n private baseEnv?: EnvData;\n private handledExtIds: string[] = [BuilderAspect.id]; // don't try to merge builder, it's possible that at one end it wasn't built yet, so it's empty\n private otherLaneIdsStr: string[];\n constructor(\n private compIdStr: string,\n private workspaceIds: ComponentID[],\n otherLane: Lane | undefined,\n private currentAspects: ExtensionDataList,\n private baseAspects: ExtensionDataList,\n private otherAspects: ExtensionDataList,\n private currentLabel: string,\n private otherLabel: string,\n private logger: Logger\n ) {\n this.otherLaneIdsStr = otherLane?.toBitIds().map((id) => id.toString()) || [];\n }\n\n merge(): ConfigMergeResult {\n this.logger.debug(`\\n************** start config-merger for ${this.compIdStr} **************`);\n this.populateEnvs();\n const results = this.currentAspects.map((currentExt) => {\n const id = currentExt.stringId;\n if (this.handledExtIds.includes(id)) return null;\n this.handledExtIds.push(id);\n const baseExt = this.baseAspects.findExtension(id, true);\n const otherExt = this.otherAspects.findExtension(id, true);\n if (otherExt) {\n // try to 3-way-merge\n return this.mergePerStrategy({ id, currentExt, otherExt, baseExt });\n }\n // exist in current but not in other\n if (baseExt) {\n // was removed on other\n return { id, conflict: { currentConfig: this.getConfig(currentExt), otherConfig: '-' } };\n }\n // exist in current but not in other and base, so it got created on current. nothing to do.\n return null;\n });\n const otherAspectsNotHandledResults = this.otherAspects.map((otherExt) => {\n let id = otherExt.stringId;\n if (this.handledExtIds.includes(id)) return null;\n this.handledExtIds.push(id);\n if (otherExt.extensionId && otherExt.extensionId.hasVersion()) {\n // avoid using the id from the other lane if it exits in the workspace. prefer the id from the workspace.\n const idFromWorkspace = this.getIdFromWorkspace(otherExt.extensionId.toStringWithoutVersion());\n if (idFromWorkspace) {\n const existingExt = this.currentAspects.findExtension(otherExt.extensionId.toStringWithoutVersion(), true);\n if (existingExt) return null; // the aspect is set currently, no need to add it again.\n id = idFromWorkspace._legacy.toString();\n }\n }\n const baseExt = this.baseAspects.findExtension(id, true);\n if (baseExt) {\n // was removed on current\n return { id, conflict: { currentConfig: '-', otherConfig: this.getConfig(otherExt) } };\n }\n // exist in other but not in current and base, so it got created on other.\n return { id, mergedConfig: this.getConfig(otherExt) };\n });\n const envResult = [this.envStrategy()] || [];\n this.logger.debug(`*** end config-merger for ${this.compIdStr} ***\\n`);\n return new ConfigMergeResult(\n this.compIdStr,\n this.currentLabel,\n this.otherLabel,\n compact([...results, ...otherAspectsNotHandledResults, ...envResult])\n );\n }\n\n private populateEnvs() {\n // populate ids\n const getEnvId = (ext: ExtensionDataList) => {\n const envsAspect = ext.findCoreExtension(EnvsAspect.id);\n if (!envsAspect) throw new Error(`unable to find ${EnvsAspect.id} aspect for ${this.compIdStr}`);\n const env = envsAspect.config.env || envsAspect.data.id;\n if (!env)\n throw new Error(`unable to find env for ${this.compIdStr}, the config and data of ${EnvsAspect.id} are empty}`);\n return env;\n };\n const currentEnv = getEnvId(this.currentAspects);\n this.currentEnv = { id: currentEnv };\n const otherEnv = getEnvId(this.otherAspects);\n this.otherEnv = { id: otherEnv };\n const baseEnv = this.baseAspects ? getEnvId(this.baseAspects) : undefined;\n if (baseEnv) this.baseEnv = { id: baseEnv };\n\n // populate version\n const currentEnvAspect = this.currentAspects.findExtension(currentEnv, true);\n if (currentEnvAspect) {\n this.handledExtIds.push(currentEnvAspect.stringId);\n this.currentEnv.version = currentEnvAspect.extensionId?.version;\n this.currentEnv.config = this.getConfig(currentEnvAspect);\n }\n const otherEnvAspect = this.otherAspects.findExtension(otherEnv, true);\n if (otherEnvAspect) {\n this.handledExtIds.push(otherEnvAspect.stringId);\n this.otherEnv.version = otherEnvAspect.extensionId?.version;\n this.otherEnv.config = this.getConfig(otherEnvAspect);\n }\n if (this.baseEnv) {\n const baseEnvAspect = this.baseAspects.findExtension(baseEnv, true);\n if (baseEnvAspect) {\n this.baseEnv.version = baseEnvAspect.extensionId?.version;\n this.baseEnv.config = this.getConfig(baseEnvAspect);\n }\n }\n }\n\n private envStrategy(): MergeStrategyResult | null {\n const mergeStrategyParams: MergeStrategyParamsWithRemoved = {\n id: EnvsAspect.id,\n currentConfig: {\n env: this.currentEnv.version ? `${this.currentEnv.id}@${this.currentEnv.version}` : this.currentEnv.id,\n },\n otherConfig: { env: this.otherEnv.version ? `${this.otherEnv.id}@${this.otherEnv.version}` : this.otherEnv.id },\n };\n if (this.baseEnv) {\n mergeStrategyParams.baseConfig = {\n env: this.baseEnv?.version ? `${this.baseEnv.id}@${this.baseEnv.version}` : this.baseEnv?.id,\n };\n }\n if (this.currentEnv.id === this.otherEnv.id && this.currentEnv.version === this.otherEnv.version) {\n return null;\n }\n if (this.isIdInWorkspaceOrOtherLane(this.currentEnv.id, this.otherEnv.version)) {\n // the env currently used is part of the workspace, that's what the user needs. don't try to resolve anything.\n return null;\n }\n return this.basicConfigMerge(mergeStrategyParams);\n }\n\n private areConfigsEqual(configA: GenericConfigOrRemoved, configB: GenericConfigOrRemoved) {\n return JSON.stringify(configA) === JSON.stringify(configB);\n }\n\n private mergePerStrategy(mergeStrategyParams: MergeStrategyParams): MergeStrategyResult | null {\n const { id, currentExt, otherExt, baseExt } = mergeStrategyParams;\n const depResolverResult = this.depResolverStrategy(mergeStrategyParams);\n\n if (depResolverResult) {\n // if (depResolverResult.mergedConfig || depResolverResult?.conflict) console.log(\"\\n\\nDepResolverResult\", this.compIdStr, '\\n', JSON.stringify(depResolverResult, undefined, 2))\n return depResolverResult;\n }\n const currentConfig = this.getConfig(currentExt);\n const otherConfig = this.getConfig(otherExt);\n const baseConfig = baseExt ? this.getConfig(baseExt) : undefined;\n\n return this.basicConfigMerge({ id, currentConfig, otherConfig, baseConfig });\n }\n\n private basicConfigMerge(mergeStrategyParams: MergeStrategyParamsWithRemoved) {\n const { id, currentConfig, otherConfig, baseConfig } = mergeStrategyParams;\n if (this.areConfigsEqual(currentConfig, otherConfig)) {\n return null;\n }\n if (baseConfig && this.areConfigsEqual(baseConfig, otherConfig)) {\n // was changed on current\n return null;\n }\n if (baseConfig && this.areConfigsEqual(baseConfig, currentConfig)) {\n // was changed on other\n return { id, mergedConfig: otherConfig };\n }\n // either no baseConfig, or baseConfig is also different from both: other and local. that's a conflict.\n return { id, conflict: { currentConfig, otherConfig, baseConfig } };\n }\n\n private depResolverStrategy(params: MergeStrategyParams): MergeStrategyResult | undefined {\n if (params.id !== DependencyResolverAspect.id) return undefined;\n this.logger.trace(`start depResolverStrategy for ${this.compIdStr}`);\n const { currentExt, otherExt, baseExt } = params;\n\n const currentConfig = this.getConfig(currentExt);\n const currentPolicy = this.getPolicy(currentConfig);\n const otherConfig = this.getConfig(otherExt);\n const otherPolicy = this.getPolicy(otherConfig);\n\n const baseConfig = baseExt ? this.getConfig(baseExt) : undefined;\n const basePolicy = baseConfig ? this.getPolicy(baseConfig) : undefined;\n\n const getAllDeps = (ext: ExtensionDataList): SerializedDependencyWithPolicy[] => {\n const data = ext.findCoreExtension(DependencyResolverAspect.id)?.data.dependencies;\n if (!data) return [];\n const policy = ext.findCoreExtension(DependencyResolverAspect.id)?.data.policy || [];\n return data.map((d) => {\n const idWithoutVersion = d.__type === 'package' ? d.id : d.id.split('@')[0];\n const existingPolicy = policy.find((p) => p.dependencyId === idWithoutVersion);\n const getPolicyVer = () => {\n if (d.__type === 'package') return undefined; // for packages, the policy is already the version\n if (existingPolicy) return existingPolicy.value.version; // currently it's missing, will be implemented by @Gilad\n return d.version;\n // if (!semver.valid(d.version)) return d.version; // could be a hash\n // // default to `^` or ~ if starts with zero, until we save the policy from the workspace during tag/snap.\n // return d.version.startsWith('0.') ? `~${d.version}` : `^${d.version}`;\n };\n return {\n ...d,\n id: idWithoutVersion,\n policy: getPolicyVer(),\n };\n });\n };\n const getDataPolicy = (ext: ExtensionDataList): VariantPolicyEntry[] => {\n return ext.findCoreExtension(DependencyResolverAspect.id)?.data.policy || [];\n };\n\n const getAutoDeps = (ext: ExtensionDataList): SerializedDependencyWithPolicy[] => {\n const allDeps = getAllDeps(ext);\n return allDeps.filter((d) => d.source === 'auto');\n };\n\n const currentAutoData = getAutoDeps(this.currentAspects);\n const currentAllData = getAllDeps(this.currentAspects);\n const currentDataPolicy = getDataPolicy(this.currentAspects);\n const otherData = getAutoDeps(this.otherAspects);\n const currentAndOtherData = uniqBy(currentAutoData.concat(otherData), (d) => d.id);\n const currentAndOtherComponentsData = currentAndOtherData.filter((c) => c.__type === 'component');\n const baseData = getAutoDeps(this.baseAspects);\n\n const getCompIdStrByPkgNameFromData = (pkgName: string): string | undefined => {\n const found = currentAndOtherComponentsData.find((d) => d.packageName === pkgName);\n return found?.id;\n };\n\n const getFromCurrentDataByPackageName = (pkgName: string) => {\n return currentAllData.find((d) => {\n if (d.__type === 'package') return d.id === pkgName;\n return d.packageName === pkgName;\n });\n };\n\n const getFromCurrentDataPolicyByPackageName = (pkgName: string) => {\n return currentDataPolicy.find((d) => d.dependencyId === pkgName);\n };\n\n const mergedPolicy = {\n dependencies: [],\n devDependencies: [],\n peerDependencies: [],\n };\n const conflictedPolicy = {\n dependencies: [],\n devDependencies: [],\n peerDependencies: [],\n };\n let hasConflict = false;\n const lifecycleToDepType = {\n runtime: 'dependencies',\n dev: 'devDependencies',\n peer: 'peerDependencies',\n };\n const handleConfigMerge = () => {\n const addVariantPolicyEntryToPolicy = (dep: VariantPolicyEntry) => {\n const compIdStr = getCompIdStrByPkgNameFromData(dep.dependencyId);\n if (compIdStr && this.isIdInWorkspaceOrOtherLane(compIdStr, dep.value.version)) {\n // no need to add if the id exists in the workspace (regardless the version)\n return;\n }\n const fromCurrentData = getFromCurrentDataByPackageName(dep.dependencyId);\n if (fromCurrentData && !dep.force) {\n if (fromCurrentData.version === dep.value.version) return;\n if (\n !isHash(fromCurrentData.version) &&\n !isHash(dep.value.version) &&\n semver.satisfies(fromCurrentData.version, dep.value.version)\n ) {\n return;\n }\n }\n const fromCurrentDataPolicy = getFromCurrentDataPolicyByPackageName(dep.dependencyId);\n if (fromCurrentDataPolicy && fromCurrentDataPolicy.value.version === dep.value.version) {\n // that's a bug. if it's in the data.policy, it should be in data.dependencies.\n return;\n }\n const depType = lifecycleToDepType[dep.lifecycleType];\n mergedPolicy[depType].push({\n name: dep.dependencyId,\n version: dep.value.version,\n force: dep.force,\n });\n };\n\n if (this.areConfigsEqual(currentConfig, otherConfig)) {\n return;\n }\n if (baseConfig && this.areConfigsEqual(baseConfig, otherConfig)) {\n // was changed on current\n return;\n }\n if (currentConfig === '-' || otherConfig === '-') {\n throw new Error('not implemented. Is it possible to have it as minus?');\n }\n if (baseConfig && this.areConfigsEqual(baseConfig, currentConfig)) {\n // was changed on other\n if (otherPolicy.length) {\n otherPolicy.forEach((dep) => {\n addVariantPolicyEntryToPolicy(dep);\n });\n }\n return;\n }\n\n // either no baseConfig, or baseConfig is also different from both: other and local. that's a conflict.\n if (!currentConfig.policy && !otherConfig.policy) return;\n const currentAndOtherConfig = uniqBy(currentPolicy.concat(otherPolicy), (d) => d.dependencyId);\n currentAndOtherConfig.forEach((dep) => {\n const depType = lifecycleToDepType[dep.lifecycleType];\n const currentDep = currentPolicy.find((d) => d.dependencyId === dep.dependencyId);\n const otherDep = otherPolicy.find((d) => d.dependencyId === dep.dependencyId);\n const baseDep = basePolicy?.find((d) => d.dependencyId === dep.dependencyId);\n\n if (!otherDep) {\n return;\n }\n if (!currentDep) {\n // only on other\n addVariantPolicyEntryToPolicy(otherDep);\n return;\n }\n const currentVer = currentDep.value.version;\n const otherVer = otherDep.value.version;\n if (currentVer === otherVer) {\n return;\n }\n const baseVer = baseDep?.value.version;\n if (baseVer && baseVer === otherVer) {\n return;\n }\n if (baseVer && baseVer === currentVer) {\n addVariantPolicyEntryToPolicy(otherDep);\n return;\n }\n const compIdStr = getCompIdStrByPkgNameFromData(dep.dependencyId);\n if (compIdStr && this.isIdInWorkspaceOrOtherLane(compIdStr, otherVer)) {\n // no need to add if the id exists in the workspace (regardless the version)\n return;\n }\n\n hasConflict = true;\n conflictedPolicy[depType].push({\n name: currentDep.dependencyId,\n version: `${conflictIndicator}${currentVer}::${otherVer}::`,\n force: currentDep.force,\n });\n });\n };\n\n handleConfigMerge();\n\n const hasConfigForDep = (depType: string, depName: string) => mergedPolicy[depType].find((d) => d.name === depName);\n const getDepIdAsPkgName = (dep: SerializedDependencyWithPolicy) => {\n if (dep.__type !== 'component') {\n return dep.id;\n }\n // @ts-ignore\n return dep.packageName;\n };\n\n const addSerializedDepToPolicy = (dep: SerializedDependencyWithPolicy) => {\n const depType = lifecycleToDepType[dep.lifecycle];\n if (dep.__type === 'component' && this.isIdInWorkspaceOrOtherLane(dep.id, dep.version)) {\n return;\n }\n if (hasConfigForDep(depType, dep.id)) {\n return; // there is already config for it.\n }\n mergedPolicy[depType].push({\n name: getDepIdAsPkgName(dep),\n version: dep.policy || dep.version,\n force: false,\n });\n };\n\n this.logger.debug(\n `currentData, ${currentAllData.length}\\n${currentAllData\n .map((d) => `${d.__type} ${d.id} ${d.version}`)\n .join('\\n')}`\n );\n this.logger.debug(\n `otherData, ${otherData.length}\\n${otherData.map((d) => `${d.__type} ${d.id} ${d.version}`).join('\\n')}`\n );\n this.logger.debug(\n `baseData, ${baseData.length}\\n${baseData.map((d) => `${d.__type} ${d.id} ${d.version}`).join('\\n')}`\n );\n\n // eslint-disable-next-line complexity\n currentAndOtherData.forEach((depData) => {\n this.logger.trace(`depData.id, ${depData.id}`);\n if (this.isEnv(depData.id)) {\n // ignore the envs\n return;\n }\n const currentDep = currentAllData.find((d) => d.id === depData.id);\n const otherDep = otherData.find((d) => d.id === depData.id);\n const baseDep = baseData.find((d) => d.id === depData.id);\n\n this.logger.trace(`currentDep`, currentDep);\n this.logger.trace(`otherDep`, otherDep);\n this.logger.trace(`baseDep`, baseDep);\n if (!otherDep) {\n return;\n }\n if (!currentDep) {\n if (baseDep) {\n // exists in other and base, so it was removed from current\n return;\n }\n // only on other\n addSerializedDepToPolicy(otherDep);\n return;\n }\n\n if (currentDep.policy && otherDep.policy) {\n if (semver.satisfies(currentDep.version, otherDep.policy)) {\n return;\n }\n if (semver.satisfies(otherDep.version, currentDep.policy)) {\n return;\n }\n }\n\n const currentVer = currentDep.policy || currentDep.version;\n const otherVer = otherDep.policy || otherDep.version;\n if (currentVer === otherVer) {\n return;\n }\n const baseVer = baseDep?.policy || baseDep?.version;\n if (baseVer && baseVer === otherVer) {\n return;\n }\n const currentId = currentDep.id;\n if (currentDep.__type === 'component' && this.isIdInWorkspaceOrOtherLane(currentId, otherDep.version)) {\n // dependencies that exist in the workspace, should be ignored. they'll be resolved later to the version in the ws.\n return;\n }\n const depType = lifecycleToDepType[currentDep.lifecycle];\n if (hasConfigForDep(depType, currentDep.id)) {\n return; // there is already config for it.\n }\n if (baseVer && baseVer === currentVer) {\n addSerializedDepToPolicy(otherDep);\n return;\n }\n hasConflict = true;\n conflictedPolicy[depType].push({\n name: getDepIdAsPkgName(currentDep),\n version: `${conflictIndicator}${currentVer}::${otherVer}::`,\n force: false,\n });\n });\n\n ['dependencies', 'devDependencies', 'peerDependencies'].forEach((depType) => {\n if (!mergedPolicy[depType].length) delete mergedPolicy[depType];\n if (!conflictedPolicy[depType].length) delete conflictedPolicy[depType];\n });\n\n const config = Object.keys(mergedPolicy).length ? { policy: mergedPolicy } : undefined;\n const conflict = hasConflict ? conflictedPolicy : undefined;\n\n this.logger.debug('final mergedConfig', config);\n this.logger.debug('final conflict', conflict);\n\n return { id: params.id, mergedConfig: config, conflict };\n }\n\n private isIdInWorkspaceOrOtherLane(id: string, versionOnOtherLane?: string): boolean {\n return Boolean(this.getIdFromWorkspace(id)) || this.otherLaneIdsStr.includes(`${id}@${versionOnOtherLane}`);\n }\n\n private getIdFromWorkspace(id: string): ComponentID | undefined {\n return this.workspaceIds.find((c) => c.toStringWithoutVersion() === id);\n }\n\n private isEnv(id: string) {\n return id === this.currentEnv.id || id === this.otherEnv.id;\n }\n\n private getConfig(ext: ExtensionDataEntry): GenericConfigOrRemoved {\n if (ext.rawConfig === '-') return ext.rawConfig;\n return omit(ext.rawConfig, ['__specific']);\n }\n\n private getPolicy(config): VariantPolicyEntry[] {\n if (!config.policy) return [];\n return VariantPolicy.fromConfigObject(config.policy).entries;\n }\n}\n"],"mappings":"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"}
|
package/dist/index.js
CHANGED
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_merging","data","require","_mergeCmd","_configMergeResult","_default","
|
|
1
|
+
{"version":3,"names":["_merging","data","require","_mergeCmd","_configMergeResult","_default","exports","default","MergingAspect"],"sources":["index.ts"],"sourcesContent":["import { MergingAspect } from './merging.aspect';\n\nexport {\n mergeReport,\n applyVersionReport,\n conflictSummaryReport,\n installationErrorOutput,\n compilationErrorOutput,\n getRemovedOutput,\n getAddedOutput,\n} from './merge-cmd';\nexport type { MergingMain, ComponentMergeStatus, ApplyVersionResults, FailedComponents } from './merging.main.runtime';\nexport { ConfigMergeResult } from './config-merge-result';\nexport default MergingAspect;\nexport { MergingAspect };\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,SAAAA,SAAA;EAAA,MAAAC,IAAA,GAAAC,OAAA;EAAAF,QAAA,YAAAA,CAAA;IAAA,OAAAC,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAEA,SAAAE,UAAA;EAAA,MAAAF,IAAA,GAAAC,OAAA;EAAAC,SAAA,YAAAA,CAAA;IAAA,OAAAF,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAUA,SAAAG,mBAAA;EAAA,MAAAH,IAAA,GAAAC,OAAA;EAAAE,kBAAA,YAAAA,CAAA;IAAA,OAAAH,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAA0D,IAAAI,QAAA,GAAAC,OAAA,CAAAC,OAAA,GAC3CC,wBAAa"}
|
package/dist/merging.aspect.js
CHANGED
|
@@ -11,9 +11,8 @@ function _harmony() {
|
|
|
11
11
|
};
|
|
12
12
|
return data;
|
|
13
13
|
}
|
|
14
|
-
const MergingAspect = _harmony().Aspect.create({
|
|
14
|
+
const MergingAspect = exports.MergingAspect = _harmony().Aspect.create({
|
|
15
15
|
id: 'teambit.component/merging'
|
|
16
16
|
});
|
|
17
|
-
exports.MergingAspect = MergingAspect;
|
|
18
17
|
|
|
19
18
|
//# sourceMappingURL=merging.aspect.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_harmony","data","require","MergingAspect","Aspect","create","id"
|
|
1
|
+
{"version":3,"names":["_harmony","data","require","MergingAspect","exports","Aspect","create","id"],"sources":["merging.aspect.ts"],"sourcesContent":["import { Aspect } from '@teambit/harmony';\n\nexport const MergingAspect = Aspect.create({\n id: 'teambit.component/merging',\n});\n"],"mappings":";;;;;;AAAA,SAAAA,SAAA;EAAA,MAAAC,IAAA,GAAAC,OAAA;EAAAF,QAAA,YAAAA,CAAA;IAAA,OAAAC,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAEO,MAAME,aAAa,GAAAC,OAAA,CAAAD,aAAA,GAAGE,iBAAM,CAACC,MAAM,CAAC;EACzCC,EAAE,EAAE;AACN,CAAC,CAAC"}
|
|
@@ -214,8 +214,8 @@ function _mergeStatusProvider() {
|
|
|
214
214
|
};
|
|
215
215
|
return data;
|
|
216
216
|
}
|
|
217
|
-
function _getRequireWildcardCache(
|
|
218
|
-
function _interopRequireWildcard(
|
|
217
|
+
function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
|
|
218
|
+
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
|
|
219
219
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
220
220
|
function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
|
221
221
|
function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_cli","data","require","_semver","_interopRequireDefault","_workspace","_interopRequireWildcard","_componentsList","_mergeVersion","_snapping","_hasWildcard","_pMapSeries","_componentId","_bitError","_generalError","_laneId","_chalk","_config","_remove","_utils","_componentWriter","_importer","_logger","_globalConfig","_lodash","_dependencyResolver","_checkout","_constants","_deleteComponentFiles","_install","_mergeCmd","_merging","_configMergeResult","_mergeStatusProvider","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","obj","__esModule","default","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","ownKeys","e","r","t","keys","getOwnPropertySymbols","o","filter","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","value","_toPropertyKey","configurable","writable","arg","_toPrimitive","String","input","hint","prim","Symbol","toPrimitive","undefined","res","TypeError","Number","MergingMain","constructor","workspace","install","snapping","checkout","logger","componentWriter","importer","config","remove","merge","ids","mergeStrategy","abort","resolve","noSnap","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","laneId","localLane","tag","_mergeSnapResults","componentWithConflict","find","component","hasConflicts","getMergeStrategyInteractive","componentStatus","shouldBeRemoved","componentIdsToRemove","changeVersion","succeededComponents","componentsResults","mapSeries","currentComponent","resolvedUnrelated","configMergeResult","modelComponent","scope","getModelComponent","updatedLaneId","isDefault","LaneId","from","name","applyVersion","remoteHead","getRef","version","allConfigMerge","compact","workspaceDepsUpdates","workspaceDepsConflicts","updateWorkspaceJsoncWithDepsIfNeeded","generateConfigMergeConflictFileForAll","objects","add","persist","unmergedComponents","write","writeBitMap","compBitIdsToRemove","ComponentIdList","fromArray","deleteComponentsFiles","cleanFromBitMap","componentsHasConfigMergeConflicts","some","_c$configMergeResult","leftUnresolvedConflicts","dedupe","updateExisting","import","err","error","consoleError","getSnapOrTagResults","idsToTag","results","tagAllLaneComponent","taggedComponents","autoTaggedResults","removedComponents","snappedComponents","autoSnappedResults","snapResolvedComponents","mergeSnapResults","mergeSnapError","bitMapSnapshot","bitMap","takeSnapshot","restoreFromSnapshot","components","applyVersionResult","configMergeFile","getConflictMergeFile","workspaceConflict","ConfigMergeResult","DependencyResolverAspect","conflict","unshift","configMerge","generateMergeConflictFile","addConflict","compIdStr","hasConflict","allResults","getDepsResolverResult","nonConflictDeps","nonConflictSources","_configMerge$getDepsR","mergedConfig","mergedConfigPolicy","policy","DEPENDENCIES_FIELDS","depField","pkg","force","includes","conflictDeps","conflictDepsSources","_configMerge$getDepsR2","mergedConfigConflict","notConflictedPackages","conflictedPackages","workspaceConfig","Error","depResolver","extensions","findCoreExtension","workspaceJsonUpdates","pkgName","_policy$depField","currentVer","newVer","debug","WS_DEPS_FIELDS","workspaceJsonConflicts","dependencies","peerDependencies","conflictPackagesToRemoveFromConfigMerge","conflictRaw","currentVal","otherVal","split","_policy$depField2","currentVerInWsJson","semver","satisfies","replace","isEmpty","result","_result$conflict","_result$conflict2","dep","getMergeStatus","currentLane","otherLane","options","mergeStatusProvider","MergeStatusProvider","getStatus","filesStatus","unmergedComponent","fullName","head","handleResolveUnrelated","addComponent","headOnCurrentLane","unrelated","unrelatedHead","unrelatedLaneId","addEntry","markAllFilesAsUnchanged","files","file","pathNormalizeToLinux","relative","FileStatus","unchanged","MergeOptions","ours","strategy","remoteId","idToLoad","theirs","legacyComponent","loadComponentFromModelImportIfNeeded","updateFileStatus","modifiedStatus","modifiedFiles","applyModifiedVersion","removeFilesIfNeeded","manyComponentsWriterOpts","writeConfig","writeMany","writtenPath","successfullyMergedConfig","getSuccessfullyMergedConfig","manual","unmergedPaths","f","filePath","setHead","markVersionAsLocal","values","getIdsForUnmerged","reset","removeComponent","abortedComponents","snap","legacyBitIds","resolvedComponents","localLaneObject","Promise","all","bitId","remoteScopeName","remoteLaneId","remoteLanes","laneIdStr","toStringWithoutVersion","getComponents","ComponentID","fromObject","tagMessage","unmodified","idsStr","componentIds","resolveMultipleComponentIds","entry","getEntry","GeneralError","unresolvedComponents","u","componentsList","ComponentsList","mergePending","listMergePendingComponents","hasWildcard","listComponentsByIdsWithWildcard","getParsedId","provider","cli","loggerMain","compWriter","globalConfig","createLogger","MergingAspect","merging","register","MergeCmd","exports","CLIAspect","WorkspaceAspect","SnappingAspect","CheckoutAspect","InstallAspect","LoggerAspect","ComponentWriterAspect","ImporterAspect","ConfigAspect","RemoveAspect","GlobalConfigAspect","MainRuntime","addRuntime"],"sources":["merging.main.runtime.ts"],"sourcesContent":["import { CLIAspect, CLIMain, MainRuntime } from '@teambit/cli';\nimport semver from 'semver';\nimport WorkspaceAspect, { OutsideWorkspaceError, Workspace } from '@teambit/workspace';\nimport { Consumer } from '@teambit/legacy/dist/consumer';\nimport ComponentsList from '@teambit/legacy/dist/consumer/component/components-list';\nimport {\n MergeStrategy,\n FileStatus,\n ApplyVersionResult,\n getMergeStrategyInteractive,\n MergeOptions,\n} from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport SnappingAspect, { SnapResults, SnappingMain, TagResults } from '@teambit/snapping';\nimport hasWildcard from '@teambit/legacy/dist/utils/string/has-wildcard';\nimport mapSeries from 'p-map-series';\nimport { ComponentID, ComponentIdList } from '@teambit/component-id';\nimport { BitError } from '@teambit/bit-error';\nimport GeneralError from '@teambit/legacy/dist/error/general-error';\nimport { LaneId } from '@teambit/lane-id';\nimport { AutoTagResult } from '@teambit/legacy/dist/scope/component-ops/auto-tag';\nimport { UnmergedComponent } from '@teambit/legacy/dist/scope/lanes/unmerged-components';\nimport { Lane, ModelComponent } from '@teambit/legacy/dist/scope/models';\nimport { Ref } from '@teambit/legacy/dist/scope/objects';\nimport chalk from 'chalk';\nimport { ConfigAspect, ConfigMain } from '@teambit/config';\nimport RemoveAspect, { RemoveMain } from '@teambit/remove';\nimport { pathNormalizeToLinux } from '@teambit/legacy/dist/utils';\nimport { ComponentWriterAspect, ComponentWriterMain } from '@teambit/component-writer';\nimport ConsumerComponent from '@teambit/legacy/dist/consumer/component/consumer-component';\nimport ImporterAspect, { ImporterMain } from '@teambit/importer';\nimport { Logger, LoggerAspect, LoggerMain } from '@teambit/logger';\nimport GlobalConfigAspect, { GlobalConfigMain } from '@teambit/global-config';\nimport { compact, isEmpty } from 'lodash';\nimport { MergeResultsThreeWay } from '@teambit/legacy/dist/consumer/versions-ops/merge-version/three-way-merge';\nimport { DependencyResolverAspect, WorkspacePolicyConfigKeysNames } from '@teambit/dependency-resolver';\nimport {\n ApplyVersionWithComps,\n CheckoutAspect,\n CheckoutMain,\n ComponentStatusBase,\n applyModifiedVersion,\n removeFilesIfNeeded,\n updateFileStatus,\n} from '@teambit/checkout';\nimport { DEPENDENCIES_FIELDS } from '@teambit/legacy/dist/constants';\nimport deleteComponentsFiles from '@teambit/legacy/dist/consumer/component-ops/delete-component-files';\nimport { SnapsDistance } from '@teambit/legacy/dist/scope/component-ops/snaps-distance';\nimport { InstallMain, InstallAspect } from '@teambit/install';\nimport { MergeCmd } from './merge-cmd';\nimport { MergingAspect } from './merging.aspect';\nimport { ConfigMergeResult } from './config-merge-result';\nimport { MergeStatusProvider } from './merge-status-provider';\n\ntype ResolveUnrelatedData = {\n strategy: MergeStrategy;\n headOnCurrentLane: Ref;\n unrelatedHead: Ref;\n unrelatedLaneId: LaneId;\n};\ntype PkgEntry = { name: string; version: string; force: boolean };\n\nexport type WorkspaceDepsUpdates = { [pkgName: string]: [string, string] }; // from => to\nexport type WorkspaceDepsConflicts = Record<WorkspacePolicyConfigKeysNames, Array<{ name: string; version: string }>>; // the pkg value is in a format of CONFLICT::OURS::THEIRS\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\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 resolvedComponents?: ConsumerComponent[]; // relevant for bit merge --resolve\n abortedComponents?: ApplyVersionResult[]; // relevant for bit merge --abort\n mergeSnapResults?: {\n snappedComponents: ConsumerComponent[];\n autoSnappedResults: AutoTagResult[];\n removedComponents?: ComponentIdList;\n } | null;\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 workspaceDepsUpdates?: WorkspaceDepsUpdates; // in case workspace.jsonc has been updated with dependencies versions\n};\n\nexport class MergingMain {\n constructor(\n private workspace: Workspace,\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 ) {}\n\n async merge(\n ids: 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 OutsideWorkspaceError();\n const consumer: Consumer = this.workspace.consumer;\n let mergeResults;\n if (resolve) {\n mergeResults = await this.resolveMerge(ids, message, build);\n } else if (abort) {\n mergeResults = await this.abortMerge(ids);\n } else {\n const bitIds = await this.getComponentsToMerge(consumer, ids);\n mergeResults = await this.mergeComponentsFromRemote(\n consumer,\n bitIds,\n mergeStrategy,\n noSnap,\n message,\n build,\n skipDependencyInstallation\n );\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: ComponentID[],\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.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 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.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 // 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, configMergeResult }) => {\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 configMergeResult,\n });\n }\n );\n\n const allConfigMerge = compact(succeededComponents.map((c) => c.configMergeResult));\n\n const { workspaceDepsUpdates, workspaceDepsConflicts } = await this.updateWorkspaceJsoncWithDepsIfNeeded(\n allConfigMerge\n );\n\n await this.generateConfigMergeConflictFileForAll(allConfigMerge, workspaceDepsConflicts);\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 await consumer.writeBitMap();\n\n if (componentIdsToRemove.length) {\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.consoleError(`failed installing packages, see the log for full stacktrace. error: ${err.message}`);\n }\n }\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 || 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(consumer, snapMessage, build);\n };\n let mergeSnapResults: ApplyVersionResults['mergeSnapResults'] = null;\n let mergeSnapError: Error | undefined;\n const bitMapSnapshot = this.workspace.bitMap.takeSnapshot();\n try {\n mergeSnapResults = await getSnapOrTagResults();\n } catch (err: any) {\n mergeSnapError = err;\n 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 leftUnresolvedConflicts,\n workspaceDepsUpdates,\n };\n }\n\n private async generateConfigMergeConflictFileForAll(\n allConfigMerge: ConfigMergeResult[],\n workspaceDepsConflicts?: WorkspaceDepsConflicts\n ) {\n const configMergeFile = this.workspace.getConflictMergeFile();\n if (workspaceDepsConflicts) {\n const workspaceConflict = new ConfigMergeResult('WORKSPACE', 'ours', 'theirs', [\n {\n id: DependencyResolverAspect.id,\n conflict: workspaceDepsConflicts,\n },\n ]);\n allConfigMerge.unshift(workspaceConflict);\n }\n allConfigMerge.forEach((configMerge) => {\n const conflict = configMerge.generateMergeConflictFile();\n if (!conflict) return;\n configMergeFile.addConflict(configMerge.compIdStr, conflict);\n });\n if (configMergeFile.hasConflict()) {\n await configMergeFile.write();\n }\n }\n\n private async updateWorkspaceJsoncWithDepsIfNeeded(\n allConfigMerge: ConfigMergeResult[]\n ): Promise<{ workspaceDepsUpdates?: WorkspaceDepsUpdates; workspaceDepsConflicts?: WorkspaceDepsConflicts }> {\n const allResults = allConfigMerge.map((c) => c.getDepsResolverResult());\n\n // aggregate all dependencies that can be updated (not conflicting)\n const nonConflictDeps: { [pkgName: string]: string[] } = {};\n const nonConflictSources: { [pkgName: string]: string[] } = {}; // for logging/debugging purposes\n allConfigMerge.forEach((configMerge) => {\n const mergedConfig = configMerge.getDepsResolverResult()?.mergedConfig;\n if (!mergedConfig || mergedConfig === '-') return;\n const mergedConfigPolicy = mergedConfig.policy || {};\n DEPENDENCIES_FIELDS.forEach((depField) => {\n if (!mergedConfigPolicy[depField]) return;\n mergedConfigPolicy[depField].forEach((pkg: PkgEntry) => {\n if (pkg.force) return; // we only care about auto-detected dependencies\n if (nonConflictDeps[pkg.name]) {\n if (!nonConflictDeps[pkg.name].includes(pkg.version)) nonConflictDeps[pkg.name].push(pkg.version);\n nonConflictSources[pkg.name].push(configMerge.compIdStr);\n return;\n }\n nonConflictDeps[pkg.name] = [pkg.version];\n nonConflictSources[pkg.name] = [configMerge.compIdStr];\n });\n });\n });\n\n // aggregate all dependencies that have conflicts\n const conflictDeps: { [pkgName: string]: string[] } = {};\n const conflictDepsSources: { [pkgName: string]: string[] } = {}; // for logging/debugging purposes\n allConfigMerge.forEach((configMerge) => {\n const mergedConfigConflict = configMerge.getDepsResolverResult()?.conflict;\n if (!mergedConfigConflict) return;\n DEPENDENCIES_FIELDS.forEach((depField) => {\n if (!mergedConfigConflict[depField]) return;\n mergedConfigConflict[depField].forEach((pkg: PkgEntry) => {\n if (pkg.force) return; // we only care about auto-detected dependencies\n if (conflictDeps[pkg.name]) {\n if (!conflictDeps[pkg.name].includes(pkg.version)) conflictDeps[pkg.name].push(pkg.version);\n conflictDepsSources[pkg.name].push(configMerge.compIdStr);\n return;\n }\n conflictDeps[pkg.name] = [pkg.version];\n conflictDepsSources[pkg.name] = [configMerge.compIdStr];\n });\n });\n });\n\n const notConflictedPackages = Object.keys(nonConflictDeps);\n const conflictedPackages = Object.keys(conflictDeps);\n if (!notConflictedPackages.length && !conflictedPackages.length) return {};\n\n const workspaceConfig = this.config.workspaceConfig;\n if (!workspaceConfig) throw new Error(`updateWorkspaceJsoncWithDepsIfNeeded unable to get workspace config`);\n const depResolver = workspaceConfig.extensions.findCoreExtension(DependencyResolverAspect.id);\n const policy = depResolver?.config.policy;\n if (!policy) {\n return {};\n }\n\n // calculate the workspace.json updates\n const workspaceJsonUpdates = {};\n notConflictedPackages.forEach((pkgName) => {\n if (nonConflictDeps[pkgName].length > 1) {\n // we only want the deps that the other lane has them in the workspace.json and that all comps use the same dep.\n return;\n }\n DEPENDENCIES_FIELDS.forEach((depField) => {\n if (!policy[depField]?.[pkgName]) return; // doesn't exists in the workspace.json\n const currentVer = policy[depField][pkgName];\n const newVer = nonConflictDeps[pkgName][0];\n if (currentVer === newVer) return;\n workspaceJsonUpdates[pkgName] = [currentVer, newVer];\n policy[depField][pkgName] = newVer;\n this.logger.debug(\n `update workspace.jsonc: ${pkgName} from ${currentVer} to ${newVer}. Triggered by: ${nonConflictSources[\n pkgName\n ].join(', ')}`\n );\n });\n });\n\n // calculate the workspace.json conflicts\n const WS_DEPS_FIELDS = ['dependencies', 'peerDependencies'];\n const workspaceJsonConflicts = { dependencies: [], peerDependencies: [] };\n const conflictPackagesToRemoveFromConfigMerge: string[] = [];\n conflictedPackages.forEach((pkgName) => {\n if (conflictDeps[pkgName].length > 1) {\n // we only want the deps that the other lane has them in the workspace.json and that all comps use the same dep.\n return;\n }\n const conflictRaw = conflictDeps[pkgName][0];\n const [, currentVal, otherVal] = conflictRaw.split('::');\n\n WS_DEPS_FIELDS.forEach((depField) => {\n if (!policy[depField]?.[pkgName]) return;\n const currentVerInWsJson = policy[depField][pkgName];\n if (!currentVerInWsJson) return;\n // the version is coming from the workspace.jsonc\n conflictPackagesToRemoveFromConfigMerge.push(pkgName);\n if (semver.satisfies(otherVal, currentVerInWsJson)) {\n // the other version is compatible with the current version in the workspace.json\n return;\n }\n workspaceJsonConflicts[depField].push({\n name: pkgName,\n version: conflictRaw.replace(currentVal, currentVerInWsJson),\n force: false,\n });\n conflictPackagesToRemoveFromConfigMerge.push(pkgName);\n this.logger.debug(\n `conflict workspace.jsonc: ${pkgName} current: ${currentVerInWsJson}, other: ${otherVal}. Triggered by: ${conflictDepsSources[\n pkgName\n ].join(', ')}`\n );\n });\n });\n WS_DEPS_FIELDS.forEach((depField) => {\n if (isEmpty(workspaceJsonConflicts[depField])) delete workspaceJsonConflicts[depField];\n });\n\n if (conflictPackagesToRemoveFromConfigMerge.length) {\n allResults.forEach((result) => {\n if (result?.conflict) {\n DEPENDENCIES_FIELDS.forEach((depField) => {\n if (!result.conflict?.[depField]) return;\n result.conflict[depField] = result.conflict?.[depField].filter(\n (dep) => !conflictPackagesToRemoveFromConfigMerge.includes(dep.name)\n );\n if (!result.conflict[depField].length) delete result.conflict[depField];\n });\n if (isEmpty(result.conflict)) result.conflict = undefined;\n }\n });\n }\n\n if (Object.keys(workspaceJsonUpdates).length) {\n await workspaceConfig.write();\n }\n\n this.logger.debug('final workspace.jsonc updates', workspaceJsonUpdates);\n this.logger.debug('final workspace.jsonc conflicts', workspaceJsonConflicts);\n\n return {\n workspaceDepsUpdates: Object.keys(workspaceJsonUpdates).length ? workspaceJsonUpdates : undefined,\n workspaceDepsConflicts: Object.keys(workspaceJsonConflicts).length ? workspaceJsonConflicts : undefined,\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 */\n async getMergeStatus(\n bitIds: ComponentID[], // the id.version is the version we want to merge to the current component\n currentLane: Lane | null, // currently checked out lane. if on main, then it's null.\n otherLane?: Lane | null, // the lane we want to merged to our lane. (null if it's \"main\").\n options?: { resolveUnrelated?: MergeStrategy; ignoreConfigChanges?: boolean }\n ): Promise<ComponentMergeStatus[]> {\n const mergeStatusProvider = new MergeStatusProvider(\n this.workspace,\n this.logger,\n this.importer,\n currentLane || undefined,\n otherLane || undefined,\n options\n );\n return mergeStatusProvider.getStatus(bitIds);\n }\n\n private async applyVersion({\n currentComponent,\n id,\n mergeResults,\n mergeStrategy,\n remoteHead,\n laneId,\n localLane,\n resolvedUnrelated,\n configMergeResult,\n }: {\n currentComponent: ConsumerComponent | null | undefined;\n id: ComponentID;\n mergeResults: MergeResultsThreeWay | null | undefined;\n mergeStrategy: MergeStrategy;\n remoteHead: Ref;\n laneId: LaneId;\n localLane: Lane | null;\n resolvedUnrelated?: ResolveUnrelatedData;\n configMergeResult?: ConfigMergeResult;\n }): Promise<ApplyVersionWithComps> {\n const consumer = this.workspace.consumer;\n let filesStatus = {};\n const unmergedComponent: UnmergedComponent = {\n // @ts-ignore\n id: { name: id.fullName, scope: id.scope },\n head: remoteHead,\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 // 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 (!localLane) throw new Error('localLane must be defined when resolvedUnrelated');\n if (!resolvedUnrelated) throw new Error('resolvedUnrelated must be populated');\n localLane.addComponent({ id, head: resolvedUnrelated.headOnCurrentLane });\n unmergedComponent.unrelated = {\n unrelatedHead: resolvedUnrelated.unrelatedHead,\n headOnCurrentLane: resolvedUnrelated.headOnCurrentLane,\n unrelatedLaneId: resolvedUnrelated.unrelatedLaneId,\n };\n consumer.scope.objects.unmergedComponents.addEntry(unmergedComponent);\n return { applyVersionResult: { id, filesStatus }, component: currentComponent };\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 { 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 = await consumer.loadComponentFromModelImportIfNeeded(idToLoad);\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 await removeFilesIfNeeded(filesStatus, currentComponent || undefined);\n\n const manyComponentsWriterOpts = {\n consumer,\n components: [legacyComponent],\n skipDependencyInstallation: true,\n writeConfig: false, // @todo: should write if config exists before, needs to figure out how to do it.\n };\n await this.componentWriter.writeMany(manyComponentsWriterOpts);\n\n if (configMergeResult) {\n if (!legacyComponent.writtenPath) {\n throw new Error(`component.writtenPath is missing for ${id.toString()}`);\n }\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 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 { applyVersionResult: { id, filesStatus }, component: currentComponent || undefined };\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: 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 | null\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, localLaneObject, localLaneObject);\n }\n\n private async snapResolvedComponents(\n consumer: Consumer,\n snapMessage: string,\n build: boolean\n ): Promise<SnapResults | null> {\n const unmergedComponents = consumer.scope.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 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(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.fromObject(u.id));\n }\n\n private async getComponentsToMerge(consumer: Consumer, ids: string[]): Promise<ComponentID[]> {\n const componentsList = new ComponentsList(consumer);\n if (!ids.length) {\n const mergePending = await componentsList.listMergePendingComponents();\n return mergePending.map((c) => c.id);\n }\n if (hasWildcard(ids)) {\n return componentsList.listComponentsByIdsWithWildcard(ids);\n }\n return ids.map((id) => consumer.getParsedId(id));\n }\n\n static slots = [];\n static dependencies = [\n CLIAspect,\n WorkspaceAspect,\n SnappingAspect,\n CheckoutAspect,\n InstallAspect,\n LoggerAspect,\n ComponentWriterAspect,\n ImporterAspect,\n ConfigAspect,\n RemoveAspect,\n GlobalConfigAspect,\n ];\n static runtime = MainRuntime;\n static async provider([\n cli,\n workspace,\n snapping,\n checkout,\n install,\n loggerMain,\n compWriter,\n importer,\n config,\n remove,\n globalConfig,\n ]: [\n CLIMain,\n Workspace,\n SnappingMain,\n CheckoutMain,\n InstallMain,\n LoggerMain,\n ComponentWriterMain,\n ImporterMain,\n ConfigMain,\n RemoveMain,\n GlobalConfigMain\n ]) {\n const logger = loggerMain.createLogger(MergingAspect.id);\n const merging = new MergingMain(\n workspace,\n install,\n snapping,\n checkout,\n logger,\n compWriter,\n importer,\n config,\n remove\n );\n cli.register(new MergeCmd(merging, globalConfig));\n return merging;\n }\n}\n\nMergingAspect.addRuntime(MergingMain);\n"],"mappings":"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"}
|
|
1
|
+
{"version":3,"names":["_cli","data","require","_semver","_interopRequireDefault","_workspace","_interopRequireWildcard","_componentsList","_mergeVersion","_snapping","_hasWildcard","_pMapSeries","_componentId","_bitError","_generalError","_laneId","_chalk","_config","_remove","_utils","_componentWriter","_importer","_logger","_globalConfig","_lodash","_dependencyResolver","_checkout","_constants","_deleteComponentFiles","_install","_mergeCmd","_merging","_configMergeResult","_mergeStatusProvider","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","obj","ownKeys","keys","getOwnPropertySymbols","o","filter","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","key","value","_toPropertyKey","configurable","writable","arg","_toPrimitive","String","input","hint","prim","Symbol","toPrimitive","undefined","res","TypeError","Number","MergingMain","constructor","workspace","install","snapping","checkout","logger","componentWriter","importer","config","remove","merge","ids","mergeStrategy","abort","resolve","noSnap","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","laneId","localLane","tag","_mergeSnapResults","componentWithConflict","find","component","hasConflicts","getMergeStrategyInteractive","componentStatus","shouldBeRemoved","componentIdsToRemove","changeVersion","succeededComponents","componentsResults","mapSeries","currentComponent","resolvedUnrelated","configMergeResult","modelComponent","scope","getModelComponent","updatedLaneId","isDefault","LaneId","from","name","applyVersion","remoteHead","getRef","version","allConfigMerge","compact","workspaceDepsUpdates","workspaceDepsConflicts","updateWorkspaceJsoncWithDepsIfNeeded","generateConfigMergeConflictFileForAll","objects","add","persist","unmergedComponents","write","writeBitMap","compBitIdsToRemove","ComponentIdList","fromArray","deleteComponentsFiles","cleanFromBitMap","componentsHasConfigMergeConflicts","some","_c$configMergeResult","leftUnresolvedConflicts","dedupe","updateExisting","import","err","error","consoleError","getSnapOrTagResults","idsToTag","results","tagAllLaneComponent","taggedComponents","autoTaggedResults","removedComponents","snappedComponents","autoSnappedResults","snapResolvedComponents","mergeSnapResults","mergeSnapError","bitMapSnapshot","bitMap","takeSnapshot","restoreFromSnapshot","components","applyVersionResult","configMergeFile","getConflictMergeFile","workspaceConflict","ConfigMergeResult","DependencyResolverAspect","conflict","unshift","configMerge","generateMergeConflictFile","addConflict","compIdStr","hasConflict","allResults","getDepsResolverResult","nonConflictDeps","nonConflictSources","_configMerge$getDepsR","mergedConfig","mergedConfigPolicy","policy","DEPENDENCIES_FIELDS","depField","pkg","force","includes","conflictDeps","conflictDepsSources","_configMerge$getDepsR2","mergedConfigConflict","notConflictedPackages","conflictedPackages","workspaceConfig","Error","depResolver","extensions","findCoreExtension","workspaceJsonUpdates","pkgName","_policy$depField","currentVer","newVer","debug","WS_DEPS_FIELDS","workspaceJsonConflicts","dependencies","peerDependencies","conflictPackagesToRemoveFromConfigMerge","conflictRaw","currentVal","otherVal","split","_policy$depField2","currentVerInWsJson","semver","satisfies","replace","isEmpty","result","_result$conflict","_result$conflict2","dep","getMergeStatus","currentLane","otherLane","options","mergeStatusProvider","MergeStatusProvider","getStatus","filesStatus","unmergedComponent","fullName","head","handleResolveUnrelated","addComponent","headOnCurrentLane","unrelated","unrelatedHead","unrelatedLaneId","addEntry","markAllFilesAsUnchanged","files","file","pathNormalizeToLinux","relative","FileStatus","unchanged","MergeOptions","ours","strategy","remoteId","idToLoad","theirs","legacyComponent","loadComponentFromModelImportIfNeeded","updateFileStatus","modifiedStatus","modifiedFiles","applyModifiedVersion","removeFilesIfNeeded","manyComponentsWriterOpts","writeConfig","writeMany","writtenPath","successfullyMergedConfig","getSuccessfullyMergedConfig","manual","unmergedPaths","f","filePath","setHead","markVersionAsLocal","values","getIdsForUnmerged","reset","removeComponent","abortedComponents","snap","legacyBitIds","resolvedComponents","localLaneObject","Promise","all","bitId","remoteScopeName","remoteLaneId","remoteLanes","laneIdStr","toStringWithoutVersion","getComponents","ComponentID","fromObject","tagMessage","unmodified","idsStr","componentIds","resolveMultipleComponentIds","entry","getEntry","GeneralError","unresolvedComponents","componentsList","ComponentsList","mergePending","listMergePendingComponents","hasWildcard","listComponentsByIdsWithWildcard","getParsedId","provider","cli","loggerMain","compWriter","globalConfig","createLogger","MergingAspect","merging","register","MergeCmd","exports","CLIAspect","WorkspaceAspect","SnappingAspect","CheckoutAspect","InstallAspect","LoggerAspect","ComponentWriterAspect","ImporterAspect","ConfigAspect","RemoveAspect","GlobalConfigAspect","MainRuntime","addRuntime"],"sources":["merging.main.runtime.ts"],"sourcesContent":["import { CLIAspect, CLIMain, MainRuntime } from '@teambit/cli';\nimport semver from 'semver';\nimport WorkspaceAspect, { OutsideWorkspaceError, Workspace } from '@teambit/workspace';\nimport { Consumer } from '@teambit/legacy/dist/consumer';\nimport ComponentsList from '@teambit/legacy/dist/consumer/component/components-list';\nimport {\n MergeStrategy,\n FileStatus,\n ApplyVersionResult,\n getMergeStrategyInteractive,\n MergeOptions,\n} from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport SnappingAspect, { SnapResults, SnappingMain, TagResults } from '@teambit/snapping';\nimport hasWildcard from '@teambit/legacy/dist/utils/string/has-wildcard';\nimport mapSeries from 'p-map-series';\nimport { ComponentID, ComponentIdList } from '@teambit/component-id';\nimport { BitError } from '@teambit/bit-error';\nimport GeneralError from '@teambit/legacy/dist/error/general-error';\nimport { LaneId } from '@teambit/lane-id';\nimport { AutoTagResult } from '@teambit/legacy/dist/scope/component-ops/auto-tag';\nimport { UnmergedComponent } from '@teambit/legacy/dist/scope/lanes/unmerged-components';\nimport { Lane, ModelComponent } from '@teambit/legacy/dist/scope/models';\nimport { Ref } from '@teambit/legacy/dist/scope/objects';\nimport chalk from 'chalk';\nimport { ConfigAspect, ConfigMain } from '@teambit/config';\nimport RemoveAspect, { RemoveMain } from '@teambit/remove';\nimport { pathNormalizeToLinux } from '@teambit/legacy/dist/utils';\nimport { ComponentWriterAspect, ComponentWriterMain } from '@teambit/component-writer';\nimport ConsumerComponent from '@teambit/legacy/dist/consumer/component/consumer-component';\nimport ImporterAspect, { ImporterMain } from '@teambit/importer';\nimport { Logger, LoggerAspect, LoggerMain } from '@teambit/logger';\nimport GlobalConfigAspect, { GlobalConfigMain } from '@teambit/global-config';\nimport { compact, isEmpty } from 'lodash';\nimport { MergeResultsThreeWay } from '@teambit/legacy/dist/consumer/versions-ops/merge-version/three-way-merge';\nimport { DependencyResolverAspect, WorkspacePolicyConfigKeysNames } from '@teambit/dependency-resolver';\nimport {\n ApplyVersionWithComps,\n CheckoutAspect,\n CheckoutMain,\n ComponentStatusBase,\n applyModifiedVersion,\n removeFilesIfNeeded,\n updateFileStatus,\n} from '@teambit/checkout';\nimport { DEPENDENCIES_FIELDS } from '@teambit/legacy/dist/constants';\nimport deleteComponentsFiles from '@teambit/legacy/dist/consumer/component-ops/delete-component-files';\nimport { SnapsDistance } from '@teambit/legacy/dist/scope/component-ops/snaps-distance';\nimport { InstallMain, InstallAspect } from '@teambit/install';\nimport { MergeCmd } from './merge-cmd';\nimport { MergingAspect } from './merging.aspect';\nimport { ConfigMergeResult } from './config-merge-result';\nimport { MergeStatusProvider } from './merge-status-provider';\n\ntype ResolveUnrelatedData = {\n strategy: MergeStrategy;\n headOnCurrentLane: Ref;\n unrelatedHead: Ref;\n unrelatedLaneId: LaneId;\n};\ntype PkgEntry = { name: string; version: string; force: boolean };\n\nexport type WorkspaceDepsUpdates = { [pkgName: string]: [string, string] }; // from => to\nexport type WorkspaceDepsConflicts = Record<WorkspacePolicyConfigKeysNames, Array<{ name: string; version: string }>>; // the pkg value is in a format of CONFLICT::OURS::THEIRS\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\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 resolvedComponents?: ConsumerComponent[]; // relevant for bit merge --resolve\n abortedComponents?: ApplyVersionResult[]; // relevant for bit merge --abort\n mergeSnapResults?: {\n snappedComponents: ConsumerComponent[];\n autoSnappedResults: AutoTagResult[];\n removedComponents?: ComponentIdList;\n } | null;\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 workspaceDepsUpdates?: WorkspaceDepsUpdates; // in case workspace.jsonc has been updated with dependencies versions\n};\n\nexport class MergingMain {\n constructor(\n private workspace: Workspace,\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 ) {}\n\n async merge(\n ids: 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 OutsideWorkspaceError();\n const consumer: Consumer = this.workspace.consumer;\n let mergeResults;\n if (resolve) {\n mergeResults = await this.resolveMerge(ids, message, build);\n } else if (abort) {\n mergeResults = await this.abortMerge(ids);\n } else {\n const bitIds = await this.getComponentsToMerge(consumer, ids);\n mergeResults = await this.mergeComponentsFromRemote(\n consumer,\n bitIds,\n mergeStrategy,\n noSnap,\n message,\n build,\n skipDependencyInstallation\n );\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: ComponentID[],\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.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 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.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 // 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, configMergeResult }) => {\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 configMergeResult,\n });\n }\n );\n\n const allConfigMerge = compact(succeededComponents.map((c) => c.configMergeResult));\n\n const { workspaceDepsUpdates, workspaceDepsConflicts } = await this.updateWorkspaceJsoncWithDepsIfNeeded(\n allConfigMerge\n );\n\n await this.generateConfigMergeConflictFileForAll(allConfigMerge, workspaceDepsConflicts);\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 await consumer.writeBitMap();\n\n if (componentIdsToRemove.length) {\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.consoleError(`failed installing packages, see the log for full stacktrace. error: ${err.message}`);\n }\n }\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 || 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(consumer, snapMessage, build);\n };\n let mergeSnapResults: ApplyVersionResults['mergeSnapResults'] = null;\n let mergeSnapError: Error | undefined;\n const bitMapSnapshot = this.workspace.bitMap.takeSnapshot();\n try {\n mergeSnapResults = await getSnapOrTagResults();\n } catch (err: any) {\n mergeSnapError = err;\n 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 leftUnresolvedConflicts,\n workspaceDepsUpdates,\n };\n }\n\n private async generateConfigMergeConflictFileForAll(\n allConfigMerge: ConfigMergeResult[],\n workspaceDepsConflicts?: WorkspaceDepsConflicts\n ) {\n const configMergeFile = this.workspace.getConflictMergeFile();\n if (workspaceDepsConflicts) {\n const workspaceConflict = new ConfigMergeResult('WORKSPACE', 'ours', 'theirs', [\n {\n id: DependencyResolverAspect.id,\n conflict: workspaceDepsConflicts,\n },\n ]);\n allConfigMerge.unshift(workspaceConflict);\n }\n allConfigMerge.forEach((configMerge) => {\n const conflict = configMerge.generateMergeConflictFile();\n if (!conflict) return;\n configMergeFile.addConflict(configMerge.compIdStr, conflict);\n });\n if (configMergeFile.hasConflict()) {\n await configMergeFile.write();\n }\n }\n\n private async updateWorkspaceJsoncWithDepsIfNeeded(\n allConfigMerge: ConfigMergeResult[]\n ): Promise<{ workspaceDepsUpdates?: WorkspaceDepsUpdates; workspaceDepsConflicts?: WorkspaceDepsConflicts }> {\n const allResults = allConfigMerge.map((c) => c.getDepsResolverResult());\n\n // aggregate all dependencies that can be updated (not conflicting)\n const nonConflictDeps: { [pkgName: string]: string[] } = {};\n const nonConflictSources: { [pkgName: string]: string[] } = {}; // for logging/debugging purposes\n allConfigMerge.forEach((configMerge) => {\n const mergedConfig = configMerge.getDepsResolverResult()?.mergedConfig;\n if (!mergedConfig || mergedConfig === '-') return;\n const mergedConfigPolicy = mergedConfig.policy || {};\n DEPENDENCIES_FIELDS.forEach((depField) => {\n if (!mergedConfigPolicy[depField]) return;\n mergedConfigPolicy[depField].forEach((pkg: PkgEntry) => {\n if (pkg.force) return; // we only care about auto-detected dependencies\n if (nonConflictDeps[pkg.name]) {\n if (!nonConflictDeps[pkg.name].includes(pkg.version)) nonConflictDeps[pkg.name].push(pkg.version);\n nonConflictSources[pkg.name].push(configMerge.compIdStr);\n return;\n }\n nonConflictDeps[pkg.name] = [pkg.version];\n nonConflictSources[pkg.name] = [configMerge.compIdStr];\n });\n });\n });\n\n // aggregate all dependencies that have conflicts\n const conflictDeps: { [pkgName: string]: string[] } = {};\n const conflictDepsSources: { [pkgName: string]: string[] } = {}; // for logging/debugging purposes\n allConfigMerge.forEach((configMerge) => {\n const mergedConfigConflict = configMerge.getDepsResolverResult()?.conflict;\n if (!mergedConfigConflict) return;\n DEPENDENCIES_FIELDS.forEach((depField) => {\n if (!mergedConfigConflict[depField]) return;\n mergedConfigConflict[depField].forEach((pkg: PkgEntry) => {\n if (pkg.force) return; // we only care about auto-detected dependencies\n if (conflictDeps[pkg.name]) {\n if (!conflictDeps[pkg.name].includes(pkg.version)) conflictDeps[pkg.name].push(pkg.version);\n conflictDepsSources[pkg.name].push(configMerge.compIdStr);\n return;\n }\n conflictDeps[pkg.name] = [pkg.version];\n conflictDepsSources[pkg.name] = [configMerge.compIdStr];\n });\n });\n });\n\n const notConflictedPackages = Object.keys(nonConflictDeps);\n const conflictedPackages = Object.keys(conflictDeps);\n if (!notConflictedPackages.length && !conflictedPackages.length) return {};\n\n const workspaceConfig = this.config.workspaceConfig;\n if (!workspaceConfig) throw new Error(`updateWorkspaceJsoncWithDepsIfNeeded unable to get workspace config`);\n const depResolver = workspaceConfig.extensions.findCoreExtension(DependencyResolverAspect.id);\n const policy = depResolver?.config.policy;\n if (!policy) {\n return {};\n }\n\n // calculate the workspace.json updates\n const workspaceJsonUpdates = {};\n notConflictedPackages.forEach((pkgName) => {\n if (nonConflictDeps[pkgName].length > 1) {\n // we only want the deps that the other lane has them in the workspace.json and that all comps use the same dep.\n return;\n }\n DEPENDENCIES_FIELDS.forEach((depField) => {\n if (!policy[depField]?.[pkgName]) return; // doesn't exists in the workspace.json\n const currentVer = policy[depField][pkgName];\n const newVer = nonConflictDeps[pkgName][0];\n if (currentVer === newVer) return;\n workspaceJsonUpdates[pkgName] = [currentVer, newVer];\n policy[depField][pkgName] = newVer;\n this.logger.debug(\n `update workspace.jsonc: ${pkgName} from ${currentVer} to ${newVer}. Triggered by: ${nonConflictSources[\n pkgName\n ].join(', ')}`\n );\n });\n });\n\n // calculate the workspace.json conflicts\n const WS_DEPS_FIELDS = ['dependencies', 'peerDependencies'];\n const workspaceJsonConflicts = { dependencies: [], peerDependencies: [] };\n const conflictPackagesToRemoveFromConfigMerge: string[] = [];\n conflictedPackages.forEach((pkgName) => {\n if (conflictDeps[pkgName].length > 1) {\n // we only want the deps that the other lane has them in the workspace.json and that all comps use the same dep.\n return;\n }\n const conflictRaw = conflictDeps[pkgName][0];\n const [, currentVal, otherVal] = conflictRaw.split('::');\n\n WS_DEPS_FIELDS.forEach((depField) => {\n if (!policy[depField]?.[pkgName]) return;\n const currentVerInWsJson = policy[depField][pkgName];\n if (!currentVerInWsJson) return;\n // the version is coming from the workspace.jsonc\n conflictPackagesToRemoveFromConfigMerge.push(pkgName);\n if (semver.satisfies(otherVal, currentVerInWsJson)) {\n // the other version is compatible with the current version in the workspace.json\n return;\n }\n workspaceJsonConflicts[depField].push({\n name: pkgName,\n version: conflictRaw.replace(currentVal, currentVerInWsJson),\n force: false,\n });\n conflictPackagesToRemoveFromConfigMerge.push(pkgName);\n this.logger.debug(\n `conflict workspace.jsonc: ${pkgName} current: ${currentVerInWsJson}, other: ${otherVal}. Triggered by: ${conflictDepsSources[\n pkgName\n ].join(', ')}`\n );\n });\n });\n WS_DEPS_FIELDS.forEach((depField) => {\n if (isEmpty(workspaceJsonConflicts[depField])) delete workspaceJsonConflicts[depField];\n });\n\n if (conflictPackagesToRemoveFromConfigMerge.length) {\n allResults.forEach((result) => {\n if (result?.conflict) {\n DEPENDENCIES_FIELDS.forEach((depField) => {\n if (!result.conflict?.[depField]) return;\n result.conflict[depField] = result.conflict?.[depField].filter(\n (dep) => !conflictPackagesToRemoveFromConfigMerge.includes(dep.name)\n );\n if (!result.conflict[depField].length) delete result.conflict[depField];\n });\n if (isEmpty(result.conflict)) result.conflict = undefined;\n }\n });\n }\n\n if (Object.keys(workspaceJsonUpdates).length) {\n await workspaceConfig.write();\n }\n\n this.logger.debug('final workspace.jsonc updates', workspaceJsonUpdates);\n this.logger.debug('final workspace.jsonc conflicts', workspaceJsonConflicts);\n\n return {\n workspaceDepsUpdates: Object.keys(workspaceJsonUpdates).length ? workspaceJsonUpdates : undefined,\n workspaceDepsConflicts: Object.keys(workspaceJsonConflicts).length ? workspaceJsonConflicts : undefined,\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 */\n async getMergeStatus(\n bitIds: ComponentID[], // the id.version is the version we want to merge to the current component\n currentLane: Lane | null, // currently checked out lane. if on main, then it's null.\n otherLane?: Lane | null, // the lane we want to merged to our lane. (null if it's \"main\").\n options?: { resolveUnrelated?: MergeStrategy; ignoreConfigChanges?: boolean }\n ): Promise<ComponentMergeStatus[]> {\n const mergeStatusProvider = new MergeStatusProvider(\n this.workspace,\n this.logger,\n this.importer,\n currentLane || undefined,\n otherLane || undefined,\n options\n );\n return mergeStatusProvider.getStatus(bitIds);\n }\n\n private async applyVersion({\n currentComponent,\n id,\n mergeResults,\n mergeStrategy,\n remoteHead,\n laneId,\n localLane,\n resolvedUnrelated,\n configMergeResult,\n }: {\n currentComponent: ConsumerComponent | null | undefined;\n id: ComponentID;\n mergeResults: MergeResultsThreeWay | null | undefined;\n mergeStrategy: MergeStrategy;\n remoteHead: Ref;\n laneId: LaneId;\n localLane: Lane | null;\n resolvedUnrelated?: ResolveUnrelatedData;\n configMergeResult?: ConfigMergeResult;\n }): Promise<ApplyVersionWithComps> {\n const consumer = this.workspace.consumer;\n let filesStatus = {};\n const unmergedComponent: UnmergedComponent = {\n // @ts-ignore\n id: { name: id.fullName, scope: id.scope },\n head: remoteHead,\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 // 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 (!localLane) throw new Error('localLane must be defined when resolvedUnrelated');\n if (!resolvedUnrelated) throw new Error('resolvedUnrelated must be populated');\n localLane.addComponent({ id, head: resolvedUnrelated.headOnCurrentLane });\n unmergedComponent.unrelated = {\n unrelatedHead: resolvedUnrelated.unrelatedHead,\n headOnCurrentLane: resolvedUnrelated.headOnCurrentLane,\n unrelatedLaneId: resolvedUnrelated.unrelatedLaneId,\n };\n consumer.scope.objects.unmergedComponents.addEntry(unmergedComponent);\n return { applyVersionResult: { id, filesStatus }, component: currentComponent };\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 { 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 = await consumer.loadComponentFromModelImportIfNeeded(idToLoad);\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 await removeFilesIfNeeded(filesStatus, currentComponent || undefined);\n\n const manyComponentsWriterOpts = {\n consumer,\n components: [legacyComponent],\n skipDependencyInstallation: true,\n writeConfig: false, // @todo: should write if config exists before, needs to figure out how to do it.\n };\n await this.componentWriter.writeMany(manyComponentsWriterOpts);\n\n if (configMergeResult) {\n if (!legacyComponent.writtenPath) {\n throw new Error(`component.writtenPath is missing for ${id.toString()}`);\n }\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 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 { applyVersionResult: { id, filesStatus }, component: currentComponent || undefined };\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: 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 | null\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, localLaneObject, localLaneObject);\n }\n\n private async snapResolvedComponents(\n consumer: Consumer,\n snapMessage: string,\n build: boolean\n ): Promise<SnapResults | null> {\n const unmergedComponents = consumer.scope.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 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(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.fromObject(u.id));\n }\n\n private async getComponentsToMerge(consumer: Consumer, ids: string[]): Promise<ComponentID[]> {\n const componentsList = new ComponentsList(consumer);\n if (!ids.length) {\n const mergePending = await componentsList.listMergePendingComponents();\n return mergePending.map((c) => c.id);\n }\n if (hasWildcard(ids)) {\n return componentsList.listComponentsByIdsWithWildcard(ids);\n }\n return ids.map((id) => consumer.getParsedId(id));\n }\n\n static slots = [];\n static dependencies = [\n CLIAspect,\n WorkspaceAspect,\n SnappingAspect,\n CheckoutAspect,\n InstallAspect,\n LoggerAspect,\n ComponentWriterAspect,\n ImporterAspect,\n ConfigAspect,\n RemoveAspect,\n GlobalConfigAspect,\n ];\n static runtime = MainRuntime;\n static async provider([\n cli,\n workspace,\n snapping,\n checkout,\n install,\n loggerMain,\n compWriter,\n importer,\n config,\n remove,\n globalConfig,\n ]: [\n CLIMain,\n Workspace,\n SnappingMain,\n CheckoutMain,\n InstallMain,\n LoggerMain,\n ComponentWriterMain,\n ImporterMain,\n ConfigMain,\n RemoveMain,\n GlobalConfigMain\n ]) {\n const logger = loggerMain.createLogger(MergingAspect.id);\n const merging = new MergingMain(\n workspace,\n install,\n snapping,\n checkout,\n logger,\n compWriter,\n importer,\n config,\n remove\n );\n cli.register(new MergeCmd(merging, globalConfig));\n return merging;\n }\n}\n\nMergingAspect.addRuntime(MergingMain);\n"],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@teambit/merging",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.43",
|
|
4
4
|
"homepage": "https://bit.cloud/teambit/component/merging",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"componentId": {
|
|
7
7
|
"scope": "teambit.component",
|
|
8
8
|
"name": "merging",
|
|
9
|
-
"version": "1.0.
|
|
9
|
+
"version": "1.0.43"
|
|
10
10
|
},
|
|
11
11
|
"dependencies": {
|
|
12
12
|
"lodash": "4.17.21",
|
|
@@ -14,26 +14,26 @@
|
|
|
14
14
|
"chalk": "2.4.2",
|
|
15
15
|
"p-map-series": "2.1.0",
|
|
16
16
|
"core-js": "^3.0.0",
|
|
17
|
-
"@babel/runtime": "7.
|
|
17
|
+
"@babel/runtime": "7.23.2",
|
|
18
18
|
"@teambit/component-id": "1.1.1",
|
|
19
19
|
"@teambit/component-version": "1.0.3",
|
|
20
20
|
"@teambit/bit-error": "0.0.404",
|
|
21
21
|
"@teambit/lane-id": "0.0.311",
|
|
22
22
|
"@teambit/harmony": "0.4.6",
|
|
23
|
-
"@teambit/dependency-resolver": "1.0.
|
|
24
|
-
"@teambit/builder": "1.0.
|
|
25
|
-
"@teambit/envs": "1.0.
|
|
26
|
-
"@teambit/logger": "0.0.
|
|
27
|
-
"@teambit/cli": "0.0.
|
|
28
|
-
"@teambit/global-config": "0.0.
|
|
29
|
-
"@teambit/importer": "1.0.
|
|
30
|
-
"@teambit/workspace": "1.0.
|
|
31
|
-
"@teambit/checkout": "1.0.
|
|
32
|
-
"@teambit/component-writer": "1.0.
|
|
33
|
-
"@teambit/config": "0.0.
|
|
34
|
-
"@teambit/install": "1.0.
|
|
35
|
-
"@teambit/remove": "1.0.
|
|
36
|
-
"@teambit/snapping": "1.0.
|
|
23
|
+
"@teambit/dependency-resolver": "1.0.43",
|
|
24
|
+
"@teambit/builder": "1.0.43",
|
|
25
|
+
"@teambit/envs": "1.0.43",
|
|
26
|
+
"@teambit/logger": "0.0.901",
|
|
27
|
+
"@teambit/cli": "0.0.808",
|
|
28
|
+
"@teambit/global-config": "0.0.810",
|
|
29
|
+
"@teambit/importer": "1.0.43",
|
|
30
|
+
"@teambit/workspace": "1.0.43",
|
|
31
|
+
"@teambit/checkout": "1.0.43",
|
|
32
|
+
"@teambit/component-writer": "1.0.43",
|
|
33
|
+
"@teambit/config": "0.0.824",
|
|
34
|
+
"@teambit/install": "1.0.43",
|
|
35
|
+
"@teambit/remove": "1.0.43",
|
|
36
|
+
"@teambit/snapping": "1.0.43"
|
|
37
37
|
},
|
|
38
38
|
"devDependencies": {
|
|
39
39
|
"@types/lodash": "4.14.165",
|
|
@@ -47,7 +47,7 @@
|
|
|
47
47
|
"@types/testing-library__jest-dom": "5.9.5"
|
|
48
48
|
},
|
|
49
49
|
"peerDependencies": {
|
|
50
|
-
"@teambit/legacy": "1.0.
|
|
50
|
+
"@teambit/legacy": "1.0.590",
|
|
51
51
|
"react": "^16.8.0 || ^17.0.0",
|
|
52
52
|
"react-dom": "^16.8.0 || ^17.0.0"
|
|
53
53
|
},
|
|
File without changes
|