@teambit/merging 1.0.103 → 1.0.105

package/dist/config-merge-result.js

@@ -28,8 +28,8 @@ function _configMerger() {
 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); }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 const DEP_RESOLVER_VERSION_INDENTATION = 8;
 const CONFLICT_MARKER_INDENTATION = 7;
 class ConfigMergeResult {

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

@@ -1 +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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"}
+{"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","i","_toPrimitive","String","Symbol","toPrimitive","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","undefined","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":";;;;;;AAAA,SAAAA,oBAAA;EAAA,MAAAC,IAAA,GAAAC,OAAA;EAAAF,mBAAA,YAAAA,CAAA;IAAA,OAAAC,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAE,QAAA;EAAA,MAAAF,IAAA,GAAAC,OAAA;EAAAC,OAAA,YAAAA,CAAA;IAAA,OAAAF,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAG,cAAA;EAAA,MAAAH,IAAA,GAAAC,OAAA;EAAAE,aAAA,YAAAA,CAAA;IAAA,OAAAH,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAAiG,SAAAI,QAAAC,CAAA,EAAAC,CAAA,QAAAC,CAAA,GAAAC,MAAA,CAAAC,IAAA,CAAAJ,CAAA,OAAAG,MAAA,CAAAE,qBAAA,QAAAC,CAAA,GAAAH,MAAA,CAAAE,qBAAA,CAAAL,CAAA,GAAAC,CAAA,KAAAK,CAAA,GAAAA,CAAA,CAAAC,MAAA,WAAAN,CAAA,WAAAE,MAAA,CAAAK,wBAAA,CAAAR,CAAA,EAAAC,CAAA,EAAAQ,UAAA,OAAAP,CAAA,CAAAQ,IAAA,CAAAC,KAAA,CAAAT,CAAA,EAAAI,CAAA,YAAAJ,CAAA;AAAA,SAAAU,cAAAZ,CAAA,aAAAC,CAAA,MAAAA,CAAA,GAAAY,SAAA,CAAAC,MAAA,EAAAb,CAAA,UAAAC,CAAA,WAAAW,SAAA,CAAAZ,CAAA,IAAAY,SAAA,CAAAZ,CAAA,QAAAA,CAAA,OAAAF,OAAA,CAAAI,MAAA,CAAAD,CAAA,OAAAa,OAAA,WAAAd,CAAA,IAAAe,eAAA,CAAAhB,CAAA,EAAAC,CAAA,EAAAC,CAAA,CAAAD,CAAA,SAAAE,MAAA,CAAAc,yBAAA,GAAAd,MAAA,CAAAe,gBAAA,CAAAlB,CAAA,EAAAG,MAAA,CAAAc,yBAAA,CAAAf,CAAA,KAAAH,OAAA,CAAAI,MAAA,CAAAD,CAAA,GAAAa,OAAA,WAAAd,CAAA,IAAAE,MAAA,CAAAgB,cAAA,CAAAnB,CAAA,EAAAC,CAAA,EAAAE,MAAA,CAAAK,wBAAA,CAAAN,CAAA,EAAAD,CAAA,iBAAAD,CAAA;AAAA,SAAAgB,gBAAAI,GAAA,EAAAC,GAAA,EAAAC,KAAA,IAAAD,GAAA,GAAAE,cAAA,CAAAF,GAAA,OAAAA,GAAA,IAAAD,GAAA,IAAAjB,MAAA,CAAAgB,cAAA,CAAAC,GAAA,EAAAC,GAAA,IAAAC,KAAA,EAAAA,KAAA,EAAAb,UAAA,QAAAe,YAAA,QAAAC,QAAA,oBAAAL,GAAA,CAAAC,GAAA,IAAAC,KAAA,WAAAF,GAAA;AAAA,SAAAG,eAAArB,CAAA,QAAAwB,CAAA,GAAAC,YAAA,CAAAzB,CAAA,uCAAAwB,CAAA,GAAAA,CAAA,GAAAE,MAAA,CAAAF,CAAA;AAAA,SAAAC,aAAAzB,CAAA,EAAAD,CAAA,2BAAAC,CAAA,KAAAA,CAAA,SAAAA,CAAA,MAAAF,CAAA,GAAAE,CAAA,CAAA2B,MAAA,CAAAC,WAAA,kBAAA9B,CAAA,QAAA0B,CAAA,GAAA1B,CAAA,CAAA+B,IAAA,CAAA7B,CAAA,EAAAD,CAAA,uCAAAyB,CAAA,SAAAA,CAAA,YAAAM,SAAA,yEAAA/B,CAAA,GAAA2B,MAAA,GAAAK,MAAA,EAAA/B,CAAA;AAEjG,MAAMgC,gCAAgC,GAAG,CAAC;AAC1C,MAAMC,2BAA2B,GAAG,CAAC;AAE9B,MAAMC,iBAAiB,CAAC;EAC7BC,WAAWA,CACAC,SAAiB,EAClBC,YAAoB,EACpBC,UAAkB,EAClBC,OAA8B,EACtC;IAAA,KAJSH,SAAiB,GAAjBA,SAAiB;IAAA,KAClBC,YAAoB,GAApBA,YAAoB;IAAA,KACpBC,UAAkB,GAAlBA,UAAkB;IAAA,KAClBC,OAA8B,GAA9BA,OAA8B;EACrC;EACHC,YAAYA,CAAA,EAAY;IACtB,OAAO,IAAI,CAACD,OAAO,CAACE,IAAI,CAAEC,MAAM,IAAKA,MAAM,CAACC,QAAQ,CAAC;EACvD;EACAC,yBAAyBA,CAAA,EAAkB;IACzC,MAAMC,mBAAmB,GAAG,IAAI,CAACN,OAAO,CAAClC,MAAM,CAAEqC,MAAM,IAAKA,MAAM,CAACC,QAAQ,CAAC;IAC5E,IAAI,CAACE,mBAAmB,CAACjC,MAAM,EAAE,OAAO,IAAI;IAC5C,MAAMkC,YAAY,GAAG,IAAAC,iBAAO,EAACF,mBAAmB,CAACG,GAAG,CAAEN,MAAM,IAAK,IAAI,CAACO,+BAA+B,CAACP,MAAM,CAAC,CAAC,CAAC;IAC/G,MAAMQ,oBAAoB,GAAGJ,YAAY,CAACE,GAAG,CAAEG,CAAC,IAAK,IAAI,CAACC,cAAc,CAACD,CAAC,CAAC,CAAC;IAC5E,MAAME,WAAW,GAAI;AACzB,EAAE,IAAI,CAACC,oBAAoB,CAACJ,oBAAoB,CAAE;AAClD,EAAE;IACE,OAAOG,WAAW;EACpB;EACAE,2BAA2BA,CAAA,EAAwB;IACjD,MAAMC,uBAAuB,GAAG,IAAI,CAACjB,OAAO,CAAClC,MAAM,CAAEqC,MAAM,IAAKA,MAAM,CAACe,YAAY,CAAC;IACpF,OAAOD,uBAAuB,CAACE,MAAM,CAAC,CAACC,GAAG,EAAEC,IAAI,KAAK;MACnD,MAAMC,UAAU,GAAG;QAAE,CAACD,IAAI,CAACE,EAAE,GAAGF,IAAI,CAACH;MAAa,CAAC;MACnD,OAAA/C,aAAA,CAAAA,aAAA,KAAYiD,GAAG,GAAKE,UAAU;IAChC,CAAC,EAAE,CAAC,CAAC,CAAC;EACR;EAEAE,qBAAqBA,CAAA,EAAoC;IACvD,OAAO,IAAI,CAACxB,OAAO,CAACyB,IAAI,CAAEtB,MAAM,IAAKA,MAAM,CAACoB,EAAE,KAAKG,8CAAwB,CAACH,EAAE,CAAC;EACjF;EAEQb,+BAA+BA,CAACP,MAA2B,EAAsB;IACvF,IAAI,CAACA,MAAM,CAACC,QAAQ,EAAE,OAAOuB,SAAS;IACtC,IAAIxB,MAAM,CAACoB,EAAE,KAAKG,8CAAwB,CAACH,EAAE,EAAE;MAC7C,OAAO,IAAI,CAACK,2BAA2B,CAACzB,MAAM,CAACC,QAAQ,CAAC;IAC1D;IACA,OAAO,IAAI,CAACyB,sBAAsB,CAAC1B,MAAM,CAACoB,EAAE,EAAEpB,MAAM,CAACC,QAAQ,CAAC;EAChE;EAEQwB,2BAA2BA,CAACxB,QAA6B,EAAU;IACzE,MAAM0B,iBAAiB,GAAGC,IAAI,CAACC,SAAS,CAAC;MAAEC,MAAM,EAAE7B;IAAS,CAAC,EAAEuB,SAAS,EAAE,CAAC,CAAC,CAACO,KAAK,CAAC,IAAI,CAAC;IACxF,MAAMC,aAAa,GAAGL,iBAAiB,CAACrB,GAAG,CAAE2B,IAAI,IAAK;MACpD,IAAI,CAACA,IAAI,CAACC,QAAQ,CAACC,iCAAiB,CAAC,EAAE,OAAOF,IAAI;MAClD,MAAM,GAAGG,UAAU,EAAEC,QAAQ,CAAC,GAAGJ,IAAI,CAACF,KAAK,CAAC,IAAI,CAAC;MACjD,OAAQ,GAAE,GAAG,CAACO,MAAM,CAAC/C,2BAA2B,CAAE,IAAG,IAAI,CAACI,YAAa;AAC7E,EAAE,GAAG,CAAC2C,MAAM,CAAChD,gCAAgC,CAAE,eAAc8C,UAAW;AACxE;AACA,EAAE,GAAG,CAACE,MAAM,CAAChD,gCAAgC,CAAE,eAAc+C,QAAS;AACtE,EAAE,GAAG,CAACC,MAAM,CAAC/C,2BAA2B,CAAE,IAAG,IAAI,CAACK,UAAW,EAAC;IAC1D,CAAC,CAAC;IACF;IACAoC,aAAa,CAACO,KAAK,CAAC,CAAC;IACrBP,aAAa,CAACQ,OAAO,CAAE,IAAGjB,8CAAwB,CAACH,EAAG,MAAK,CAAC;IAC5D,OAAOY,aAAa,CAACS,IAAI,CAAC,IAAI,CAAC;EACjC;EAEQf,sBAAsBA,CAACN,EAAU,EAAEsB,WAAgC,EAAU;IACnF,MAAM;MAAEC,aAAa;MAAEC;IAAY,CAAC,GAAGF,WAAW;IAClD,IAAIzC,QAAgB;IACpB,IAAI0C,aAAa,KAAK,GAAG,EAAE;MACzB1C,QAAQ,GAAI,GAAE,GAAG,CAACqC,MAAM,CAAC/C,2BAA2B,CAAE,IAAG,IAAI,CAACI,YAAa;AACjF,GAAGyB,EAAG;AACN;AACA,GAAGA,EAAG,MAAKQ,IAAI,CAACC,SAAS,CAACe,WAAW,EAAEpB,SAAS,EAAE,CAAC,CAAE;AACrD,EAAE,GAAG,CAACc,MAAM,CAAC/C,2BAA2B,CAAE,IAAG,IAAI,CAACK,UAAW,EAAC;IAC1D,CAAC,MAAM,IAAIgD,WAAW,KAAK,GAAG,EAAE;MAC9B3C,QAAQ,GAAI,GAAE,GAAG,CAACqC,MAAM,CAAC/C,2BAA2B,CAAE,IAAG,IAAI,CAACI,YAAa;AACjF,GAAGyB,EAAG,MAAKQ,IAAI,CAACC,SAAS,CAACc,aAAa,EAAEnB,SAAS,EAAE,CAAC,CAAE;AACvD;AACA,GAAGJ,EAAG;AACN,EAAE,GAAG,CAACkB,MAAM,CAAC/C,2BAA2B,CAAE,IAAG,IAAI,CAACK,UAAW,EAAC;IAC1D,CAAC,MAAM;MACL,MAAMiD,YAAY,GAAIC,IAA4B,IAAK;QACrD,MAAMC,OAAO,GAAGnB,IAAI,CAACC,SAAS,CAACiB,IAAI,EAAEtB,SAAS,EAAE,CAAC,CAAC;QAClD,MAAMwB,YAAY,GAAGD,OAAO,CAAChB,KAAK,CAAC,IAAI,CAAC;QACxCiB,YAAY,CAACT,KAAK,CAAC,CAAC,CAAC,CAAC;QACtBS,YAAY,CAACC,GAAG,CAAC,CAAC,CAAC,CAAC;QACpB,OAAOD,YAAY,CAACP,IAAI,CAAC,IAAI,CAAC;MAChC,CAAC;MACDxC,QAAQ,GAAI,IAAGmB,EAAG;AACxB,EAAE,GAAG,CAACkB,MAAM,CAAC/C,2BAA2B,CAAE,IAAG,IAAI,CAACI,YAAa;AAC/D,EAAEkD,YAAY,CAACF,aAAa,CAAE;AAC9B;AACA,EAAEE,YAAY,CAACD,WAAW,CAAE;AAC5B,EAAE,GAAG,CAACN,MAAM,CAAC/C,2BAA2B,CAAE,IAAG,IAAI,CAACK,UAAW;AAC7D,EAAE;IACE;IAEA,OAAOK,QAAQ;EACjB;EAEQS,cAAcA,CAACT,QAAgB,EAAE;IACvC,OACEA,QAAQ,CACL8B,KAAK,CAAC,IAAI;IACX;IAAA,CACCzB,GAAG,CAAE2B,IAAI,IAAM,KAAIA,IAAK,EAAC;IAC1B;IAAA,CACC3B,GAAG,CAAE2B,IAAI,IAAKA,IAAI,CAACiB,OAAO,CAAC,8BAA8B,EAAE,IAAI,CAAC,CAAC,CACjET,IAAI,CAAC,IAAI,CAAC;EAEjB;EAEQ7B,oBAAoBA,CAACuC,SAAmB,EAAE;IAChD,MAAMC,kBAAkB,GAAGD,SAAS,CAAC7C,GAAG,CAAC,CAACL,QAAQ,EAAEoD,KAAK,KAAK;MAC5D,IAAIA,KAAK,KAAKF,SAAS,CAACjF,MAAM,GAAG,CAAC,EAAE,OAAO+B,QAAQ,CAAC,CAAC;MACrD,IAAIA,QAAQ,CAACqD,QAAQ,CAAC,GAAG,CAAC,EAAE,OAAQ,GAAErD,QAAS,GAAE,CAAC,CAAC;MACnD;MACA;MACA,MAAMsD,aAAa,GAAGtD,QAAQ,CAAC8B,KAAK,CAAC,IAAI,CAAC;MAC1C;MACA,MAAMyB,wBAAwB,GAAGD,aAAa,CAACE,WAAW,CAAC,KAAK,CAAC;MACjEF,aAAa,CAACC,wBAAwB,CAAC,IAAI,GAAG;MAC9C,OAAOD,aAAa,CAACd,IAAI,CAAC,IAAI,CAAC;IACjC,CAAC,CAAC;IACF,OAAOW,kBAAkB,CAACX,IAAI,CAAC,IAAI,CAAC;EACtC;AACF;AAACiB,OAAA,CAAAlE,iBAAA,GAAAA,iBAAA"}

package/dist/config-merger.js

@@ -57,8 +57,8 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 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); }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 const conflictIndicator = exports.conflictIndicator = 'CONFLICT::';
 /**
  * perform 3-way merge of component configuration (aspects).
@@ -329,7 +329,6 @@ class ConfigMerger {
           // // default to `^` or ~ if starts with zero, until we save the policy from the workspace during tag/snap.
           // return d.version.startsWith('0.') ? `~${d.version}` : `^${d.version}`;
         };
-
         return _objectSpread(_objectSpread({}, d), {}, {
           id: idWithoutVersion,
           policy: getPolicyVer()
@@ -491,7 +490,6 @@ class ConfigMerger {
       if (hasConfigForDep(depType, dep.id)) {
         return; // there is already config for it.
       }
-
       mergedPolicy[depType].push({
         name: getDepIdAsPkgName(dep),
         version: dep.policy || dep.version,
@@ -553,7 +551,6 @@ class ConfigMerger {
       if (hasConfigForDep(depType, currentDep.id)) {
         return; // there is already config for it.
       }
-
       if (baseVer && baseVer === currentVer) {
         addSerializedDepToPolicy(otherDep);
         return;

package/dist/config-merger.js.map

@@ -1 +1 @@
-{"version":3,"names":["_semver","data","_interopRequireDefault","require","_builder","_componentVersion","_dependencyResolver","_envs","_lodash","_configMergeResult","obj","__esModule","default","ownKeys","e","r","t","Object","keys","getOwnPropertySymbols","o","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","defineProperty","key","value","_toPropertyKey","configurable","writable","arg","_toPrimitive","String","input","hint","prim","Symbol","toPrimitive","undefined","res","call","TypeError","Number","conflictIndicator","exports","ConfigMerger","constructor","compIdStr","workspaceIds","otherLane","currentAspects","baseAspects","otherAspects","currentLabel","otherLabel","logger","BuilderAspect","id","otherLaneIdsStr","toBitIds","map","toString","merge","debug","populateEnvs","results","currentExt","stringId","handledExtIds","includes","baseExt","findExtension","otherExt","mergePerStrategy","conflict","currentConfig","getConfig","otherConfig","otherAspectsNotHandledResults","extensionId","hasVersion","idFromWorkspace","getIdFromWorkspace","toStringWithoutVersion","existingExt","_legacy","mergedConfig","envResult","envStrategy","ConfigMergeResult","compact","getEnvId","ext","envsAspect","findCoreExtension","EnvsAspect","Error","env","config","currentEnv","otherEnv","baseEnv","currentEnvAspect","_currentEnvAspect$ext","version","otherEnvAspect","_otherEnvAspect$exten","baseEnvAspect","_baseEnvAspect$extens","mergeStrategyParams","_this$baseEnv","_this$baseEnv2","baseConfig","isIdInWorkspaceOrOtherLane","basicConfigMerge","areConfigsEqual","configA","configB","JSON","stringify","depResolverResult","depResolverStrategy","params","DependencyResolverAspect","trace","currentConfigPolicy","getPolicy","otherConfigPolicy","baseConfigPolicy","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.logger.debug(`currentLabel: ${this.currentLabel}`);\n    this.logger.debug(`otherLabel: ${this.otherLabel}`);\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 currentConfigPolicy = this.getPolicy(currentConfig);\n    const otherConfig = this.getConfig(otherExt);\n    const otherConfigPolicy = this.getPolicy(otherConfig);\n\n    const baseConfig = baseExt ? this.getConfig(baseExt) : undefined;\n    const baseConfigPolicy = baseConfig ? this.getPolicy(baseConfig) : undefined;\n\n    this.logger.debug(`currentConfig, ${JSON.stringify(currentConfig, undefined, 2)}`);\n    this.logger.debug(`otherConfig, ${JSON.stringify(otherConfig, undefined, 2)}`);\n    this.logger.debug(`baseConfig, ${JSON.stringify(baseConfig, undefined, 2)}`);\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          // -- updated comment --\n          // not sure why this block is needed. this gets called also from this if: `if (baseConfig && this.areConfigsEqual(baseConfig, currentConfig)) {`\n          // and in this case, it's possible that current/base has 5 deps, and other just added one and it has 6.\n          // in which case, we do need to add all these 5 in additional to the new one. otherwise, only the new one appears in the final\n          // merged object, and all the 5 deps are lost.\n          // --- previous comment ---\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 (otherConfigPolicy.length) {\n          otherConfigPolicy.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(currentConfigPolicy.concat(otherConfigPolicy), (d) => d.dependencyId);\n      currentAndOtherConfig.forEach((dep) => {\n        const depType = lifecycleToDepType[dep.lifecycleType];\n        const currentDep = currentConfigPolicy.find((d) => d.dependencyId === dep.dependencyId);\n        const otherDep = otherConfigPolicy.find((d) => d.dependencyId === dep.dependencyId);\n        const baseDep = baseConfigPolicy?.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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"}
+{"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","i","_toPrimitive","String","Symbol","toPrimitive","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","undefined","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","currentConfigPolicy","getPolicy","otherConfigPolicy","baseConfigPolicy","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.logger.debug(`currentLabel: ${this.currentLabel}`);\n    this.logger.debug(`otherLabel: ${this.otherLabel}`);\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 currentConfigPolicy = this.getPolicy(currentConfig);\n    const otherConfig = this.getConfig(otherExt);\n    const otherConfigPolicy = this.getPolicy(otherConfig);\n\n    const baseConfig = baseExt ? this.getConfig(baseExt) : undefined;\n    const baseConfigPolicy = baseConfig ? this.getPolicy(baseConfig) : undefined;\n\n    this.logger.debug(`currentConfig, ${JSON.stringify(currentConfig, undefined, 2)}`);\n    this.logger.debug(`otherConfig, ${JSON.stringify(otherConfig, undefined, 2)}`);\n    this.logger.debug(`baseConfig, ${JSON.stringify(baseConfig, undefined, 2)}`);\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          // -- updated comment --\n          // not sure why this block is needed. this gets called also from this if: `if (baseConfig && this.areConfigsEqual(baseConfig, currentConfig)) {`\n          // and in this case, it's possible that current/base has 5 deps, and other just added one and it has 6.\n          // in which case, we do need to add all these 5 in additional to the new one. otherwise, only the new one appears in the final\n          // merged object, and all the 5 deps are lost.\n          // --- previous comment ---\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 (otherConfigPolicy.length) {\n          otherConfigPolicy.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(currentConfigPolicy.concat(otherConfigPolicy), (d) => d.dependencyId);\n      currentAndOtherConfig.forEach((dep) => {\n        const depType = lifecycleToDepType[dep.lifecycleType];\n        const currentDep = currentConfigPolicy.find((d) => d.dependencyId === dep.dependencyId);\n        const otherDep = otherConfigPolicy.find((d) => d.dependencyId === dep.dependencyId);\n        const baseDep = baseConfigPolicy?.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-cmd.js

@@ -48,8 +48,8 @@ function _bitError() {
 }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 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); }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 class MergeCmd {
   constructor(merging, globalConfig) {
     this.merging = merging;

package/dist/merge-cmd.js.map

@@ -1 +1 @@
-{"version":3,"names":["_chalk","data","_interopRequireDefault","require","_lodash","_constants","_mergeVersion","_bitError","obj","__esModule","default","_defineProperty","key","value","_toPropertyKey","Object","defineProperty","enumerable","configurable","writable","arg","_toPrimitive","String","input","hint","prim","Symbol","toPrimitive","undefined","res","call","TypeError","Number","MergeCmd","constructor","merging","globalConfig","WILDCARD_HELP","report","ids","ours","theirs","manual","autoMergeResolve","abort","resolve","build","noSnap","verbose","message","skipDependencyInstallation","getBool","CFG_FORCE_LOCAL_BUILD","Boolean","BitError","components","failedComponents","version","resolvedComponents","abortedComponents","mergeSnapResults","mergeSnapError","merge","title","componentsStr","map","c","id","toStringWithoutVersion","join","chalk","underline","green","mergeReport","exports","removedComponents","leftUnresolvedConflicts","configMergeResults","workspaceDepsUpdates","getSuccessOutput","length","bold","fileChangesReport","applyVersionReport","getConflictSummary","suggestion","conflictSummaryReport","yellow","configMergeWithConflicts","filter","hasConflicts","getConfigMergeConflictSummary","comps","compIdStr","MergeConfigFilename","getSnapsOutput","snappedComponents","autoSnappedResults","outputComponents","component","componentOutput","toString","autoTag","result","triggeredBy","searchWithoutVersion","autoTagComp","a","AUTO_SNAPPED_MSG","getWorkspaceDepsOutput","body","keys","pkgName","from","to","getFailureOutput","compact","failedComponent","unchangedLegitimately","color","unchangedMessage","getSummary","merged","f","failedToMerge","autoSnapped","newLines","mergedStr","unchangedLegitimatelyStr","failedToMergeStr","autoSnappedStr","removedStr","getRemovedOutput","addName","showVersion","tab","fileChanges","name","files","filesStatus","file","FileStatus","unchanged","note","white","cyan","FILE_CHANGES_CHECKOUT_MSG","installationErrorOutput","installationError","subTitle","red","compilationErrorOutput","compilationError","getAddedOutput","addedComponents"],"sources":["merge-cmd.ts"],"sourcesContent":["import chalk from 'chalk';\nimport { Command, CommandOptions } from '@teambit/cli';\nimport { ComponentID } from '@teambit/component-id';\nimport { compact } from 'lodash';\nimport {\n  WILDCARD_HELP,\n  AUTO_SNAPPED_MSG,\n  MergeConfigFilename,\n  FILE_CHANGES_CHECKOUT_MSG,\n  CFG_FORCE_LOCAL_BUILD,\n} from '@teambit/legacy/dist/constants';\nimport {\n  FileStatus,\n  ApplyVersionResult,\n  MergeStrategy,\n} from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport { GlobalConfigMain } from '@teambit/global-config';\nimport { BitError } from '@teambit/bit-error';\nimport { ApplyVersionResults, MergingMain } from './merging.main.runtime';\nimport { ConfigMergeResult } from './config-merge-result';\n\nexport class MergeCmd implements Command {\n  name = 'merge [ids...]';\n  description = 'merge changes of the remote head into local - auto-snaps all merged components';\n  helpUrl = 'reference/components/merging-changes';\n  group = 'development';\n  extendedDescription = `merge changes of the remote head into local when they are diverged. when on a lane, merge the remote head of the lane into the local\nand creates snaps for merged components that have diverged, on the lane.\nif no ids are specified, all pending-merge components will be merged. (run \"bit status\" to list them).\noptionally use '--abort' to revert the last merge. to revert a lane merge, use \"bit lane merge-abort\" command.\n${WILDCARD_HELP('merge')}`;\n  alias = '';\n  options = [\n    ['', 'ours', 'DEPRECATED. use --auto-merge-resolve. in case of a conflict, keep the local modification'],\n    [\n      '',\n      'theirs',\n      'DEPRECATED. use --auto-merge-resolve. in case of a conflict, override the local modification with the specified version',\n    ],\n    ['', 'manual', 'DEPRECATED. use --auto-merge-resolve'],\n    [\n      '',\n      'auto-merge-resolve <merge-strategy>',\n      'in case of a conflict, resolve according to the strategy: [ours, theirs, manual]',\n    ],\n    ['', 'abort', 'in case of an unresolved merge, revert to pre-merge state'],\n    ['', 'resolve', 'mark an unresolved merge as resolved and create a new snap with the changes'],\n    ['', 'no-snap', 'do not auto snap even if the merge completed without conflicts'],\n    ['', 'build', 'in case of snap during the merge, run the build-pipeline (similar to bit snap --build)'],\n    ['', 'verbose', 'show details of components that were not merged successfully'],\n    ['x', 'skip-dependency-installation', 'do not install new dependencies resulting from the merge'],\n    ['m', 'message <message>', 'override the default message for the auto snap'],\n  ] as CommandOptions;\n  loader = true;\n\n  constructor(private merging: MergingMain, private globalConfig: GlobalConfigMain) {}\n\n  async report(\n    [ids = []]: [string[]],\n    {\n      ours = false,\n      theirs = false,\n      manual = false,\n      autoMergeResolve,\n      abort = false,\n      resolve = false,\n      build = false,\n      noSnap = false,\n      verbose = false,\n      message,\n      skipDependencyInstallation = false,\n    }: {\n      ours?: boolean;\n      theirs?: boolean;\n      manual?: boolean;\n      autoMergeResolve?: MergeStrategy;\n      abort?: boolean;\n      resolve?: boolean;\n      build?: boolean;\n      noSnap?: boolean;\n      verbose?: boolean;\n      message: string;\n      skipDependencyInstallation?: boolean;\n    }\n  ) {\n    build = (await this.globalConfig.getBool(CFG_FORCE_LOCAL_BUILD)) || Boolean(build);\n    if (ours || theirs || manual) {\n      throw new BitError(\n        'the \"--ours\", \"--theirs\" and \"--manual\" flags are deprecated. use \"--auto-merge-resolve\" instead'\n      );\n    }\n    if (\n      autoMergeResolve &&\n      autoMergeResolve !== 'ours' &&\n      autoMergeResolve !== 'theirs' &&\n      autoMergeResolve !== 'manual'\n    ) {\n      throw new BitError('--auto-merge-resolve must be one of the following: [ours, theirs, manual]');\n    }\n    if (abort && resolve) throw new BitError('unable to use \"abort\" and \"resolve\" flags together');\n    if (noSnap && message) throw new BitError('unable to use \"noSnap\" and \"message\" flags together');\n    const {\n      components,\n      failedComponents,\n      version,\n      resolvedComponents,\n      abortedComponents,\n      mergeSnapResults,\n      mergeSnapError,\n    }: ApplyVersionResults = await this.merging.merge(\n      ids,\n      autoMergeResolve as any,\n      abort,\n      resolve,\n      noSnap,\n      message,\n      build,\n      skipDependencyInstallation\n    );\n    if (resolvedComponents) {\n      const title = 'successfully resolved component(s)\\n';\n      const componentsStr = resolvedComponents.map((c) => c.id.toStringWithoutVersion()).join('\\n');\n      return chalk.underline(title) + chalk.green(componentsStr);\n    }\n    if (abortedComponents) {\n      const title = 'successfully aborted the merge of the following component(s)\\n';\n      const componentsStr = abortedComponents.map((c) => c.id.toStringWithoutVersion()).join('\\n');\n      return chalk.underline(title) + chalk.green(componentsStr);\n    }\n\n    return mergeReport({\n      components,\n      failedComponents,\n      version,\n      mergeSnapResults,\n      mergeSnapError,\n      verbose,\n    });\n  }\n}\n\nexport function mergeReport({\n  components,\n  failedComponents,\n  removedComponents,\n  version,\n  mergeSnapResults,\n  mergeSnapError,\n  leftUnresolvedConflicts,\n  verbose,\n  configMergeResults,\n  workspaceDepsUpdates,\n}: ApplyVersionResults & { configMergeResults?: ConfigMergeResult[] }): string {\n  const getSuccessOutput = () => {\n    if (!components || !components.length) return '';\n    const title = `successfully merged ${components.length} components${\n      version ? `from version ${chalk.bold(version)}` : ''\n    }\\n`;\n    const fileChangesReport = applyVersionReport(components);\n\n    return chalk.bold(title) + fileChangesReport;\n  };\n\n  const getConflictSummary = () => {\n    if (!components || !components.length || !leftUnresolvedConflicts) return '';\n    const title = `\\n\\nfiles with conflicts summary\\n`;\n    const suggestion = `\\n\\nmerge process not completed due to the conflicts above. fix conflicts manually and then run \"bit install\".\nonce ready, snap/tag the components to complete the merge.`;\n    return chalk.underline(title) + conflictSummaryReport(components) + chalk.yellow(suggestion);\n  };\n\n  const configMergeWithConflicts = configMergeResults?.filter((c) => c.hasConflicts()) || [];\n  const getConfigMergeConflictSummary = () => {\n    if (!configMergeWithConflicts.length) return '';\n    const comps = configMergeWithConflicts.map((c) => c.compIdStr).join('\\n');\n    const title = `\\n\\ncomponents with config-merge conflicts\\n`;\n    const suggestion = `\\nconflicts were found while trying to merge the config. fix them manually by editing the ${MergeConfigFilename} file in the workspace root.\nonce ready, snap/tag the components to complete the merge.`;\n    return chalk.underline(title) + comps + chalk.yellow(suggestion);\n  };\n\n  const getSnapsOutput = () => {\n    if (mergeSnapError) {\n      return `\n${chalk.bold('snapping merged components failed with the following error, please fix the issues and snap manually')}\n${mergeSnapError.message}\n`;\n    }\n    if (!mergeSnapResults || !mergeSnapResults.snappedComponents) return '';\n    const { snappedComponents, autoSnappedResults } = mergeSnapResults;\n    const outputComponents = (comps) => {\n      return comps\n        .map((component) => {\n          let componentOutput = `     > ${component.id.toString()}`;\n          const autoTag = autoSnappedResults.filter((result) => result.triggeredBy.searchWithoutVersion(component.id));\n          if (autoTag.length) {\n            const autoTagComp = autoTag.map((a) => a.component.id.toString());\n            componentOutput += `\\n       ${AUTO_SNAPPED_MSG}: ${autoTagComp.join(', ')}`;\n          }\n          return componentOutput;\n        })\n        .join('\\n');\n    };\n\n    return `\\n${chalk.underline(\n      'merge-snapped components'\n    )}\\n(${'components snapped as a result of the merge'})\\n${outputComponents(snappedComponents)}\\n`;\n  };\n\n  const getWorkspaceDepsOutput = () => {\n    if (!workspaceDepsUpdates) return '';\n\n    const title = '\\nworkspace.jsonc has been updated with the following dependencies';\n    const body = Object.keys(workspaceDepsUpdates)\n      .map((pkgName) => {\n        const [from, to] = workspaceDepsUpdates[pkgName];\n        return `  ${pkgName}: ${from} => ${to}`;\n      })\n      .join('\\n');\n\n    return `\\n${chalk.underline(title)}\\n${body}\\n\\n`;\n  };\n\n  const getFailureOutput = () => {\n    if (!failedComponents || !failedComponents.length) return '';\n    const title = '\\nmerge skipped for the following component(s)';\n    const body = compact(\n      failedComponents.map((failedComponent) => {\n        if (!verbose && failedComponent.unchangedLegitimately) return null;\n        const color = failedComponent.unchangedLegitimately ? 'white' : 'red';\n        return `${chalk.bold(failedComponent.id.toString())} - ${chalk[color](failedComponent.unchangedMessage)}`;\n      })\n    ).join('\\n');\n    if (!body) {\n      return `${chalk.bold(`\\nmerge skipped legitimately for ${failedComponents.length} component(s)`)}\n(use --verbose to list them next time)`;\n    }\n    return `\\n${chalk.underline(title)}\\n${body}\\n\\n`;\n  };\n\n  const getSummary = () => {\n    const merged = components?.length || 0;\n    const unchangedLegitimately = failedComponents?.filter((f) => f.unchangedLegitimately).length || 0;\n    const failedToMerge = failedComponents?.filter((f) => !f.unchangedLegitimately).length || 0;\n    const autoSnapped =\n      (mergeSnapResults?.snappedComponents.length || 0) + (mergeSnapResults?.autoSnappedResults.length || 0);\n\n    const newLines = '\\n\\n';\n    const title = chalk.bold.underline('Merge Summary');\n    const mergedStr = `\\nTotal Merged: ${chalk.bold(merged.toString())}`;\n    const unchangedLegitimatelyStr = `\\nTotal Unchanged: ${chalk.bold(unchangedLegitimately.toString())}`;\n    const failedToMergeStr = `\\nTotal Failed: ${chalk.bold(failedToMerge.toString())}`;\n    const autoSnappedStr = `\\nTotal Snapped: ${chalk.bold(autoSnapped.toString())}`;\n    const removedStr = `\\nTotal Removed: ${chalk.bold(removedComponents?.length.toString() || '0')}`;\n\n    return newLines + title + mergedStr + unchangedLegitimatelyStr + failedToMergeStr + autoSnappedStr + removedStr;\n  };\n\n  return (\n    getSuccessOutput() +\n    getFailureOutput() +\n    getRemovedOutput(removedComponents) +\n    getSnapsOutput() +\n    getWorkspaceDepsOutput() +\n    getConfigMergeConflictSummary() +\n    getConflictSummary() +\n    getSummary()\n  );\n}\n\n/**\n * shows only the file-changes section.\n * if all files are \"unchanged\", it returns an empty string\n */\nexport function applyVersionReport(components: ApplyVersionResult[], addName = true, showVersion = false): string {\n  const tab = addName ? '\\t' : '';\n  const fileChanges = compact(\n    components.map((component: ApplyVersionResult) => {\n      const name = showVersion ? component.id.toString() : component.id.toStringWithoutVersion();\n      const files = compact(\n        Object.keys(component.filesStatus).map((file) => {\n          if (component.filesStatus[file] === FileStatus.unchanged) return null;\n          const note =\n            component.filesStatus[file] === FileStatus.manual\n              ? chalk.white('automatic merge failed. please fix conflicts manually and then run \"bit install\"')\n              : '';\n          return `${tab}${component.filesStatus[file]} ${chalk.bold(file)} ${note}`;\n        })\n      ).join('\\n');\n      if (!files) return null;\n      return `${addName ? name : ''}\\n${chalk.cyan(files)}`;\n    })\n  ).join('\\n\\n');\n  if (!fileChanges) {\n    return '';\n  }\n  const title = `\\n${FILE_CHANGES_CHECKOUT_MSG}\\n`;\n  return chalk.underline(title) + fileChanges;\n}\n\nexport function conflictSummaryReport(components: ApplyVersionResult[]): string {\n  const tab = '\\t';\n  return compact(\n    components.map((component: ApplyVersionResult) => {\n      const name = component.id.toStringWithoutVersion();\n      const files = compact(\n        Object.keys(component.filesStatus).map((file) => {\n          if (component.filesStatus[file] === FileStatus.manual) {\n            return `${tab}${component.filesStatus[file]} ${chalk.bold(file)}`;\n          }\n          return null;\n        })\n      );\n      if (!files.length) return null;\n\n      return `${name}\\n${chalk.cyan(files.join('\\n'))}`;\n    })\n  ).join('\\n');\n}\n\nexport function installationErrorOutput(installationError?: Error) {\n  if (!installationError) return '';\n  const title = chalk.underline('Installation Error');\n  const subTitle = 'The following error was thrown by the package manager, please fix the issue and run \"bit install\"';\n  const body = chalk.red(installationError.message);\n  return `\\n\\n${title}\\n${subTitle}\\n${body}`;\n}\n\nexport function compilationErrorOutput(compilationError?: Error) {\n  if (!compilationError) return '';\n  const title = chalk.underline('Compilation Error');\n  const subTitle = 'The following error was thrown by the compiler, please fix the issue and run \"bit compile\"';\n  const body = chalk.red(compilationError.message);\n  return `\\n\\n${title}\\n${subTitle}\\n${body}`;\n}\n\nexport function getRemovedOutput(removedComponents?: ComponentID[]) {\n  if (!removedComponents?.length) return '';\n  const title = `the following ${removedComponents.length} component(s) have been removed`;\n  const body = removedComponents.join('\\n');\n  return `\\n\\n${chalk.underline(title)}\\n${body}\\n\\n`;\n}\n\nexport function getAddedOutput(addedComponents?: ComponentID[]) {\n  if (!addedComponents?.length) return '';\n  const title = `the following ${addedComponents.length} component(s) have been added`;\n  const body = addedComponents.join('\\n');\n  return `\\n\\n${chalk.underline(title)}\\n${body}\\n\\n`;\n}\n"],"mappings":"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"}
+{"version":3,"names":["_chalk","data","_interopRequireDefault","require","_lodash","_constants","_mergeVersion","_bitError","obj","__esModule","default","_defineProperty","key","value","_toPropertyKey","Object","defineProperty","enumerable","configurable","writable","t","i","_toPrimitive","String","r","e","Symbol","toPrimitive","call","TypeError","Number","MergeCmd","constructor","merging","globalConfig","WILDCARD_HELP","report","ids","ours","theirs","manual","autoMergeResolve","abort","resolve","build","noSnap","verbose","message","skipDependencyInstallation","getBool","CFG_FORCE_LOCAL_BUILD","Boolean","BitError","components","failedComponents","version","resolvedComponents","abortedComponents","mergeSnapResults","mergeSnapError","merge","title","componentsStr","map","c","id","toStringWithoutVersion","join","chalk","underline","green","mergeReport","exports","removedComponents","leftUnresolvedConflicts","configMergeResults","workspaceDepsUpdates","getSuccessOutput","length","bold","fileChangesReport","applyVersionReport","getConflictSummary","suggestion","conflictSummaryReport","yellow","configMergeWithConflicts","filter","hasConflicts","getConfigMergeConflictSummary","comps","compIdStr","MergeConfigFilename","getSnapsOutput","snappedComponents","autoSnappedResults","outputComponents","component","componentOutput","toString","autoTag","result","triggeredBy","searchWithoutVersion","autoTagComp","a","AUTO_SNAPPED_MSG","getWorkspaceDepsOutput","body","keys","pkgName","from","to","getFailureOutput","compact","failedComponent","unchangedLegitimately","color","unchangedMessage","getSummary","merged","f","failedToMerge","autoSnapped","newLines","mergedStr","unchangedLegitimatelyStr","failedToMergeStr","autoSnappedStr","removedStr","getRemovedOutput","addName","showVersion","tab","fileChanges","name","files","filesStatus","file","FileStatus","unchanged","note","white","cyan","FILE_CHANGES_CHECKOUT_MSG","installationErrorOutput","installationError","subTitle","red","compilationErrorOutput","compilationError","getAddedOutput","addedComponents"],"sources":["merge-cmd.ts"],"sourcesContent":["import chalk from 'chalk';\nimport { Command, CommandOptions } from '@teambit/cli';\nimport { ComponentID } from '@teambit/component-id';\nimport { compact } from 'lodash';\nimport {\n  WILDCARD_HELP,\n  AUTO_SNAPPED_MSG,\n  MergeConfigFilename,\n  FILE_CHANGES_CHECKOUT_MSG,\n  CFG_FORCE_LOCAL_BUILD,\n} from '@teambit/legacy/dist/constants';\nimport {\n  FileStatus,\n  ApplyVersionResult,\n  MergeStrategy,\n} from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport { GlobalConfigMain } from '@teambit/global-config';\nimport { BitError } from '@teambit/bit-error';\nimport { ApplyVersionResults, MergingMain } from './merging.main.runtime';\nimport { ConfigMergeResult } from './config-merge-result';\n\nexport class MergeCmd implements Command {\n  name = 'merge [ids...]';\n  description = 'merge changes of the remote head into local - auto-snaps all merged components';\n  helpUrl = 'reference/components/merging-changes';\n  group = 'development';\n  extendedDescription = `merge changes of the remote head into local when they are diverged. when on a lane, merge the remote head of the lane into the local\nand creates snaps for merged components that have diverged, on the lane.\nif no ids are specified, all pending-merge components will be merged. (run \"bit status\" to list them).\noptionally use '--abort' to revert the last merge. to revert a lane merge, use \"bit lane merge-abort\" command.\n${WILDCARD_HELP('merge')}`;\n  alias = '';\n  options = [\n    ['', 'ours', 'DEPRECATED. use --auto-merge-resolve. in case of a conflict, keep the local modification'],\n    [\n      '',\n      'theirs',\n      'DEPRECATED. use --auto-merge-resolve. in case of a conflict, override the local modification with the specified version',\n    ],\n    ['', 'manual', 'DEPRECATED. use --auto-merge-resolve'],\n    [\n      '',\n      'auto-merge-resolve <merge-strategy>',\n      'in case of a conflict, resolve according to the strategy: [ours, theirs, manual]',\n    ],\n    ['', 'abort', 'in case of an unresolved merge, revert to pre-merge state'],\n    ['', 'resolve', 'mark an unresolved merge as resolved and create a new snap with the changes'],\n    ['', 'no-snap', 'do not auto snap even if the merge completed without conflicts'],\n    ['', 'build', 'in case of snap during the merge, run the build-pipeline (similar to bit snap --build)'],\n    ['', 'verbose', 'show details of components that were not merged successfully'],\n    ['x', 'skip-dependency-installation', 'do not install new dependencies resulting from the merge'],\n    ['m', 'message <message>', 'override the default message for the auto snap'],\n  ] as CommandOptions;\n  loader = true;\n\n  constructor(private merging: MergingMain, private globalConfig: GlobalConfigMain) {}\n\n  async report(\n    [ids = []]: [string[]],\n    {\n      ours = false,\n      theirs = false,\n      manual = false,\n      autoMergeResolve,\n      abort = false,\n      resolve = false,\n      build = false,\n      noSnap = false,\n      verbose = false,\n      message,\n      skipDependencyInstallation = false,\n    }: {\n      ours?: boolean;\n      theirs?: boolean;\n      manual?: boolean;\n      autoMergeResolve?: MergeStrategy;\n      abort?: boolean;\n      resolve?: boolean;\n      build?: boolean;\n      noSnap?: boolean;\n      verbose?: boolean;\n      message: string;\n      skipDependencyInstallation?: boolean;\n    }\n  ) {\n    build = (await this.globalConfig.getBool(CFG_FORCE_LOCAL_BUILD)) || Boolean(build);\n    if (ours || theirs || manual) {\n      throw new BitError(\n        'the \"--ours\", \"--theirs\" and \"--manual\" flags are deprecated. use \"--auto-merge-resolve\" instead'\n      );\n    }\n    if (\n      autoMergeResolve &&\n      autoMergeResolve !== 'ours' &&\n      autoMergeResolve !== 'theirs' &&\n      autoMergeResolve !== 'manual'\n    ) {\n      throw new BitError('--auto-merge-resolve must be one of the following: [ours, theirs, manual]');\n    }\n    if (abort && resolve) throw new BitError('unable to use \"abort\" and \"resolve\" flags together');\n    if (noSnap && message) throw new BitError('unable to use \"noSnap\" and \"message\" flags together');\n    const {\n      components,\n      failedComponents,\n      version,\n      resolvedComponents,\n      abortedComponents,\n      mergeSnapResults,\n      mergeSnapError,\n    }: ApplyVersionResults = await this.merging.merge(\n      ids,\n      autoMergeResolve as any,\n      abort,\n      resolve,\n      noSnap,\n      message,\n      build,\n      skipDependencyInstallation\n    );\n    if (resolvedComponents) {\n      const title = 'successfully resolved component(s)\\n';\n      const componentsStr = resolvedComponents.map((c) => c.id.toStringWithoutVersion()).join('\\n');\n      return chalk.underline(title) + chalk.green(componentsStr);\n    }\n    if (abortedComponents) {\n      const title = 'successfully aborted the merge of the following component(s)\\n';\n      const componentsStr = abortedComponents.map((c) => c.id.toStringWithoutVersion()).join('\\n');\n      return chalk.underline(title) + chalk.green(componentsStr);\n    }\n\n    return mergeReport({\n      components,\n      failedComponents,\n      version,\n      mergeSnapResults,\n      mergeSnapError,\n      verbose,\n    });\n  }\n}\n\nexport function mergeReport({\n  components,\n  failedComponents,\n  removedComponents,\n  version,\n  mergeSnapResults,\n  mergeSnapError,\n  leftUnresolvedConflicts,\n  verbose,\n  configMergeResults,\n  workspaceDepsUpdates,\n}: ApplyVersionResults & { configMergeResults?: ConfigMergeResult[] }): string {\n  const getSuccessOutput = () => {\n    if (!components || !components.length) return '';\n    const title = `successfully merged ${components.length} components${\n      version ? `from version ${chalk.bold(version)}` : ''\n    }\\n`;\n    const fileChangesReport = applyVersionReport(components);\n\n    return chalk.bold(title) + fileChangesReport;\n  };\n\n  const getConflictSummary = () => {\n    if (!components || !components.length || !leftUnresolvedConflicts) return '';\n    const title = `\\n\\nfiles with conflicts summary\\n`;\n    const suggestion = `\\n\\nmerge process not completed due to the conflicts above. fix conflicts manually and then run \"bit install\".\nonce ready, snap/tag the components to complete the merge.`;\n    return chalk.underline(title) + conflictSummaryReport(components) + chalk.yellow(suggestion);\n  };\n\n  const configMergeWithConflicts = configMergeResults?.filter((c) => c.hasConflicts()) || [];\n  const getConfigMergeConflictSummary = () => {\n    if (!configMergeWithConflicts.length) return '';\n    const comps = configMergeWithConflicts.map((c) => c.compIdStr).join('\\n');\n    const title = `\\n\\ncomponents with config-merge conflicts\\n`;\n    const suggestion = `\\nconflicts were found while trying to merge the config. fix them manually by editing the ${MergeConfigFilename} file in the workspace root.\nonce ready, snap/tag the components to complete the merge.`;\n    return chalk.underline(title) + comps + chalk.yellow(suggestion);\n  };\n\n  const getSnapsOutput = () => {\n    if (mergeSnapError) {\n      return `\n${chalk.bold('snapping merged components failed with the following error, please fix the issues and snap manually')}\n${mergeSnapError.message}\n`;\n    }\n    if (!mergeSnapResults || !mergeSnapResults.snappedComponents) return '';\n    const { snappedComponents, autoSnappedResults } = mergeSnapResults;\n    const outputComponents = (comps) => {\n      return comps\n        .map((component) => {\n          let componentOutput = `     > ${component.id.toString()}`;\n          const autoTag = autoSnappedResults.filter((result) => result.triggeredBy.searchWithoutVersion(component.id));\n          if (autoTag.length) {\n            const autoTagComp = autoTag.map((a) => a.component.id.toString());\n            componentOutput += `\\n       ${AUTO_SNAPPED_MSG}: ${autoTagComp.join(', ')}`;\n          }\n          return componentOutput;\n        })\n        .join('\\n');\n    };\n\n    return `\\n${chalk.underline(\n      'merge-snapped components'\n    )}\\n(${'components snapped as a result of the merge'})\\n${outputComponents(snappedComponents)}\\n`;\n  };\n\n  const getWorkspaceDepsOutput = () => {\n    if (!workspaceDepsUpdates) return '';\n\n    const title = '\\nworkspace.jsonc has been updated with the following dependencies';\n    const body = Object.keys(workspaceDepsUpdates)\n      .map((pkgName) => {\n        const [from, to] = workspaceDepsUpdates[pkgName];\n        return `  ${pkgName}: ${from} => ${to}`;\n      })\n      .join('\\n');\n\n    return `\\n${chalk.underline(title)}\\n${body}\\n\\n`;\n  };\n\n  const getFailureOutput = () => {\n    if (!failedComponents || !failedComponents.length) return '';\n    const title = '\\nmerge skipped for the following component(s)';\n    const body = compact(\n      failedComponents.map((failedComponent) => {\n        if (!verbose && failedComponent.unchangedLegitimately) return null;\n        const color = failedComponent.unchangedLegitimately ? 'white' : 'red';\n        return `${chalk.bold(failedComponent.id.toString())} - ${chalk[color](failedComponent.unchangedMessage)}`;\n      })\n    ).join('\\n');\n    if (!body) {\n      return `${chalk.bold(`\\nmerge skipped legitimately for ${failedComponents.length} component(s)`)}\n(use --verbose to list them next time)`;\n    }\n    return `\\n${chalk.underline(title)}\\n${body}\\n\\n`;\n  };\n\n  const getSummary = () => {\n    const merged = components?.length || 0;\n    const unchangedLegitimately = failedComponents?.filter((f) => f.unchangedLegitimately).length || 0;\n    const failedToMerge = failedComponents?.filter((f) => !f.unchangedLegitimately).length || 0;\n    const autoSnapped =\n      (mergeSnapResults?.snappedComponents.length || 0) + (mergeSnapResults?.autoSnappedResults.length || 0);\n\n    const newLines = '\\n\\n';\n    const title = chalk.bold.underline('Merge Summary');\n    const mergedStr = `\\nTotal Merged: ${chalk.bold(merged.toString())}`;\n    const unchangedLegitimatelyStr = `\\nTotal Unchanged: ${chalk.bold(unchangedLegitimately.toString())}`;\n    const failedToMergeStr = `\\nTotal Failed: ${chalk.bold(failedToMerge.toString())}`;\n    const autoSnappedStr = `\\nTotal Snapped: ${chalk.bold(autoSnapped.toString())}`;\n    const removedStr = `\\nTotal Removed: ${chalk.bold(removedComponents?.length.toString() || '0')}`;\n\n    return newLines + title + mergedStr + unchangedLegitimatelyStr + failedToMergeStr + autoSnappedStr + removedStr;\n  };\n\n  return (\n    getSuccessOutput() +\n    getFailureOutput() +\n    getRemovedOutput(removedComponents) +\n    getSnapsOutput() +\n    getWorkspaceDepsOutput() +\n    getConfigMergeConflictSummary() +\n    getConflictSummary() +\n    getSummary()\n  );\n}\n\n/**\n * shows only the file-changes section.\n * if all files are \"unchanged\", it returns an empty string\n */\nexport function applyVersionReport(components: ApplyVersionResult[], addName = true, showVersion = false): string {\n  const tab = addName ? '\\t' : '';\n  const fileChanges = compact(\n    components.map((component: ApplyVersionResult) => {\n      const name = showVersion ? component.id.toString() : component.id.toStringWithoutVersion();\n      const files = compact(\n        Object.keys(component.filesStatus).map((file) => {\n          if (component.filesStatus[file] === FileStatus.unchanged) return null;\n          const note =\n            component.filesStatus[file] === FileStatus.manual\n              ? chalk.white('automatic merge failed. please fix conflicts manually and then run \"bit install\"')\n              : '';\n          return `${tab}${component.filesStatus[file]} ${chalk.bold(file)} ${note}`;\n        })\n      ).join('\\n');\n      if (!files) return null;\n      return `${addName ? name : ''}\\n${chalk.cyan(files)}`;\n    })\n  ).join('\\n\\n');\n  if (!fileChanges) {\n    return '';\n  }\n  const title = `\\n${FILE_CHANGES_CHECKOUT_MSG}\\n`;\n  return chalk.underline(title) + fileChanges;\n}\n\nexport function conflictSummaryReport(components: ApplyVersionResult[]): string {\n  const tab = '\\t';\n  return compact(\n    components.map((component: ApplyVersionResult) => {\n      const name = component.id.toStringWithoutVersion();\n      const files = compact(\n        Object.keys(component.filesStatus).map((file) => {\n          if (component.filesStatus[file] === FileStatus.manual) {\n            return `${tab}${component.filesStatus[file]} ${chalk.bold(file)}`;\n          }\n          return null;\n        })\n      );\n      if (!files.length) return null;\n\n      return `${name}\\n${chalk.cyan(files.join('\\n'))}`;\n    })\n  ).join('\\n');\n}\n\nexport function installationErrorOutput(installationError?: Error) {\n  if (!installationError) return '';\n  const title = chalk.underline('Installation Error');\n  const subTitle = 'The following error was thrown by the package manager, please fix the issue and run \"bit install\"';\n  const body = chalk.red(installationError.message);\n  return `\\n\\n${title}\\n${subTitle}\\n${body}`;\n}\n\nexport function compilationErrorOutput(compilationError?: Error) {\n  if (!compilationError) return '';\n  const title = chalk.underline('Compilation Error');\n  const subTitle = 'The following error was thrown by the compiler, please fix the issue and run \"bit compile\"';\n  const body = chalk.red(compilationError.message);\n  return `\\n\\n${title}\\n${subTitle}\\n${body}`;\n}\n\nexport function getRemovedOutput(removedComponents?: ComponentID[]) {\n  if (!removedComponents?.length) return '';\n  const title = `the following ${removedComponents.length} component(s) have been removed`;\n  const body = removedComponents.join('\\n');\n  return `\\n\\n${chalk.underline(title)}\\n${body}\\n\\n`;\n}\n\nexport function getAddedOutput(addedComponents?: ComponentID[]) {\n  if (!addedComponents?.length) return '';\n  const title = `the following ${addedComponents.length} component(s) have been added`;\n  const body = addedComponents.join('\\n');\n  return `\\n\\n${chalk.underline(title)}\\n${body}\\n\\n`;\n}\n"],"mappings":"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"}

