npm - @teambit/merging - Versions diffs - 1.0.8 → 1.0.10 - Mend

@teambit/merging 1.0.8 → 1.0.10

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (10) hide show

package/dist/config-merge-result.js +2 -2
package/dist/config-merge-result.js.map +1 -1
package/dist/config-merger.js +11 -3
package/dist/config-merger.js.map +1 -1
package/dist/merge-status-provider.js +2 -2
package/dist/merge-status-provider.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 -17
/package/dist/{preview-1695698249502.js → preview-1695901055662.js} +0 -0

package/dist/config-merge-result.js CHANGED Viewed

@@ -25,8 +25,8 @@ function _configMerger() {
   };
   return data;
 }
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+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; }
+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; }
 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; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
 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); }

package/dist/config-merge-result.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"names":["_dependencyResolver","data","require","_lodash","_configMerger","ownKeys","object","enumerableOnly","keys","Object","getOwnPropertySymbols","symbols","filter","sym","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","target","i","arguments","length","source","forEach","key","_defineProperty","getOwnPropertyDescriptors","defineProperties","defineProperty","obj","value","_toPropertyKey","configurable","writable","arg","_toPrimitive","String","input","hint","prim","Symbol","toPrimitive","undefined","res","call","TypeError","Number","DEP_RESOLVER_VERSION_INDENTATION","CONFLICT_MARKER_INDENTATION","ConfigMergeResult","constructor","compIdStr","currentLabel","otherLabel","results","hasConflicts","some","result","conflict","generateMergeConflictFile","resultsWithConflict","allConflicts","compact","map","generateConflictStringPerAspect","configMergeFormatted","c","formatConflict","conflictStr","concatenateConflicts","getSuccessfullyMergedConfig","resultsWithMergedConfig","mergedConfig","reduce","acc","curr","currObject","id","getDepsResolverResult","find","DependencyResolverAspect","depsResolverConfigGenerator","basicConflictGenerator","mergedConfigSplit","JSON","stringify","policy","split","conflictLines","line","includes","conflictIndicator","currentVal","otherVal","repeat","shift","unshift","join","conflictObj","currentConfig","otherConfig","formatConfig","conf","confStr","confStrSplit","pop","replace","conflicts","conflictsWithComma","index","endsWith","conflictSplit","lastLineWithClosingBrace","lastIndexOf","exports"],"sources":["config-merge-result.ts"],"sourcesContent":["import { DependencyResolverAspect } from '@teambit/dependency-resolver';\nimport { compact } from 'lodash';\nimport { MergeStrategyResult, conflictIndicator, GenericConfigOrRemoved } from './config-merger';\n\nconst DEP_RESOLVER_VERSION_INDENTATION = 8;\nconst CONFLICT_MARKER_INDENTATION = 7;\n\nexport class ConfigMergeResult {\n constructor(\n readonly compIdStr: string,\n private currentLabel: string,\n private otherLabel: string,\n private results: MergeStrategyResult[]\n ) {}\n hasConflicts(): boolean {\n return this.results.some((result) => result.conflict);\n }\n generateMergeConflictFile(): string \| null {\n const resultsWithConflict = this.results.filter((result) => result.conflict);\n if (!resultsWithConflict.length) return null;\n const allConflicts = compact(resultsWithConflict.map((result) => this.generateConflictStringPerAspect(result)));\n const configMergeFormatted = allConflicts.map((c) => this.formatConflict(c));\n const conflictStr = `{\n${this.concatenateConflicts(configMergeFormatted)}\n}`;\n return conflictStr;\n }\n getSuccessfullyMergedConfig(): Record<string, any> {\n const resultsWithMergedConfig = this.results.filter((result) => result.mergedConfig);\n return resultsWithMergedConfig.reduce((acc, curr) => {\n const currObject = { [curr.id]: curr.mergedConfig };\n return { ...acc, ...currObject };\n }, {});\n }\n\n getDepsResolverResult(): MergeStrategyResult \| undefined {\n return this.results.find((result) => result.id === DependencyResolverAspect.id);\n }\n\n private generateConflictStringPerAspect(result: MergeStrategyResult): string \| undefined {\n if (!result.conflict) return undefined;\n if (result.id === DependencyResolverAspect.id) {\n return this.depsResolverConfigGenerator(result.conflict);\n }\n return this.basicConflictGenerator(result.id, result.conflict);\n }\n\n private depsResolverConfigGenerator(conflict: Record<string, any>): string {\n const mergedConfigSplit = JSON.stringify({ policy: conflict }, undefined, 2).split('\\n');\n const conflictLines = mergedConfigSplit.map((line) => {\n if (!line.includes(conflictIndicator)) return line;\n const [, currentVal, otherVal] = line.split('::');\n return `${'<'.repeat(CONFLICT_MARKER_INDENTATION)} ${this.currentLabel}\n${' '.repeat(DEP_RESOLVER_VERSION_INDENTATION)}\"version\": \"${currentVal}\",\n=======\n${' '.repeat(DEP_RESOLVER_VERSION_INDENTATION)}\"version\": \"${otherVal}\",\n${'>'.repeat(CONFLICT_MARKER_INDENTATION)} ${this.otherLabel}`;\n });\n // replace the first line with line with the id\n conflictLines.shift();\n conflictLines.unshift(`\"${DependencyResolverAspect.id}\": {`);\n return conflictLines.join('\\n');\n }\n\n private basicConflictGenerator(id: string, conflictObj: Record<string, any>): string {\n const { currentConfig, otherConfig } = conflictObj;\n let conflict: string;\n if (currentConfig === '-') {\n conflict = `${'<'.repeat(CONFLICT_MARKER_INDENTATION)} ${this.currentLabel}\n\"${id}\": \"-\"\n=======\n\"${id}\": ${JSON.stringify(otherConfig, undefined, 2)}\n${'>'.repeat(CONFLICT_MARKER_INDENTATION)} ${this.otherLabel}`;\n } else if (otherConfig === '-') {\n conflict = `${'<'.repeat(CONFLICT_MARKER_INDENTATION)} ${this.currentLabel}\n\"${id}\": ${JSON.stringify(currentConfig, undefined, 2)}\n=======\n\"${id}\": \"-\"\n${'>'.repeat(CONFLICT_MARKER_INDENTATION)} ${this.otherLabel}`;\n } else {\n const formatConfig = (conf: GenericConfigOrRemoved) => {\n const confStr = JSON.stringify(conf, undefined, 2);\n const confStrSplit = confStr.split('\\n');\n confStrSplit.shift(); // remove first {\n confStrSplit.pop(); // remove last }\n return confStrSplit.join('\\n');\n };\n conflict = `\"${id}\": {\n${'<'.repeat(CONFLICT_MARKER_INDENTATION)} ${this.currentLabel}\n${formatConfig(currentConfig)}\n=======\n${formatConfig(otherConfig)}\n${'>'.repeat(CONFLICT_MARKER_INDENTATION)} ${this.otherLabel}\n}`;\n }\n\n return conflict;\n }\n\n private formatConflict(conflict: string) {\n return (\n conflict\n .split('\\n')\n // add 2 spaces before each line\n .map((line) => ` ${line}`)\n // remove the white spaces before the conflict indicators\n .map((line) => line.replace(/ *(<<<<<<<\|>>>>>>>\|=======)/g, '$1'))\n .join('\\n')\n );\n }\n\n private concatenateConflicts(conflicts: string[]) {\n const conflictsWithComma = conflicts.map((conflict, index) => {\n if (index === conflicts.length - 1) return conflict; // last element in the array, no need to add a comma\n if (conflict.endsWith('}')) return `${conflict},`; // ends normally with a closing brace, add a comma.\n // if it doesn't end with a closing brace, it means it ends with a conflict indicator.\n // the comma should be added after the last line with a closing brace.\n const conflictSplit = conflict.split('\\n');\n // find the last line with '}' and add a comma after it\n const lastLineWithClosingBrace = conflictSplit.lastIndexOf(' }');\n conflictSplit[lastLineWithClosingBrace] += ',';\n return conflictSplit.join('\\n');\n });\n return conflictsWithComma.join('\\n');\n }\n}\n"],"mappings":"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"}
1	+ {"version":3,"names":["_dependencyResolver","data","require","_lodash","_configMerger","ownKeys","e","r","t","Object","keys","getOwnPropertySymbols","o","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","defineProperty","obj","key","value","_toPropertyKey","configurable","writable","arg","_toPrimitive","String","input","hint","prim","Symbol","toPrimitive","undefined","res","call","TypeError","Number","DEP_RESOLVER_VERSION_INDENTATION","CONFLICT_MARKER_INDENTATION","ConfigMergeResult","constructor","compIdStr","currentLabel","otherLabel","results","hasConflicts","some","result","conflict","generateMergeConflictFile","resultsWithConflict","allConflicts","compact","map","generateConflictStringPerAspect","configMergeFormatted","c","formatConflict","conflictStr","concatenateConflicts","getSuccessfullyMergedConfig","resultsWithMergedConfig","mergedConfig","reduce","acc","curr","currObject","id","getDepsResolverResult","find","DependencyResolverAspect","depsResolverConfigGenerator","basicConflictGenerator","mergedConfigSplit","JSON","stringify","policy","split","conflictLines","line","includes","conflictIndicator","currentVal","otherVal","repeat","shift","unshift","join","conflictObj","currentConfig","otherConfig","formatConfig","conf","confStr","confStrSplit","pop","replace","conflicts","conflictsWithComma","index","endsWith","conflictSplit","lastLineWithClosingBrace","lastIndexOf","exports"],"sources":["config-merge-result.ts"],"sourcesContent":["import { DependencyResolverAspect } from '@teambit/dependency-resolver';\nimport { compact } from 'lodash';\nimport { MergeStrategyResult, conflictIndicator, GenericConfigOrRemoved } from './config-merger';\n\nconst DEP_RESOLVER_VERSION_INDENTATION = 8;\nconst CONFLICT_MARKER_INDENTATION = 7;\n\nexport class ConfigMergeResult {\n constructor(\n readonly compIdStr: string,\n private currentLabel: string,\n private otherLabel: string,\n private results: MergeStrategyResult[]\n ) {}\n hasConflicts(): boolean {\n return this.results.some((result) => result.conflict);\n }\n generateMergeConflictFile(): string \| null {\n const resultsWithConflict = this.results.filter((result) => result.conflict);\n if (!resultsWithConflict.length) return null;\n const allConflicts = compact(resultsWithConflict.map((result) => this.generateConflictStringPerAspect(result)));\n const configMergeFormatted = allConflicts.map((c) => this.formatConflict(c));\n const conflictStr = `{\n${this.concatenateConflicts(configMergeFormatted)}\n}`;\n return conflictStr;\n }\n getSuccessfullyMergedConfig(): Record<string, any> {\n const resultsWithMergedConfig = this.results.filter((result) => result.mergedConfig);\n return resultsWithMergedConfig.reduce((acc, curr) => {\n const currObject = { [curr.id]: curr.mergedConfig };\n return { ...acc, ...currObject };\n }, {});\n }\n\n getDepsResolverResult(): MergeStrategyResult \| undefined {\n return this.results.find((result) => result.id === DependencyResolverAspect.id);\n }\n\n private generateConflictStringPerAspect(result: MergeStrategyResult): string \| undefined {\n if (!result.conflict) return undefined;\n if (result.id === DependencyResolverAspect.id) {\n return this.depsResolverConfigGenerator(result.conflict);\n }\n return this.basicConflictGenerator(result.id, result.conflict);\n }\n\n private depsResolverConfigGenerator(conflict: Record<string, any>): string {\n const mergedConfigSplit = JSON.stringify({ policy: conflict }, undefined, 2).split('\\n');\n const conflictLines = mergedConfigSplit.map((line) => {\n if (!line.includes(conflictIndicator)) return line;\n const [, currentVal, otherVal] = line.split('::');\n return `${'<'.repeat(CONFLICT_MARKER_INDENTATION)} ${this.currentLabel}\n${' '.repeat(DEP_RESOLVER_VERSION_INDENTATION)}\"version\": \"${currentVal}\",\n=======\n${' '.repeat(DEP_RESOLVER_VERSION_INDENTATION)}\"version\": \"${otherVal}\",\n${'>'.repeat(CONFLICT_MARKER_INDENTATION)} ${this.otherLabel}`;\n });\n // replace the first line with line with the id\n conflictLines.shift();\n conflictLines.unshift(`\"${DependencyResolverAspect.id}\": {`);\n return conflictLines.join('\\n');\n }\n\n private basicConflictGenerator(id: string, conflictObj: Record<string, any>): string {\n const { currentConfig, otherConfig } = conflictObj;\n let conflict: string;\n if (currentConfig === '-') {\n conflict = `${'<'.repeat(CONFLICT_MARKER_INDENTATION)} ${this.currentLabel}\n\"${id}\": \"-\"\n=======\n\"${id}\": ${JSON.stringify(otherConfig, undefined, 2)}\n${'>'.repeat(CONFLICT_MARKER_INDENTATION)} ${this.otherLabel}`;\n } else if (otherConfig === '-') {\n conflict = `${'<'.repeat(CONFLICT_MARKER_INDENTATION)} ${this.currentLabel}\n\"${id}\": ${JSON.stringify(currentConfig, undefined, 2)}\n=======\n\"${id}\": \"-\"\n${'>'.repeat(CONFLICT_MARKER_INDENTATION)} ${this.otherLabel}`;\n } else {\n const formatConfig = (conf: GenericConfigOrRemoved) => {\n const confStr = JSON.stringify(conf, undefined, 2);\n const confStrSplit = confStr.split('\\n');\n confStrSplit.shift(); // remove first {\n confStrSplit.pop(); // remove last }\n return confStrSplit.join('\\n');\n };\n conflict = `\"${id}\": {\n${'<'.repeat(CONFLICT_MARKER_INDENTATION)} ${this.currentLabel}\n${formatConfig(currentConfig)}\n=======\n${formatConfig(otherConfig)}\n${'>'.repeat(CONFLICT_MARKER_INDENTATION)} ${this.otherLabel}\n}`;\n }\n\n return conflict;\n }\n\n private formatConflict(conflict: string) {\n return (\n conflict\n .split('\\n')\n // add 2 spaces before each line\n .map((line) => ` ${line}`)\n // remove the white spaces before the conflict indicators\n .map((line) => line.replace(/ *(<<<<<<<\|>>>>>>>\|=======)/g, '$1'))\n .join('\\n')\n );\n }\n\n private concatenateConflicts(conflicts: string[]) {\n const conflictsWithComma = conflicts.map((conflict, index) => {\n if (index === conflicts.length - 1) return conflict; // last element in the array, no need to add a comma\n if (conflict.endsWith('}')) return `${conflict},`; // ends normally with a closing brace, add a comma.\n // if it doesn't end with a closing brace, it means it ends with a conflict indicator.\n // the comma should be added after the last line with a closing brace.\n const conflictSplit = conflict.split('\\n');\n // find the last line with '}' and add a comma after it\n const lastLineWithClosingBrace = conflictSplit.lastIndexOf(' }');\n conflictSplit[lastLineWithClosingBrace] += ',';\n return conflictSplit.join('\\n');\n });\n return conflictsWithComma.join('\\n');\n }\n}\n"],"mappings":"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"}

