@teambit/merging 1.0.108 → 1.0.109

package/artifacts/preview/teambit_component_merging-preview.js

@@ -0,0 +1 @@
+!function(e,o){"object"==typeof exports&&"object"==typeof module?module.exports=o():"function"==typeof define&&define.amd?define([],o):"object"==typeof exports?exports["teambit.component/merging-preview"]=o():e["teambit.component/merging-preview"]=o()}(self,(()=>(()=>{"use strict";var e={d:(o,t)=>{for(var r in t)e.o(t,r)&&!e.o(o,r)&&Object.defineProperty(o,r,{enumerable:!0,get:t[r]})},o:(e,o)=>Object.prototype.hasOwnProperty.call(e,o),r:e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})}},o={};e.r(o),e.d(o,{compositions:()=>t,compositions_metadata:()=>n,overview:()=>r});const t=[],r=[],n={compositions:[]};return o})()));

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@teambit/merging",
-  "version": "1.0.108",
+  "version": "1.0.109",
   "homepage": "https://bit.cloud/teambit/component/merging",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.component",
     "name": "merging",
-    "version": "1.0.108"
+    "version": "1.0.109"
   },
   "dependencies": {
     "lodash": "4.17.21",
@@ -18,20 +18,20 @@
     "@teambit/bit-error": "0.0.404",
     "@teambit/lane-id": "0.0.311",
     "@teambit/harmony": "0.4.6",
-    "@teambit/dependency-resolver": "1.0.108",
-    "@teambit/builder": "1.0.108",
-    "@teambit/envs": "1.0.108",
-    "@teambit/logger": "0.0.933",
-    "@teambit/cli": "0.0.840",
-    "@teambit/global-config": "0.0.842",
-    "@teambit/importer": "1.0.108",
-    "@teambit/workspace": "1.0.108",
-    "@teambit/checkout": "1.0.108",
-    "@teambit/component-writer": "1.0.108",
-    "@teambit/config": "0.0.859",
-    "@teambit/install": "1.0.108",
-    "@teambit/remove": "1.0.108",
-    "@teambit/snapping": "1.0.108"
+    "@teambit/dependency-resolver": "1.0.109",
+    "@teambit/builder": "1.0.109",
+    "@teambit/envs": "1.0.109",
+    "@teambit/logger": "0.0.934",
+    "@teambit/cli": "0.0.841",
+    "@teambit/global-config": "0.0.843",
+    "@teambit/importer": "1.0.109",
+    "@teambit/workspace": "1.0.109",
+    "@teambit/checkout": "1.0.109",
+    "@teambit/component-writer": "1.0.109",
+    "@teambit/config": "0.0.860",
+    "@teambit/install": "1.0.109",
+    "@teambit/remove": "1.0.109",
+    "@teambit/snapping": "1.0.109"
   },
   "devDependencies": {
     "@types/lodash": "4.14.165",
@@ -39,7 +39,7 @@
     "@types/mocha": "9.1.0",
     "@types/jest": "^29.2.2",
     "@types/testing-library__jest-dom": "^5.9.5",
-    "@teambit/harmony.envs.core-aspect-env": "0.0.13"
+    "@teambit/harmony.envs.core-aspect-env": "0.0.14"
   },
   "peerDependencies": {
     "@teambit/legacy": "1.0.624"

package/config-merge-result.ts

@@ -1,126 +0,0 @@
-import { DependencyResolverAspect } from '@teambit/dependency-resolver';
-import { compact } from 'lodash';
-import { MergeStrategyResult, conflictIndicator, GenericConfigOrRemoved } from './config-merger';
-
-const DEP_RESOLVER_VERSION_INDENTATION = 8;
-const CONFLICT_MARKER_INDENTATION = 7;
-
-export class ConfigMergeResult {
-  constructor(
-    readonly compIdStr: string,
-    private currentLabel: string,
-    private otherLabel: string,
-    private results: MergeStrategyResult[]
-  ) {}
-  hasConflicts(): boolean {
-    return this.results.some((result) => result.conflict);
-  }
-  generateMergeConflictFile(): string | null {
-    const resultsWithConflict = this.results.filter((result) => result.conflict);
-    if (!resultsWithConflict.length) return null;
-    const allConflicts = compact(resultsWithConflict.map((result) => this.generateConflictStringPerAspect(result)));
-    const configMergeFormatted = allConflicts.map((c) => this.formatConflict(c));
-    const conflictStr = `{
-${this.concatenateConflicts(configMergeFormatted)}
-}`;
-    return conflictStr;
-  }
-  getSuccessfullyMergedConfig(): Record<string, any> {
-    const resultsWithMergedConfig = this.results.filter((result) => result.mergedConfig);
-    return resultsWithMergedConfig.reduce((acc, curr) => {
-      const currObject = { [curr.id]: curr.mergedConfig };
-      return { ...acc, ...currObject };
-    }, {});
-  }
-
-  getDepsResolverResult(): MergeStrategyResult | undefined {
-    return this.results.find((result) => result.id === DependencyResolverAspect.id);
-  }
-
-  private generateConflictStringPerAspect(result: MergeStrategyResult): string | undefined {
-    if (!result.conflict) return undefined;
-    if (result.id === DependencyResolverAspect.id) {
-      return this.depsResolverConfigGenerator(result.conflict);
-    }
-    return this.basicConflictGenerator(result.id, result.conflict);
-  }
-
-  private depsResolverConfigGenerator(conflict: Record<string, any>): string {
-    const mergedConfigSplit = JSON.stringify({ policy: conflict }, undefined, 2).split('\n');
-    const conflictLines = mergedConfigSplit.map((line) => {
-      if (!line.includes(conflictIndicator)) return line;
-      const [, currentVal, otherVal] = line.split('::');
-      return `${'<'.repeat(CONFLICT_MARKER_INDENTATION)} ${this.currentLabel}
-${' '.repeat(DEP_RESOLVER_VERSION_INDENTATION)}"version": "${currentVal}",
-=======
-${' '.repeat(DEP_RESOLVER_VERSION_INDENTATION)}"version": "${otherVal}",
-${'>'.repeat(CONFLICT_MARKER_INDENTATION)} ${this.otherLabel}`;
-    });
-    // replace the first line with line with the id
-    conflictLines.shift();
-    conflictLines.unshift(`"${DependencyResolverAspect.id}": {`);
-    return conflictLines.join('\n');
-  }
-
-  private basicConflictGenerator(id: string, conflictObj: Record<string, any>): string {
-    const { currentConfig, otherConfig } = conflictObj;
-    let conflict: string;
-    if (currentConfig === '-') {
-      conflict = `${'<'.repeat(CONFLICT_MARKER_INDENTATION)} ${this.currentLabel}
-"${id}": "-"
-=======
-"${id}": ${JSON.stringify(otherConfig, undefined, 2)}
-${'>'.repeat(CONFLICT_MARKER_INDENTATION)} ${this.otherLabel}`;
-    } else if (otherConfig === '-') {
-      conflict = `${'<'.repeat(CONFLICT_MARKER_INDENTATION)} ${this.currentLabel}
-"${id}": ${JSON.stringify(currentConfig, undefined, 2)}
-=======
-"${id}": "-"
-${'>'.repeat(CONFLICT_MARKER_INDENTATION)} ${this.otherLabel}`;
-    } else {
-      const formatConfig = (conf: GenericConfigOrRemoved) => {
-        const confStr = JSON.stringify(conf, undefined, 2);
-        const confStrSplit = confStr.split('\n');
-        confStrSplit.shift(); // remove first {
-        confStrSplit.pop(); // remove last }
-        return confStrSplit.join('\n');
-      };
-      conflict = `"${id}": {
-${'<'.repeat(CONFLICT_MARKER_INDENTATION)} ${this.currentLabel}
-${formatConfig(currentConfig)}
-=======
-${formatConfig(otherConfig)}
-${'>'.repeat(CONFLICT_MARKER_INDENTATION)} ${this.otherLabel}
-}`;
-    }
-
-    return conflict;
-  }
-
-  private formatConflict(conflict: string) {
-    return (
-      conflict
-        .split('\n')
-        // add 2 spaces before each line
-        .map((line) => `  ${line}`)
-        // remove the white spaces before the conflict indicators
-        .map((line) => line.replace(/ *(<<<<<<<|>>>>>>>|=======)/g, '$1'))
-        .join('\n')
-    );
-  }
-
-  private concatenateConflicts(conflicts: string[]) {
-    const conflictsWithComma = conflicts.map((conflict, index) => {
-      if (index === conflicts.length - 1) return conflict; // last element in the array, no need to add a comma
-      if (conflict.endsWith('}')) return `${conflict},`; // ends normally with a closing brace, add a comma.
-      // if it doesn't end with a closing brace, it means it ends with a conflict indicator.
-      // the comma should be added after the last line with a closing brace.
-      const conflictSplit = conflict.split('\n');
-      // find the last line with '}' and add a comma after it
-      const lastLineWithClosingBrace = conflictSplit.lastIndexOf('  }');
-      conflictSplit[lastLineWithClosingBrace] += ',';
-      return conflictSplit.join('\n');
-    });
-    return conflictsWithComma.join('\n');
-  }
-}