package/dist/merge-status-provider.js

@@ -71,8 +71,8 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 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); }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 class MergeStatusProvider {
   constructor(workspace, logger, importer, currentLane,
   // currently checked out lane. if on main, then it's undefined.

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

@@ -1 +1 @@
-{"version":3,"names":["_pMapSeries","data","_interopRequireDefault","require","_componentId","_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$options","_this$otherLane","_this$otherLane2","_this$currentLane","_this$otherLane3","importObjectsFromMainIfExist","toBitIds","toVersionLatest","componentStatusBeforeMergeAttempt","mapSeries","id","getComponentStatusBeforeMergeAttempt","shouldImportHistoryOfOtherLane","shouldSquash","scope","toImport","map","compStatus","divergeData","versionsToImport","commonSnapBeforeDiverge","snapsOnTargetOnly","compact","v","changeVersion","toString","flat","reason","consumer","scopeImporter","importWithoutDeps","ComponentIdList","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$options2","getModelComponentIfExist","unmerged","unmergedComponents","getEntry","fullName","getRef","existingBitMapId","bitMap","getComponentIdIfExist","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$options3","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 { ComponentID, ComponentIdList } from '@teambit/component-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 type MergeStatusProviderOptions = {\n  resolveUnrelated?: MergeStrategy;\n  ignoreConfigChanges?: boolean;\n  shouldSquash?: boolean;\n};\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?: MergeStatusProviderOptions\n  ) {}\n\n  async getStatus(\n    bitIds: ComponentID[] // the id.version is the version we want to merge to the current component\n  ): Promise<ComponentMergeStatus[]> {\n    if (!this.currentLane && this.otherLane) {\n      await this.importer.importObjectsFromMainIfExist(this.otherLane.toBitIds().toVersionLatest());\n    }\n    const componentStatusBeforeMergeAttempt = await mapSeries(bitIds, (id) =>\n      this.getComponentStatusBeforeMergeAttempt(id)\n    );\n    // whether or not we need to import the gap between the common-snap and the other lane.\n    // the common-snap itself we need anyway in order to get the files hash/content for checking conflicts.\n    const shouldImportHistoryOfOtherLane =\n      !this.options?.shouldSquash && // when squashing, no need for all history, only the head is going to be pushed\n      (!this.currentLane || // on main. we need all history in order to push each component to its remote\n        this.currentLane.scope !== this.otherLane?.scope); // on lane, but the other lane is from a different scope. we need all history in order to push to the current lane's scope\n    const toImport = componentStatusBeforeMergeAttempt\n      .map((compStatus) => {\n        if (!compStatus.divergeData) return [];\n        const versionsToImport = [compStatus.divergeData.commonSnapBeforeDiverge];\n        if (shouldImportHistoryOfOtherLane) {\n          versionsToImport.push(...compStatus.divergeData.snapsOnTargetOnly);\n        }\n        return compact(versionsToImport).map((v) => compStatus.id.changeVersion(v.toString()));\n      })\n      .flat();\n    const reason = shouldImportHistoryOfOtherLane\n      ? `for filling the gap between the common-snap and the head of ${this.otherLane?.id() || 'main'}`\n      : `for getting the common-snap between ${this.currentLane?.id() || 'main'} and ${this.otherLane?.id() || 'main'}`;\n    await this.workspace.consumer.scope.scopeImporter.importWithoutDeps(ComponentIdList.fromArray(toImport), {\n      lane: this.otherLane,\n      cache: true,\n      includeVersionHistory: false,\n      reason,\n    });\n\n    const compStatusNotNeedMerge = componentStatusBeforeMergeAttempt.filter(\n      (c) => !c.mergeProps\n    ) as ComponentMergeStatus[];\n    const compStatusNeedMerge = componentStatusBeforeMergeAttempt.filter((c) => c.mergeProps);\n\n    const getComponentsStatusNeedMerge = async (): Promise<ComponentMergeStatus[]> => {\n      const tmp = new Tmp(this.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(\n    id: ComponentID,\n    msg: string,\n    unmergedLegitimately = false\n  ): ComponentMergeStatusBeforeMergeAttempt {\n    const componentStatus: ComponentMergeStatusBeforeMergeAttempt = { id };\n    componentStatus.unchangedMessage = msg;\n    componentStatus.unchangedLegitimately = unmergedLegitimately;\n    return componentStatus;\n  }\n\n  private async getComponentStatusBeforeMergeAttempt(\n    id: ComponentID // the id.version is the version we want to merge to the current component\n  ): Promise<ComponentMergeStatusBeforeMergeAttempt> {\n    const consumer = this.workspace.consumer;\n    const componentStatus: ComponentMergeStatusBeforeMergeAttempt = { id };\n    const modelComponent = await 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.fullName);\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.getComponentIdIfExist(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 main. in this case, we don't care what happens on main, we want the component to stay deleted on\n      // this lane. (even when main is ahead, we don't want to merge it).\n      // 2. other is ahead. in this case, other recovered the component. so we can continue with the merge.\n      // it is possible that it is diverged, in which case, still continue with the merge, and later on, the\n      // merge-config will show a config conflict of the remove aspect.\n      // 3. other is not ahead. in this case, just ignore this component, no point to merge it, we want it removed.\n      const divergeData = await getDivergeData({ repo, modelComponent, targetHead: otherLaneHead, throws: false });\n      const isTargetNotAhead = !divergeData.err && !divergeData.isTargetAhead();\n      const shouldIgnore = this.otherLane\n        ? isTargetNotAhead // option #2 and #3 above\n        : true; // it's main. option #1 above.\n      if (shouldIgnore) {\n        return this.returnUnmerged(id, `component has been removed`, true);\n      }\n    }\n\n    const isModified = async (): Promise<undefined | 'code' | 'config'> => {\n      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: ComponentID,\n    otherLaneHead: Ref,\n    currentComponent: ConsumerComponent,\n    componentOnOther?: Version,\n    divergeData?: SnapsDistance\n  ): Promise<ComponentMergeStatusBeforeMergeAttempt> {\n    let { resolveUnrelated } = this.options || {};\n    if (currentComponent.isRemoved()) {\n      resolveUnrelated = 'theirs';\n    }\n    if (!resolveUnrelated) throw new Error(`handleNoCommonSnap expects resolveUnrelated to be set`);\n    const 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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"}
+{"version":3,"names":["_pMapSeries","data","_interopRequireDefault","require","_componentId","_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","i","_toPrimitive","String","Symbol","toPrimitive","call","TypeError","Number","MergeStatusProvider","constructor","workspace","logger","importer","currentLane","otherLane","options","getStatus","bitIds","_this$options","_this$otherLane","_this$otherLane2","_this$currentLane","_this$otherLane3","importObjectsFromMainIfExist","toBitIds","toVersionLatest","componentStatusBeforeMergeAttempt","mapSeries","id","getComponentStatusBeforeMergeAttempt","shouldImportHistoryOfOtherLane","shouldSquash","scope","toImport","map","compStatus","divergeData","versionsToImport","commonSnapBeforeDiverge","snapsOnTargetOnly","compact","v","changeVersion","toString","flat","reason","consumer","scopeImporter","importWithoutDeps","ComponentIdList","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$options2","getModelComponentIfExist","unmerged","unmergedComponents","getEntry","fullName","getRef","existingBitMapId","bitMap","getComponentIdIfExist","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","undefined","isSourceCodeModified","isComponentSourceCodeModified","modifiedType","ignoreConfigChanges","_this$options3","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 { ComponentID, ComponentIdList } from '@teambit/component-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 type MergeStatusProviderOptions = {\n  resolveUnrelated?: MergeStrategy;\n  ignoreConfigChanges?: boolean;\n  shouldSquash?: boolean;\n};\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?: MergeStatusProviderOptions\n  ) {}\n\n  async getStatus(\n    bitIds: ComponentID[] // the id.version is the version we want to merge to the current component\n  ): Promise<ComponentMergeStatus[]> {\n    if (!this.currentLane && this.otherLane) {\n      await this.importer.importObjectsFromMainIfExist(this.otherLane.toBitIds().toVersionLatest());\n    }\n    const componentStatusBeforeMergeAttempt = await mapSeries(bitIds, (id) =>\n      this.getComponentStatusBeforeMergeAttempt(id)\n    );\n    // whether or not we need to import the gap between the common-snap and the other lane.\n    // the common-snap itself we need anyway in order to get the files hash/content for checking conflicts.\n    const shouldImportHistoryOfOtherLane =\n      !this.options?.shouldSquash && // when squashing, no need for all history, only the head is going to be pushed\n      (!this.currentLane || // on main. we need all history in order to push each component to its remote\n        this.currentLane.scope !== this.otherLane?.scope); // on lane, but the other lane is from a different scope. we need all history in order to push to the current lane's scope\n    const toImport = componentStatusBeforeMergeAttempt\n      .map((compStatus) => {\n        if (!compStatus.divergeData) return [];\n        const versionsToImport = [compStatus.divergeData.commonSnapBeforeDiverge];\n        if (shouldImportHistoryOfOtherLane) {\n          versionsToImport.push(...compStatus.divergeData.snapsOnTargetOnly);\n        }\n        return compact(versionsToImport).map((v) => compStatus.id.changeVersion(v.toString()));\n      })\n      .flat();\n    const reason = shouldImportHistoryOfOtherLane\n      ? `for filling the gap between the common-snap and the head of ${this.otherLane?.id() || 'main'}`\n      : `for getting the common-snap between ${this.currentLane?.id() || 'main'} and ${this.otherLane?.id() || 'main'}`;\n    await this.workspace.consumer.scope.scopeImporter.importWithoutDeps(ComponentIdList.fromArray(toImport), {\n      lane: this.otherLane,\n      cache: true,\n      includeVersionHistory: false,\n      reason,\n    });\n\n    const compStatusNotNeedMerge = componentStatusBeforeMergeAttempt.filter(\n      (c) => !c.mergeProps\n    ) as ComponentMergeStatus[];\n    const compStatusNeedMerge = componentStatusBeforeMergeAttempt.filter((c) => c.mergeProps);\n\n    const getComponentsStatusNeedMerge = async (): Promise<ComponentMergeStatus[]> => {\n      const tmp = new Tmp(this.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(\n    id: ComponentID,\n    msg: string,\n    unmergedLegitimately = false\n  ): ComponentMergeStatusBeforeMergeAttempt {\n    const componentStatus: ComponentMergeStatusBeforeMergeAttempt = { id };\n    componentStatus.unchangedMessage = msg;\n    componentStatus.unchangedLegitimately = unmergedLegitimately;\n    return componentStatus;\n  }\n\n  private async getComponentStatusBeforeMergeAttempt(\n    id: ComponentID // the id.version is the version we want to merge to the current component\n  ): Promise<ComponentMergeStatusBeforeMergeAttempt> {\n    const consumer = this.workspace.consumer;\n    const componentStatus: ComponentMergeStatusBeforeMergeAttempt = { id };\n    const modelComponent = await 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.fullName);\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.getComponentIdIfExist(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 main. in this case, we don't care what happens on main, we want the component to stay deleted on\n      // this lane. (even when main is ahead, we don't want to merge it).\n      // 2. other is ahead. in this case, other recovered the component. so we can continue with the merge.\n      // it is possible that it is diverged, in which case, still continue with the merge, and later on, the\n      // merge-config will show a config conflict of the remove aspect.\n      // 3. other is not ahead. in this case, just ignore this component, no point to merge it, we want it removed.\n      const divergeData = await getDivergeData({ repo, modelComponent, targetHead: otherLaneHead, throws: false });\n      const isTargetNotAhead = !divergeData.err && !divergeData.isTargetAhead();\n      const shouldIgnore = this.otherLane\n        ? isTargetNotAhead // option #2 and #3 above\n        : true; // it's main. option #1 above.\n      if (shouldIgnore) {\n        return this.returnUnmerged(id, `component has been removed`, true);\n      }\n    }\n\n    const isModified = async (): Promise<undefined | 'code' | 'config'> => {\n      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: ComponentID,\n    otherLaneHead: Ref,\n    currentComponent: ConsumerComponent,\n    componentOnOther?: Version,\n    divergeData?: SnapsDistance\n  ): Promise<ComponentMergeStatusBeforeMergeAttempt> {\n    let { resolveUnrelated } = this.options || {};\n    if (currentComponent.isRemoved()) {\n      resolveUnrelated = 'theirs';\n    }\n    if (!resolveUnrelated) throw new Error(`handleNoCommonSnap expects resolveUnrelated to be set`);\n    const 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

@@ -220,8 +220,8 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 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); }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 // from => to
 // the pkg value is in a format of CONFLICT::OURS::THEIRS
 

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

@@ -1 +1 @@
-{"version":3,"names":["_cli","data","require","_semver","_interopRequireDefault","_workspace","_interopRequireWildcard","_componentsList","_mergeVersion","_snapping","_hasWildcard","_pMapSeries","_componentId","_bitError","_generalError","_laneId","_chalk","_config","_remove","_utils","_componentWriter","_importer","_logger","_globalConfig","_lodash","_dependencyResolver","_checkout","_constants","_deleteComponentFiles","_install","_mergeCmd","_merging","_configMergeResult","_mergeStatusProvider","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","obj","ownKeys","keys","getOwnPropertySymbols","o","filter","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","key","value","_toPropertyKey","configurable","writable","arg","_toPrimitive","String","input","hint","prim","Symbol","toPrimitive","undefined","res","TypeError","Number","MergingMain","constructor","workspace","install","snapping","checkout","logger","componentWriter","importer","config","remove","merge","ids","mergeStrategy","abort","resolve","noSnap","message","build","skipDependencyInstallation","OutsideWorkspaceError","consumer","mergeResults","resolveMerge","abortMerge","bitIds","getComponentsToMerge","mergeComponentsFromRemote","onDestroy","snapMessage","currentLaneId","getCurrentLaneId","currentLaneObject","getCurrentLaneObject","allComponentsStatus","getAllComponentsStatus","failedComponents","c","unchangedMessage","unchangedLegitimately","failureMsgs","map","failedComponent","chalk","bold","id","toString","red","join","BitError","mergeSnaps","laneId","localLane","tag","_mergeSnapResults","componentWithConflict","find","component","hasConflicts","getMergeStrategyInteractive","componentStatus","shouldBeRemoved","componentIdsToRemove","changeVersion","succeededComponents","componentsResults","applyVersionMultiple","allConfigMerge","compact","configMergeResult","workspaceDepsUpdates","workspaceDepsConflicts","updateWorkspaceJsoncWithDepsIfNeeded","generateConfigMergeConflictFileForAll","scope","objects","add","persist","unmergedComponents","write","writeBitMap","compBitIdsToRemove","ComponentIdList","fromArray","deleteComponentsFiles","cleanFromBitMap","componentsHasConfigMergeConflicts","some","_c$configMergeResult","leftUnresolvedConflicts","dedupe","updateExisting","import","err","error","consoleError","getSnapOrTagResults","idsToTag","results","tagAllLaneComponent","taggedComponents","autoTaggedResults","removedComponents","snappedComponents","autoSnappedResults","snapResolvedComponents","mergeSnapResults","mergeSnapError","bitMapSnapshot","bitMap","takeSnapshot","restoreFromSnapshot","components","applyVersionResult","configMergeFile","getConflictMergeFile","workspaceConflict","ConfigMergeResult","DependencyResolverAspect","conflict","unshift","configMerge","generateMergeConflictFile","addConflict","compIdStr","hasConflict","allResults","getDepsResolverResult","nonConflictDeps","nonConflictSources","_configMerge$getDepsR","mergedConfig","mergedConfigPolicy","policy","DEPENDENCIES_FIELDS","depField","pkg","force","name","includes","version","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","mapSeries","currentComponent","resolvedUnrelated","modelComponent","getModelComponent","updatedLaneId","isDefault","LaneId","from","applyVersion","remoteHead","getRef","compsToWrite","legacyCompToWrite","manyComponentsWriterOpts","writeConfig","reasonForBitmapChange","writeMany","filesStatus","unmergedComponent","fullName","head","handleResolveUnrelated","addComponent","headOnCurrentLane","unrelated","unrelatedHead","unrelatedLaneId","addEntry","markAllFilesAsUnchanged","files","file","pathNormalizeToLinux","relative","FileStatus","unchanged","MergeOptions","ours","strategy","remoteId","idToLoad","theirs","legacyComponent","loadComponentFromModelImportIfNeeded","updateFileStatus","modifiedStatus","modifiedFiles","applyModifiedVersion","removeFilesIfNeeded","successfullyMergedConfig","getSuccessfullyMergedConfig","manual","unmergedPaths","f","filePath","setHead","markVersionAsLocal","values","getIdsForUnmerged","reset","removeComponent","abortedComponents","snap","legacyBitIds","resolvedComponents","localLaneObject","Promise","all","bitId","remoteScopeName","remoteLaneId","remoteLanes","laneIdStr","toStringWithoutVersion","shouldSquash","getComponents","ComponentID","fromObject","tagMessage","unmodified","idsStr","componentIds","resolveMultipleComponentIds","entry","getEntry","GeneralError","unresolvedComponents","componentsList","ComponentsList","mergePending","listMergePendingComponents","hasWildcard","listComponentsByIdsWithWildcard","getParsedId","provider","cli","loggerMain","compWriter","globalConfig","createLogger","MergingAspect","merging","register","MergeCmd","exports","CLIAspect","WorkspaceAspect","SnappingAspect","CheckoutAspect","InstallAspect","LoggerAspect","ComponentWriterAspect","ImporterAspect","ConfigAspect","RemoveAspect","GlobalConfigAspect","MainRuntime","addRuntime"],"sources":["merging.main.runtime.ts"],"sourcesContent":["import { CLIAspect, CLIMain, MainRuntime } from '@teambit/cli';\nimport semver from 'semver';\nimport WorkspaceAspect, { OutsideWorkspaceError, Workspace } from '@teambit/workspace';\nimport { Consumer } from '@teambit/legacy/dist/consumer';\nimport ComponentsList from '@teambit/legacy/dist/consumer/component/components-list';\nimport {\n  MergeStrategy,\n  FileStatus,\n  ApplyVersionResult,\n  getMergeStrategyInteractive,\n  MergeOptions,\n} from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport SnappingAspect, { SnapResults, SnappingMain, TagResults } from '@teambit/snapping';\nimport hasWildcard from '@teambit/legacy/dist/utils/string/has-wildcard';\nimport mapSeries from 'p-map-series';\nimport { ComponentID, ComponentIdList } from '@teambit/component-id';\nimport { BitError } from '@teambit/bit-error';\nimport GeneralError from '@teambit/legacy/dist/error/general-error';\nimport { LaneId } from '@teambit/lane-id';\nimport { AutoTagResult } from '@teambit/legacy/dist/scope/component-ops/auto-tag';\nimport { UnmergedComponent } from '@teambit/legacy/dist/scope/lanes/unmerged-components';\nimport { Lane, ModelComponent } from '@teambit/legacy/dist/scope/models';\nimport { Ref } from '@teambit/legacy/dist/scope/objects';\nimport chalk from 'chalk';\nimport { ConfigAspect, ConfigMain } from '@teambit/config';\nimport RemoveAspect, { RemoveMain } from '@teambit/remove';\nimport { pathNormalizeToLinux } from '@teambit/legacy/dist/utils';\nimport { ComponentWriterAspect, ComponentWriterMain } from '@teambit/component-writer';\nimport ConsumerComponent from '@teambit/legacy/dist/consumer/component/consumer-component';\nimport ImporterAspect, { ImporterMain } from '@teambit/importer';\nimport { Logger, LoggerAspect, LoggerMain } from '@teambit/logger';\nimport GlobalConfigAspect, { GlobalConfigMain } from '@teambit/global-config';\nimport { compact, isEmpty } from 'lodash';\nimport { MergeResultsThreeWay } from '@teambit/legacy/dist/consumer/versions-ops/merge-version/three-way-merge';\nimport { DependencyResolverAspect, WorkspacePolicyConfigKeysNames } from '@teambit/dependency-resolver';\nimport {\n  ApplyVersionWithComps,\n  CheckoutAspect,\n  CheckoutMain,\n  ComponentStatusBase,\n  applyModifiedVersion,\n  removeFilesIfNeeded,\n  updateFileStatus,\n} from '@teambit/checkout';\nimport { DEPENDENCIES_FIELDS } from '@teambit/legacy/dist/constants';\nimport deleteComponentsFiles from '@teambit/legacy/dist/consumer/component-ops/delete-component-files';\nimport { SnapsDistance } from '@teambit/legacy/dist/scope/component-ops/snaps-distance';\nimport { InstallMain, InstallAspect } from '@teambit/install';\nimport { MergeCmd } from './merge-cmd';\nimport { MergingAspect } from './merging.aspect';\nimport { ConfigMergeResult } from './config-merge-result';\nimport { MergeStatusProvider, MergeStatusProviderOptions } from './merge-status-provider';\n\ntype ResolveUnrelatedData = {\n  strategy: MergeStrategy;\n  headOnCurrentLane: Ref;\n  unrelatedHead: Ref;\n  unrelatedLaneId: LaneId;\n};\ntype PkgEntry = { name: string; version: string; force: boolean };\n\nexport type WorkspaceDepsUpdates = { [pkgName: string]: [string, string] }; // from => to\nexport type WorkspaceDepsConflicts = Record<WorkspacePolicyConfigKeysNames, Array<{ name: string; version: string }>>; // the pkg value is in a format of CONFLICT::OURS::THEIRS\n\nexport type ComponentMergeStatus = ComponentStatusBase & {\n  mergeResults?: MergeResultsThreeWay | null;\n  divergeData?: SnapsDistance;\n  resolvedUnrelated?: ResolveUnrelatedData;\n  configMergeResult?: ConfigMergeResult;\n};\n\nexport type ComponentMergeStatusBeforeMergeAttempt = ComponentStatusBase & {\n  divergeData?: SnapsDistance;\n  resolvedUnrelated?: ResolveUnrelatedData;\n  mergeProps?: {\n    otherLaneHead: Ref;\n    currentId: ComponentID;\n    modelComponent: ModelComponent;\n  };\n};\n\nexport type FailedComponents = { id: ComponentID; unchangedMessage: string; unchangedLegitimately?: boolean };\n\nexport type ApplyVersionResults = {\n  components?: ApplyVersionResult[];\n  version?: string;\n  failedComponents?: FailedComponents[];\n  removedComponents?: ComponentID[];\n  addedComponents?: ComponentID[]; // relevant when restoreMissingComponents is true (e.g. bit lane merge-abort)\n  resolvedComponents?: ConsumerComponent[]; // relevant for bit merge --resolve\n  abortedComponents?: ApplyVersionResult[]; // relevant for bit merge --abort\n  mergeSnapResults?: {\n    snappedComponents: ConsumerComponent[];\n    autoSnappedResults: AutoTagResult[];\n    removedComponents?: ComponentIdList;\n  } | null;\n  mergeSnapError?: Error;\n  leftUnresolvedConflicts?: boolean;\n  verbose?: boolean;\n  newFromLane?: string[];\n  newFromLaneAdded?: boolean;\n  installationError?: Error; // in case the package manager failed, it won't throw, instead, it'll return error here\n  compilationError?: Error; // in case the compiler failed, it won't throw, instead, it'll return error here\n  workspaceDepsUpdates?: WorkspaceDepsUpdates; // in case workspace.jsonc has been updated with dependencies versions\n};\n\nexport class MergingMain {\n  constructor(\n    private workspace: Workspace,\n    private install: InstallMain,\n    private snapping: SnappingMain,\n    private checkout: CheckoutMain,\n    private logger: Logger,\n    private componentWriter: ComponentWriterMain,\n    private importer: ImporterMain,\n    private config: ConfigMain,\n    private remove: RemoveMain\n  ) {}\n\n  async merge(\n    ids: string[],\n    mergeStrategy: MergeStrategy,\n    abort: boolean,\n    resolve: boolean,\n    noSnap: boolean,\n    message: string,\n    build: boolean,\n    skipDependencyInstallation: boolean\n  ): Promise<ApplyVersionResults> {\n    if (!this.workspace) throw new OutsideWorkspaceError();\n    const consumer: Consumer = this.workspace.consumer;\n    let mergeResults;\n    if (resolve) {\n      mergeResults = await this.resolveMerge(ids, message, build);\n    } else if (abort) {\n      mergeResults = await this.abortMerge(ids);\n    } else {\n      const bitIds = await this.getComponentsToMerge(consumer, ids);\n      mergeResults = await this.mergeComponentsFromRemote(\n        consumer,\n        bitIds,\n        mergeStrategy,\n        noSnap,\n        message,\n        build,\n        skipDependencyInstallation\n      );\n    }\n    await consumer.onDestroy('merge');\n    return mergeResults;\n  }\n\n  /**\n   * when user is on main, it merges the remote main components into local.\n   * when user is on a lane, it merges the remote lane components into the local lane.\n   */\n  async mergeComponentsFromRemote(\n    consumer: Consumer,\n    bitIds: ComponentID[],\n    mergeStrategy: MergeStrategy,\n    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\n    const componentsResults = await this.applyVersionMultiple(succeededComponents, laneId, mergeStrategy, localLane);\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(`merge ${laneId.toString()}`);\n\n    if (componentIdsToRemove.length) {\n      const compBitIdsToRemove = ComponentIdList.fromArray(componentIdsToRemove);\n      await deleteComponentsFiles(consumer, compBitIdsToRemove);\n      await consumer.cleanFromBitMap(compBitIdsToRemove);\n    }\n\n    const componentsHasConfigMergeConflicts = allComponentsStatus.some((c) => c.configMergeResult?.hasConflicts());\n    const leftUnresolvedConflicts = componentWithConflict && mergeStrategy === 'manual';\n    if (!skipDependencyInstallation && !leftUnresolvedConflicts && !componentsHasConfigMergeConflicts) {\n      try {\n        await this.install.install(undefined, {\n          dedupe: true,\n          updateExisting: false,\n          import: false,\n        });\n      } catch (err: any) {\n        this.logger.error(`failed installing packages`, err);\n        this.logger.consoleError(`failed installing packages, see the log for full stacktrace. error: ${err.message}`);\n      }\n    }\n\n    const getSnapOrTagResults = async () => {\n      // if one of the component has conflict, don't snap-merge. otherwise, some of the components would be snap-merged\n      // and some not. besides the fact that it could by mistake tag dependent, it's a confusing state. better not snap.\n      if (noSnap || leftUnresolvedConflicts || componentsHasConfigMergeConflicts) {\n        return null;\n      }\n      if (tag) {\n        const idsToTag = allComponentsStatus.map((c) => c.id);\n        const results = await this.tagAllLaneComponent(idsToTag, snapMessage, build);\n        if (!results) return null;\n        const { taggedComponents, autoTaggedResults, removedComponents } = results;\n        return { snappedComponents: taggedComponents, autoSnappedResults: autoTaggedResults, removedComponents };\n      }\n      return this.snapResolvedComponents(consumer, snapMessage, build);\n    };\n    let mergeSnapResults: ApplyVersionResults['mergeSnapResults'] = null;\n    let mergeSnapError: Error | undefined;\n    const bitMapSnapshot = this.workspace.bitMap.takeSnapshot();\n    try {\n      mergeSnapResults = await getSnapOrTagResults();\n    } catch (err: any) {\n      mergeSnapError = err;\n      this.workspace.bitMap.restoreFromSnapshot(bitMapSnapshot);\n    }\n\n    return {\n      components: componentsResults.map((c) => c.applyVersionResult),\n      failedComponents,\n      removedComponents: [...componentIdsToRemove, ...(mergeSnapResults?.removedComponents || [])],\n      mergeSnapResults,\n      mergeSnapError,\n      leftUnresolvedConflicts,\n      workspaceDepsUpdates,\n    };\n  }\n\n  private async generateConfigMergeConflictFileForAll(\n    allConfigMerge: ConfigMergeResult[],\n    workspaceDepsConflicts?: WorkspaceDepsConflicts\n  ) {\n    const configMergeFile = this.workspace.getConflictMergeFile();\n    if (workspaceDepsConflicts) {\n      const workspaceConflict = new ConfigMergeResult('WORKSPACE', 'ours', 'theirs', [\n        {\n          id: DependencyResolverAspect.id,\n          conflict: workspaceDepsConflicts,\n        },\n      ]);\n      allConfigMerge.unshift(workspaceConflict);\n    }\n    allConfigMerge.forEach((configMerge) => {\n      const conflict = configMerge.generateMergeConflictFile();\n      if (!conflict) return;\n      configMergeFile.addConflict(configMerge.compIdStr, conflict);\n    });\n    if (configMergeFile.hasConflict()) {\n      await configMergeFile.write();\n    }\n  }\n\n  private async updateWorkspaceJsoncWithDepsIfNeeded(\n    allConfigMerge: ConfigMergeResult[]\n  ): Promise<{ workspaceDepsUpdates?: WorkspaceDepsUpdates; workspaceDepsConflicts?: WorkspaceDepsConflicts }> {\n    const allResults = allConfigMerge.map((c) => c.getDepsResolverResult());\n\n    // aggregate all dependencies that can be updated (not conflicting)\n    const nonConflictDeps: { [pkgName: string]: string[] } = {};\n    const nonConflictSources: { [pkgName: string]: string[] } = {}; // for logging/debugging purposes\n    allConfigMerge.forEach((configMerge) => {\n      const mergedConfig = configMerge.getDepsResolverResult()?.mergedConfig;\n      if (!mergedConfig || mergedConfig === '-') return;\n      const mergedConfigPolicy = mergedConfig.policy || {};\n      DEPENDENCIES_FIELDS.forEach((depField) => {\n        if (!mergedConfigPolicy[depField]) return;\n        mergedConfigPolicy[depField].forEach((pkg: PkgEntry) => {\n          if (pkg.force) return; // we only care about auto-detected dependencies\n          if (nonConflictDeps[pkg.name]) {\n            if (!nonConflictDeps[pkg.name].includes(pkg.version)) nonConflictDeps[pkg.name].push(pkg.version);\n            nonConflictSources[pkg.name].push(configMerge.compIdStr);\n            return;\n          }\n          nonConflictDeps[pkg.name] = [pkg.version];\n          nonConflictSources[pkg.name] = [configMerge.compIdStr];\n        });\n      });\n    });\n\n    // aggregate all dependencies that have conflicts\n    const conflictDeps: { [pkgName: string]: string[] } = {};\n    const conflictDepsSources: { [pkgName: string]: string[] } = {}; // for logging/debugging purposes\n    allConfigMerge.forEach((configMerge) => {\n      const mergedConfigConflict = configMerge.getDepsResolverResult()?.conflict;\n      if (!mergedConfigConflict) return;\n      DEPENDENCIES_FIELDS.forEach((depField) => {\n        if (!mergedConfigConflict[depField]) return;\n        mergedConfigConflict[depField].forEach((pkg: PkgEntry) => {\n          if (pkg.force) return; // we only care about auto-detected dependencies\n          if (conflictDeps[pkg.name]) {\n            if (!conflictDeps[pkg.name].includes(pkg.version)) conflictDeps[pkg.name].push(pkg.version);\n            conflictDepsSources[pkg.name].push(configMerge.compIdStr);\n            return;\n          }\n          conflictDeps[pkg.name] = [pkg.version];\n          conflictDepsSources[pkg.name] = [configMerge.compIdStr];\n        });\n      });\n    });\n\n    const notConflictedPackages = Object.keys(nonConflictDeps);\n    const conflictedPackages = Object.keys(conflictDeps);\n    if (!notConflictedPackages.length && !conflictedPackages.length) return {};\n\n    const workspaceConfig = this.config.workspaceConfig;\n    if (!workspaceConfig) throw new Error(`updateWorkspaceJsoncWithDepsIfNeeded unable to get workspace config`);\n    const depResolver = workspaceConfig.extensions.findCoreExtension(DependencyResolverAspect.id);\n    const policy = depResolver?.config.policy;\n    if (!policy) {\n      return {};\n    }\n\n    // calculate the workspace.json updates\n    const workspaceJsonUpdates = {};\n    notConflictedPackages.forEach((pkgName) => {\n      if (nonConflictDeps[pkgName].length > 1) {\n        // we only want the deps that the other lane has them in the workspace.json and that all comps use the same dep.\n        return;\n      }\n      DEPENDENCIES_FIELDS.forEach((depField) => {\n        if (!policy[depField]?.[pkgName]) return; // doesn't exists in the workspace.json\n        const currentVer = policy[depField][pkgName];\n        const newVer = nonConflictDeps[pkgName][0];\n        if (currentVer === newVer) return;\n        workspaceJsonUpdates[pkgName] = [currentVer, newVer];\n        policy[depField][pkgName] = newVer;\n        this.logger.debug(\n          `update workspace.jsonc: ${pkgName} from ${currentVer} to ${newVer}. Triggered by: ${nonConflictSources[\n            pkgName\n          ].join(', ')}`\n        );\n      });\n    });\n\n    // calculate the workspace.json conflicts\n    const WS_DEPS_FIELDS = ['dependencies', 'peerDependencies'];\n    const workspaceJsonConflicts = { dependencies: [], peerDependencies: [] };\n    const conflictPackagesToRemoveFromConfigMerge: string[] = [];\n    conflictedPackages.forEach((pkgName) => {\n      if (conflictDeps[pkgName].length > 1) {\n        // we only want the deps that the other lane has them in the workspace.json and that all comps use the same dep.\n        return;\n      }\n      const conflictRaw = conflictDeps[pkgName][0];\n      const [, currentVal, otherVal] = conflictRaw.split('::');\n\n      WS_DEPS_FIELDS.forEach((depField) => {\n        if (!policy[depField]?.[pkgName]) return;\n        const currentVerInWsJson = policy[depField][pkgName];\n        if (!currentVerInWsJson) return;\n        // the version is coming from the workspace.jsonc\n        conflictPackagesToRemoveFromConfigMerge.push(pkgName);\n        if (semver.satisfies(otherVal, currentVerInWsJson)) {\n          // the other version is compatible with the current version in the workspace.json\n          return;\n        }\n        workspaceJsonConflicts[depField].push({\n          name: pkgName,\n          version: conflictRaw.replace(currentVal, currentVerInWsJson),\n          force: false,\n        });\n        conflictPackagesToRemoveFromConfigMerge.push(pkgName);\n        this.logger.debug(\n          `conflict workspace.jsonc: ${pkgName} current: ${currentVerInWsJson}, other: ${otherVal}. Triggered by: ${conflictDepsSources[\n            pkgName\n          ].join(', ')}`\n        );\n      });\n    });\n    WS_DEPS_FIELDS.forEach((depField) => {\n      if (isEmpty(workspaceJsonConflicts[depField])) delete workspaceJsonConflicts[depField];\n    });\n\n    if (conflictPackagesToRemoveFromConfigMerge.length) {\n      allResults.forEach((result) => {\n        if (result?.conflict) {\n          DEPENDENCIES_FIELDS.forEach((depField) => {\n            if (!result.conflict?.[depField]) return;\n            result.conflict[depField] = result.conflict?.[depField].filter(\n              (dep) => !conflictPackagesToRemoveFromConfigMerge.includes(dep.name)\n            );\n            if (!result.conflict[depField].length) delete result.conflict[depField];\n          });\n          if (isEmpty(result.conflict)) result.conflict = undefined;\n        }\n      });\n    }\n\n    if (Object.keys(workspaceJsonUpdates).length) {\n      await workspaceConfig.write();\n    }\n\n    this.logger.debug('final workspace.jsonc updates', workspaceJsonUpdates);\n    this.logger.debug('final workspace.jsonc conflicts', workspaceJsonConflicts);\n\n    return {\n      workspaceDepsUpdates: Object.keys(workspaceJsonUpdates).length ? workspaceJsonUpdates : undefined,\n      workspaceDepsConflicts: Object.keys(workspaceJsonConflicts).length ? workspaceJsonConflicts : undefined,\n    };\n  }\n\n  /**\n   * this function gets called from two different commands:\n   * 1. \"bit merge <ids...>\", when merging a component from a remote to the local.\n   * in this case, the remote and local are on the same lane or both on main.\n   * 2. \"bit lane merge\", when merging from one lane to another.\n   */\n  async getMergeStatus(\n    bitIds: ComponentID[], // the id.version is the version we want to merge to the current component\n    currentLane: Lane | null, // currently checked out lane. if on main, then it's null.\n    otherLane?: Lane | null, // the lane we want to merged to our lane. (null if it's \"main\").\n    options?: MergeStatusProviderOptions\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 applyVersionMultiple(\n    succeededComponents: ComponentMergeStatus[],\n    laneId: LaneId,\n    mergeStrategy: MergeStrategy,\n    localLane: Lane | null\n  ): Promise<ApplyVersionWithComps[]> {\n    const componentsResults = await mapSeries(\n      succeededComponents,\n      async ({ currentComponent, id, mergeResults, resolvedUnrelated, configMergeResult }) => {\n        const modelComponent = await this.workspace.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 compsToWrite = compact(componentsResults.map((c) => c.legacyCompToWrite));\n\n    const manyComponentsWriterOpts = {\n      consumer: this.workspace.consumer,\n      components: compsToWrite,\n      skipDependencyInstallation: true,\n      writeConfig: false, // @todo: should write if config exists before, needs to figure out how to do it.\n      reasonForBitmapChange: 'merge',\n    };\n    await this.componentWriter.writeMany(manyComponentsWriterOpts);\n\n    return componentsResults;\n  }\n\n  private async applyVersion({\n    currentComponent,\n    id,\n    mergeResults,\n    mergeStrategy,\n    remoteHead,\n    laneId,\n    localLane,\n    resolvedUnrelated,\n    configMergeResult,\n  }: {\n    currentComponent: ConsumerComponent | null | undefined;\n    id: ComponentID;\n    mergeResults: MergeResultsThreeWay | null | undefined;\n    mergeStrategy: MergeStrategy;\n    remoteHead: Ref;\n    laneId: LaneId;\n    localLane: Lane | null;\n    resolvedUnrelated?: ResolveUnrelatedData;\n    configMergeResult?: ConfigMergeResult;\n  }): Promise<ApplyVersionWithComps> {\n    const consumer = this.workspace.consumer;\n    let filesStatus = {};\n    const unmergedComponent: UnmergedComponent = {\n      // @ts-ignore\n      id: { name: id.fullName, scope: id.scope },\n      head: remoteHead,\n      laneId,\n    };\n    id = currentComponent ? currentComponent.id : id;\n\n    const modelComponent = await consumer.scope.getModelComponent(id);\n    const handleResolveUnrelated = (legacyCompToWrite?: ConsumerComponent) => {\n      if (!currentComponent) throw new Error('currentComponent must be defined when resolvedUnrelated');\n      // because when on a main, we don't allow merging lanes with unrelated. we asks users to switch to the lane\n      // first and then merge with --resolve-unrelated\n      if (!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, legacyCompToWrite };\n    };\n\n    const markAllFilesAsUnchanged = () => {\n      if (!currentComponent) throw new Error(`applyVersion expect to get currentComponent for ${id.toString()}`);\n      currentComponent.files.forEach((file) => {\n        filesStatus[pathNormalizeToLinux(file.relative)] = FileStatus.unchanged;\n      });\n    };\n    if (mergeResults && mergeResults.hasConflicts && mergeStrategy === MergeOptions.ours) {\n      markAllFilesAsUnchanged();\n      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    if (configMergeResult) {\n      const successfullyMergedConfig = configMergeResult.getSuccessfullyMergedConfig();\n      if (successfullyMergedConfig) {\n        unmergedComponent.mergedConfig = successfullyMergedConfig;\n        // no need to `unmergedComponents.addEntry` here. it'll be added in the next lines inside `if (mergeResults)`.\n        // because if `configMergeResult` is set, `mergeResults` must be set as well. both happen on diverge.\n      }\n    }\n\n    // if mergeResults, the head snap is going to be updated on a later phase when snapping with two parents\n    // otherwise, update the head of the current lane or main\n    if (mergeResults) {\n      if (mergeResults.hasConflicts && mergeStrategy === MergeOptions.manual) {\n        unmergedComponent.unmergedPaths = mergeResults.modifiedFiles.filter((f) => f.conflict).map((f) => f.filePath);\n      }\n      consumer.scope.objects.unmergedComponents.addEntry(unmergedComponent);\n    } else if (localLane) {\n      if (resolvedUnrelated) {\n        // must be \"theirs\"\n        return handleResolveUnrelated(legacyComponent);\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 {\n      applyVersionResult: { id, filesStatus },\n      component: currentComponent || undefined,\n      legacyCompToWrite: legacyComponent,\n    };\n  }\n\n  private async abortMerge(values: string[]): Promise<ApplyVersionResults> {\n    const consumer = this.workspace.consumer;\n    const ids = await this.getIdsForUnmerged(values);\n    const results = await this.checkout.checkout({ ids, reset: true });\n    ids.forEach((id) => consumer.scope.objects.unmergedComponents.removeComponent(id.fullName));\n    await consumer.scope.objects.unmergedComponents.write();\n    return { abortedComponents: results.components };\n  }\n\n  private async resolveMerge(values: string[], snapMessage: string, build: boolean): Promise<ApplyVersionResults> {\n    const ids = await this.getIdsForUnmerged(values);\n    // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n    const { snappedComponents } = await this.snapping.snap({\n      legacyBitIds: ComponentIdList.fromArray(ids.map((id) => id)),\n      build,\n      message: snapMessage,\n    });\n    return { resolvedComponents: snappedComponents };\n  }\n\n  private async getAllComponentsStatus(\n    bitIds: ComponentID[],\n    laneId: LaneId,\n    localLaneObject: Lane | null\n  ): Promise<ComponentMergeStatus[]> {\n    const ids = await Promise.all(\n      bitIds.map(async (bitId) => {\n        const remoteScopeName = laneId.isDefault() ? bitId.scope : laneId.scope;\n        const remoteLaneId = LaneId.from(laneId.name, remoteScopeName as string);\n        const remoteHead = await this.workspace.consumer.scope.objects.remoteLanes.getRef(remoteLaneId, bitId);\n        const laneIdStr = remoteLaneId.toString();\n        if (!remoteHead) {\n          throw new BitError(`unable to find a remote head of \"${bitId.toStringWithoutVersion()}\" in \"${laneIdStr}\"`);\n        }\n        return bitId.changeVersion(remoteHead.toString());\n      })\n    );\n\n    return this.getMergeStatus(ids, localLaneObject, localLaneObject, { shouldSquash: false });\n  }\n\n  private async snapResolvedComponents(\n    consumer: Consumer,\n    snapMessage: string,\n    build: boolean\n  ): Promise<SnapResults | null> {\n    const unmergedComponents = consumer.scope.objects.unmergedComponents.getComponents();\n    this.logger.debug(`merge-snaps, snapResolvedComponents, total ${unmergedComponents.length.toString()} components`);\n    if (!unmergedComponents.length) return null;\n    const ids = ComponentIdList.fromArray(unmergedComponents.map((r) => ComponentID.fromObject(r.id)));\n    return this.snapping.snap({\n      legacyBitIds: ids,\n      build,\n      message: snapMessage,\n    });\n  }\n\n  private async tagAllLaneComponent(\n    idsToTag: ComponentID[],\n    tagMessage: string,\n    build: boolean\n  ): Promise<TagResults | null> {\n    const ids = idsToTag.map((id) => {\n      return id.toStringWithoutVersion();\n    });\n    this.logger.debug(`merge-snaps, tagResolvedComponents, total ${idsToTag.length.toString()} components`);\n    return this.snapping.tag({\n      ids,\n      build,\n      message: tagMessage,\n      unmodified: true,\n    });\n  }\n\n  private async getIdsForUnmerged(idsStr?: string[]): Promise<ComponentID[]> {\n    if (idsStr && idsStr.length) {\n      const componentIds = await this.workspace.resolveMultipleComponentIds(idsStr);\n      componentIds.forEach((id) => {\n        const entry = this.workspace.consumer.scope.objects.unmergedComponents.getEntry(id.fullName);\n        if (!entry) {\n          throw new GeneralError(`unable to merge-resolve ${id.toString()}, it is not marked as unresolved`);\n        }\n      });\n      return componentIds;\n    }\n    const unresolvedComponents = this.workspace.consumer.scope.objects.unmergedComponents.getComponents();\n    if (!unresolvedComponents.length) throw new GeneralError(`all components are resolved already, nothing to do`);\n    return unresolvedComponents.map((u) => ComponentID.fromObject(u.id));\n  }\n\n  private async getComponentsToMerge(consumer: Consumer, ids: string[]): Promise<ComponentID[]> {\n    const componentsList = new ComponentsList(consumer);\n    if (!ids.length) {\n      const mergePending = await componentsList.listMergePendingComponents();\n      return mergePending.map((c) => c.id);\n    }\n    if (hasWildcard(ids)) {\n      return componentsList.listComponentsByIdsWithWildcard(ids);\n    }\n    return ids.map((id) => consumer.getParsedId(id));\n  }\n\n  static slots = [];\n  static dependencies = [\n    CLIAspect,\n    WorkspaceAspect,\n    SnappingAspect,\n    CheckoutAspect,\n    InstallAspect,\n    LoggerAspect,\n    ComponentWriterAspect,\n    ImporterAspect,\n    ConfigAspect,\n    RemoveAspect,\n    GlobalConfigAspect,\n  ];\n  static runtime = MainRuntime;\n  static async provider([\n    cli,\n    workspace,\n    snapping,\n    checkout,\n    install,\n    loggerMain,\n    compWriter,\n    importer,\n    config,\n    remove,\n    globalConfig,\n  ]: [\n    CLIMain,\n    Workspace,\n    SnappingMain,\n    CheckoutMain,\n    InstallMain,\n    LoggerMain,\n    ComponentWriterMain,\n    ImporterMain,\n    ConfigMain,\n    RemoveMain,\n    GlobalConfigMain\n  ]) {\n    const logger = loggerMain.createLogger(MergingAspect.id);\n    const merging = new MergingMain(\n      workspace,\n      install,\n      snapping,\n      checkout,\n      logger,\n      compWriter,\n      importer,\n      config,\n      remove\n    );\n    cli.register(new MergeCmd(merging, globalConfig));\n    return merging;\n  }\n}\n\nMergingAspect.addRuntime(MergingMain);\n"],"mappings":"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"}
+{"version":3,"names":["_cli","data","require","_semver","_interopRequireDefault","_workspace","_interopRequireWildcard","_componentsList","_mergeVersion","_snapping","_hasWildcard","_pMapSeries","_componentId","_bitError","_generalError","_laneId","_chalk","_config","_remove","_utils","_componentWriter","_importer","_logger","_globalConfig","_lodash","_dependencyResolver","_checkout","_constants","_deleteComponentFiles","_install","_mergeCmd","_merging","_configMergeResult","_mergeStatusProvider","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","obj","ownKeys","keys","getOwnPropertySymbols","o","filter","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","key","value","_toPropertyKey","configurable","writable","_toPrimitive","String","Symbol","toPrimitive","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","undefined","succeededComponents","componentsResults","applyVersionMultiple","allConfigMerge","compact","configMergeResult","workspaceDepsUpdates","workspaceDepsConflicts","updateWorkspaceJsoncWithDepsIfNeeded","generateConfigMergeConflictFileForAll","scope","objects","add","persist","unmergedComponents","write","writeBitMap","compBitIdsToRemove","ComponentIdList","fromArray","deleteComponentsFiles","cleanFromBitMap","componentsHasConfigMergeConflicts","some","_c$configMergeResult","leftUnresolvedConflicts","dedupe","updateExisting","import","err","error","consoleError","getSnapOrTagResults","idsToTag","results","tagAllLaneComponent","taggedComponents","autoTaggedResults","removedComponents","snappedComponents","autoSnappedResults","snapResolvedComponents","mergeSnapResults","mergeSnapError","bitMapSnapshot","bitMap","takeSnapshot","restoreFromSnapshot","components","applyVersionResult","configMergeFile","getConflictMergeFile","workspaceConflict","ConfigMergeResult","DependencyResolverAspect","conflict","unshift","configMerge","generateMergeConflictFile","addConflict","compIdStr","hasConflict","allResults","getDepsResolverResult","nonConflictDeps","nonConflictSources","_configMerge$getDepsR","mergedConfig","mergedConfigPolicy","policy","DEPENDENCIES_FIELDS","depField","pkg","force","name","includes","version","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","mapSeries","currentComponent","resolvedUnrelated","modelComponent","getModelComponent","updatedLaneId","isDefault","LaneId","from","applyVersion","remoteHead","getRef","compsToWrite","legacyCompToWrite","manyComponentsWriterOpts","writeConfig","reasonForBitmapChange","writeMany","filesStatus","unmergedComponent","fullName","head","handleResolveUnrelated","addComponent","headOnCurrentLane","unrelated","unrelatedHead","unrelatedLaneId","addEntry","markAllFilesAsUnchanged","files","file","pathNormalizeToLinux","relative","FileStatus","unchanged","MergeOptions","ours","strategy","remoteId","idToLoad","theirs","legacyComponent","loadComponentFromModelImportIfNeeded","updateFileStatus","modifiedStatus","modifiedFiles","applyModifiedVersion","removeFilesIfNeeded","successfullyMergedConfig","getSuccessfullyMergedConfig","manual","unmergedPaths","f","filePath","setHead","markVersionAsLocal","values","getIdsForUnmerged","reset","removeComponent","abortedComponents","snap","legacyBitIds","resolvedComponents","localLaneObject","Promise","all","bitId","remoteScopeName","remoteLaneId","remoteLanes","laneIdStr","toStringWithoutVersion","shouldSquash","getComponents","ComponentID","fromObject","tagMessage","unmodified","idsStr","componentIds","resolveMultipleComponentIds","entry","getEntry","GeneralError","unresolvedComponents","componentsList","ComponentsList","mergePending","listMergePendingComponents","hasWildcard","listComponentsByIdsWithWildcard","getParsedId","provider","cli","loggerMain","compWriter","globalConfig","createLogger","MergingAspect","merging","register","MergeCmd","exports","CLIAspect","WorkspaceAspect","SnappingAspect","CheckoutAspect","InstallAspect","LoggerAspect","ComponentWriterAspect","ImporterAspect","ConfigAspect","RemoveAspect","GlobalConfigAspect","MainRuntime","addRuntime"],"sources":["merging.main.runtime.ts"],"sourcesContent":["import { CLIAspect, CLIMain, MainRuntime } from '@teambit/cli';\nimport semver from 'semver';\nimport WorkspaceAspect, { OutsideWorkspaceError, Workspace } from '@teambit/workspace';\nimport { Consumer } from '@teambit/legacy/dist/consumer';\nimport ComponentsList from '@teambit/legacy/dist/consumer/component/components-list';\nimport {\n  MergeStrategy,\n  FileStatus,\n  ApplyVersionResult,\n  getMergeStrategyInteractive,\n  MergeOptions,\n} from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport SnappingAspect, { SnapResults, SnappingMain, TagResults } from '@teambit/snapping';\nimport hasWildcard from '@teambit/legacy/dist/utils/string/has-wildcard';\nimport mapSeries from 'p-map-series';\nimport { ComponentID, ComponentIdList } from '@teambit/component-id';\nimport { BitError } from '@teambit/bit-error';\nimport GeneralError from '@teambit/legacy/dist/error/general-error';\nimport { LaneId } from '@teambit/lane-id';\nimport { AutoTagResult } from '@teambit/legacy/dist/scope/component-ops/auto-tag';\nimport { UnmergedComponent } from '@teambit/legacy/dist/scope/lanes/unmerged-components';\nimport { Lane, ModelComponent } from '@teambit/legacy/dist/scope/models';\nimport { Ref } from '@teambit/legacy/dist/scope/objects';\nimport chalk from 'chalk';\nimport { ConfigAspect, ConfigMain } from '@teambit/config';\nimport RemoveAspect, { RemoveMain } from '@teambit/remove';\nimport { pathNormalizeToLinux } from '@teambit/legacy/dist/utils';\nimport { ComponentWriterAspect, ComponentWriterMain } from '@teambit/component-writer';\nimport ConsumerComponent from '@teambit/legacy/dist/consumer/component/consumer-component';\nimport ImporterAspect, { ImporterMain } from '@teambit/importer';\nimport { Logger, LoggerAspect, LoggerMain } from '@teambit/logger';\nimport GlobalConfigAspect, { GlobalConfigMain } from '@teambit/global-config';\nimport { compact, isEmpty } from 'lodash';\nimport { MergeResultsThreeWay } from '@teambit/legacy/dist/consumer/versions-ops/merge-version/three-way-merge';\nimport { DependencyResolverAspect, WorkspacePolicyConfigKeysNames } from '@teambit/dependency-resolver';\nimport {\n  ApplyVersionWithComps,\n  CheckoutAspect,\n  CheckoutMain,\n  ComponentStatusBase,\n  applyModifiedVersion,\n  removeFilesIfNeeded,\n  updateFileStatus,\n} from '@teambit/checkout';\nimport { DEPENDENCIES_FIELDS } from '@teambit/legacy/dist/constants';\nimport deleteComponentsFiles from '@teambit/legacy/dist/consumer/component-ops/delete-component-files';\nimport { SnapsDistance } from '@teambit/legacy/dist/scope/component-ops/snaps-distance';\nimport { InstallMain, InstallAspect } from '@teambit/install';\nimport { MergeCmd } from './merge-cmd';\nimport { MergingAspect } from './merging.aspect';\nimport { ConfigMergeResult } from './config-merge-result';\nimport { MergeStatusProvider, MergeStatusProviderOptions } from './merge-status-provider';\n\ntype ResolveUnrelatedData = {\n  strategy: MergeStrategy;\n  headOnCurrentLane: Ref;\n  unrelatedHead: Ref;\n  unrelatedLaneId: LaneId;\n};\ntype PkgEntry = { name: string; version: string; force: boolean };\n\nexport type WorkspaceDepsUpdates = { [pkgName: string]: [string, string] }; // from => to\nexport type WorkspaceDepsConflicts = Record<WorkspacePolicyConfigKeysNames, Array<{ name: string; version: string }>>; // the pkg value is in a format of CONFLICT::OURS::THEIRS\n\nexport type ComponentMergeStatus = ComponentStatusBase & {\n  mergeResults?: MergeResultsThreeWay | null;\n  divergeData?: SnapsDistance;\n  resolvedUnrelated?: ResolveUnrelatedData;\n  configMergeResult?: ConfigMergeResult;\n};\n\nexport type ComponentMergeStatusBeforeMergeAttempt = ComponentStatusBase & {\n  divergeData?: SnapsDistance;\n  resolvedUnrelated?: ResolveUnrelatedData;\n  mergeProps?: {\n    otherLaneHead: Ref;\n    currentId: ComponentID;\n    modelComponent: ModelComponent;\n  };\n};\n\nexport type FailedComponents = { id: ComponentID; unchangedMessage: string; unchangedLegitimately?: boolean };\n\nexport type ApplyVersionResults = {\n  components?: ApplyVersionResult[];\n  version?: string;\n  failedComponents?: FailedComponents[];\n  removedComponents?: ComponentID[];\n  addedComponents?: ComponentID[]; // relevant when restoreMissingComponents is true (e.g. bit lane merge-abort)\n  resolvedComponents?: ConsumerComponent[]; // relevant for bit merge --resolve\n  abortedComponents?: ApplyVersionResult[]; // relevant for bit merge --abort\n  mergeSnapResults?: {\n    snappedComponents: ConsumerComponent[];\n    autoSnappedResults: AutoTagResult[];\n    removedComponents?: ComponentIdList;\n  } | null;\n  mergeSnapError?: Error;\n  leftUnresolvedConflicts?: boolean;\n  verbose?: boolean;\n  newFromLane?: string[];\n  newFromLaneAdded?: boolean;\n  installationError?: Error; // in case the package manager failed, it won't throw, instead, it'll return error here\n  compilationError?: Error; // in case the compiler failed, it won't throw, instead, it'll return error here\n  workspaceDepsUpdates?: WorkspaceDepsUpdates; // in case workspace.jsonc has been updated with dependencies versions\n};\n\nexport class MergingMain {\n  constructor(\n    private workspace: Workspace,\n    private install: InstallMain,\n    private snapping: SnappingMain,\n    private checkout: CheckoutMain,\n    private logger: Logger,\n    private componentWriter: ComponentWriterMain,\n    private importer: ImporterMain,\n    private config: ConfigMain,\n    private remove: RemoveMain\n  ) {}\n\n  async merge(\n    ids: string[],\n    mergeStrategy: MergeStrategy,\n    abort: boolean,\n    resolve: boolean,\n    noSnap: boolean,\n    message: string,\n    build: boolean,\n    skipDependencyInstallation: boolean\n  ): Promise<ApplyVersionResults> {\n    if (!this.workspace) throw new OutsideWorkspaceError();\n    const consumer: Consumer = this.workspace.consumer;\n    let mergeResults;\n    if (resolve) {\n      mergeResults = await this.resolveMerge(ids, message, build);\n    } else if (abort) {\n      mergeResults = await this.abortMerge(ids);\n    } else {\n      const bitIds = await this.getComponentsToMerge(consumer, ids);\n      mergeResults = await this.mergeComponentsFromRemote(\n        consumer,\n        bitIds,\n        mergeStrategy,\n        noSnap,\n        message,\n        build,\n        skipDependencyInstallation\n      );\n    }\n    await consumer.onDestroy('merge');\n    return mergeResults;\n  }\n\n  /**\n   * when user is on main, it merges the remote main components into local.\n   * when user is on a lane, it merges the remote lane components into the local lane.\n   */\n  async mergeComponentsFromRemote(\n    consumer: Consumer,\n    bitIds: ComponentID[],\n    mergeStrategy: MergeStrategy,\n    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\n    const componentsResults = await this.applyVersionMultiple(succeededComponents, laneId, mergeStrategy, localLane);\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(`merge ${laneId.toString()}`);\n\n    if (componentIdsToRemove.length) {\n      const compBitIdsToRemove = ComponentIdList.fromArray(componentIdsToRemove);\n      await deleteComponentsFiles(consumer, compBitIdsToRemove);\n      await consumer.cleanFromBitMap(compBitIdsToRemove);\n    }\n\n    const componentsHasConfigMergeConflicts = allComponentsStatus.some((c) => c.configMergeResult?.hasConflicts());\n    const leftUnresolvedConflicts = componentWithConflict && mergeStrategy === 'manual';\n    if (!skipDependencyInstallation && !leftUnresolvedConflicts && !componentsHasConfigMergeConflicts) {\n      try {\n        await this.install.install(undefined, {\n          dedupe: true,\n          updateExisting: false,\n          import: false,\n        });\n      } catch (err: any) {\n        this.logger.error(`failed installing packages`, err);\n        this.logger.consoleError(`failed installing packages, see the log for full stacktrace. error: ${err.message}`);\n      }\n    }\n\n    const getSnapOrTagResults = async () => {\n      // if one of the component has conflict, don't snap-merge. otherwise, some of the components would be snap-merged\n      // and some not. besides the fact that it could by mistake tag dependent, it's a confusing state. better not snap.\n      if (noSnap || leftUnresolvedConflicts || componentsHasConfigMergeConflicts) {\n        return null;\n      }\n      if (tag) {\n        const idsToTag = allComponentsStatus.map((c) => c.id);\n        const results = await this.tagAllLaneComponent(idsToTag, snapMessage, build);\n        if (!results) return null;\n        const { taggedComponents, autoTaggedResults, removedComponents } = results;\n        return { snappedComponents: taggedComponents, autoSnappedResults: autoTaggedResults, removedComponents };\n      }\n      return this.snapResolvedComponents(consumer, snapMessage, build);\n    };\n    let mergeSnapResults: ApplyVersionResults['mergeSnapResults'] = null;\n    let mergeSnapError: Error | undefined;\n    const bitMapSnapshot = this.workspace.bitMap.takeSnapshot();\n    try {\n      mergeSnapResults = await getSnapOrTagResults();\n    } catch (err: any) {\n      mergeSnapError = err;\n      this.workspace.bitMap.restoreFromSnapshot(bitMapSnapshot);\n    }\n\n    return {\n      components: componentsResults.map((c) => c.applyVersionResult),\n      failedComponents,\n      removedComponents: [...componentIdsToRemove, ...(mergeSnapResults?.removedComponents || [])],\n      mergeSnapResults,\n      mergeSnapError,\n      leftUnresolvedConflicts,\n      workspaceDepsUpdates,\n    };\n  }\n\n  private async generateConfigMergeConflictFileForAll(\n    allConfigMerge: ConfigMergeResult[],\n    workspaceDepsConflicts?: WorkspaceDepsConflicts\n  ) {\n    const configMergeFile = this.workspace.getConflictMergeFile();\n    if (workspaceDepsConflicts) {\n      const workspaceConflict = new ConfigMergeResult('WORKSPACE', 'ours', 'theirs', [\n        {\n          id: DependencyResolverAspect.id,\n          conflict: workspaceDepsConflicts,\n        },\n      ]);\n      allConfigMerge.unshift(workspaceConflict);\n    }\n    allConfigMerge.forEach((configMerge) => {\n      const conflict = configMerge.generateMergeConflictFile();\n      if (!conflict) return;\n      configMergeFile.addConflict(configMerge.compIdStr, conflict);\n    });\n    if (configMergeFile.hasConflict()) {\n      await configMergeFile.write();\n    }\n  }\n\n  private async updateWorkspaceJsoncWithDepsIfNeeded(\n    allConfigMerge: ConfigMergeResult[]\n  ): Promise<{ workspaceDepsUpdates?: WorkspaceDepsUpdates; workspaceDepsConflicts?: WorkspaceDepsConflicts }> {\n    const allResults = allConfigMerge.map((c) => c.getDepsResolverResult());\n\n    // aggregate all dependencies that can be updated (not conflicting)\n    const nonConflictDeps: { [pkgName: string]: string[] } = {};\n    const nonConflictSources: { [pkgName: string]: string[] } = {}; // for logging/debugging purposes\n    allConfigMerge.forEach((configMerge) => {\n      const mergedConfig = configMerge.getDepsResolverResult()?.mergedConfig;\n      if (!mergedConfig || mergedConfig === '-') return;\n      const mergedConfigPolicy = mergedConfig.policy || {};\n      DEPENDENCIES_FIELDS.forEach((depField) => {\n        if (!mergedConfigPolicy[depField]) return;\n        mergedConfigPolicy[depField].forEach((pkg: PkgEntry) => {\n          if (pkg.force) return; // we only care about auto-detected dependencies\n          if (nonConflictDeps[pkg.name]) {\n            if (!nonConflictDeps[pkg.name].includes(pkg.version)) nonConflictDeps[pkg.name].push(pkg.version);\n            nonConflictSources[pkg.name].push(configMerge.compIdStr);\n            return;\n          }\n          nonConflictDeps[pkg.name] = [pkg.version];\n          nonConflictSources[pkg.name] = [configMerge.compIdStr];\n        });\n      });\n    });\n\n    // aggregate all dependencies that have conflicts\n    const conflictDeps: { [pkgName: string]: string[] } = {};\n    const conflictDepsSources: { [pkgName: string]: string[] } = {}; // for logging/debugging purposes\n    allConfigMerge.forEach((configMerge) => {\n      const mergedConfigConflict = configMerge.getDepsResolverResult()?.conflict;\n      if (!mergedConfigConflict) return;\n      DEPENDENCIES_FIELDS.forEach((depField) => {\n        if (!mergedConfigConflict[depField]) return;\n        mergedConfigConflict[depField].forEach((pkg: PkgEntry) => {\n          if (pkg.force) return; // we only care about auto-detected dependencies\n          if (conflictDeps[pkg.name]) {\n            if (!conflictDeps[pkg.name].includes(pkg.version)) conflictDeps[pkg.name].push(pkg.version);\n            conflictDepsSources[pkg.name].push(configMerge.compIdStr);\n            return;\n          }\n          conflictDeps[pkg.name] = [pkg.version];\n          conflictDepsSources[pkg.name] = [configMerge.compIdStr];\n        });\n      });\n    });\n\n    const notConflictedPackages = Object.keys(nonConflictDeps);\n    const conflictedPackages = Object.keys(conflictDeps);\n    if (!notConflictedPackages.length && !conflictedPackages.length) return {};\n\n    const workspaceConfig = this.config.workspaceConfig;\n    if (!workspaceConfig) throw new Error(`updateWorkspaceJsoncWithDepsIfNeeded unable to get workspace config`);\n    const depResolver = workspaceConfig.extensions.findCoreExtension(DependencyResolverAspect.id);\n    const policy = depResolver?.config.policy;\n    if (!policy) {\n      return {};\n    }\n\n    // calculate the workspace.json updates\n    const workspaceJsonUpdates = {};\n    notConflictedPackages.forEach((pkgName) => {\n      if (nonConflictDeps[pkgName].length > 1) {\n        // we only want the deps that the other lane has them in the workspace.json and that all comps use the same dep.\n        return;\n      }\n      DEPENDENCIES_FIELDS.forEach((depField) => {\n        if (!policy[depField]?.[pkgName]) return; // doesn't exists in the workspace.json\n        const currentVer = policy[depField][pkgName];\n        const newVer = nonConflictDeps[pkgName][0];\n        if (currentVer === newVer) return;\n        workspaceJsonUpdates[pkgName] = [currentVer, newVer];\n        policy[depField][pkgName] = newVer;\n        this.logger.debug(\n          `update workspace.jsonc: ${pkgName} from ${currentVer} to ${newVer}. Triggered by: ${nonConflictSources[\n            pkgName\n          ].join(', ')}`\n        );\n      });\n    });\n\n    // calculate the workspace.json conflicts\n    const WS_DEPS_FIELDS = ['dependencies', 'peerDependencies'];\n    const workspaceJsonConflicts = { dependencies: [], peerDependencies: [] };\n    const conflictPackagesToRemoveFromConfigMerge: string[] = [];\n    conflictedPackages.forEach((pkgName) => {\n      if (conflictDeps[pkgName].length > 1) {\n        // we only want the deps that the other lane has them in the workspace.json and that all comps use the same dep.\n        return;\n      }\n      const conflictRaw = conflictDeps[pkgName][0];\n      const [, currentVal, otherVal] = conflictRaw.split('::');\n\n      WS_DEPS_FIELDS.forEach((depField) => {\n        if (!policy[depField]?.[pkgName]) return;\n        const currentVerInWsJson = policy[depField][pkgName];\n        if (!currentVerInWsJson) return;\n        // the version is coming from the workspace.jsonc\n        conflictPackagesToRemoveFromConfigMerge.push(pkgName);\n        if (semver.satisfies(otherVal, currentVerInWsJson)) {\n          // the other version is compatible with the current version in the workspace.json\n          return;\n        }\n        workspaceJsonConflicts[depField].push({\n          name: pkgName,\n          version: conflictRaw.replace(currentVal, currentVerInWsJson),\n          force: false,\n        });\n        conflictPackagesToRemoveFromConfigMerge.push(pkgName);\n        this.logger.debug(\n          `conflict workspace.jsonc: ${pkgName} current: ${currentVerInWsJson}, other: ${otherVal}. Triggered by: ${conflictDepsSources[\n            pkgName\n          ].join(', ')}`\n        );\n      });\n    });\n    WS_DEPS_FIELDS.forEach((depField) => {\n      if (isEmpty(workspaceJsonConflicts[depField])) delete workspaceJsonConflicts[depField];\n    });\n\n    if (conflictPackagesToRemoveFromConfigMerge.length) {\n      allResults.forEach((result) => {\n        if (result?.conflict) {\n          DEPENDENCIES_FIELDS.forEach((depField) => {\n            if (!result.conflict?.[depField]) return;\n            result.conflict[depField] = result.conflict?.[depField].filter(\n              (dep) => !conflictPackagesToRemoveFromConfigMerge.includes(dep.name)\n            );\n            if (!result.conflict[depField].length) delete result.conflict[depField];\n          });\n          if (isEmpty(result.conflict)) result.conflict = undefined;\n        }\n      });\n    }\n\n    if (Object.keys(workspaceJsonUpdates).length) {\n      await workspaceConfig.write();\n    }\n\n    this.logger.debug('final workspace.jsonc updates', workspaceJsonUpdates);\n    this.logger.debug('final workspace.jsonc conflicts', workspaceJsonConflicts);\n\n    return {\n      workspaceDepsUpdates: Object.keys(workspaceJsonUpdates).length ? workspaceJsonUpdates : undefined,\n      workspaceDepsConflicts: Object.keys(workspaceJsonConflicts).length ? workspaceJsonConflicts : undefined,\n    };\n  }\n\n  /**\n   * this function gets called from two different commands:\n   * 1. \"bit merge <ids...>\", when merging a component from a remote to the local.\n   * in this case, the remote and local are on the same lane or both on main.\n   * 2. \"bit lane merge\", when merging from one lane to another.\n   */\n  async getMergeStatus(\n    bitIds: ComponentID[], // the id.version is the version we want to merge to the current component\n    currentLane: Lane | null, // currently checked out lane. if on main, then it's null.\n    otherLane?: Lane | null, // the lane we want to merged to our lane. (null if it's \"main\").\n    options?: MergeStatusProviderOptions\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 applyVersionMultiple(\n    succeededComponents: ComponentMergeStatus[],\n    laneId: LaneId,\n    mergeStrategy: MergeStrategy,\n    localLane: Lane | null\n  ): Promise<ApplyVersionWithComps[]> {\n    const componentsResults = await mapSeries(\n      succeededComponents,\n      async ({ currentComponent, id, mergeResults, resolvedUnrelated, configMergeResult }) => {\n        const modelComponent = await this.workspace.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 compsToWrite = compact(componentsResults.map((c) => c.legacyCompToWrite));\n\n    const manyComponentsWriterOpts = {\n      consumer: this.workspace.consumer,\n      components: compsToWrite,\n      skipDependencyInstallation: true,\n      writeConfig: false, // @todo: should write if config exists before, needs to figure out how to do it.\n      reasonForBitmapChange: 'merge',\n    };\n    await this.componentWriter.writeMany(manyComponentsWriterOpts);\n\n    return componentsResults;\n  }\n\n  private async applyVersion({\n    currentComponent,\n    id,\n    mergeResults,\n    mergeStrategy,\n    remoteHead,\n    laneId,\n    localLane,\n    resolvedUnrelated,\n    configMergeResult,\n  }: {\n    currentComponent: ConsumerComponent | null | undefined;\n    id: ComponentID;\n    mergeResults: MergeResultsThreeWay | null | undefined;\n    mergeStrategy: MergeStrategy;\n    remoteHead: Ref;\n    laneId: LaneId;\n    localLane: Lane | null;\n    resolvedUnrelated?: ResolveUnrelatedData;\n    configMergeResult?: ConfigMergeResult;\n  }): Promise<ApplyVersionWithComps> {\n    const consumer = this.workspace.consumer;\n    let filesStatus = {};\n    const unmergedComponent: UnmergedComponent = {\n      // @ts-ignore\n      id: { name: id.fullName, scope: id.scope },\n      head: remoteHead,\n      laneId,\n    };\n    id = currentComponent ? currentComponent.id : id;\n\n    const modelComponent = await consumer.scope.getModelComponent(id);\n    const handleResolveUnrelated = (legacyCompToWrite?: ConsumerComponent) => {\n      if (!currentComponent) throw new Error('currentComponent must be defined when resolvedUnrelated');\n      // because when on a main, we don't allow merging lanes with unrelated. we asks users to switch to the lane\n      // first and then merge with --resolve-unrelated\n      if (!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, legacyCompToWrite };\n    };\n\n    const markAllFilesAsUnchanged = () => {\n      if (!currentComponent) throw new Error(`applyVersion expect to get currentComponent for ${id.toString()}`);\n      currentComponent.files.forEach((file) => {\n        filesStatus[pathNormalizeToLinux(file.relative)] = FileStatus.unchanged;\n      });\n    };\n    if (mergeResults && mergeResults.hasConflicts && mergeStrategy === MergeOptions.ours) {\n      markAllFilesAsUnchanged();\n      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    if (configMergeResult) {\n      const successfullyMergedConfig = configMergeResult.getSuccessfullyMergedConfig();\n      if (successfullyMergedConfig) {\n        unmergedComponent.mergedConfig = successfullyMergedConfig;\n        // no need to `unmergedComponents.addEntry` here. it'll be added in the next lines inside `if (mergeResults)`.\n        // because if `configMergeResult` is set, `mergeResults` must be set as well. both happen on diverge.\n      }\n    }\n\n    // if mergeResults, the head snap is going to be updated on a later phase when snapping with two parents\n    // otherwise, update the head of the current lane or main\n    if (mergeResults) {\n      if (mergeResults.hasConflicts && mergeStrategy === MergeOptions.manual) {\n        unmergedComponent.unmergedPaths = mergeResults.modifiedFiles.filter((f) => f.conflict).map((f) => f.filePath);\n      }\n      consumer.scope.objects.unmergedComponents.addEntry(unmergedComponent);\n    } else if (localLane) {\n      if (resolvedUnrelated) {\n        // must be \"theirs\"\n        return handleResolveUnrelated(legacyComponent);\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 {\n      applyVersionResult: { id, filesStatus },\n      component: currentComponent || undefined,\n      legacyCompToWrite: legacyComponent,\n    };\n  }\n\n  private async abortMerge(values: string[]): Promise<ApplyVersionResults> {\n    const consumer = this.workspace.consumer;\n    const ids = await this.getIdsForUnmerged(values);\n    const results = await this.checkout.checkout({ ids, reset: true });\n    ids.forEach((id) => consumer.scope.objects.unmergedComponents.removeComponent(id.fullName));\n    await consumer.scope.objects.unmergedComponents.write();\n    return { abortedComponents: results.components };\n  }\n\n  private async resolveMerge(values: string[], snapMessage: string, build: boolean): Promise<ApplyVersionResults> {\n    const ids = await this.getIdsForUnmerged(values);\n    // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n    const { snappedComponents } = await this.snapping.snap({\n      legacyBitIds: ComponentIdList.fromArray(ids.map((id) => id)),\n      build,\n      message: snapMessage,\n    });\n    return { resolvedComponents: snappedComponents };\n  }\n\n  private async getAllComponentsStatus(\n    bitIds: ComponentID[],\n    laneId: LaneId,\n    localLaneObject: Lane | null\n  ): Promise<ComponentMergeStatus[]> {\n    const ids = await Promise.all(\n      bitIds.map(async (bitId) => {\n        const remoteScopeName = laneId.isDefault() ? bitId.scope : laneId.scope;\n        const remoteLaneId = LaneId.from(laneId.name, remoteScopeName as string);\n        const remoteHead = await this.workspace.consumer.scope.objects.remoteLanes.getRef(remoteLaneId, bitId);\n        const laneIdStr = remoteLaneId.toString();\n        if (!remoteHead) {\n          throw new BitError(`unable to find a remote head of \"${bitId.toStringWithoutVersion()}\" in \"${laneIdStr}\"`);\n        }\n        return bitId.changeVersion(remoteHead.toString());\n      })\n    );\n\n    return this.getMergeStatus(ids, localLaneObject, localLaneObject, { shouldSquash: false });\n  }\n\n  private async snapResolvedComponents(\n    consumer: Consumer,\n    snapMessage: string,\n    build: boolean\n  ): Promise<SnapResults | null> {\n    const unmergedComponents = consumer.scope.objects.unmergedComponents.getComponents();\n    this.logger.debug(`merge-snaps, snapResolvedComponents, total ${unmergedComponents.length.toString()} components`);\n    if (!unmergedComponents.length) return null;\n    const ids = ComponentIdList.fromArray(unmergedComponents.map((r) => ComponentID.fromObject(r.id)));\n    return this.snapping.snap({\n      legacyBitIds: ids,\n      build,\n      message: snapMessage,\n    });\n  }\n\n  private async tagAllLaneComponent(\n    idsToTag: ComponentID[],\n    tagMessage: string,\n    build: boolean\n  ): Promise<TagResults | null> {\n    const ids = idsToTag.map((id) => {\n      return id.toStringWithoutVersion();\n    });\n    this.logger.debug(`merge-snaps, tagResolvedComponents, total ${idsToTag.length.toString()} components`);\n    return this.snapping.tag({\n      ids,\n      build,\n      message: tagMessage,\n      unmodified: true,\n    });\n  }\n\n  private async getIdsForUnmerged(idsStr?: string[]): Promise<ComponentID[]> {\n    if (idsStr && idsStr.length) {\n      const componentIds = await this.workspace.resolveMultipleComponentIds(idsStr);\n      componentIds.forEach((id) => {\n        const entry = this.workspace.consumer.scope.objects.unmergedComponents.getEntry(id.fullName);\n        if (!entry) {\n          throw new GeneralError(`unable to merge-resolve ${id.toString()}, it is not marked as unresolved`);\n        }\n      });\n      return componentIds;\n    }\n    const unresolvedComponents = this.workspace.consumer.scope.objects.unmergedComponents.getComponents();\n    if (!unresolvedComponents.length) throw new GeneralError(`all components are resolved already, nothing to do`);\n    return unresolvedComponents.map((u) => ComponentID.fromObject(u.id));\n  }\n\n  private async getComponentsToMerge(consumer: Consumer, ids: string[]): Promise<ComponentID[]> {\n    const componentsList = new ComponentsList(consumer);\n    if (!ids.length) {\n      const mergePending = await componentsList.listMergePendingComponents();\n      return mergePending.map((c) => c.id);\n    }\n    if (hasWildcard(ids)) {\n      return componentsList.listComponentsByIdsWithWildcard(ids);\n    }\n    return ids.map((id) => consumer.getParsedId(id));\n  }\n\n  static slots = [];\n  static dependencies = [\n    CLIAspect,\n    WorkspaceAspect,\n    SnappingAspect,\n    CheckoutAspect,\n    InstallAspect,\n    LoggerAspect,\n    ComponentWriterAspect,\n    ImporterAspect,\n    ConfigAspect,\n    RemoveAspect,\n    GlobalConfigAspect,\n  ];\n  static runtime = MainRuntime;\n  static async provider([\n    cli,\n    workspace,\n    snapping,\n    checkout,\n    install,\n    loggerMain,\n    compWriter,\n    importer,\n    config,\n    remove,\n    globalConfig,\n  ]: [\n    CLIMain,\n    Workspace,\n    SnappingMain,\n    CheckoutMain,\n    InstallMain,\n    LoggerMain,\n    ComponentWriterMain,\n    ImporterMain,\n    ConfigMain,\n    RemoveMain,\n    GlobalConfigMain\n  ]) {\n    const logger = loggerMain.createLogger(MergingAspect.id);\n    const merging = new MergingMain(\n      workspace,\n      install,\n      snapping,\n      checkout,\n      logger,\n      compWriter,\n      importer,\n      config,\n      remove\n    );\n    cli.register(new MergeCmd(merging, globalConfig));\n    return merging;\n  }\n}\n\nMergingAspect.addRuntime(MergingMain);\n"],"mappings":"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"}

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@teambit/merging",
-  "version": "1.0.103",
+  "version": "1.0.105",
   "homepage": "https://bit.cloud/teambit/component/merging",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.component",
     "name": "merging",
-    "version": "1.0.103"
+    "version": "1.0.105"
   },
   "dependencies": {
     "lodash": "4.17.21",
@@ -20,20 +20,20 @@
     "@teambit/bit-error": "0.0.404",
     "@teambit/lane-id": "0.0.311",
     "@teambit/harmony": "0.4.6",
-    "@teambit/dependency-resolver": "1.0.103",
-    "@teambit/builder": "1.0.103",
-    "@teambit/envs": "1.0.103",
-    "@teambit/logger": "0.0.930",
-    "@teambit/cli": "0.0.837",
-    "@teambit/global-config": "0.0.839",
-    "@teambit/importer": "1.0.103",
-    "@teambit/workspace": "1.0.103",
-    "@teambit/checkout": "1.0.103",
-    "@teambit/component-writer": "1.0.103",
-    "@teambit/config": "0.0.854",
-    "@teambit/install": "1.0.103",
-    "@teambit/remove": "1.0.103",
-    "@teambit/snapping": "1.0.103"
+    "@teambit/dependency-resolver": "1.0.105",
+    "@teambit/builder": "1.0.105",
+    "@teambit/envs": "1.0.105",
+    "@teambit/logger": "0.0.931",
+    "@teambit/cli": "0.0.838",
+    "@teambit/global-config": "0.0.840",
+    "@teambit/importer": "1.0.105",
+    "@teambit/workspace": "1.0.105",
+    "@teambit/checkout": "1.0.105",
+    "@teambit/component-writer": "1.0.105",
+    "@teambit/config": "0.0.856",
+    "@teambit/install": "1.0.105",
+    "@teambit/remove": "1.0.105",
+    "@teambit/snapping": "1.0.105"
   },
   "devDependencies": {
     "@types/lodash": "4.14.165",
@@ -47,7 +47,7 @@
     "@types/testing-library__jest-dom": "5.9.5"
   },
   "peerDependencies": {
-    "@teambit/legacy": "1.0.622",
+    "@teambit/legacy": "1.0.623",
     "react": "^16.8.0 || ^17.0.0",
     "react-dom": "^16.8.0 || ^17.0.0"
   },