package/dist/config-merger.js CHANGED Viewed

@@ -11,6 +11,13 @@ function _semver() {
   };
   return data;
 }
+function _builder() {
+  const data = _interopRequireDefault(require("@teambit/builder"));
+  _builder = function () {
+    return data;
+  };
+  return data;
+}
 function _componentVersion() {
   const data = require("@teambit/component-version");
   _componentVersion = function () {
@@ -47,8 +54,8 @@ function _configMergeResult() {
   return data;
 }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+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; }
+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; }
 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; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
 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); }
@@ -90,7 +97,8 @@ class ConfigMerger {
     _defineProperty(this, "currentEnv", void 0);
     _defineProperty(this, "otherEnv", void 0);
     _defineProperty(this, "baseEnv", void 0);
-    _defineProperty(this, "handledExtIds", []);
+    _defineProperty(this, "handledExtIds", [_builder().default.id]);
+    // don't try to merge builder, it's possible that at one end it wasn't built yet, so it's empty
     _defineProperty(this, "otherLaneIdsStr", void 0);
     this.otherLaneIdsStr = (otherLane === null || otherLane === void 0 ? void 0 : otherLane.toBitIds().map(id => id.toString())) || [];
   }

package/dist/config-merger.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"names":["_semver","data","_interopRequireDefault","require","_componentVersion","_dependencyResolver","_envs","_lodash","_configMergeResult","obj","__esModule","default","ownKeys","object","enumerableOnly","keys","Object","getOwnPropertySymbols","symbols","filter","sym","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","target","i","arguments","length","source","forEach","key","_defineProperty","getOwnPropertyDescriptors","defineProperties","defineProperty","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","otherLaneIdsStr","toBitIds","map","id","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","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 { 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[] = [];\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/merge-status-provider.js CHANGED Viewed

@@ -68,8 +68,8 @@ function _configMerger() {
   return data;
 }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+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; }
+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; }
 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; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
 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); }

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

	@@ -1 +1 @@
