@teambit/merging 0.0.473 → 0.0.475

package/dist/config-merge-result.js

@@ -1,20 +1,9 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-require("core-js/modules/es.array.iterator.js");
-require("core-js/modules/es.regexp.exec.js");
-require("core-js/modules/es.string.replace.js");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.ConfigMergeResult = void 0;
-function _defineProperty2() {
-  const data = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-  _defineProperty2 = function () {
-    return data;
-  };
-  return data;
-}
 function _dependencyResolver() {
   const data = require("@teambit/dependency-resolver");
   _dependencyResolver = function () {
@@ -37,7 +26,10 @@ function _configMerger() {
   return data;
 }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2().default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _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); }
 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","object","enumerableOnly","keys","Object","getOwnPropertySymbols","symbols","filter","sym","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","target","i","arguments","length","source","forEach","key","_defineProperty2","default","getOwnPropertyDescriptors","defineProperties","defineProperty","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,MAAA,EAAAC,cAAA,QAAAC,IAAA,GAAAC,MAAA,CAAAD,IAAA,CAAAF,MAAA,OAAAG,MAAA,CAAAC,qBAAA,QAAAC,OAAA,GAAAF,MAAA,CAAAC,qBAAA,CAAAJ,MAAA,GAAAC,cAAA,KAAAI,OAAA,GAAAA,OAAA,CAAAC,MAAA,WAAAC,GAAA,WAAAJ,MAAA,CAAAK,wBAAA,CAAAR,MAAA,EAAAO,GAAA,EAAAE,UAAA,OAAAP,IAAA,CAAAQ,IAAA,CAAAC,KAAA,CAAAT,IAAA,EAAAG,OAAA,YAAAH,IAAA;AAAA,SAAAU,cAAAC,MAAA,aAAAC,CAAA,MAAAA,CAAA,GAAAC,SAAA,CAAAC,MAAA,EAAAF,CAAA,UAAAG,MAAA,WAAAF,SAAA,CAAAD,CAAA,IAAAC,SAAA,CAAAD,CAAA,QAAAA,CAAA,OAAAf,OAAA,CAAAI,MAAA,CAAAc,MAAA,OAAAC,OAAA,WAAAC,GAAA,QAAAC,gBAAA,GAAAC,OAAA,EAAAR,MAAA,EAAAM,GAAA,EAAAF,MAAA,CAAAE,GAAA,SAAAhB,MAAA,CAAAmB,yBAAA,GAAAnB,MAAA,CAAAoB,gBAAA,CAAAV,MAAA,EAAAV,MAAA,CAAAmB,yBAAA,CAAAL,MAAA,KAAAlB,OAAA,CAAAI,MAAA,CAAAc,MAAA,GAAAC,OAAA,WAAAC,GAAA,IAAAhB,MAAA,CAAAqB,cAAA,CAAAX,MAAA,EAAAM,GAAA,EAAAhB,MAAA,CAAAK,wBAAA,CAAAS,MAAA,EAAAE,GAAA,iBAAAN,MAAA;AAEjG,MAAMY,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,CAAC1B,MAAM,CAAE6B,MAAM,IAAKA,MAAM,CAACC,QAAQ,CAAC;IAC5E,IAAI,CAACE,mBAAmB,CAACtB,MAAM,EAAE,OAAO,IAAI;IAC5C,MAAMuB,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,CAAC1B,MAAM,CAAE6B,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,OAAAtC,aAAA,CAAAA,aAAA,KAAYwC,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,CAACtE,MAAM,GAAG,CAAC,EAAE,OAAOoB,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"}
+{"version":3,"names":["_dependencyResolver","data","require","_lodash","_configMerger","ownKeys","object","enumerableOnly","keys","Object","getOwnPropertySymbols","symbols","filter","sym","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","target","i","arguments","length","source","forEach","key","_defineProperty","getOwnPropertyDescriptors","defineProperties","defineProperty","obj","value","_toPropertyKey","configurable","writable","arg","_toPrimitive","String","input","hint","prim","Symbol","toPrimitive","undefined","res","call","TypeError","Number","DEP_RESOLVER_VERSION_INDENTATION","CONFLICT_MARKER_INDENTATION","ConfigMergeResult","constructor","compIdStr","currentLabel","otherLabel","results","hasConflicts","some","result","conflict","generateMergeConflictFile","resultsWithConflict","allConflicts","compact","map","generateConflictStringPerAspect","configMergeFormatted","c","formatConflict","conflictStr","concatenateConflicts","getSuccessfullyMergedConfig","resultsWithMergedConfig","mergedConfig","reduce","acc","curr","currObject","id","getDepsResolverResult","find","DependencyResolverAspect","depsResolverConfigGenerator","basicConflictGenerator","mergedConfigSplit","JSON","stringify","policy","split","conflictLines","line","includes","conflictIndicator","currentVal","otherVal","repeat","shift","unshift","join","conflictObj","currentConfig","otherConfig","formatConfig","conf","confStr","confStrSplit","pop","replace","conflicts","conflictsWithComma","index","endsWith","conflictSplit","lastLineWithClosingBrace","lastIndexOf","exports"],"sources":["config-merge-result.ts"],"sourcesContent":["import { DependencyResolverAspect } from '@teambit/dependency-resolver';\nimport { compact } from 'lodash';\nimport { MergeStrategyResult, conflictIndicator, GenericConfigOrRemoved } from './config-merger';\n\nconst DEP_RESOLVER_VERSION_INDENTATION = 8;\nconst CONFLICT_MARKER_INDENTATION = 7;\n\nexport class ConfigMergeResult {\n  constructor(\n    readonly compIdStr: string,\n    private currentLabel: string,\n    private otherLabel: string,\n    private results: MergeStrategyResult[]\n  ) {}\n  hasConflicts(): boolean {\n    return this.results.some((result) => result.conflict);\n  }\n  generateMergeConflictFile(): string | null {\n    const resultsWithConflict = this.results.filter((result) => result.conflict);\n    if (!resultsWithConflict.length) return null;\n    const allConflicts = compact(resultsWithConflict.map((result) => this.generateConflictStringPerAspect(result)));\n    const configMergeFormatted = allConflicts.map((c) => this.formatConflict(c));\n    const conflictStr = `{\n${this.concatenateConflicts(configMergeFormatted)}\n}`;\n    return conflictStr;\n  }\n  getSuccessfullyMergedConfig(): Record<string, any> {\n    const resultsWithMergedConfig = this.results.filter((result) => result.mergedConfig);\n    return resultsWithMergedConfig.reduce((acc, curr) => {\n      const currObject = { [curr.id]: curr.mergedConfig };\n      return { ...acc, ...currObject };\n    }, {});\n  }\n\n  getDepsResolverResult(): MergeStrategyResult | undefined {\n    return this.results.find((result) => result.id === DependencyResolverAspect.id);\n  }\n\n  private generateConflictStringPerAspect(result: MergeStrategyResult): string | undefined {\n    if (!result.conflict) return undefined;\n    if (result.id === DependencyResolverAspect.id) {\n      return this.depsResolverConfigGenerator(result.conflict);\n    }\n    return this.basicConflictGenerator(result.id, result.conflict);\n  }\n\n  private depsResolverConfigGenerator(conflict: Record<string, any>): string {\n    const mergedConfigSplit = JSON.stringify({ policy: conflict }, undefined, 2).split('\\n');\n    const conflictLines = mergedConfigSplit.map((line) => {\n      if (!line.includes(conflictIndicator)) return line;\n      const [, currentVal, otherVal] = line.split('::');\n      return `${'<'.repeat(CONFLICT_MARKER_INDENTATION)} ${this.currentLabel}\n${' '.repeat(DEP_RESOLVER_VERSION_INDENTATION)}\"version\": \"${currentVal}\",\n=======\n${' '.repeat(DEP_RESOLVER_VERSION_INDENTATION)}\"version\": \"${otherVal}\",\n${'>'.repeat(CONFLICT_MARKER_INDENTATION)} ${this.otherLabel}`;\n    });\n    // replace the first line with line with the id\n    conflictLines.shift();\n    conflictLines.unshift(`\"${DependencyResolverAspect.id}\": {`);\n    return conflictLines.join('\\n');\n  }\n\n  private basicConflictGenerator(id: string, conflictObj: Record<string, any>): string {\n    const { currentConfig, otherConfig } = conflictObj;\n    let conflict: string;\n    if (currentConfig === '-') {\n      conflict = `${'<'.repeat(CONFLICT_MARKER_INDENTATION)} ${this.currentLabel}\n\"${id}\": \"-\"\n=======\n\"${id}\": ${JSON.stringify(otherConfig, undefined, 2)}\n${'>'.repeat(CONFLICT_MARKER_INDENTATION)} ${this.otherLabel}`;\n    } else if (otherConfig === '-') {\n      conflict = `${'<'.repeat(CONFLICT_MARKER_INDENTATION)} ${this.currentLabel}\n\"${id}\": ${JSON.stringify(currentConfig, undefined, 2)}\n=======\n\"${id}\": \"-\"\n${'>'.repeat(CONFLICT_MARKER_INDENTATION)} ${this.otherLabel}`;\n    } else {\n      const formatConfig = (conf: GenericConfigOrRemoved) => {\n        const confStr = JSON.stringify(conf, undefined, 2);\n        const confStrSplit = confStr.split('\\n');\n        confStrSplit.shift(); // remove first {\n        confStrSplit.pop(); // remove last }\n        return confStrSplit.join('\\n');\n      };\n      conflict = `\"${id}\": {\n${'<'.repeat(CONFLICT_MARKER_INDENTATION)} ${this.currentLabel}\n${formatConfig(currentConfig)}\n=======\n${formatConfig(otherConfig)}\n${'>'.repeat(CONFLICT_MARKER_INDENTATION)} ${this.otherLabel}\n}`;\n    }\n\n    return conflict;\n  }\n\n  private formatConflict(conflict: string) {\n    return (\n      conflict\n        .split('\\n')\n        // add 2 spaces before each line\n        .map((line) => `  ${line}`)\n        // remove the white spaces before the conflict indicators\n        .map((line) => line.replace(/ *(<<<<<<<|>>>>>>>|=======)/g, '$1'))\n        .join('\\n')\n    );\n  }\n\n  private concatenateConflicts(conflicts: string[]) {\n    const conflictsWithComma = conflicts.map((conflict, index) => {\n      if (index === conflicts.length - 1) return conflict; // last element in the array, no need to add a comma\n      if (conflict.endsWith('}')) return `${conflict},`; // ends normally with a closing brace, add a comma.\n      // if it doesn't end with a closing brace, it means it ends with a conflict indicator.\n      // the comma should be added after the last line with a closing brace.\n      const conflictSplit = conflict.split('\\n');\n      // find the last line with '}' and add a comma after it\n      const lastLineWithClosingBrace = conflictSplit.lastIndexOf('  }');\n      conflictSplit[lastLineWithClosingBrace] += ',';\n      return conflictSplit.join('\\n');\n    });\n    return conflictsWithComma.join('\\n');\n  }\n}\n"],"mappings":"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"}