1	- {"version":3,"names":["_pMapSeries","data","_interopRequireDefault","require","_bitId","_laneId","_getDivergeData","_repositories","_lodash","_threeWayMerge","_noCommonSnap","_configMerger","obj","__esModule","default","ownKeys","object","enumerableOnly","keys","Object","getOwnPropertySymbols","symbols","filter","sym","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","target","i","arguments","length","source","forEach","key","_defineProperty","getOwnPropertyDescriptors","defineProperties","defineProperty","value","_toPropertyKey","configurable","writable","arg","_toPrimitive","String","input","hint","prim","Symbol","toPrimitive","undefined","res","call","TypeError","Number","MergeStatusProvider","constructor","workspace","logger","importer","currentLane","otherLane","options","getStatus","bitIds","_this$otherLane","_this$otherLane2","_this$currentLane","_this$otherLane3","importObjectsFromMainIfExist","toBitIds","toVersionLatest","componentStatusBeforeMergeAttempt","mapSeries","id","getComponentStatusBeforeMergeAttempt","shouldImportHistoryOfOtherLane","scope","toImport","map","compStatus","divergeData","versionsToImport","commonSnapBeforeDiverge","snapsOnTargetOnly","compact","v","changeVersion","toString","flat","reason","consumer","scopeImporter","importWithoutDeps","BitIds","fromArray","lane","cache","includeVersionHistory","compStatusNotNeedMerge","c","mergeProps","compStatusNeedMerge","getComponentsStatusNeedMerge","tmp","Tmp","componentsStatus","Promise","all","getComponentMergeStatus","clear","err","results","componentMergeStatusBeforeMergeAttempt","_this$currentLane2","currentComponent","Error","otherLaneHead","currentId","modelComponent","repo","objects","baseSnap","debug","toStringWithoutVersion","version","baseComponent","loadVersion","otherComponent","currentLaneName","toLaneId","otherLaneName","DEFAULT_LANE","currentLabel","otherLabel","workspaceIds","listIds","configMerger","ConfigMerger","extensions","configMergeResult","merge","mergeResults","threeWayMerge","returnUnmerged","msg","unmergedLegitimately","componentStatus","unchangedMessage","unchangedLegitimately","_this$currentLane3","_this$options","getModelComponentIfExist","unmerged","unmergedComponents","getEntry","name","getRef","existingBitMapId","bitMap","getBitIdIfExist","ignoreVersion","componentOnOther","idOnCurrentLane","getComponent","isRemoved","shouldMerge","shouldRemoveFromMain","shouldBeRemoved","getCurrentId","head","getHeadAsTagIfExist","getDivergeData","targetHead","throws","componentFromModel","getCurrentComponent","loadComponent","getConsumerComponent","isTargetNotAhead","isTargetAhead","shouldIgnore","isModified","componentModificationStatus","getComponentStatusById","modified","isSourceCodeModified","isComponentSourceCodeModified","modifiedType","ignoreConfigChanges","_this$options2","NoCommonSnap","resolveUnrelated","message","handleNoCommonSnap","isDiverged","isSourceAhead","mainHead","returnAccordingToOurs","headToSaveInLane","unrelatedHead","unrelatedLaneId","resolvedUnrelated","strategy","headOnCurrentLane","returnAccordingToTheirs","resolvedRef","unrelatedHeadRef","currentVersionRef","otherVersionRef","hasResolvedFromMain","hashToCompare","divergeDataFromMain","sourceHead","hasResolvedLocally","getHeadRegardlessOfLane","hasResolvedRemotely","refToSaveInLane","_this$currentLane4","_this$currentLane5","_this$otherLane4","_this$currentLane6","exports"],"sources":["merge-status-provider.ts"],"sourcesContent":["import { Workspace } from '@teambit/workspace';\nimport { MergeStrategy } from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport mapSeries from 'p-map-series';\nimport { BitId, BitIds } from '@teambit/legacy/dist/bit-id';\nimport { DEFAULT_LANE, LaneId } from '@teambit/lane-id';\nimport { getDivergeData } from '@teambit/legacy/dist/scope/component-ops/get-diverge-data';\nimport { Lane, ModelComponent, Version } from '@teambit/legacy/dist/scope/models';\nimport { Ref } from '@teambit/legacy/dist/scope/objects';\nimport { Tmp } from '@teambit/legacy/dist/scope/repositories';\nimport ConsumerComponent from '@teambit/legacy/dist/consumer/component/consumer-component';\nimport { ImporterMain } from '@teambit/importer';\nimport { Logger } from '@teambit/logger';\nimport { compact } from 'lodash';\nimport threeWayMerge from '@teambit/legacy/dist/consumer/versions-ops/merge-version/three-way-merge';\nimport { SnapsDistance } from '@teambit/legacy/dist/scope/component-ops/snaps-distance';\nimport { NoCommonSnap } from '@teambit/legacy/dist/scope/exceptions/no-common-snap';\nimport { ConfigMerger } from './config-merger';\nimport { ComponentMergeStatus, ComponentMergeStatusBeforeMergeAttempt } from './merging.main.runtime';\n\nexport class MergeStatusProvider {\n constructor(\n private workspace: Workspace,\n private logger: Logger,\n private importer: ImporterMain,\n private currentLane?: Lane, // currently checked out lane. if on main, then it's undefined.\n private otherLane?: Lane, // the lane we want to merged to our lane. (undefined if it's \"main\").\n private options?: { resolveUnrelated?: MergeStrategy; ignoreConfigChanges?: boolean }\n ) {}\n\n async getStatus(\n bitIds: BitId[] // the id.version is the version we want to merge to the current component\n ): Promise<ComponentMergeStatus[]> {\n if (!this.currentLane && this.otherLane) {\n await this.importer.importObjectsFromMainIfExist(this.otherLane.toBitIds().toVersionLatest());\n }\n const componentStatusBeforeMergeAttempt = await mapSeries(bitIds, (id) =>\n this.getComponentStatusBeforeMergeAttempt(id)\n );\n // whether or not we need to import the gap between the common-snap and the other lane.\n // the common-snap itself we need anyway in order to get the files hash/content for checking conflicts.\n const shouldImportHistoryOfOtherLane =\n !this.currentLane \|\| // on main. we need all history in order to push each component to its remote\n this.currentLane.scope !== this.otherLane?.scope; // on lane, but the other lane is from a different scope. we need all history in order to push to the current lane's scope\n const toImport = componentStatusBeforeMergeAttempt\n .map((compStatus) => {\n if (!compStatus.divergeData) return [];\n const versionsToImport = [compStatus.divergeData.commonSnapBeforeDiverge];\n if (shouldImportHistoryOfOtherLane) {\n versionsToImport.push(...compStatus.divergeData.snapsOnTargetOnly);\n }\n return compact(versionsToImport).map((v) => compStatus.id.changeVersion(v.toString()));\n })\n .flat();\n const reason = shouldImportHistoryOfOtherLane\n ? `for filling the gap between the common-snap and the head of ${this.otherLane?.id() \|\| 'main'}`\n : `for getting the common-snap between ${this.currentLane?.id() \|\| 'main'} and ${this.otherLane?.id() \|\| 'main'}`;\n await this.workspace.consumer.scope.scopeImporter.importWithoutDeps(BitIds.fromArray(toImport), {\n lane: this.otherLane,\n cache: true,\n includeVersionHistory: false,\n reason,\n });\n\n const compStatusNotNeedMerge = componentStatusBeforeMergeAttempt.filter(\n (c) => !c.mergeProps\n ) as ComponentMergeStatus[];\n const compStatusNeedMerge = componentStatusBeforeMergeAttempt.filter((c) => c.mergeProps);\n\n const getComponentsStatusNeedMerge = async (): Promise<ComponentMergeStatus[]> => {\n const tmp = new Tmp(this.workspace.consumer.scope);\n try {\n const componentsStatus = await Promise.all(\n compStatusNeedMerge.map((compStatus) => this.getComponentMergeStatus(compStatus))\n );\n await tmp.clear();\n return componentsStatus;\n } catch (err: any) {\n await tmp.clear();\n throw err;\n }\n };\n const results = await getComponentsStatusNeedMerge();\n\n results.push(...compStatusNotNeedMerge);\n return results;\n }\n\n private async getComponentMergeStatus(\n componentMergeStatusBeforeMergeAttempt: ComponentMergeStatusBeforeMergeAttempt\n ) {\n const { id, divergeData, currentComponent, mergeProps } = componentMergeStatusBeforeMergeAttempt;\n if (!mergeProps) throw new Error(`getDivergedMergeStatus, mergeProps is missing for ${id.toString()}`);\n const { otherLaneHead, currentId, modelComponent } = mergeProps;\n const repo = this.workspace.consumer.scope.objects;\n if (!divergeData) throw new Error(`getDivergedMergeStatus, divergeData is missing for ${id.toString()}`);\n if (!currentComponent) throw new Error(`getDivergedMergeStatus, currentComponent is missing for ${id.toString()}`);\n\n const baseSnap = divergeData.commonSnapBeforeDiverge as Ref; // must be set when isTrueMerge\n this.logger.debug(`merging snaps details:\nid: ${id.toStringWithoutVersion()}\nbase: ${baseSnap.toString()}\ncurrent: ${currentId.version}\nother: ${otherLaneHead.toString()}`);\n const baseComponent: Version = await modelComponent.loadVersion(baseSnap.toString(), repo);\n const otherComponent: Version = await modelComponent.loadVersion(otherLaneHead.toString(), repo);\n\n const currentLaneName = this.currentLane?.toLaneId().toString() \|\| 'main';\n const otherLaneName = this.otherLane ? this.otherLane.toLaneId().toString() : DEFAULT_LANE;\n const currentLabel = `${currentId.version} (${currentLaneName === otherLaneName ? 'current' : currentLaneName})`;\n const otherLabel = `${otherLaneHead.toString()} (${\n otherLaneName === currentLaneName ? 'incoming' : otherLaneName\n })`;\n const workspaceIds = await this.workspace.listIds();\n const configMerger = new ConfigMerger(\n id.toStringWithoutVersion(),\n workspaceIds,\n this.otherLane,\n currentComponent.extensions,\n baseComponent.extensions,\n otherComponent.extensions,\n currentLabel,\n otherLabel,\n this.logger\n );\n const configMergeResult = configMerger.merge();\n\n const mergeResults = await threeWayMerge({\n consumer: this.workspace.consumer,\n otherComponent,\n otherLabel,\n currentComponent,\n currentLabel,\n baseComponent,\n });\n return { currentComponent, id, mergeResults, divergeData, configMergeResult };\n }\n\n private returnUnmerged(id: BitId, msg: string, unmergedLegitimately = false): ComponentMergeStatusBeforeMergeAttempt {\n const componentStatus: ComponentMergeStatusBeforeMergeAttempt = { id };\n componentStatus.unchangedMessage = msg;\n componentStatus.unchangedLegitimately = unmergedLegitimately;\n return componentStatus;\n }\n\n private async getComponentStatusBeforeMergeAttempt(\n id: BitId // the id.version is the version we want to merge to the current component\n ): Promise<ComponentMergeStatusBeforeMergeAttempt> {\n const consumer = this.workspace.consumer;\n const componentStatus: ComponentMergeStatusBeforeMergeAttempt = { id };\n const modelComponent = await consumer.scope.getModelComponentIfExist(id);\n if (!modelComponent) {\n return this.returnUnmerged(\n id,\n `component ${id.toString()} is on the lane/main but its objects were not found, please re-import the lane`\n );\n }\n const unmerged = consumer.scope.objects.unmergedComponents.getEntry(id.name);\n if (unmerged) {\n return this.returnUnmerged(\n id,\n `component ${id.toStringWithoutVersion()} is in during-merge state a previous merge, please snap/tag it first (or use bit merge --resolve/--abort/ bit lane merge-abort)`\n );\n }\n const repo = consumer.scope.objects;\n const version = id.version as string;\n const otherLaneHead = modelComponent.getRef(version);\n const existingBitMapId = consumer.bitMap.getBitIdIfExist(id, { ignoreVersion: true });\n const componentOnOther: Version = await modelComponent.loadVersion(version, consumer.scope.objects);\n const idOnCurrentLane = this.currentLane?.getComponent(id);\n\n if (componentOnOther.isRemoved()) {\n // if exist in current lane, we want the current lane to get the soft-remove update.\n // or if it was removed with --update-main, we want to merge it so then main will get the update.\n const shouldMerge = idOnCurrentLane \|\| componentOnOther.shouldRemoveFromMain();\n if (shouldMerge) {\n // remove the component from the workspace if exist.\n componentStatus.shouldBeRemoved = true;\n } else {\n // on main, don't merge soft-removed components unless it's marked with removeOnMain.\n // on lane, if it's not part of the current lane, don't merge it.\n return this.returnUnmerged(id, `component has been removed`, true);\n }\n }\n const getCurrentId = () => {\n if (existingBitMapId) return existingBitMapId;\n if (this.currentLane) {\n if (!idOnCurrentLane) return null;\n return idOnCurrentLane.id.changeVersion(idOnCurrentLane.head.toString());\n }\n // it's on main\n const head = modelComponent.getHeadAsTagIfExist();\n if (head) {\n return id.changeVersion(head);\n }\n return null;\n };\n const currentId = getCurrentId();\n if (!currentId) {\n const divergeData = await getDivergeData({ repo, modelComponent, targetHead: otherLaneHead, throws: false });\n return { ...componentStatus, componentFromModel: componentOnOther, divergeData };\n }\n const getCurrentComponent = () => {\n if (existingBitMapId) return consumer.loadComponent(existingBitMapId);\n return consumer.scope.getConsumerComponent(currentId);\n };\n const currentComponent = await getCurrentComponent();\n if (currentComponent.isRemoved()) {\n // we have a few options:\n // 1. other is ahead. in this case, other recovered the component. so we can continue with the merge.\n // it is possible that it is diverged, in which case, still continue with the merge, and later on, the\n // merge-config will show a config conflict of the remove aspect.\n // 2. other is not ahead. in this case, just ignore this component, no point to merge it, we want it removed.\n // 3. there are errors when calculating the divergeData, e.g. no snap in common.\n // here we need to differentiate between two cases:\n // 3.1. the \"otherLane\" is main. in this case, we probably noticed that our component by accident got created\n // with the same name of an existing component on main and therefore we removed it. so we want to keep this\n // component removed during merges and we don't care about merging it.\n // 3.2. the \"otherLane\" is a lane. in this case, it's possible that although it was removed in this lane, it's\n // needed and is used by other components of the other other lane, so in order for this merge to work\n // (and not throw error about deps from other lane), it needs the option to merge (user can decide whether to\n // exclude it or to use --resolve-unrelated)\n const divergeData = await getDivergeData({ repo, modelComponent, targetHead: otherLaneHead, throws: false });\n const isTargetNotAhead = !divergeData.err && !divergeData.isTargetAhead();\n const shouldIgnore = this.otherLane\n ? isTargetNotAhead // options 3.2 above. if they're not related - don't ignore.\n : isTargetNotAhead \|\| divergeData.err; // it's main. options 3.1 above. even if they're not related - still ignore.\n if (shouldIgnore) {\n return this.returnUnmerged(id, `component has been removed`, true);\n }\n }\n\n const isModified = async (): Promise<undefined \| 'code' \| 'config'> => {\n const componentModificationStatus = await consumer.getComponentStatusById(currentComponent.id);\n if (!componentModificationStatus.modified) return undefined;\n if (!existingBitMapId) return undefined;\n const baseComponent = await modelComponent.loadVersion(\n existingBitMapId.version as string,\n consumer.scope.objects\n );\n const isSourceCodeModified = await consumer.isComponentSourceCodeModified(baseComponent, currentComponent);\n if (isSourceCodeModified) return 'code';\n return 'config';\n };\n\n const modifiedType = await isModified();\n if (modifiedType === 'config' && !this.options?.ignoreConfigChanges) {\n return this.returnUnmerged(\n id,\n `component has config changes, please snap/tag it first. alternatively, use --ignore-config-changes flag to bypass`\n );\n }\n if (modifiedType === 'code') {\n return this.returnUnmerged(id, `component is modified, please snap/tag it first`);\n }\n\n if (!otherLaneHead) {\n throw new Error(`merging: unable finding a hash for the version ${version} of ${id.toString()}`);\n }\n const divergeData = await getDivergeData({\n repo,\n modelComponent,\n targetHead: otherLaneHead,\n throws: false,\n });\n if (divergeData.err) {\n if (!(divergeData.err instanceof NoCommonSnap) \|\| !this.options?.resolveUnrelated) {\n return this.returnUnmerged(\n id,\n `unable to traverse ${currentComponent.id.toString()} history. error: ${divergeData.err.message}`\n );\n }\n return this.handleNoCommonSnap(\n modelComponent,\n id,\n otherLaneHead,\n currentComponent,\n componentOnOther,\n divergeData\n );\n }\n if (!divergeData.isDiverged()) {\n if (divergeData.isSourceAhead()) {\n // do nothing!\n return this.returnUnmerged(id, `component ${currentComponent.id.toString()} is ahead, nothing to merge`, true);\n }\n if (divergeData.isTargetAhead()) {\n // just override with the model data\n return {\n ...componentStatus,\n currentComponent,\n componentFromModel: componentOnOther,\n divergeData,\n };\n }\n // we know that localHead and remoteHead are set, so if none of them is ahead they must be equal\n return this.returnUnmerged(id, `component ${currentComponent.id.toString()} is already merged`, true);\n }\n\n // it's diverged and needs merge operation\n const mergeProps = {\n otherLaneHead,\n currentId,\n modelComponent,\n };\n\n return { ...componentStatus, currentComponent, mergeProps, divergeData };\n }\n\n private async handleNoCommonSnap(\n modelComponent: ModelComponent,\n id: BitId,\n otherLaneHead: Ref,\n currentComponent: ConsumerComponent,\n componentOnOther?: Version,\n divergeData?: SnapsDistance\n ): Promise<ComponentMergeStatusBeforeMergeAttempt> {\n let { resolveUnrelated } = this.options \|\| {};\n if (currentComponent.isRemoved()) {\n resolveUnrelated = 'theirs';\n }\n if (!resolveUnrelated) throw new Error(`handleNoCommonSnap expects resolveUnrelated to be set`);\n const consumer = this.workspace.consumer;\n const repo = consumer.scope.objects;\n const mainHead = modelComponent.head;\n\n const returnAccordingToOurs = (\n headToSaveInLane: Ref,\n unrelatedHead: Ref,\n unrelatedLaneId: LaneId\n ): ComponentMergeStatusBeforeMergeAttempt => {\n return {\n currentComponent,\n id,\n divergeData,\n resolvedUnrelated: {\n strategy: 'ours',\n headOnCurrentLane: headToSaveInLane,\n unrelatedHead,\n unrelatedLaneId,\n },\n };\n };\n const returnAccordingToTheirs = (\n resolvedRef: Ref,\n unrelatedHeadRef: Ref,\n unrelatedLaneId: LaneId\n ): ComponentMergeStatusBeforeMergeAttempt => {\n // just override with the model data\n return {\n currentComponent,\n componentFromModel: componentOnOther,\n id,\n divergeData,\n resolvedUnrelated: {\n strategy: 'theirs',\n headOnCurrentLane: resolvedRef,\n unrelatedHead: unrelatedHeadRef,\n unrelatedLaneId,\n },\n };\n };\n\n const currentVersionRef = modelComponent.getRef(currentComponent.id.version as string);\n if (!currentVersionRef)\n throw new Error(\n `handleNoCommonSnap, unable to get ref of current version \"${\n currentComponent.id.version\n }\" for \"${id.toString()}\"`\n );\n const otherVersionRef = modelComponent.getRef(id.version as string);\n if (!otherVersionRef)\n throw new Error(`handleNoCommonSnap, unable to get ref of other version \"${id.version}\" for \"${id.toString()}\"`);\n\n if (mainHead) {\n const hasResolvedFromMain = async (hashToCompare: Ref \| null) => {\n const divergeDataFromMain = await getDivergeData({\n repo,\n modelComponent,\n sourceHead: hashToCompare,\n targetHead: mainHead,\n throws: false,\n });\n if (!divergeDataFromMain.err) return true;\n return !(divergeDataFromMain.err instanceof NoCommonSnap);\n };\n const hasResolvedLocally = await hasResolvedFromMain(modelComponent.getHeadRegardlessOfLane() as Ref);\n const hasResolvedRemotely = await hasResolvedFromMain(otherLaneHead);\n if (!hasResolvedLocally && !hasResolvedRemotely) {\n return this.returnUnmerged(\n id,\n `unable to traverse ${currentComponent.id.toString()} history. the main-head ${mainHead.toString()} doesn't appear in both lanes.\nit was probably created in each lane separately and it also exists on main. please merge main first to one of these lanes`\n );\n }\n const refToSaveInLane = hasResolvedLocally ? currentVersionRef : otherVersionRef;\n const unrelatedHeadRef = hasResolvedLocally ? otherVersionRef : currentVersionRef;\n if (resolveUnrelated === 'ours') {\n return returnAccordingToOurs(refToSaveInLane, unrelatedHeadRef, this.currentLane?.toLaneId() as LaneId);\n }\n if (resolveUnrelated === 'theirs') {\n return returnAccordingToTheirs(refToSaveInLane, unrelatedHeadRef, this.currentLane?.toLaneId() as LaneId);\n }\n throw new Error(\n `unsupported strategy \"${resolveUnrelated}\" of resolve-unrelated. supported strategies are: [ours, theirs]`\n );\n }\n\n const refToSaveInLane = resolveUnrelated === 'ours' ? currentVersionRef : otherVersionRef;\n const unrelatedHeadRef = resolveUnrelated === 'ours' ? otherVersionRef : currentVersionRef;\n if (resolveUnrelated === 'ours') {\n return returnAccordingToOurs(refToSaveInLane, unrelatedHeadRef, this.otherLane?.toLaneId() as LaneId);\n }\n if (resolveUnrelated === 'theirs') {\n return returnAccordingToTheirs(refToSaveInLane, unrelatedHeadRef, this.currentLane?.toLaneId() as LaneId);\n }\n throw new Error(\n `unsupported strategy \"${resolveUnrelated}\" of resolve-unrelated. supported strategies are: [ours, theirs]`\n );\n }\n}\n"],"mappings":"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"}
1	+ {"version":3,"names":["_pMapSeries","data","_interopRequireDefault","require","_bitId","_laneId","_getDivergeData","_repositories","_lodash","_threeWayMerge","_noCommonSnap","_configMerger","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","MergeStatusProvider","constructor","workspace","logger","importer","currentLane","otherLane","options","getStatus","bitIds","_this$otherLane","_this$otherLane2","_this$currentLane","_this$otherLane3","importObjectsFromMainIfExist","toBitIds","toVersionLatest","componentStatusBeforeMergeAttempt","mapSeries","id","getComponentStatusBeforeMergeAttempt","shouldImportHistoryOfOtherLane","scope","toImport","map","compStatus","divergeData","versionsToImport","commonSnapBeforeDiverge","snapsOnTargetOnly","compact","v","changeVersion","toString","flat","reason","consumer","scopeImporter","importWithoutDeps","BitIds","fromArray","lane","cache","includeVersionHistory","compStatusNotNeedMerge","c","mergeProps","compStatusNeedMerge","getComponentsStatusNeedMerge","tmp","Tmp","componentsStatus","Promise","all","getComponentMergeStatus","clear","err","results","componentMergeStatusBeforeMergeAttempt","_this$currentLane2","currentComponent","Error","otherLaneHead","currentId","modelComponent","repo","objects","baseSnap","debug","toStringWithoutVersion","version","baseComponent","loadVersion","otherComponent","currentLaneName","toLaneId","otherLaneName","DEFAULT_LANE","currentLabel","otherLabel","workspaceIds","listIds","configMerger","ConfigMerger","extensions","configMergeResult","merge","mergeResults","threeWayMerge","returnUnmerged","msg","unmergedLegitimately","componentStatus","unchangedMessage","unchangedLegitimately","_this$currentLane3","_this$options","getModelComponentIfExist","unmerged","unmergedComponents","getEntry","name","getRef","existingBitMapId","bitMap","getBitIdIfExist","ignoreVersion","componentOnOther","idOnCurrentLane","getComponent","isRemoved","shouldMerge","shouldRemoveFromMain","shouldBeRemoved","getCurrentId","head","getHeadAsTagIfExist","getDivergeData","targetHead","throws","componentFromModel","getCurrentComponent","loadComponent","getConsumerComponent","isTargetNotAhead","isTargetAhead","shouldIgnore","isModified","componentModificationStatus","getComponentStatusById","modified","isSourceCodeModified","isComponentSourceCodeModified","modifiedType","ignoreConfigChanges","_this$options2","NoCommonSnap","resolveUnrelated","message","handleNoCommonSnap","isDiverged","isSourceAhead","mainHead","returnAccordingToOurs","headToSaveInLane","unrelatedHead","unrelatedLaneId","resolvedUnrelated","strategy","headOnCurrentLane","returnAccordingToTheirs","resolvedRef","unrelatedHeadRef","currentVersionRef","otherVersionRef","hasResolvedFromMain","hashToCompare","divergeDataFromMain","sourceHead","hasResolvedLocally","getHeadRegardlessOfLane","hasResolvedRemotely","refToSaveInLane","_this$currentLane4","_this$currentLane5","_this$otherLane4","_this$currentLane6","exports"],"sources":["merge-status-provider.ts"],"sourcesContent":["import { Workspace } from '@teambit/workspace';\nimport { MergeStrategy } from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport mapSeries from 'p-map-series';\nimport { BitId, BitIds } from '@teambit/legacy/dist/bit-id';\nimport { DEFAULT_LANE, LaneId } from '@teambit/lane-id';\nimport { getDivergeData } from '@teambit/legacy/dist/scope/component-ops/get-diverge-data';\nimport { Lane, ModelComponent, Version } from '@teambit/legacy/dist/scope/models';\nimport { Ref } from '@teambit/legacy/dist/scope/objects';\nimport { Tmp } from '@teambit/legacy/dist/scope/repositories';\nimport ConsumerComponent from '@teambit/legacy/dist/consumer/component/consumer-component';\nimport { ImporterMain } from '@teambit/importer';\nimport { Logger } from '@teambit/logger';\nimport { compact } from 'lodash';\nimport threeWayMerge from '@teambit/legacy/dist/consumer/versions-ops/merge-version/three-way-merge';\nimport { SnapsDistance } from '@teambit/legacy/dist/scope/component-ops/snaps-distance';\nimport { NoCommonSnap } from '@teambit/legacy/dist/scope/exceptions/no-common-snap';\nimport { ConfigMerger } from './config-merger';\nimport { ComponentMergeStatus, ComponentMergeStatusBeforeMergeAttempt } from './merging.main.runtime';\n\nexport class MergeStatusProvider {\n constructor(\n private workspace: Workspace,\n private logger: Logger,\n private importer: ImporterMain,\n private currentLane?: Lane, // currently checked out lane. if on main, then it's undefined.\n private otherLane?: Lane, // the lane we want to merged to our lane. (undefined if it's \"main\").\n private options?: { resolveUnrelated?: MergeStrategy; ignoreConfigChanges?: boolean }\n ) {}\n\n async getStatus(\n bitIds: BitId[] // the id.version is the version we want to merge to the current component\n ): Promise<ComponentMergeStatus[]> {\n if (!this.currentLane && this.otherLane) {\n await this.importer.importObjectsFromMainIfExist(this.otherLane.toBitIds().toVersionLatest());\n }\n const componentStatusBeforeMergeAttempt = await mapSeries(bitIds, (id) =>\n this.getComponentStatusBeforeMergeAttempt(id)\n );\n // whether or not we need to import the gap between the common-snap and the other lane.\n // the common-snap itself we need anyway in order to get the files hash/content for checking conflicts.\n const shouldImportHistoryOfOtherLane =\n !this.currentLane \|\| // on main. we need all history in order to push each component to its remote\n this.currentLane.scope !== this.otherLane?.scope; // on lane, but the other lane is from a different scope. we need all history in order to push to the current lane's scope\n const toImport = componentStatusBeforeMergeAttempt\n .map((compStatus) => {\n if (!compStatus.divergeData) return [];\n const versionsToImport = [compStatus.divergeData.commonSnapBeforeDiverge];\n if (shouldImportHistoryOfOtherLane) {\n versionsToImport.push(...compStatus.divergeData.snapsOnTargetOnly);\n }\n return compact(versionsToImport).map((v) => compStatus.id.changeVersion(v.toString()));\n })\n .flat();\n const reason = shouldImportHistoryOfOtherLane\n ? `for filling the gap between the common-snap and the head of ${this.otherLane?.id() \|\| 'main'}`\n : `for getting the common-snap between ${this.currentLane?.id() \|\| 'main'} and ${this.otherLane?.id() \|\| 'main'}`;\n await this.workspace.consumer.scope.scopeImporter.importWithoutDeps(BitIds.fromArray(toImport), {\n lane: this.otherLane,\n cache: true,\n includeVersionHistory: false,\n reason,\n });\n\n const compStatusNotNeedMerge = componentStatusBeforeMergeAttempt.filter(\n (c) => !c.mergeProps\n ) as ComponentMergeStatus[];\n const compStatusNeedMerge = componentStatusBeforeMergeAttempt.filter((c) => c.mergeProps);\n\n const getComponentsStatusNeedMerge = async (): Promise<ComponentMergeStatus[]> => {\n const tmp = new Tmp(this.workspace.consumer.scope);\n try {\n const componentsStatus = await Promise.all(\n compStatusNeedMerge.map((compStatus) => this.getComponentMergeStatus(compStatus))\n );\n await tmp.clear();\n return componentsStatus;\n } catch (err: any) {\n await tmp.clear();\n throw err;\n }\n };\n const results = await getComponentsStatusNeedMerge();\n\n results.push(...compStatusNotNeedMerge);\n return results;\n }\n\n private async getComponentMergeStatus(\n componentMergeStatusBeforeMergeAttempt: ComponentMergeStatusBeforeMergeAttempt\n ) {\n const { id, divergeData, currentComponent, mergeProps } = componentMergeStatusBeforeMergeAttempt;\n if (!mergeProps) throw new Error(`getDivergedMergeStatus, mergeProps is missing for ${id.toString()}`);\n const { otherLaneHead, currentId, modelComponent } = mergeProps;\n const repo = this.workspace.consumer.scope.objects;\n if (!divergeData) throw new Error(`getDivergedMergeStatus, divergeData is missing for ${id.toString()}`);\n if (!currentComponent) throw new Error(`getDivergedMergeStatus, currentComponent is missing for ${id.toString()}`);\n\n const baseSnap = divergeData.commonSnapBeforeDiverge as Ref; // must be set when isTrueMerge\n this.logger.debug(`merging snaps details:\nid: ${id.toStringWithoutVersion()}\nbase: ${baseSnap.toString()}\ncurrent: ${currentId.version}\nother: ${otherLaneHead.toString()}`);\n const baseComponent: Version = await modelComponent.loadVersion(baseSnap.toString(), repo);\n const otherComponent: Version = await modelComponent.loadVersion(otherLaneHead.toString(), repo);\n\n const currentLaneName = this.currentLane?.toLaneId().toString() \|\| 'main';\n const otherLaneName = this.otherLane ? this.otherLane.toLaneId().toString() : DEFAULT_LANE;\n const currentLabel = `${currentId.version} (${currentLaneName === otherLaneName ? 'current' : currentLaneName})`;\n const otherLabel = `${otherLaneHead.toString()} (${\n otherLaneName === currentLaneName ? 'incoming' : otherLaneName\n })`;\n const workspaceIds = await this.workspace.listIds();\n const configMerger = new ConfigMerger(\n id.toStringWithoutVersion(),\n workspaceIds,\n this.otherLane,\n currentComponent.extensions,\n baseComponent.extensions,\n otherComponent.extensions,\n currentLabel,\n otherLabel,\n this.logger\n );\n const configMergeResult = configMerger.merge();\n\n const mergeResults = await threeWayMerge({\n consumer: this.workspace.consumer,\n otherComponent,\n otherLabel,\n currentComponent,\n currentLabel,\n baseComponent,\n });\n return { currentComponent, id, mergeResults, divergeData, configMergeResult };\n }\n\n private returnUnmerged(id: BitId, msg: string, unmergedLegitimately = false): ComponentMergeStatusBeforeMergeAttempt {\n const componentStatus: ComponentMergeStatusBeforeMergeAttempt = { id };\n componentStatus.unchangedMessage = msg;\n componentStatus.unchangedLegitimately = unmergedLegitimately;\n return componentStatus;\n }\n\n private async getComponentStatusBeforeMergeAttempt(\n id: BitId // the id.version is the version we want to merge to the current component\n ): Promise<ComponentMergeStatusBeforeMergeAttempt> {\n const consumer = this.workspace.consumer;\n const componentStatus: ComponentMergeStatusBeforeMergeAttempt = { id };\n const modelComponent = await consumer.scope.getModelComponentIfExist(id);\n if (!modelComponent) {\n return this.returnUnmerged(\n id,\n `component ${id.toString()} is on the lane/main but its objects were not found, please re-import the lane`\n );\n }\n const unmerged = consumer.scope.objects.unmergedComponents.getEntry(id.name);\n if (unmerged) {\n return this.returnUnmerged(\n id,\n `component ${id.toStringWithoutVersion()} is in during-merge state a previous merge, please snap/tag it first (or use bit merge --resolve/--abort/ bit lane merge-abort)`\n );\n }\n const repo = consumer.scope.objects;\n const version = id.version as string;\n const otherLaneHead = modelComponent.getRef(version);\n const existingBitMapId = consumer.bitMap.getBitIdIfExist(id, { ignoreVersion: true });\n const componentOnOther: Version = await modelComponent.loadVersion(version, consumer.scope.objects);\n const idOnCurrentLane = this.currentLane?.getComponent(id);\n\n if (componentOnOther.isRemoved()) {\n // if exist in current lane, we want the current lane to get the soft-remove update.\n // or if it was removed with --update-main, we want to merge it so then main will get the update.\n const shouldMerge = idOnCurrentLane \|\| componentOnOther.shouldRemoveFromMain();\n if (shouldMerge) {\n // remove the component from the workspace if exist.\n componentStatus.shouldBeRemoved = true;\n } else {\n // on main, don't merge soft-removed components unless it's marked with removeOnMain.\n // on lane, if it's not part of the current lane, don't merge it.\n return this.returnUnmerged(id, `component has been removed`, true);\n }\n }\n const getCurrentId = () => {\n if (existingBitMapId) return existingBitMapId;\n if (this.currentLane) {\n if (!idOnCurrentLane) return null;\n return idOnCurrentLane.id.changeVersion(idOnCurrentLane.head.toString());\n }\n // it's on main\n const head = modelComponent.getHeadAsTagIfExist();\n if (head) {\n return id.changeVersion(head);\n }\n return null;\n };\n const currentId = getCurrentId();\n if (!currentId) {\n const divergeData = await getDivergeData({ repo, modelComponent, targetHead: otherLaneHead, throws: false });\n return { ...componentStatus, componentFromModel: componentOnOther, divergeData };\n }\n const getCurrentComponent = () => {\n if (existingBitMapId) return consumer.loadComponent(existingBitMapId);\n return consumer.scope.getConsumerComponent(currentId);\n };\n const currentComponent = await getCurrentComponent();\n if (currentComponent.isRemoved()) {\n // we have a few options:\n // 1. other is ahead. in this case, other recovered the component. so we can continue with the merge.\n // it is possible that it is diverged, in which case, still continue with the merge, and later on, the\n // merge-config will show a config conflict of the remove aspect.\n // 2. other is not ahead. in this case, just ignore this component, no point to merge it, we want it removed.\n // 3. there are errors when calculating the divergeData, e.g. no snap in common.\n // here we need to differentiate between two cases:\n // 3.1. the \"otherLane\" is main. in this case, we probably noticed that our component by accident got created\n // with the same name of an existing component on main and therefore we removed it. so we want to keep this\n // component removed during merges and we don't care about merging it.\n // 3.2. the \"otherLane\" is a lane. in this case, it's possible that although it was removed in this lane, it's\n // needed and is used by other components of the other other lane, so in order for this merge to work\n // (and not throw error about deps from other lane), it needs the option to merge (user can decide whether to\n // exclude it or to use --resolve-unrelated)\n const divergeData = await getDivergeData({ repo, modelComponent, targetHead: otherLaneHead, throws: false });\n const isTargetNotAhead = !divergeData.err && !divergeData.isTargetAhead();\n const shouldIgnore = this.otherLane\n ? isTargetNotAhead // options 3.2 above. if they're not related - don't ignore.\n : isTargetNotAhead \|\| divergeData.err; // it's main. options 3.1 above. even if they're not related - still ignore.\n if (shouldIgnore) {\n return this.returnUnmerged(id, `component has been removed`, true);\n }\n }\n\n const isModified = async (): Promise<undefined \| 'code' \| 'config'> => {\n const componentModificationStatus = await consumer.getComponentStatusById(currentComponent.id);\n if (!componentModificationStatus.modified) return undefined;\n if (!existingBitMapId) return undefined;\n const baseComponent = await modelComponent.loadVersion(\n existingBitMapId.version as string,\n consumer.scope.objects\n );\n const isSourceCodeModified = await consumer.isComponentSourceCodeModified(baseComponent, currentComponent);\n if (isSourceCodeModified) return 'code';\n return 'config';\n };\n\n const modifiedType = await isModified();\n if (modifiedType === 'config' && !this.options?.ignoreConfigChanges) {\n return this.returnUnmerged(\n id,\n `component has config changes, please snap/tag it first. alternatively, use --ignore-config-changes flag to bypass`\n );\n }\n if (modifiedType === 'code') {\n return this.returnUnmerged(id, `component is modified, please snap/tag it first`);\n }\n\n if (!otherLaneHead) {\n throw new Error(`merging: unable finding a hash for the version ${version} of ${id.toString()}`);\n }\n const divergeData = await getDivergeData({\n repo,\n modelComponent,\n targetHead: otherLaneHead,\n throws: false,\n });\n if (divergeData.err) {\n if (!(divergeData.err instanceof NoCommonSnap) \|\| !this.options?.resolveUnrelated) {\n return this.returnUnmerged(\n id,\n `unable to traverse ${currentComponent.id.toString()} history. error: ${divergeData.err.message}`\n );\n }\n return this.handleNoCommonSnap(\n modelComponent,\n id,\n otherLaneHead,\n currentComponent,\n componentOnOther,\n divergeData\n );\n }\n if (!divergeData.isDiverged()) {\n if (divergeData.isSourceAhead()) {\n // do nothing!\n return this.returnUnmerged(id, `component ${currentComponent.id.toString()} is ahead, nothing to merge`, true);\n }\n if (divergeData.isTargetAhead()) {\n // just override with the model data\n return {\n ...componentStatus,\n currentComponent,\n componentFromModel: componentOnOther,\n divergeData,\n };\n }\n // we know that localHead and remoteHead are set, so if none of them is ahead they must be equal\n return this.returnUnmerged(id, `component ${currentComponent.id.toString()} is already merged`, true);\n }\n\n // it's diverged and needs merge operation\n const mergeProps = {\n otherLaneHead,\n currentId,\n modelComponent,\n };\n\n return { ...componentStatus, currentComponent, mergeProps, divergeData };\n }\n\n private async handleNoCommonSnap(\n modelComponent: ModelComponent,\n id: BitId,\n otherLaneHead: Ref,\n currentComponent: ConsumerComponent,\n componentOnOther?: Version,\n divergeData?: SnapsDistance\n ): Promise<ComponentMergeStatusBeforeMergeAttempt> {\n let { resolveUnrelated } = this.options \|\| {};\n if (currentComponent.isRemoved()) {\n resolveUnrelated = 'theirs';\n }\n if (!resolveUnrelated) throw new Error(`handleNoCommonSnap expects resolveUnrelated to be set`);\n const consumer = this.workspace.consumer;\n const repo = consumer.scope.objects;\n const mainHead = modelComponent.head;\n\n const returnAccordingToOurs = (\n headToSaveInLane: Ref,\n unrelatedHead: Ref,\n unrelatedLaneId: LaneId\n ): ComponentMergeStatusBeforeMergeAttempt => {\n return {\n currentComponent,\n id,\n divergeData,\n resolvedUnrelated: {\n strategy: 'ours',\n headOnCurrentLane: headToSaveInLane,\n unrelatedHead,\n unrelatedLaneId,\n },\n };\n };\n const returnAccordingToTheirs = (\n resolvedRef: Ref,\n unrelatedHeadRef: Ref,\n unrelatedLaneId: LaneId\n ): ComponentMergeStatusBeforeMergeAttempt => {\n // just override with the model data\n return {\n currentComponent,\n componentFromModel: componentOnOther,\n id,\n divergeData,\n resolvedUnrelated: {\n strategy: 'theirs',\n headOnCurrentLane: resolvedRef,\n unrelatedHead: unrelatedHeadRef,\n unrelatedLaneId,\n },\n };\n };\n\n const currentVersionRef = modelComponent.getRef(currentComponent.id.version as string);\n if (!currentVersionRef)\n throw new Error(\n `handleNoCommonSnap, unable to get ref of current version \"${\n currentComponent.id.version\n }\" for \"${id.toString()}\"`\n );\n const otherVersionRef = modelComponent.getRef(id.version as string);\n if (!otherVersionRef)\n throw new Error(`handleNoCommonSnap, unable to get ref of other version \"${id.version}\" for \"${id.toString()}\"`);\n\n if (mainHead) {\n const hasResolvedFromMain = async (hashToCompare: Ref \| null) => {\n const divergeDataFromMain = await getDivergeData({\n repo,\n modelComponent,\n sourceHead: hashToCompare,\n targetHead: mainHead,\n throws: false,\n });\n if (!divergeDataFromMain.err) return true;\n return !(divergeDataFromMain.err instanceof NoCommonSnap);\n };\n const hasResolvedLocally = await hasResolvedFromMain(modelComponent.getHeadRegardlessOfLane() as Ref);\n const hasResolvedRemotely = await hasResolvedFromMain(otherLaneHead);\n if (!hasResolvedLocally && !hasResolvedRemotely) {\n return this.returnUnmerged(\n id,\n `unable to traverse ${currentComponent.id.toString()} history. the main-head ${mainHead.toString()} doesn't appear in both lanes.\nit was probably created in each lane separately and it also exists on main. please merge main first to one of these lanes`\n );\n }\n const refToSaveInLane = hasResolvedLocally ? currentVersionRef : otherVersionRef;\n const unrelatedHeadRef = hasResolvedLocally ? otherVersionRef : currentVersionRef;\n if (resolveUnrelated === 'ours') {\n return returnAccordingToOurs(refToSaveInLane, unrelatedHeadRef, this.currentLane?.toLaneId() as LaneId);\n }\n if (resolveUnrelated === 'theirs') {\n return returnAccordingToTheirs(refToSaveInLane, unrelatedHeadRef, this.currentLane?.toLaneId() as LaneId);\n }\n throw new Error(\n `unsupported strategy \"${resolveUnrelated}\" of resolve-unrelated. supported strategies are: [ours, theirs]`\n );\n }\n\n const refToSaveInLane = resolveUnrelated === 'ours' ? currentVersionRef : otherVersionRef;\n const unrelatedHeadRef = resolveUnrelated === 'ours' ? otherVersionRef : currentVersionRef;\n if (resolveUnrelated === 'ours') {\n return returnAccordingToOurs(refToSaveInLane, unrelatedHeadRef, this.otherLane?.toLaneId() as LaneId);\n }\n if (resolveUnrelated === 'theirs') {\n return returnAccordingToTheirs(refToSaveInLane, unrelatedHeadRef, this.currentLane?.toLaneId() as LaneId);\n }\n throw new Error(\n `unsupported strategy \"${resolveUnrelated}\" of resolve-unrelated. supported strategies are: [ours, theirs]`\n );\n }\n}\n"],"mappings":"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"}

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

@@ -224,8 +224,8 @@ function _mergeStatusProvider() {
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+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; }
+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; }
 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; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
 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); }

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

	@@ -1 +1 @@
1	- {"version":3,"names":["_cli","data","require","_semver","_interopRequireDefault","_workspace","_interopRequireWildcard","_componentsList","_mergeVersion","_snapping","_hasWildcard","_pMapSeries","_bitId","_bitError","_generalError","_laneId","_chalk","_config","_remove","_utils","_componentWriter","_importer","_logger","_globalConfig","_lodash","_dependencyResolver","_checkout","_componentId","_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","object","enumerableOnly","keys","getOwnPropertySymbols","symbols","filter","sym","enumerable","push","apply","_objectSpread","target","i","arguments","length","source","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","BitIds","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","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","fullName","abortedComponents","snap","legacyBitIds","_legacy","resolvedComponents","localLaneObject","Promise","all","bitId","remoteScopeName","remoteLaneId","remoteLanes","laneIdStr","toStringWithoutVersion","getComponents","r","BitId","tagMessage","unmodified","idsStr","componentIds","resolveMultipleComponentIds","entry","getEntry","GeneralError","unresolvedComponents","u","ComponentID","fromLegacy","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 { BitId, BitIds } from '@teambit/legacy/dist/bit-id';\nimport { BitError } from '@teambit/bit-error';\nimport GeneralError from '@teambit/legacy/dist/error/general-error';\nimport { LaneId } from '@teambit/lane-id';\nimport { 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 { ComponentID } from '@teambit/component-id';\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: BitId;\n modelComponent: ModelComponent;\n };\n};\n\nexport type FailedComponents = { id: BitId; unchangedMessage: string; unchangedLegitimately?: boolean };\n\nexport type ApplyVersionResults = {\n components?: ApplyVersionResult[];\n version?: string;\n failedComponents?: FailedComponents[];\n removedComponents?: BitId[];\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?: BitIds;\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: BitId[],\n mergeStrategy: MergeStrategy,\n noSnap: boolean,\n snapMessage: string,\n build: boolean,\n skipDependencyInstallation: boolean\n ): Promise<ApplyVersionResults> {\n const currentLaneId = consumer.getCurrentLaneId();\n const currentLaneObject = await consumer.getCurrentLaneObject();\n const allComponentsStatus = await this.getAllComponentsStatus(bitIds, currentLaneId, currentLaneObject);\n const failedComponents = allComponentsStatus.filter((c) => c.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 = BitIds.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: BitId[], // 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: BitId;\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.name, 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: BitIds.fromArray(ids.map((id) => id._legacy)),\n build,\n message: snapMessage,\n });\n return { resolvedComponents: snappedComponents };\n }\n\n private async getAllComponentsStatus(\n bitIds: BitId[],\n laneId: LaneId,\n localLaneObject: Lane \| null\n ): Promise<ComponentMergeStatus[]> {\n const 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 = BitIds.fromArray(unmergedComponents.map((r) => new BitId(r.id)));\n return this.snapping.snap({\n legacyBitIds: ids,\n build,\n message: snapMessage,\n });\n }\n\n private async tagAllLaneComponent(idsToTag: BitId[], tagMessage: string, build: boolean): Promise<TagResults \| null> {\n const ids = idsToTag.map((id) => {\n return id.toStringWithoutVersion();\n });\n 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.fromLegacy(new BitId(u.id)));\n }\n\n private async getComponentsToMerge(consumer: Consumer, ids: string[]): Promise<BitId[]> {\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","_bitId","_bitError","_generalError","_laneId","_chalk","_config","_remove","_utils","_componentWriter","_importer","_logger","_globalConfig","_lodash","_dependencyResolver","_checkout","_componentId","_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","BitIds","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","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","fullName","abortedComponents","snap","legacyBitIds","_legacy","resolvedComponents","localLaneObject","Promise","all","bitId","remoteScopeName","remoteLaneId","remoteLanes","laneIdStr","toStringWithoutVersion","getComponents","BitId","tagMessage","unmodified","idsStr","componentIds","resolveMultipleComponentIds","entry","getEntry","GeneralError","unresolvedComponents","u","ComponentID","fromLegacy","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 { BitId, BitIds } from '@teambit/legacy/dist/bit-id';\nimport { BitError } from '@teambit/bit-error';\nimport GeneralError from '@teambit/legacy/dist/error/general-error';\nimport { LaneId } from '@teambit/lane-id';\nimport { 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 { ComponentID } from '@teambit/component-id';\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: BitId;\n modelComponent: ModelComponent;\n };\n};\n\nexport type FailedComponents = { id: BitId; unchangedMessage: string; unchangedLegitimately?: boolean };\n\nexport type ApplyVersionResults = {\n components?: ApplyVersionResult[];\n version?: string;\n failedComponents?: FailedComponents[];\n removedComponents?: BitId[];\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?: BitIds;\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: BitId[],\n mergeStrategy: MergeStrategy,\n noSnap: boolean,\n snapMessage: string,\n build: boolean,\n skipDependencyInstallation: boolean\n ): Promise<ApplyVersionResults> {\n const currentLaneId = consumer.getCurrentLaneId();\n const currentLaneObject = await consumer.getCurrentLaneObject();\n const allComponentsStatus = await this.getAllComponentsStatus(bitIds, currentLaneId, currentLaneObject);\n const failedComponents = allComponentsStatus.filter((c) => c.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 = BitIds.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: BitId[], // 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: BitId;\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.name, 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: BitIds.fromArray(ids.map((id) => id._legacy)),\n build,\n message: snapMessage,\n });\n return { resolvedComponents: snappedComponents };\n }\n\n private async getAllComponentsStatus(\n bitIds: BitId[],\n laneId: LaneId,\n localLaneObject: Lane \| null\n ): Promise<ComponentMergeStatus[]> {\n const 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 = BitIds.fromArray(unmergedComponents.map((r) => new BitId(r.id)));\n return this.snapping.snap({\n legacyBitIds: ids,\n build,\n message: snapMessage,\n });\n }\n\n private async tagAllLaneComponent(idsToTag: BitId[], tagMessage: string, build: boolean): Promise<TagResults \| null> {\n const ids = idsToTag.map((id) => {\n return id.toStringWithoutVersion();\n });\n 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.fromLegacy(new BitId(u.id)));\n }\n\n private async getComponentsToMerge(consumer: Consumer, ids: string[]): Promise<BitId[]> {\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 Viewed

@@ -1,12 +1,12 @@
 {
   "name": "@teambit/merging",
-  "version": "1.0.8",
+  "version": "1.0.10",
   "homepage": "https://bit.cloud/teambit/component/merging",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.component",
     "name": "merging",
-    "version": "1.0.8"
+    "version": "1.0.10"
   },
   "dependencies": {
     "lodash": "4.17.21",
@@ -18,22 +18,23 @@
     "@teambit/component-id": "0.0.427",
     "@teambit/legacy-bit-id": "1.0.0",
     "@teambit/harmony": "0.4.6",
-    "@teambit/dependency-resolver": "1.0.8",
+    "@teambit/dependency-resolver": "1.0.10",
+    "@teambit/builder": "1.0.10",
     "@teambit/component-version": "1.0.2",
-    "@teambit/envs": "1.0.8",
-    "@teambit/logger": "0.0.883",
+    "@teambit/envs": "1.0.10",
+    "@teambit/logger": "0.0.885",
     "@teambit/bit-error": "0.0.404",
-    "@teambit/cli": "0.0.790",
-    "@teambit/global-config": "0.0.792",
-    "@teambit/importer": "1.0.8",
-    "@teambit/lane-id": "0.0.303",
-    "@teambit/workspace": "1.0.8",
-    "@teambit/checkout": "1.0.8",
-    "@teambit/component-writer": "1.0.8",
-    "@teambit/config": "0.0.805",
-    "@teambit/install": "1.0.8",
-    "@teambit/remove": "1.0.8",
-    "@teambit/snapping": "1.0.8"
+    "@teambit/cli": "0.0.792",
+    "@teambit/global-config": "0.0.794",
+    "@teambit/importer": "1.0.10",
+    "@teambit/lane-id": "0.0.305",
+    "@teambit/workspace": "1.0.10",
+    "@teambit/checkout": "1.0.10",
+    "@teambit/component-writer": "1.0.10",
+    "@teambit/config": "0.0.807",
+    "@teambit/install": "1.0.10",
+    "@teambit/remove": "1.0.10",
+    "@teambit/snapping": "1.0.10"
   },
   "devDependencies": {
     "@types/lodash": "4.14.165",
@@ -47,7 +48,7 @@
     "@types/testing-library__jest-dom": "5.9.5"
   },
   "peerDependencies": {
-    "@teambit/legacy": "1.0.570",
+    "@teambit/legacy": "1.0.572",
     "react": "^16.8.0 || ^17.0.0",
     "react-dom": "^16.8.0 || ^17.0.0"
   },

/package/dist/{preview-1695698249502.js → preview-1695901055662.js} RENAMED Viewed

File without changes