package/dist/config-merger.js

@@ -1,19 +1,9 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-require("core-js/modules/es.array.iterator.js");
-require("core-js/modules/es.regexp.exec.js");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.conflictIndicator = exports.ConfigMerger = void 0;
-function _defineProperty2() {
-  const data = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-  _defineProperty2 = function () {
-    return data;
-  };
-  return data;
-}
 function _semver() {
   const data = _interopRequireDefault(require("semver"));
   _semver = function () {
@@ -56,8 +46,12 @@ function _configMergeResult() {
   };
   return data;
 }
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2().default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _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); }
 const conflictIndicator = 'CONFLICT::';
 exports.conflictIndicator = conflictIndicator;
 /**
@@ -93,11 +87,11 @@ class ConfigMerger {
     this.currentLabel = currentLabel;
     this.otherLabel = otherLabel;
     this.logger = logger;
-    (0, _defineProperty2().default)(this, "currentEnv", void 0);
-    (0, _defineProperty2().default)(this, "otherEnv", void 0);
-    (0, _defineProperty2().default)(this, "baseEnv", void 0);
-    (0, _defineProperty2().default)(this, "handledExtIds", []);
-    (0, _defineProperty2().default)(this, "otherLaneIdsStr", void 0);
+    _defineProperty(this, "currentEnv", void 0);
+    _defineProperty(this, "otherEnv", void 0);
+    _defineProperty(this, "baseEnv", void 0);
+    _defineProperty(this, "handledExtIds", []);
+    _defineProperty(this, "otherLaneIdsStr", void 0);
     this.otherLaneIdsStr = (otherLane === null || otherLane === void 0 ? void 0 : otherLane.toBitIds().map(id => id.toString())) || [];
   }
   merge() {

package/dist/config-merger.js.map

@@ -1 +1 @@
-{"version":3,"names":["_semver","data","_interopRequireDefault","require","_componentVersion","_dependencyResolver","_envs","_lodash","_configMergeResult","ownKeys","object","enumerableOnly","keys","Object","getOwnPropertySymbols","symbols","filter","sym","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","target","i","arguments","length","source","forEach","key","_defineProperty2","default","getOwnPropertyDescriptors","defineProperties","defineProperty","conflictIndicator","exports","ConfigMerger","constructor","compIdStr","workspaceIds","otherLane","currentAspects","baseAspects","otherAspects","currentLabel","otherLabel","logger","otherLaneIdsStr","toBitIds","map","id","toString","merge","debug","populateEnvs","results","currentExt","stringId","handledExtIds","includes","baseExt","findExtension","otherExt","mergePerStrategy","conflict","currentConfig","getConfig","otherConfig","otherAspectsNotHandledResults","extensionId","hasVersion","idFromWorkspace","getIdFromWorkspace","toStringWithoutVersion","existingExt","_legacy","mergedConfig","envResult","envStrategy","ConfigMergeResult","compact","getEnvId","ext","envsAspect","findCoreExtension","EnvsAspect","Error","env","config","currentEnv","otherEnv","baseEnv","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","currentPolicy","getPolicy","otherPolicy","basePolicy","getAllDeps","_ext$findCoreExtensio","_ext$findCoreExtensio2","dependencies","policy","d","idWithoutVersion","__type","split","existingPolicy","find","p","dependencyId","getPolicyVer","value","getDataPolicy","_ext$findCoreExtensio3","getAutoDeps","allDeps","currentAutoData","currentAllData","currentDataPolicy","otherData","currentAndOtherData","uniqBy","concat","currentAndOtherComponentsData","c","baseData","getCompIdStrByPkgNameFromData","pkgName","found","packageName","getFromCurrentDataByPackageName","getFromCurrentDataPolicyByPackageName","mergedPolicy","devDependencies","peerDependencies","conflictedPolicy","hasConflict","lifecycleToDepType","runtime","dev","peer","handleConfigMerge","addVariantPolicyEntryToPolicy","dep","fromCurrentData","force","isHash","semver","satisfies","fromCurrentDataPolicy","depType","lifecycleType","name","currentAndOtherConfig","currentDep","otherDep","baseDep","currentVer","otherVer","baseVer","hasConfigForDep","depName","getDepIdAsPkgName","addSerializedDepToPolicy","lifecycle","join","depData","isEnv","currentId","versionOnOtherLane","Boolean","rawConfig","omit","VariantPolicy","fromConfigObject","entries"],"sources":["config-merger.ts"],"sourcesContent":["import { ComponentID } from '@teambit/component-id';\nimport semver from 'semver';\nimport { Logger } from '@teambit/logger';\nimport { isHash } from '@teambit/component-version';\nimport {\n  DependencyResolverAspect,\n  SerializedDependency,\n  VariantPolicy,\n  VariantPolicyEntry,\n} from '@teambit/dependency-resolver';\nimport { Lane } from '@teambit/legacy/dist/scope/models';\nimport { EnvsAspect } from '@teambit/envs';\nimport { ExtensionDataEntry, ExtensionDataList } from '@teambit/legacy/dist/consumer/config/extension-data';\nimport { compact, omit, uniqBy } from 'lodash';\nimport { ConfigMergeResult } from './config-merge-result';\n\nexport type GenericConfigOrRemoved = Record<string, any> | '-';\n\ntype EnvData = { id: string; version?: string; config?: GenericConfigOrRemoved };\n\ntype SerializedDependencyWithPolicy = SerializedDependency & { policy?: string; packageName?: string };\n\nexport const conflictIndicator = 'CONFLICT::';\n\nexport type MergeStrategyResult = {\n  id: string;\n  mergedConfig?: GenericConfigOrRemoved;\n  conflict?: Record<string, any>;\n};\ntype MergeStrategyParamsWithRemoved = {\n  id: string;\n  currentConfig: GenericConfigOrRemoved;\n  otherConfig: GenericConfigOrRemoved;\n  baseConfig?: GenericConfigOrRemoved;\n};\ntype MergeStrategyParams = {\n  id: string;\n  currentExt: ExtensionDataEntry;\n  otherExt: ExtensionDataEntry;\n  baseExt?: ExtensionDataEntry;\n};\n\n/**\n * perform 3-way merge of component configuration (aspects).\n * normally this is needed when merging one lane into another. the component may have different aspects config in each lane.\n * the baseAspects are the aspects of the component in the diversion point (the common ancestor of the two lanes).\n * the currentAspects are the aspects of the component in the current lane.\n * the otherAspects are the aspects of the component in the other lane. this is the lane we merge into the current lane.\n *\n * the basic merging strategy is a simple comparison between the aspect-configs, if they're different, we have a conflict.\n * we have two special cases:\n *\n * 1. dependency-resolver: we do a deeper check for the policy, we compare each dependency separately. also, we take\n * into account not only the config, but also the data. this is needed because some dependencies are automatically\n * added by Bit (from the import statements in the code) and they're not in the config. the final config has the deps\n * from both sources, the config and the data. The way we know to differentiate between them is by the \"force\" prop.\n * the config has always force: true.\n *\n * 2. envs: if we don't treat it specially, the user will need to make the change not only in the envs aspect, but also\n * in the deps-resolver (because the env is added as a devDependency) and also in the aspect itself (because\n * teambit.envs/env has only the id and not the version). to make it simpler, we ignore the envs in the deps-resolver\n * we ignore the individual aspect that is the env itself. we only show teambit.envs/env and we put the env id and\n * version. later, when the component is loaded, we split the id and the version and put them in the correct places.\n * see workspace.componentExtension / adjustEnvsOnConfigMerge for more details.\n */\nexport class ConfigMerger {\n  private currentEnv: EnvData;\n  private otherEnv: EnvData;\n  private baseEnv?: EnvData;\n  private handledExtIds: string[] = [];\n  private otherLaneIdsStr: string[];\n  constructor(\n    private compIdStr: string,\n    private workspaceIds: ComponentID[],\n    otherLane: Lane | undefined,\n    private currentAspects: ExtensionDataList,\n    private baseAspects: ExtensionDataList,\n    private otherAspects: ExtensionDataList,\n    private currentLabel: string,\n    private otherLabel: string,\n    private logger: Logger\n  ) {\n    this.otherLaneIdsStr = otherLane?.toBitIds().map((id) => id.toString()) || [];\n  }\n\n  merge(): ConfigMergeResult {\n    this.logger.debug(`\\n************** start config-merger for ${this.compIdStr} **************`);\n    this.populateEnvs();\n    const results = this.currentAspects.map((currentExt) => {\n      const id = currentExt.stringId;\n      if (this.handledExtIds.includes(id)) return null;\n      this.handledExtIds.push(id);\n      const baseExt = this.baseAspects.findExtension(id, true);\n      const otherExt = this.otherAspects.findExtension(id, true);\n      if (otherExt) {\n        // try to 3-way-merge\n        return this.mergePerStrategy({ id, currentExt, otherExt, baseExt });\n      }\n      // exist in current but not in other\n      if (baseExt) {\n        // was removed on other\n        return { id, conflict: { currentConfig: this.getConfig(currentExt), otherConfig: '-' } };\n      }\n      // exist in current but not in other and base, so it got created on current. nothing to do.\n      return null;\n    });\n    const otherAspectsNotHandledResults = this.otherAspects.map((otherExt) => {\n      let id = otherExt.stringId;\n      if (this.handledExtIds.includes(id)) return null;\n      this.handledExtIds.push(id);\n      if (otherExt.extensionId && otherExt.extensionId.hasVersion()) {\n        // avoid using the id from the other lane if it exits in the workspace. prefer the id from the workspace.\n        const idFromWorkspace = this.getIdFromWorkspace(otherExt.extensionId.toStringWithoutVersion());\n        if (idFromWorkspace) {\n          const existingExt = this.currentAspects.findExtension(otherExt.extensionId.toStringWithoutVersion(), true);\n          if (existingExt) return null; // the aspect is set currently, no need to add it again.\n          id = idFromWorkspace._legacy.toString();\n        }\n      }\n      const baseExt = this.baseAspects.findExtension(id, true);\n      if (baseExt) {\n        // was removed on current\n        return { id, conflict: { currentConfig: '-', otherConfig: this.getConfig(otherExt) } };\n      }\n      // exist in other but not in current and base, so it got created on other.\n      return { id, mergedConfig: this.getConfig(otherExt) };\n    });\n    const envResult = [this.envStrategy()] || [];\n    this.logger.debug(`*** end config-merger for ${this.compIdStr} ***\\n`);\n    return new ConfigMergeResult(\n      this.compIdStr,\n      this.currentLabel,\n      this.otherLabel,\n      compact([...results, ...otherAspectsNotHandledResults, ...envResult])\n    );\n  }\n\n  private populateEnvs() {\n    // populate ids\n    const getEnvId = (ext: ExtensionDataList) => {\n      const envsAspect = ext.findCoreExtension(EnvsAspect.id);\n      if (!envsAspect) throw new Error(`unable to find ${EnvsAspect.id} aspect for ${this.compIdStr}`);\n      const env = envsAspect.config.env || envsAspect.data.id;\n      if (!env)\n        throw new Error(`unable to find env for ${this.compIdStr}, the config and data of ${EnvsAspect.id} are empty}`);\n      return env;\n    };\n    const currentEnv = getEnvId(this.currentAspects);\n    this.currentEnv = { id: currentEnv };\n    const otherEnv = getEnvId(this.otherAspects);\n    this.otherEnv = { id: otherEnv };\n    const baseEnv = this.baseAspects ? getEnvId(this.baseAspects) : undefined;\n    if (baseEnv) this.baseEnv = { id: baseEnv };\n\n    // populate version\n    const currentEnvAspect = this.currentAspects.findExtension(currentEnv, true);\n    if (currentEnvAspect) {\n      this.handledExtIds.push(currentEnvAspect.stringId);\n      this.currentEnv.version = currentEnvAspect.extensionId?.version;\n      this.currentEnv.config = this.getConfig(currentEnvAspect);\n    }\n    const otherEnvAspect = this.otherAspects.findExtension(otherEnv, true);\n    if (otherEnvAspect) {\n      this.handledExtIds.push(otherEnvAspect.stringId);\n      this.otherEnv.version = otherEnvAspect.extensionId?.version;\n      this.otherEnv.config = this.getConfig(otherEnvAspect);\n    }\n    if (this.baseEnv) {\n      const baseEnvAspect = this.baseAspects.findExtension(baseEnv, true);\n      if (baseEnvAspect) {\n        this.baseEnv.version = baseEnvAspect.extensionId?.version;\n        this.baseEnv.config = this.getConfig(baseEnvAspect);\n      }\n    }\n  }\n\n  private envStrategy(): MergeStrategyResult | null {\n    const mergeStrategyParams: MergeStrategyParamsWithRemoved = {\n      id: EnvsAspect.id,\n      currentConfig: {\n        env: this.currentEnv.version ? `${this.currentEnv.id}@${this.currentEnv.version}` : this.currentEnv.id,\n      },\n      otherConfig: { env: this.otherEnv.version ? `${this.otherEnv.id}@${this.otherEnv.version}` : this.otherEnv.id },\n    };\n    if (this.baseEnv) {\n      mergeStrategyParams.baseConfig = {\n        env: this.baseEnv?.version ? `${this.baseEnv.id}@${this.baseEnv.version}` : this.baseEnv?.id,\n      };\n    }\n    if (this.currentEnv.id === this.otherEnv.id && this.currentEnv.version === this.otherEnv.version) {\n      return null;\n    }\n    if (this.isIdInWorkspaceOrOtherLane(this.currentEnv.id, this.otherEnv.version)) {\n      // the env currently used is part of the workspace, that's what the user needs. don't try to resolve anything.\n      return null;\n    }\n    return this.basicConfigMerge(mergeStrategyParams);\n  }\n\n  private areConfigsEqual(configA: GenericConfigOrRemoved, configB: GenericConfigOrRemoved) {\n    return JSON.stringify(configA) === JSON.stringify(configB);\n  }\n\n  private mergePerStrategy(mergeStrategyParams: MergeStrategyParams): MergeStrategyResult | null {\n    const { id, currentExt, otherExt, baseExt } = mergeStrategyParams;\n    const depResolverResult = this.depResolverStrategy(mergeStrategyParams);\n\n    if (depResolverResult) {\n      // if (depResolverResult.mergedConfig || depResolverResult?.conflict) console.log(\"\\n\\nDepResolverResult\", this.compIdStr, '\\n', JSON.stringify(depResolverResult, undefined, 2))\n      return depResolverResult;\n    }\n    const currentConfig = this.getConfig(currentExt);\n    const otherConfig = this.getConfig(otherExt);\n    const baseConfig = baseExt ? this.getConfig(baseExt) : undefined;\n\n    return this.basicConfigMerge({ id, currentConfig, otherConfig, baseConfig });\n  }\n\n  private basicConfigMerge(mergeStrategyParams: MergeStrategyParamsWithRemoved) {\n    const { id, currentConfig, otherConfig, baseConfig } = mergeStrategyParams;\n    if (this.areConfigsEqual(currentConfig, otherConfig)) {\n      return null;\n    }\n    if (baseConfig && this.areConfigsEqual(baseConfig, otherConfig)) {\n      // was changed on current\n      return null;\n    }\n    if (baseConfig && this.areConfigsEqual(baseConfig, currentConfig)) {\n      // was changed on other\n      return { id, mergedConfig: otherConfig };\n    }\n    // either no baseConfig, or baseConfig is also different from both: other and local. that's a conflict.\n    return { id, conflict: { currentConfig, otherConfig, baseConfig } };\n  }\n\n  private depResolverStrategy(params: MergeStrategyParams): MergeStrategyResult | undefined {\n    if (params.id !== DependencyResolverAspect.id) return undefined;\n    this.logger.trace(`start depResolverStrategy for ${this.compIdStr}`);\n    const { currentExt, otherExt, baseExt } = params;\n\n    const currentConfig = this.getConfig(currentExt);\n    const currentPolicy = this.getPolicy(currentConfig);\n    const otherConfig = this.getConfig(otherExt);\n    const otherPolicy = this.getPolicy(otherConfig);\n\n    const baseConfig = baseExt ? this.getConfig(baseExt) : undefined;\n    const basePolicy = baseConfig ? this.getPolicy(baseConfig) : undefined;\n\n    const getAllDeps = (ext: ExtensionDataList): SerializedDependencyWithPolicy[] => {\n      const data = ext.findCoreExtension(DependencyResolverAspect.id)?.data.dependencies;\n      if (!data) return [];\n      const policy = ext.findCoreExtension(DependencyResolverAspect.id)?.data.policy || [];\n      return data.map((d) => {\n        const idWithoutVersion = d.__type === 'package' ? d.id : d.id.split('@')[0];\n        const existingPolicy = policy.find((p) => p.dependencyId === idWithoutVersion);\n        const getPolicyVer = () => {\n          if (d.__type === 'package') return undefined; // for packages, the policy is already the version\n          if (existingPolicy) return existingPolicy.value.version; // currently it's missing, will be implemented by @Gilad\n          return d.version;\n          // if (!semver.valid(d.version)) return d.version; // could be a hash\n          // // default to `^` or ~ if starts with zero, until we save the policy from the workspace during tag/snap.\n          // return d.version.startsWith('0.') ? `~${d.version}` : `^${d.version}`;\n        };\n        return {\n          ...d,\n          id: idWithoutVersion,\n          policy: getPolicyVer(),\n        };\n      });\n    };\n    const getDataPolicy = (ext: ExtensionDataList): VariantPolicyEntry[] => {\n      return ext.findCoreExtension(DependencyResolverAspect.id)?.data.policy || [];\n    };\n\n    const getAutoDeps = (ext: ExtensionDataList): SerializedDependencyWithPolicy[] => {\n      const allDeps = getAllDeps(ext);\n      return allDeps.filter((d) => d.source === 'auto');\n    };\n\n    const currentAutoData = getAutoDeps(this.currentAspects);\n    const currentAllData = getAllDeps(this.currentAspects);\n    const currentDataPolicy = getDataPolicy(this.currentAspects);\n    const otherData = getAutoDeps(this.otherAspects);\n    const currentAndOtherData = uniqBy(currentAutoData.concat(otherData), (d) => d.id);\n    const currentAndOtherComponentsData = currentAndOtherData.filter((c) => c.__type === 'component');\n    const baseData = getAutoDeps(this.baseAspects);\n\n    const getCompIdStrByPkgNameFromData = (pkgName: string): string | undefined => {\n      const found = currentAndOtherComponentsData.find((d) => d.packageName === pkgName);\n      return found?.id;\n    };\n\n    const getFromCurrentDataByPackageName = (pkgName: string) => {\n      return currentAllData.find((d) => {\n        if (d.__type === 'package') return d.id === pkgName;\n        return d.packageName === pkgName;\n      });\n    };\n\n    const getFromCurrentDataPolicyByPackageName = (pkgName: string) => {\n      return currentDataPolicy.find((d) => d.dependencyId === pkgName);\n    };\n\n    const mergedPolicy = {\n      dependencies: [],\n      devDependencies: [],\n      peerDependencies: [],\n    };\n    const conflictedPolicy = {\n      dependencies: [],\n      devDependencies: [],\n      peerDependencies: [],\n    };\n    let hasConflict = false;\n    const lifecycleToDepType = {\n      runtime: 'dependencies',\n      dev: 'devDependencies',\n      peer: 'peerDependencies',\n    };\n    const handleConfigMerge = () => {\n      const addVariantPolicyEntryToPolicy = (dep: VariantPolicyEntry) => {\n        const compIdStr = getCompIdStrByPkgNameFromData(dep.dependencyId);\n        if (compIdStr && this.isIdInWorkspaceOrOtherLane(compIdStr, dep.value.version)) {\n          // no need to add if the id exists in the workspace (regardless the version)\n          return;\n        }\n        const fromCurrentData = getFromCurrentDataByPackageName(dep.dependencyId);\n        if (fromCurrentData && !dep.force) {\n          if (fromCurrentData.version === dep.value.version) return;\n          if (\n            !isHash(fromCurrentData.version) &&\n            !isHash(dep.value.version) &&\n            semver.satisfies(fromCurrentData.version, dep.value.version)\n          ) {\n            return;\n          }\n        }\n        const fromCurrentDataPolicy = getFromCurrentDataPolicyByPackageName(dep.dependencyId);\n        if (fromCurrentDataPolicy && fromCurrentDataPolicy.value.version === dep.value.version) {\n          // that's a bug. if it's in the data.policy, it should be in data.dependencies.\n          return;\n        }\n        const depType = lifecycleToDepType[dep.lifecycleType];\n        mergedPolicy[depType].push({\n          name: dep.dependencyId,\n          version: dep.value.version,\n          force: dep.force,\n        });\n      };\n\n      if (this.areConfigsEqual(currentConfig, otherConfig)) {\n        return;\n      }\n      if (baseConfig && this.areConfigsEqual(baseConfig, otherConfig)) {\n        // was changed on current\n        return;\n      }\n      if (currentConfig === '-' || otherConfig === '-') {\n        throw new Error('not implemented. Is it possible to have it as minus?');\n      }\n      if (baseConfig && this.areConfigsEqual(baseConfig, currentConfig)) {\n        // was changed on other\n        if (otherPolicy.length) {\n          otherPolicy.forEach((dep) => {\n            addVariantPolicyEntryToPolicy(dep);\n          });\n        }\n        return;\n      }\n\n      // either no baseConfig, or baseConfig is also different from both: other and local. that's a conflict.\n      if (!currentConfig.policy && !otherConfig.policy) return;\n      const currentAndOtherConfig = uniqBy(currentPolicy.concat(otherPolicy), (d) => d.dependencyId);\n      currentAndOtherConfig.forEach((dep) => {\n        const depType = lifecycleToDepType[dep.lifecycleType];\n        const currentDep = currentPolicy.find((d) => d.dependencyId === dep.dependencyId);\n        const otherDep = otherPolicy.find((d) => d.dependencyId === dep.dependencyId);\n        const baseDep = basePolicy?.find((d) => d.dependencyId === dep.dependencyId);\n\n        if (!otherDep) {\n          return;\n        }\n        if (!currentDep) {\n          // only on other\n          addVariantPolicyEntryToPolicy(otherDep);\n          return;\n        }\n        const currentVer = currentDep.value.version;\n        const otherVer = otherDep.value.version;\n        if (currentVer === otherVer) {\n          return;\n        }\n        const baseVer = baseDep?.value.version;\n        if (baseVer && baseVer === otherVer) {\n          return;\n        }\n        if (baseVer && baseVer === currentVer) {\n          addVariantPolicyEntryToPolicy(otherDep);\n          return;\n        }\n        const compIdStr = getCompIdStrByPkgNameFromData(dep.dependencyId);\n        if (compIdStr && this.isIdInWorkspaceOrOtherLane(compIdStr, otherVer)) {\n          // no need to add if the id exists in the workspace (regardless the version)\n          return;\n        }\n\n        hasConflict = true;\n        conflictedPolicy[depType].push({\n          name: currentDep.dependencyId,\n          version: `${conflictIndicator}${currentVer}::${otherVer}::`,\n          force: currentDep.force,\n        });\n      });\n    };\n\n    handleConfigMerge();\n\n    const hasConfigForDep = (depType: string, depName: string) => mergedPolicy[depType].find((d) => d.name === depName);\n    const getDepIdAsPkgName = (dep: SerializedDependencyWithPolicy) => {\n      if (dep.__type !== 'component') {\n        return dep.id;\n      }\n      // @ts-ignore\n      return dep.packageName;\n    };\n\n    const addSerializedDepToPolicy = (dep: SerializedDependencyWithPolicy) => {\n      const depType = lifecycleToDepType[dep.lifecycle];\n      if (dep.__type === 'component' && this.isIdInWorkspaceOrOtherLane(dep.id, dep.version)) {\n        return;\n      }\n      if (hasConfigForDep(depType, dep.id)) {\n        return; // there is already config for it.\n      }\n      mergedPolicy[depType].push({\n        name: getDepIdAsPkgName(dep),\n        version: dep.policy || dep.version,\n        force: false,\n      });\n    };\n\n    this.logger.debug(\n      `currentData, ${currentAllData.length}\\n${currentAllData\n        .map((d) => `${d.__type} ${d.id} ${d.version}`)\n        .join('\\n')}`\n    );\n    this.logger.debug(\n      `otherData, ${otherData.length}\\n${otherData.map((d) => `${d.__type} ${d.id} ${d.version}`).join('\\n')}`\n    );\n    this.logger.debug(\n      `baseData, ${baseData.length}\\n${baseData.map((d) => `${d.__type} ${d.id} ${d.version}`).join('\\n')}`\n    );\n\n    // eslint-disable-next-line complexity\n    currentAndOtherData.forEach((depData) => {\n      this.logger.trace(`depData.id, ${depData.id}`);\n      if (this.isEnv(depData.id)) {\n        // ignore the envs\n        return;\n      }\n      const currentDep = currentAllData.find((d) => d.id === depData.id);\n      const otherDep = otherData.find((d) => d.id === depData.id);\n      const baseDep = baseData.find((d) => d.id === depData.id);\n\n      this.logger.trace(`currentDep`, currentDep);\n      this.logger.trace(`otherDep`, otherDep);\n      this.logger.trace(`baseDep`, baseDep);\n      if (!otherDep) {\n        return;\n      }\n      if (!currentDep) {\n        if (baseDep) {\n          // exists in other and base, so it was removed from current\n          return;\n        }\n        // only on other\n        addSerializedDepToPolicy(otherDep);\n        return;\n      }\n\n      if (currentDep.policy && otherDep.policy) {\n        if (semver.satisfies(currentDep.version, otherDep.policy)) {\n          return;\n        }\n        if (semver.satisfies(otherDep.version, currentDep.policy)) {\n          return;\n        }\n      }\n\n      const currentVer = currentDep.policy || currentDep.version;\n      const otherVer = otherDep.policy || otherDep.version;\n      if (currentVer === otherVer) {\n        return;\n      }\n      const baseVer = baseDep?.policy || baseDep?.version;\n      if (baseVer && baseVer === otherVer) {\n        return;\n      }\n      const currentId = currentDep.id;\n      if (currentDep.__type === 'component' && this.isIdInWorkspaceOrOtherLane(currentId, otherDep.version)) {\n        // dependencies that exist in the workspace, should be ignored. they'll be resolved later to the version in the ws.\n        return;\n      }\n      const depType = lifecycleToDepType[currentDep.lifecycle];\n      if (hasConfigForDep(depType, currentDep.id)) {\n        return; // there is already config for it.\n      }\n      if (baseVer && baseVer === currentVer) {\n        addSerializedDepToPolicy(otherDep);\n        return;\n      }\n      hasConflict = true;\n      conflictedPolicy[depType].push({\n        name: getDepIdAsPkgName(currentDep),\n        version: `${conflictIndicator}${currentVer}::${otherVer}::`,\n        force: false,\n      });\n    });\n\n    ['dependencies', 'devDependencies', 'peerDependencies'].forEach((depType) => {\n      if (!mergedPolicy[depType].length) delete mergedPolicy[depType];\n      if (!conflictedPolicy[depType].length) delete conflictedPolicy[depType];\n    });\n\n    const config = Object.keys(mergedPolicy).length ? { policy: mergedPolicy } : undefined;\n    const conflict = hasConflict ? conflictedPolicy : undefined;\n\n    this.logger.debug('final mergedConfig', config);\n    this.logger.debug('final conflict', conflict);\n\n    return { id: params.id, mergedConfig: config, conflict };\n  }\n\n  private isIdInWorkspaceOrOtherLane(id: string, versionOnOtherLane?: string): boolean {\n    return Boolean(this.getIdFromWorkspace(id)) || this.otherLaneIdsStr.includes(`${id}@${versionOnOtherLane}`);\n  }\n\n  private getIdFromWorkspace(id: string): ComponentID | undefined {\n    return this.workspaceIds.find((c) => c.toStringWithoutVersion() === id);\n  }\n\n  private isEnv(id: string) {\n    return id === this.currentEnv.id || id === this.otherEnv.id;\n  }\n\n  private getConfig(ext: ExtensionDataEntry): GenericConfigOrRemoved {\n    if (ext.rawConfig === '-') return ext.rawConfig;\n    return omit(ext.rawConfig, ['__specific']);\n  }\n\n  private getPolicy(config): VariantPolicyEntry[] {\n    if (!config.policy) return [];\n    return VariantPolicy.fromConfigObject(config.policy).entries;\n  }\n}\n"],"mappings":"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"}
+{"version":3,"names":["_semver","data","_interopRequireDefault","require","_componentVersion","_dependencyResolver","_envs","_lodash","_configMergeResult","obj","__esModule","default","ownKeys","object","enumerableOnly","keys","Object","getOwnPropertySymbols","symbols","filter","sym","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","target","i","arguments","length","source","forEach","key","_defineProperty","getOwnPropertyDescriptors","defineProperties","defineProperty","value","_toPropertyKey","configurable","writable","arg","_toPrimitive","String","input","hint","prim","Symbol","toPrimitive","undefined","res","call","TypeError","Number","conflictIndicator","exports","ConfigMerger","constructor","compIdStr","workspaceIds","otherLane","currentAspects","baseAspects","otherAspects","currentLabel","otherLabel","logger","otherLaneIdsStr","toBitIds","map","id","toString","merge","debug","populateEnvs","results","currentExt","stringId","handledExtIds","includes","baseExt","findExtension","otherExt","mergePerStrategy","conflict","currentConfig","getConfig","otherConfig","otherAspectsNotHandledResults","extensionId","hasVersion","idFromWorkspace","getIdFromWorkspace","toStringWithoutVersion","existingExt","_legacy","mergedConfig","envResult","envStrategy","ConfigMergeResult","compact","getEnvId","ext","envsAspect","findCoreExtension","EnvsAspect","Error","env","config","currentEnv","otherEnv","baseEnv","currentEnvAspect","_currentEnvAspect$ext","version","otherEnvAspect","_otherEnvAspect$exten","baseEnvAspect","_baseEnvAspect$extens","mergeStrategyParams","_this$baseEnv","_this$baseEnv2","baseConfig","isIdInWorkspaceOrOtherLane","basicConfigMerge","areConfigsEqual","configA","configB","JSON","stringify","depResolverResult","depResolverStrategy","params","DependencyResolverAspect","trace","currentPolicy","getPolicy","otherPolicy","basePolicy","getAllDeps","_ext$findCoreExtensio","_ext$findCoreExtensio2","dependencies","policy","d","idWithoutVersion","__type","split","existingPolicy","find","p","dependencyId","getPolicyVer","getDataPolicy","_ext$findCoreExtensio3","getAutoDeps","allDeps","currentAutoData","currentAllData","currentDataPolicy","otherData","currentAndOtherData","uniqBy","concat","currentAndOtherComponentsData","c","baseData","getCompIdStrByPkgNameFromData","pkgName","found","packageName","getFromCurrentDataByPackageName","getFromCurrentDataPolicyByPackageName","mergedPolicy","devDependencies","peerDependencies","conflictedPolicy","hasConflict","lifecycleToDepType","runtime","dev","peer","handleConfigMerge","addVariantPolicyEntryToPolicy","dep","fromCurrentData","force","isHash","semver","satisfies","fromCurrentDataPolicy","depType","lifecycleType","name","currentAndOtherConfig","currentDep","otherDep","baseDep","currentVer","otherVer","baseVer","hasConfigForDep","depName","getDepIdAsPkgName","addSerializedDepToPolicy","lifecycle","join","depData","isEnv","currentId","versionOnOtherLane","Boolean","rawConfig","omit","VariantPolicy","fromConfigObject","entries"],"sources":["config-merger.ts"],"sourcesContent":["import { ComponentID } from '@teambit/component-id';\nimport semver from 'semver';\nimport { Logger } from '@teambit/logger';\nimport { isHash } from '@teambit/component-version';\nimport {\n  DependencyResolverAspect,\n  SerializedDependency,\n  VariantPolicy,\n  VariantPolicyEntry,\n} from '@teambit/dependency-resolver';\nimport { Lane } from '@teambit/legacy/dist/scope/models';\nimport { EnvsAspect } from '@teambit/envs';\nimport { ExtensionDataEntry, ExtensionDataList } from '@teambit/legacy/dist/consumer/config/extension-data';\nimport { compact, omit, uniqBy } from 'lodash';\nimport { ConfigMergeResult } from './config-merge-result';\n\nexport type GenericConfigOrRemoved = Record<string, any> | '-';\n\ntype EnvData = { id: string; version?: string; config?: GenericConfigOrRemoved };\n\ntype SerializedDependencyWithPolicy = SerializedDependency & { policy?: string; packageName?: string };\n\nexport const conflictIndicator = 'CONFLICT::';\n\nexport type MergeStrategyResult = {\n  id: string;\n  mergedConfig?: GenericConfigOrRemoved;\n  conflict?: Record<string, any>;\n};\ntype MergeStrategyParamsWithRemoved = {\n  id: string;\n  currentConfig: GenericConfigOrRemoved;\n  otherConfig: GenericConfigOrRemoved;\n  baseConfig?: GenericConfigOrRemoved;\n};\ntype MergeStrategyParams = {\n  id: string;\n  currentExt: ExtensionDataEntry;\n  otherExt: ExtensionDataEntry;\n  baseExt?: ExtensionDataEntry;\n};\n\n/**\n * perform 3-way merge of component configuration (aspects).\n * normally this is needed when merging one lane into another. the component may have different aspects config in each lane.\n * the baseAspects are the aspects of the component in the diversion point (the common ancestor of the two lanes).\n * the currentAspects are the aspects of the component in the current lane.\n * the otherAspects are the aspects of the component in the other lane. this is the lane we merge into the current lane.\n *\n * the basic merging strategy is a simple comparison between the aspect-configs, if they're different, we have a conflict.\n * we have two special cases:\n *\n * 1. dependency-resolver: we do a deeper check for the policy, we compare each dependency separately. also, we take\n * into account not only the config, but also the data. this is needed because some dependencies are automatically\n * added by Bit (from the import statements in the code) and they're not in the config. the final config has the deps\n * from both sources, the config and the data. The way we know to differentiate between them is by the \"force\" prop.\n * the config has always force: true.\n *\n * 2. envs: if we don't treat it specially, the user will need to make the change not only in the envs aspect, but also\n * in the deps-resolver (because the env is added as a devDependency) and also in the aspect itself (because\n * teambit.envs/env has only the id and not the version). to make it simpler, we ignore the envs in the deps-resolver\n * we ignore the individual aspect that is the env itself. we only show teambit.envs/env and we put the env id and\n * version. later, when the component is loaded, we split the id and the version and put them in the correct places.\n * see workspace.componentExtension / adjustEnvsOnConfigMerge for more details.\n */\nexport class ConfigMerger {\n  private currentEnv: EnvData;\n  private otherEnv: EnvData;\n  private baseEnv?: EnvData;\n  private handledExtIds: string[] = [];\n  private otherLaneIdsStr: string[];\n  constructor(\n    private compIdStr: string,\n    private workspaceIds: ComponentID[],\n    otherLane: Lane | undefined,\n    private currentAspects: ExtensionDataList,\n    private baseAspects: ExtensionDataList,\n    private otherAspects: ExtensionDataList,\n    private currentLabel: string,\n    private otherLabel: string,\n    private logger: Logger\n  ) {\n    this.otherLaneIdsStr = otherLane?.toBitIds().map((id) => id.toString()) || [];\n  }\n\n  merge(): ConfigMergeResult {\n    this.logger.debug(`\\n************** start config-merger for ${this.compIdStr} **************`);\n    this.populateEnvs();\n    const results = this.currentAspects.map((currentExt) => {\n      const id = currentExt.stringId;\n      if (this.handledExtIds.includes(id)) return null;\n      this.handledExtIds.push(id);\n      const baseExt = this.baseAspects.findExtension(id, true);\n      const otherExt = this.otherAspects.findExtension(id, true);\n      if (otherExt) {\n        // try to 3-way-merge\n        return this.mergePerStrategy({ id, currentExt, otherExt, baseExt });\n      }\n      // exist in current but not in other\n      if (baseExt) {\n        // was removed on other\n        return { id, conflict: { currentConfig: this.getConfig(currentExt), otherConfig: '-' } };\n      }\n      // exist in current but not in other and base, so it got created on current. nothing to do.\n      return null;\n    });\n    const otherAspectsNotHandledResults = this.otherAspects.map((otherExt) => {\n      let id = otherExt.stringId;\n      if (this.handledExtIds.includes(id)) return null;\n      this.handledExtIds.push(id);\n      if (otherExt.extensionId && otherExt.extensionId.hasVersion()) {\n        // avoid using the id from the other lane if it exits in the workspace. prefer the id from the workspace.\n        const idFromWorkspace = this.getIdFromWorkspace(otherExt.extensionId.toStringWithoutVersion());\n        if (idFromWorkspace) {\n          const existingExt = this.currentAspects.findExtension(otherExt.extensionId.toStringWithoutVersion(), true);\n          if (existingExt) return null; // the aspect is set currently, no need to add it again.\n          id = idFromWorkspace._legacy.toString();\n        }\n      }\n      const baseExt = this.baseAspects.findExtension(id, true);\n      if (baseExt) {\n        // was removed on current\n        return { id, conflict: { currentConfig: '-', otherConfig: this.getConfig(otherExt) } };\n      }\n      // exist in other but not in current and base, so it got created on other.\n      return { id, mergedConfig: this.getConfig(otherExt) };\n    });\n    const envResult = [this.envStrategy()] || [];\n    this.logger.debug(`*** end config-merger for ${this.compIdStr} ***\\n`);\n    return new ConfigMergeResult(\n      this.compIdStr,\n      this.currentLabel,\n      this.otherLabel,\n      compact([...results, ...otherAspectsNotHandledResults, ...envResult])\n    );\n  }\n\n  private populateEnvs() {\n    // populate ids\n    const getEnvId = (ext: ExtensionDataList) => {\n      const envsAspect = ext.findCoreExtension(EnvsAspect.id);\n      if (!envsAspect) throw new Error(`unable to find ${EnvsAspect.id} aspect for ${this.compIdStr}`);\n      const env = envsAspect.config.env || envsAspect.data.id;\n      if (!env)\n        throw new Error(`unable to find env for ${this.compIdStr}, the config and data of ${EnvsAspect.id} are empty}`);\n      return env;\n    };\n    const currentEnv = getEnvId(this.currentAspects);\n    this.currentEnv = { id: currentEnv };\n    const otherEnv = getEnvId(this.otherAspects);\n    this.otherEnv = { id: otherEnv };\n    const baseEnv = this.baseAspects ? getEnvId(this.baseAspects) : undefined;\n    if (baseEnv) this.baseEnv = { id: baseEnv };\n\n    // populate version\n    const currentEnvAspect = this.currentAspects.findExtension(currentEnv, true);\n    if (currentEnvAspect) {\n      this.handledExtIds.push(currentEnvAspect.stringId);\n      this.currentEnv.version = currentEnvAspect.extensionId?.version;\n      this.currentEnv.config = this.getConfig(currentEnvAspect);\n    }\n    const otherEnvAspect = this.otherAspects.findExtension(otherEnv, true);\n    if (otherEnvAspect) {\n      this.handledExtIds.push(otherEnvAspect.stringId);\n      this.otherEnv.version = otherEnvAspect.extensionId?.version;\n      this.otherEnv.config = this.getConfig(otherEnvAspect);\n    }\n    if (this.baseEnv) {\n      const baseEnvAspect = this.baseAspects.findExtension(baseEnv, true);\n      if (baseEnvAspect) {\n        this.baseEnv.version = baseEnvAspect.extensionId?.version;\n        this.baseEnv.config = this.getConfig(baseEnvAspect);\n      }\n    }\n  }\n\n  private envStrategy(): MergeStrategyResult | null {\n    const mergeStrategyParams: MergeStrategyParamsWithRemoved = {\n      id: EnvsAspect.id,\n      currentConfig: {\n        env: this.currentEnv.version ? `${this.currentEnv.id}@${this.currentEnv.version}` : this.currentEnv.id,\n      },\n      otherConfig: { env: this.otherEnv.version ? `${this.otherEnv.id}@${this.otherEnv.version}` : this.otherEnv.id },\n    };\n    if (this.baseEnv) {\n      mergeStrategyParams.baseConfig = {\n        env: this.baseEnv?.version ? `${this.baseEnv.id}@${this.baseEnv.version}` : this.baseEnv?.id,\n      };\n    }\n    if (this.currentEnv.id === this.otherEnv.id && this.currentEnv.version === this.otherEnv.version) {\n      return null;\n    }\n    if (this.isIdInWorkspaceOrOtherLane(this.currentEnv.id, this.otherEnv.version)) {\n      // the env currently used is part of the workspace, that's what the user needs. don't try to resolve anything.\n      return null;\n    }\n    return this.basicConfigMerge(mergeStrategyParams);\n  }\n\n  private areConfigsEqual(configA: GenericConfigOrRemoved, configB: GenericConfigOrRemoved) {\n    return JSON.stringify(configA) === JSON.stringify(configB);\n  }\n\n  private mergePerStrategy(mergeStrategyParams: MergeStrategyParams): MergeStrategyResult | null {\n    const { id, currentExt, otherExt, baseExt } = mergeStrategyParams;\n    const depResolverResult = this.depResolverStrategy(mergeStrategyParams);\n\n    if (depResolverResult) {\n      // if (depResolverResult.mergedConfig || depResolverResult?.conflict) console.log(\"\\n\\nDepResolverResult\", this.compIdStr, '\\n', JSON.stringify(depResolverResult, undefined, 2))\n      return depResolverResult;\n    }\n    const currentConfig = this.getConfig(currentExt);\n    const otherConfig = this.getConfig(otherExt);\n    const baseConfig = baseExt ? this.getConfig(baseExt) : undefined;\n\n    return this.basicConfigMerge({ id, currentConfig, otherConfig, baseConfig });\n  }\n\n  private basicConfigMerge(mergeStrategyParams: MergeStrategyParamsWithRemoved) {\n    const { id, currentConfig, otherConfig, baseConfig } = mergeStrategyParams;\n    if (this.areConfigsEqual(currentConfig, otherConfig)) {\n      return null;\n    }\n    if (baseConfig && this.areConfigsEqual(baseConfig, otherConfig)) {\n      // was changed on current\n      return null;\n    }\n    if (baseConfig && this.areConfigsEqual(baseConfig, currentConfig)) {\n      // was changed on other\n      return { id, mergedConfig: otherConfig };\n    }\n    // either no baseConfig, or baseConfig is also different from both: other and local. that's a conflict.\n    return { id, conflict: { currentConfig, otherConfig, baseConfig } };\n  }\n\n  private depResolverStrategy(params: MergeStrategyParams): MergeStrategyResult | undefined {\n    if (params.id !== DependencyResolverAspect.id) return undefined;\n    this.logger.trace(`start depResolverStrategy for ${this.compIdStr}`);\n    const { currentExt, otherExt, baseExt } = params;\n\n    const currentConfig = this.getConfig(currentExt);\n    const currentPolicy = this.getPolicy(currentConfig);\n    const otherConfig = this.getConfig(otherExt);\n    const otherPolicy = this.getPolicy(otherConfig);\n\n    const baseConfig = baseExt ? this.getConfig(baseExt) : undefined;\n    const basePolicy = baseConfig ? this.getPolicy(baseConfig) : undefined;\n\n    const getAllDeps = (ext: ExtensionDataList): SerializedDependencyWithPolicy[] => {\n      const data = ext.findCoreExtension(DependencyResolverAspect.id)?.data.dependencies;\n      if (!data) return [];\n      const policy = ext.findCoreExtension(DependencyResolverAspect.id)?.data.policy || [];\n      return data.map((d) => {\n        const idWithoutVersion = d.__type === 'package' ? d.id : d.id.split('@')[0];\n        const existingPolicy = policy.find((p) => p.dependencyId === idWithoutVersion);\n        const getPolicyVer = () => {\n          if (d.__type === 'package') return undefined; // for packages, the policy is already the version\n          if (existingPolicy) return existingPolicy.value.version; // currently it's missing, will be implemented by @Gilad\n          return d.version;\n          // if (!semver.valid(d.version)) return d.version; // could be a hash\n          // // default to `^` or ~ if starts with zero, until we save the policy from the workspace during tag/snap.\n          // return d.version.startsWith('0.') ? `~${d.version}` : `^${d.version}`;\n        };\n        return {\n          ...d,\n          id: idWithoutVersion,\n          policy: getPolicyVer(),\n        };\n      });\n    };\n    const getDataPolicy = (ext: ExtensionDataList): VariantPolicyEntry[] => {\n      return ext.findCoreExtension(DependencyResolverAspect.id)?.data.policy || [];\n    };\n\n    const getAutoDeps = (ext: ExtensionDataList): SerializedDependencyWithPolicy[] => {\n      const allDeps = getAllDeps(ext);\n      return allDeps.filter((d) => d.source === 'auto');\n    };\n\n    const currentAutoData = getAutoDeps(this.currentAspects);\n    const currentAllData = getAllDeps(this.currentAspects);\n    const currentDataPolicy = getDataPolicy(this.currentAspects);\n    const otherData = getAutoDeps(this.otherAspects);\n    const currentAndOtherData = uniqBy(currentAutoData.concat(otherData), (d) => d.id);\n    const currentAndOtherComponentsData = currentAndOtherData.filter((c) => c.__type === 'component');\n    const baseData = getAutoDeps(this.baseAspects);\n\n    const getCompIdStrByPkgNameFromData = (pkgName: string): string | undefined => {\n      const found = currentAndOtherComponentsData.find((d) => d.packageName === pkgName);\n      return found?.id;\n    };\n\n    const getFromCurrentDataByPackageName = (pkgName: string) => {\n      return currentAllData.find((d) => {\n        if (d.__type === 'package') return d.id === pkgName;\n        return d.packageName === pkgName;\n      });\n    };\n\n    const getFromCurrentDataPolicyByPackageName = (pkgName: string) => {\n      return currentDataPolicy.find((d) => d.dependencyId === pkgName);\n    };\n\n    const mergedPolicy = {\n      dependencies: [],\n      devDependencies: [],\n      peerDependencies: [],\n    };\n    const conflictedPolicy = {\n      dependencies: [],\n      devDependencies: [],\n      peerDependencies: [],\n    };\n    let hasConflict = false;\n    const lifecycleToDepType = {\n      runtime: 'dependencies',\n      dev: 'devDependencies',\n      peer: 'peerDependencies',\n    };\n    const handleConfigMerge = () => {\n      const addVariantPolicyEntryToPolicy = (dep: VariantPolicyEntry) => {\n        const compIdStr = getCompIdStrByPkgNameFromData(dep.dependencyId);\n        if (compIdStr && this.isIdInWorkspaceOrOtherLane(compIdStr, dep.value.version)) {\n          // no need to add if the id exists in the workspace (regardless the version)\n          return;\n        }\n        const fromCurrentData = getFromCurrentDataByPackageName(dep.dependencyId);\n        if (fromCurrentData && !dep.force) {\n          if (fromCurrentData.version === dep.value.version) return;\n          if (\n            !isHash(fromCurrentData.version) &&\n            !isHash(dep.value.version) &&\n            semver.satisfies(fromCurrentData.version, dep.value.version)\n          ) {\n            return;\n          }\n        }\n        const fromCurrentDataPolicy = getFromCurrentDataPolicyByPackageName(dep.dependencyId);\n        if (fromCurrentDataPolicy && fromCurrentDataPolicy.value.version === dep.value.version) {\n          // that's a bug. if it's in the data.policy, it should be in data.dependencies.\n          return;\n        }\n        const depType = lifecycleToDepType[dep.lifecycleType];\n        mergedPolicy[depType].push({\n          name: dep.dependencyId,\n          version: dep.value.version,\n          force: dep.force,\n        });\n      };\n\n      if (this.areConfigsEqual(currentConfig, otherConfig)) {\n        return;\n      }\n      if (baseConfig && this.areConfigsEqual(baseConfig, otherConfig)) {\n        // was changed on current\n        return;\n      }\n      if (currentConfig === '-' || otherConfig === '-') {\n        throw new Error('not implemented. Is it possible to have it as minus?');\n      }\n      if (baseConfig && this.areConfigsEqual(baseConfig, currentConfig)) {\n        // was changed on other\n        if (otherPolicy.length) {\n          otherPolicy.forEach((dep) => {\n            addVariantPolicyEntryToPolicy(dep);\n          });\n        }\n        return;\n      }\n\n      // either no baseConfig, or baseConfig is also different from both: other and local. that's a conflict.\n      if (!currentConfig.policy && !otherConfig.policy) return;\n      const currentAndOtherConfig = uniqBy(currentPolicy.concat(otherPolicy), (d) => d.dependencyId);\n      currentAndOtherConfig.forEach((dep) => {\n        const depType = lifecycleToDepType[dep.lifecycleType];\n        const currentDep = currentPolicy.find((d) => d.dependencyId === dep.dependencyId);\n        const otherDep = otherPolicy.find((d) => d.dependencyId === dep.dependencyId);\n        const baseDep = basePolicy?.find((d) => d.dependencyId === dep.dependencyId);\n\n        if (!otherDep) {\n          return;\n        }\n        if (!currentDep) {\n          // only on other\n          addVariantPolicyEntryToPolicy(otherDep);\n          return;\n        }\n        const currentVer = currentDep.value.version;\n        const otherVer = otherDep.value.version;\n        if (currentVer === otherVer) {\n          return;\n        }\n        const baseVer = baseDep?.value.version;\n        if (baseVer && baseVer === otherVer) {\n          return;\n        }\n        if (baseVer && baseVer === currentVer) {\n          addVariantPolicyEntryToPolicy(otherDep);\n          return;\n        }\n        const compIdStr = getCompIdStrByPkgNameFromData(dep.dependencyId);\n        if (compIdStr && this.isIdInWorkspaceOrOtherLane(compIdStr, otherVer)) {\n          // no need to add if the id exists in the workspace (regardless the version)\n          return;\n        }\n\n        hasConflict = true;\n        conflictedPolicy[depType].push({\n          name: currentDep.dependencyId,\n          version: `${conflictIndicator}${currentVer}::${otherVer}::`,\n          force: currentDep.force,\n        });\n      });\n    };\n\n    handleConfigMerge();\n\n    const hasConfigForDep = (depType: string, depName: string) => mergedPolicy[depType].find((d) => d.name === depName);\n    const getDepIdAsPkgName = (dep: SerializedDependencyWithPolicy) => {\n      if (dep.__type !== 'component') {\n        return dep.id;\n      }\n      // @ts-ignore\n      return dep.packageName;\n    };\n\n    const addSerializedDepToPolicy = (dep: SerializedDependencyWithPolicy) => {\n      const depType = lifecycleToDepType[dep.lifecycle];\n      if (dep.__type === 'component' && this.isIdInWorkspaceOrOtherLane(dep.id, dep.version)) {\n        return;\n      }\n      if (hasConfigForDep(depType, dep.id)) {\n        return; // there is already config for it.\n      }\n      mergedPolicy[depType].push({\n        name: getDepIdAsPkgName(dep),\n        version: dep.policy || dep.version,\n        force: false,\n      });\n    };\n\n    this.logger.debug(\n      `currentData, ${currentAllData.length}\\n${currentAllData\n        .map((d) => `${d.__type} ${d.id} ${d.version}`)\n        .join('\\n')}`\n    );\n    this.logger.debug(\n      `otherData, ${otherData.length}\\n${otherData.map((d) => `${d.__type} ${d.id} ${d.version}`).join('\\n')}`\n    );\n    this.logger.debug(\n      `baseData, ${baseData.length}\\n${baseData.map((d) => `${d.__type} ${d.id} ${d.version}`).join('\\n')}`\n    );\n\n    // eslint-disable-next-line complexity\n    currentAndOtherData.forEach((depData) => {\n      this.logger.trace(`depData.id, ${depData.id}`);\n      if (this.isEnv(depData.id)) {\n        // ignore the envs\n        return;\n      }\n      const currentDep = currentAllData.find((d) => d.id === depData.id);\n      const otherDep = otherData.find((d) => d.id === depData.id);\n      const baseDep = baseData.find((d) => d.id === depData.id);\n\n      this.logger.trace(`currentDep`, currentDep);\n      this.logger.trace(`otherDep`, otherDep);\n      this.logger.trace(`baseDep`, baseDep);\n      if (!otherDep) {\n        return;\n      }\n      if (!currentDep) {\n        if (baseDep) {\n          // exists in other and base, so it was removed from current\n          return;\n        }\n        // only on other\n        addSerializedDepToPolicy(otherDep);\n        return;\n      }\n\n      if (currentDep.policy && otherDep.policy) {\n        if (semver.satisfies(currentDep.version, otherDep.policy)) {\n          return;\n        }\n        if (semver.satisfies(otherDep.version, currentDep.policy)) {\n          return;\n        }\n      }\n\n      const currentVer = currentDep.policy || currentDep.version;\n      const otherVer = otherDep.policy || otherDep.version;\n      if (currentVer === otherVer) {\n        return;\n      }\n      const baseVer = baseDep?.policy || baseDep?.version;\n      if (baseVer && baseVer === otherVer) {\n        return;\n      }\n      const currentId = currentDep.id;\n      if (currentDep.__type === 'component' && this.isIdInWorkspaceOrOtherLane(currentId, otherDep.version)) {\n        // dependencies that exist in the workspace, should be ignored. they'll be resolved later to the version in the ws.\n        return;\n      }\n      const depType = lifecycleToDepType[currentDep.lifecycle];\n      if (hasConfigForDep(depType, currentDep.id)) {\n        return; // there is already config for it.\n      }\n      if (baseVer && baseVer === currentVer) {\n        addSerializedDepToPolicy(otherDep);\n        return;\n      }\n      hasConflict = true;\n      conflictedPolicy[depType].push({\n        name: getDepIdAsPkgName(currentDep),\n        version: `${conflictIndicator}${currentVer}::${otherVer}::`,\n        force: false,\n      });\n    });\n\n    ['dependencies', 'devDependencies', 'peerDependencies'].forEach((depType) => {\n      if (!mergedPolicy[depType].length) delete mergedPolicy[depType];\n      if (!conflictedPolicy[depType].length) delete conflictedPolicy[depType];\n    });\n\n    const config = Object.keys(mergedPolicy).length ? { policy: mergedPolicy } : undefined;\n    const conflict = hasConflict ? conflictedPolicy : undefined;\n\n    this.logger.debug('final mergedConfig', config);\n    this.logger.debug('final conflict', conflict);\n\n    return { id: params.id, mergedConfig: config, conflict };\n  }\n\n  private isIdInWorkspaceOrOtherLane(id: string, versionOnOtherLane?: string): boolean {\n    return Boolean(this.getIdFromWorkspace(id)) || this.otherLaneIdsStr.includes(`${id}@${versionOnOtherLane}`);\n  }\n\n  private getIdFromWorkspace(id: string): ComponentID | undefined {\n    return this.workspaceIds.find((c) => c.toStringWithoutVersion() === id);\n  }\n\n  private isEnv(id: string) {\n    return id === this.currentEnv.id || id === this.otherEnv.id;\n  }\n\n  private getConfig(ext: ExtensionDataEntry): GenericConfigOrRemoved {\n    if (ext.rawConfig === '-') return ext.rawConfig;\n    return omit(ext.rawConfig, ['__specific']);\n  }\n\n  private getPolicy(config): VariantPolicyEntry[] {\n    if (!config.policy) return [];\n    return VariantPolicy.fromConfigObject(config.policy).entries;\n  }\n}\n"],"mappings":"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"}

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import { MergingAspect } from './merging.aspect';
 export { mergeReport, applyVersionReport, conflictSummaryReport, installationErrorOutput, compilationErrorOutput, getRemovedOutput, getAddedOutput, } from './merge-cmd';
-export type { MergingMain, ComponentMergeStatus, ApplyVersionResults } from './merging.main.runtime';
+export type { MergingMain, ComponentMergeStatus, ApplyVersionResults, FailedComponents } from './merging.main.runtime';
 export { ConfigMergeResult } from './config-merge-result';
 export default MergingAspect;
 export { MergingAspect };

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["_merging","data","require","_mergeCmd","_configMergeResult","_default","MergingAspect","exports","default"],"sources":["index.ts"],"sourcesContent":["import { MergingAspect } from './merging.aspect';\n\nexport {\n  mergeReport,\n  applyVersionReport,\n  conflictSummaryReport,\n  installationErrorOutput,\n  compilationErrorOutput,\n  getRemovedOutput,\n  getAddedOutput,\n} from './merge-cmd';\nexport type { MergingMain, ComponentMergeStatus, ApplyVersionResults } from './merging.main.runtime';\nexport { ConfigMergeResult } from './config-merge-result';\nexport default MergingAspect;\nexport { MergingAspect };\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,SAAAA,SAAA;EAAA,MAAAC,IAAA,GAAAC,OAAA;EAAAF,QAAA,YAAAA,CAAA;IAAA,OAAAC,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAEA,SAAAE,UAAA;EAAA,MAAAF,IAAA,GAAAC,OAAA;EAAAC,SAAA,YAAAA,CAAA;IAAA,OAAAF,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAUA,SAAAG,mBAAA;EAAA,MAAAH,IAAA,GAAAC,OAAA;EAAAE,kBAAA,YAAAA,CAAA;IAAA,OAAAH,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAA0D,IAAAI,QAAA,GAC3CC,wBAAa;AAAAC,OAAA,CAAAC,OAAA,GAAAH,QAAA"}
+{"version":3,"names":["_merging","data","require","_mergeCmd","_configMergeResult","_default","MergingAspect","exports","default"],"sources":["index.ts"],"sourcesContent":["import { MergingAspect } from './merging.aspect';\n\nexport {\n  mergeReport,\n  applyVersionReport,\n  conflictSummaryReport,\n  installationErrorOutput,\n  compilationErrorOutput,\n  getRemovedOutput,\n  getAddedOutput,\n} from './merge-cmd';\nexport type { MergingMain, ComponentMergeStatus, ApplyVersionResults, FailedComponents } from './merging.main.runtime';\nexport { ConfigMergeResult } from './config-merge-result';\nexport default MergingAspect;\nexport { MergingAspect };\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,SAAAA,SAAA;EAAA,MAAAC,IAAA,GAAAC,OAAA;EAAAF,QAAA,YAAAA,CAAA;IAAA,OAAAC,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAEA,SAAAE,UAAA;EAAA,MAAAF,IAAA,GAAAC,OAAA;EAAAC,SAAA,YAAAA,CAAA;IAAA,OAAAF,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAUA,SAAAG,mBAAA;EAAA,MAAAH,IAAA,GAAAC,OAAA;EAAAE,kBAAA,YAAAA,CAAA;IAAA,OAAAH,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAA0D,IAAAI,QAAA,GAC3CC,wBAAa;AAAAC,OAAA,CAAAC,OAAA,GAAAH,QAAA"}

package/dist/merge-cmd.js

@@ -1,8 +1,5 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-require("core-js/modules/es.array.iterator.js");
-require("core-js/modules/es.promise.js");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -14,13 +11,6 @@ exports.getAddedOutput = getAddedOutput;
 exports.getRemovedOutput = getRemovedOutput;
 exports.installationErrorOutput = installationErrorOutput;
 exports.mergeReport = mergeReport;
-function _defineProperty2() {
-  const data = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-  _defineProperty2 = function () {
-    return data;
-  };
-  return data;
-}
 function _chalk() {
   const data = _interopRequireDefault(require("chalk"));
   _chalk = function () {
@@ -63,21 +53,25 @@ function _bitError() {
   };
   return data;
 }
+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); }
 class MergeCmd {
   constructor(merging) {
     this.merging = merging;
-    (0, _defineProperty2().default)(this, "name", 'merge [ids...]');
-    (0, _defineProperty2().default)(this, "description", 'merge changes of the remote head into local - auto-snaps all merged components');
-    (0, _defineProperty2().default)(this, "helpUrl", 'reference/components/merging-changes');
-    (0, _defineProperty2().default)(this, "group", 'development');
-    (0, _defineProperty2().default)(this, "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
+    _defineProperty(this, "name", 'merge [ids...]');
+    _defineProperty(this, "description", 'merge changes of the remote head into local - auto-snaps all merged components');
+    _defineProperty(this, "helpUrl", 'reference/components/merging-changes');
+    _defineProperty(this, "group", 'development');
+    _defineProperty(this, "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
 and creates snaps for merged components that have diverged, on the lane.
 if no ids are specified, all pending-merge components will be merged. (run "bit status" to list them).
 optionally use '--abort' to revert the last merge. to revert a lane merge, use "bit lane merge-abort" command.
 ${(0, _constants().WILDCARD_HELP)('merge')}`);
-    (0, _defineProperty2().default)(this, "alias", '');
-    (0, _defineProperty2().default)(this, "options", [['', 'ours', 'DEPRECATED. use --auto-merge-resolve. in case of a conflict, keep the local modification'], ['', 'theirs', 'DEPRECATED. use --auto-merge-resolve. in case of a conflict, override the local modification with the specified version'], ['', 'manual', 'DEPRECATED. use --auto-merge-resolve'], ['', 'auto-merge-resolve <merge-strategy>', 'in case of a conflict, resolve according to the strategy: [ours, theirs, manual]'], ['', 'abort', 'in case of an unresolved merge, revert to pre-merge state'], ['', 'resolve', 'mark an unresolved merge as resolved and create a new snap with the changes'], ['', 'no-snap', 'do not auto snap even if the merge completed without conflicts'], ['', 'build', 'in case of snap during the merge, run the build-pipeline (similar to bit snap --build)'], ['', 'verbose', 'show details of components that were not merged successfully'], ['x', 'skip-dependency-installation', 'do not install new dependencies resulting from the merge'], ['m', 'message <message>', 'override the default message for the auto snap']]);
-    (0, _defineProperty2().default)(this, "loader", true);
+    _defineProperty(this, "alias", '');
+    _defineProperty(this, "options", [['', 'ours', 'DEPRECATED. use --auto-merge-resolve. in case of a conflict, keep the local modification'], ['', 'theirs', 'DEPRECATED. use --auto-merge-resolve. in case of a conflict, override the local modification with the specified version'], ['', 'manual', 'DEPRECATED. use --auto-merge-resolve'], ['', 'auto-merge-resolve <merge-strategy>', 'in case of a conflict, resolve according to the strategy: [ours, theirs, manual]'], ['', 'abort', 'in case of an unresolved merge, revert to pre-merge state'], ['', 'resolve', 'mark an unresolved merge as resolved and create a new snap with the changes'], ['', 'no-snap', 'do not auto snap even if the merge completed without conflicts'], ['', 'build', 'in case of snap during the merge, run the build-pipeline (similar to bit snap --build)'], ['', 'verbose', 'show details of components that were not merged successfully'], ['x', 'skip-dependency-installation', 'do not install new dependencies resulting from the merge'], ['m', 'message <message>', 'override the default message for the auto snap']]);
+    _defineProperty(this, "loader", true);
   }
   async report([ids = []], {
     ours = false,
@@ -205,7 +199,7 @@ ${mergeSnapError.message}
     const body = (0, _lodash().compact)(failedComponents.map(failedComponent => {
       if (!verbose && failedComponent.unchangedLegitimately) return null;
       const color = failedComponent.unchangedLegitimately ? 'white' : 'red';
-      return `${_chalk().default.bold(failedComponent.id.toString())} - ${_chalk().default[color](failedComponent.failureMessage)}`;
+      return `${_chalk().default.bold(failedComponent.id.toString())} - ${_chalk().default[color](failedComponent.unchangedMessage)}`;
     })).join('\n');
     if (!body) {
       return `${_chalk().default.bold(`\nmerge skipped legitimately for ${failedComponents.length} component(s)`)}