@teambit/merging 0.0.126 → 0.0.129

package/dist/merge-cmd.d.ts

@@ -11,7 +11,7 @@ export declare class MergeCmd implements Command {
     options: CommandOptions;
     loader: boolean;
     constructor(merging: MergingMain);
-    report([values]: [string[]], { ours, theirs, manual, abort, resolve, build, noSnap, message, }: {
+    report([values]: [string[]], { ours, theirs, manual, abort, resolve, build, noSnap, verbose, message, skipDependencyInstallation, }: {
         ours?: boolean;
         theirs?: boolean;
         manual?: boolean;
@@ -19,7 +19,9 @@ export declare class MergeCmd implements Command {
         resolve?: boolean;
         build?: boolean;
         noSnap?: boolean;
+        verbose?: boolean;
         message: string;
+        skipDependencyInstallation?: boolean;
     }): Promise<string>;
 }
-export declare function mergeReport({ components, failedComponents, version, mergeSnapResults, leftUnresolvedConflicts, }: ApplyVersionResults): string;
+export declare function mergeReport({ components, failedComponents, version, mergeSnapResults, leftUnresolvedConflicts, verbose, }: ApplyVersionResults): string;

package/dist/merge-cmd.js

@@ -32,6 +32,16 @@ function _chalk() {
   return data;
 }
 
+function _lodash() {
+  const data = require("lodash");
+
+  _lodash = function () {
+    return data;
+  };
+
+  return data;
+}
+
 function _constants() {
   const data = require("@teambit/legacy/dist/constants");
 
@@ -83,7 +93,7 @@ class MergeCmd {
   \`bit merge [ids...]\` => EXPERIMENTAL. merge changes of the remote head into local, optionally use '--abort' or '--resolve'
   ${(0, _constants().WILDCARD_HELP)('merge 0.0.1')}`);
     (0, _defineProperty2().default)(this, "alias", '');
-    (0, _defineProperty2().default)(this, "options", [['', 'ours', 'in case of a conflict, override the used version with the current modification'], ['', 'theirs', 'in case of a conflict, override the current modification with the specified version'], ['', 'manual', 'in case of a conflict, leave the files with a conflict state to resolve them manually later'], ['', 'abort', 'EXPERIMENTAL. in case of an unresolved merge, revert to the state before the merge began'], ['', 'resolve', 'EXPERIMENTAL. mark an unresolved merge as resolved and create a new snap with the changes'], ['', 'no-snap', 'EXPERIMENTAL. do not auto snap in case the merge completed without conflicts'], ['', 'build', 'in case of snap during the merge, run the build-pipeline (similar to bit snap --build)'], ['m', 'message <message>', 'EXPERIMENTAL. override the default message for the auto snap']]);
+    (0, _defineProperty2().default)(this, "options", [['', 'ours', 'in case of a conflict, override the used version with the current modification'], ['', 'theirs', 'in case of a conflict, override the current modification with the specified version'], ['', 'manual', 'in case of a conflict, leave the files with a conflict state to resolve them manually later'], ['', 'abort', 'EXPERIMENTAL. in case of an unresolved merge, revert to the state before the merge began'], ['', 'resolve', 'EXPERIMENTAL. mark an unresolved merge as resolved and create a new snap with the changes'], ['', 'no-snap', 'EXPERIMENTAL. do not auto snap in case 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 legitimately'], ['', 'skip-dependency-installation', 'do not install packages of the imported components'], ['m', 'message <message>', 'EXPERIMENTAL. override the default message for the auto snap']]);
     (0, _defineProperty2().default)(this, "loader", true);
   }
 
@@ -95,7 +105,9 @@ class MergeCmd {
     resolve = false,
     build = false,
     noSnap = false,
-    message
+    verbose = false,
+    message,
+    skipDependencyInstallation = false
   }) {
     build = (0, _featureToggle().isFeatureEnabled)(_featureToggle().BUILD_ON_CI) ? Boolean(build) : true;
     const mergeStrategy = (0, _mergeVersion().getMergeStrategy)(ours, theirs, manual);
@@ -108,7 +120,7 @@ class MergeCmd {
       resolvedComponents,
       abortedComponents,
       mergeSnapResults
-    } = await this.merging.merge(values, mergeStrategy, abort, resolve, noSnap, message, build);
+    } = await this.merging.merge(values, mergeStrategy, abort, resolve, noSnap, message, build, skipDependencyInstallation);
 
     if (resolvedComponents) {
       const title = 'successfully resolved component(s)\n';
@@ -126,7 +138,8 @@ class MergeCmd {
       components,
       failedComponents,
       version,
-      mergeSnapResults
+      mergeSnapResults,
+      verbose
     });
   }
 
@@ -139,7 +152,8 @@ function mergeReport({
   failedComponents,
   version,
   mergeSnapResults,
-  leftUnresolvedConflicts
+  leftUnresolvedConflicts,
+  verbose
 }) {
   const getSuccessOutput = () => {
     if (!components || !components.length) return ''; // @ts-ignore version is set in case of merge command
@@ -151,7 +165,7 @@ function mergeReport({
 
   const getConflictSummary = () => {
     if (!components || !components.length || !leftUnresolvedConflicts) return '';
-    const title = `files with conflicts summary\n`;
+    const title = `\nfiles with conflicts summary\n`;
     const suggestion = `\n\nthe merge process wasn't completed due to the conflicts above. fix them manually and then run "bit install".
 once ready, snap/tag the components to complete the merge.`;
     return _chalk().default.underline(title) + (0, _mergeVersion().conflictSummaryReport)(components) + _chalk().default.yellow(suggestion);
@@ -184,10 +198,11 @@ once ready, snap/tag the components to complete the merge.`;
   const getFailureOutput = () => {
     if (!failedComponents || !failedComponents.length) return '';
     const title = '\nthe merge has been canceled on the following component(s)';
-    const body = failedComponents.map(failedComponent => {
+    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)}`;
-    }).join('\n');
+    })).join('\n');
     return `\n${_chalk().default.underline(title)}\n${body}\n\n`;
   };
 

package/dist/merge-cmd.js.map

@@ -1 +1 @@
-{"version":3,"names":["MergeCmd","constructor","merging","WILDCARD_HELP","report","values","ours","theirs","manual","abort","resolve","build","noSnap","message","isFeatureEnabled","BUILD_ON_CI","Boolean","mergeStrategy","getMergeStrategy","BitError","components","failedComponents","version","resolvedComponents","abortedComponents","mergeSnapResults","merge","title","componentsStr","map","c","id","toStringWithoutVersion","join","chalk","underline","green","mergeReport","leftUnresolvedConflicts","getSuccessOutput","length","bold","applyVersionReport","getConflictSummary","suggestion","conflictSummaryReport","yellow","getSnapsOutput","snappedComponents","autoSnappedResults","outputComponents","comps","component","componentOutput","toString","autoTag","filter","result","triggeredBy","searchWithoutScopeAndVersion","autoTagComp","a","AUTO_SNAPPED_MSG","getFailureOutput","body","failedComponent","color","unchangedLegitimately","failureMessage"],"sources":["merge-cmd.ts"],"sourcesContent":["import chalk from 'chalk';\nimport { Command, CommandOptions } from '@teambit/cli';\nimport { WILDCARD_HELP, AUTO_SNAPPED_MSG } from '@teambit/legacy/dist/constants';\nimport {\n  ApplyVersionResults,\n  conflictSummaryReport,\n  getMergeStrategy,\n  applyVersionReport,\n} from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport { isFeatureEnabled, BUILD_ON_CI } from '@teambit/legacy/dist/api/consumer/lib/feature-toggle';\nimport { BitError } from '@teambit/bit-error';\nimport { MergingMain } from './merging.main.runtime';\n\nexport class MergeCmd implements Command {\n  name = 'merge [values...]';\n  description = 'merge changes of different component versions';\n  group = 'development';\n  extendedDescription = `merge changes of different component versions\n  \\`bit merge <version> [ids...]\\` => merge changes of the given version into the checked out version\n  \\`bit merge [ids...]\\` => EXPERIMENTAL. merge changes of the remote head into local, optionally use '--abort' or '--resolve'\n  ${WILDCARD_HELP('merge 0.0.1')}`;\n  alias = '';\n  options = [\n    ['', 'ours', 'in case of a conflict, override the used version with the current modification'],\n    ['', 'theirs', 'in case of a conflict, override the current modification with the specified version'],\n    ['', 'manual', 'in case of a conflict, leave the files with a conflict state to resolve them manually later'],\n    ['', 'abort', 'EXPERIMENTAL. in case of an unresolved merge, revert to the state before the merge began'],\n    ['', 'resolve', 'EXPERIMENTAL. mark an unresolved merge as resolved and create a new snap with the changes'],\n    ['', 'no-snap', 'EXPERIMENTAL. do not auto snap in case the merge completed without conflicts'],\n    ['', 'build', 'in case of snap during the merge, run the build-pipeline (similar to bit snap --build)'],\n    ['m', 'message <message>', 'EXPERIMENTAL. override the default message for the auto snap'],\n  ] as CommandOptions;\n  loader = true;\n\n  constructor(private merging: MergingMain) {}\n\n  async report(\n    [values = []]: [string[]],\n    {\n      ours = false,\n      theirs = false,\n      manual = false,\n      abort = false,\n      resolve = false,\n      build = false,\n      noSnap = false,\n      message,\n    }: {\n      ours?: boolean;\n      theirs?: boolean;\n      manual?: boolean;\n      abort?: boolean;\n      resolve?: boolean;\n      build?: boolean;\n      noSnap?: boolean;\n      message: string;\n    }\n  ) {\n    build = isFeatureEnabled(BUILD_ON_CI) ? Boolean(build) : true;\n    const mergeStrategy = getMergeStrategy(ours, theirs, manual);\n    if (abort && resolve) throw new BitError('unable to use \"abort\" and \"resolve\" flags together');\n    if (noSnap && message) throw new BitError('unable to use \"noSnap\" and \"message\" flags together');\n    const {\n      components,\n      failedComponents,\n      version,\n      resolvedComponents,\n      abortedComponents,\n      mergeSnapResults,\n    }: ApplyVersionResults = await this.merging.merge(\n      values,\n      mergeStrategy as any,\n      abort,\n      resolve,\n      noSnap,\n      message,\n      build\n    );\n    if (resolvedComponents) {\n      const title = 'successfully resolved component(s)\\n';\n      const componentsStr = resolvedComponents.map((c) => c.id.toStringWithoutVersion()).join('\\n');\n      return chalk.underline(title) + chalk.green(componentsStr);\n    }\n    if (abortedComponents) {\n      const title = 'successfully aborted the merge of the following component(s)\\n';\n      const componentsStr = abortedComponents.map((c) => c.id.toStringWithoutVersion()).join('\\n');\n      return chalk.underline(title) + chalk.green(componentsStr);\n    }\n\n    return mergeReport({\n      components,\n      failedComponents,\n      version,\n      mergeSnapResults,\n    });\n  }\n}\n\nexport function mergeReport({\n  components,\n  failedComponents,\n  version,\n  mergeSnapResults,\n  leftUnresolvedConflicts,\n}: ApplyVersionResults): string {\n  const getSuccessOutput = () => {\n    if (!components || !components.length) return '';\n    // @ts-ignore version is set in case of merge command\n    const title = `successfully merged components${version ? `from version ${chalk.bold(version)}` : ''}\\n`;\n    // @ts-ignore components is set in case of merge command\n    return chalk.underline(title) + chalk.green(applyVersionReport(components));\n  };\n\n  const getConflictSummary = () => {\n    if (!components || !components.length || !leftUnresolvedConflicts) return '';\n    const title = `files with conflicts summary\\n`;\n    const suggestion = `\\n\\nthe merge process wasn't completed due to the conflicts above. fix them manually and then run \"bit install\".\nonce ready, snap/tag the components to complete the merge.`;\n    return chalk.underline(title) + conflictSummaryReport(components) + chalk.yellow(suggestion);\n  };\n\n  const getSnapsOutput = () => {\n    if (!mergeSnapResults || !mergeSnapResults.snappedComponents) return '';\n    const { snappedComponents, autoSnappedResults } = mergeSnapResults;\n    const outputComponents = (comps) => {\n      return comps\n        .map((component) => {\n          let componentOutput = `     > ${component.id.toString()}`;\n          const autoTag = autoSnappedResults.filter((result) =>\n            result.triggeredBy.searchWithoutScopeAndVersion(component.id)\n          );\n          if (autoTag.length) {\n            const autoTagComp = autoTag.map((a) => a.component.id.toString());\n            componentOutput += `\\n       ${AUTO_SNAPPED_MSG}: ${autoTagComp.join(', ')}`;\n          }\n          return componentOutput;\n        })\n        .join('\\n');\n    };\n\n    return `\\n${chalk.underline(\n      'merge-snapped components'\n    )}\\n(${'components that snapped as a result of the merge'})\\n${outputComponents(snappedComponents)}\\n`;\n  };\n\n  const getFailureOutput = () => {\n    if (!failedComponents || !failedComponents.length) return '';\n    const title = '\\nthe merge has been canceled on the following component(s)';\n    const body = failedComponents\n      .map((failedComponent) => {\n        const color = failedComponent.unchangedLegitimately ? 'white' : 'red';\n        return `${chalk.bold(failedComponent.id.toString())} - ${chalk[color](failedComponent.failureMessage)}`;\n      })\n      .join('\\n');\n    return `\\n${chalk.underline(title)}\\n${body}\\n\\n`;\n  };\n\n  return getSuccessOutput() + getFailureOutput() + getSnapsOutput() + getConflictSummary();\n}\n"],"mappings":"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"}
+{"version":3,"names":["MergeCmd","constructor","merging","WILDCARD_HELP","report","values","ours","theirs","manual","abort","resolve","build","noSnap","verbose","message","skipDependencyInstallation","isFeatureEnabled","BUILD_ON_CI","Boolean","mergeStrategy","getMergeStrategy","BitError","components","failedComponents","version","resolvedComponents","abortedComponents","mergeSnapResults","merge","title","componentsStr","map","c","id","toStringWithoutVersion","join","chalk","underline","green","mergeReport","leftUnresolvedConflicts","getSuccessOutput","length","bold","applyVersionReport","getConflictSummary","suggestion","conflictSummaryReport","yellow","getSnapsOutput","snappedComponents","autoSnappedResults","outputComponents","comps","component","componentOutput","toString","autoTag","filter","result","triggeredBy","searchWithoutScopeAndVersion","autoTagComp","a","AUTO_SNAPPED_MSG","getFailureOutput","body","compact","failedComponent","unchangedLegitimately","color","failureMessage"],"sources":["merge-cmd.ts"],"sourcesContent":["import chalk from 'chalk';\nimport { Command, CommandOptions } from '@teambit/cli';\nimport { compact } from 'lodash';\nimport { WILDCARD_HELP, AUTO_SNAPPED_MSG } from '@teambit/legacy/dist/constants';\nimport {\n  ApplyVersionResults,\n  conflictSummaryReport,\n  getMergeStrategy,\n  applyVersionReport,\n} from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport { isFeatureEnabled, BUILD_ON_CI } from '@teambit/legacy/dist/api/consumer/lib/feature-toggle';\nimport { BitError } from '@teambit/bit-error';\nimport { MergingMain } from './merging.main.runtime';\n\nexport class MergeCmd implements Command {\n  name = 'merge [values...]';\n  description = 'merge changes of different component versions';\n  group = 'development';\n  extendedDescription = `merge changes of different component versions\n  \\`bit merge <version> [ids...]\\` => merge changes of the given version into the checked out version\n  \\`bit merge [ids...]\\` => EXPERIMENTAL. merge changes of the remote head into local, optionally use '--abort' or '--resolve'\n  ${WILDCARD_HELP('merge 0.0.1')}`;\n  alias = '';\n  options = [\n    ['', 'ours', 'in case of a conflict, override the used version with the current modification'],\n    ['', 'theirs', 'in case of a conflict, override the current modification with the specified version'],\n    ['', 'manual', 'in case of a conflict, leave the files with a conflict state to resolve them manually later'],\n    ['', 'abort', 'EXPERIMENTAL. in case of an unresolved merge, revert to the state before the merge began'],\n    ['', 'resolve', 'EXPERIMENTAL. mark an unresolved merge as resolved and create a new snap with the changes'],\n    ['', 'no-snap', 'EXPERIMENTAL. do not auto snap in case the merge completed without conflicts'],\n    ['', 'build', 'in case of snap during the merge, run the build-pipeline (similar to bit snap --build)'],\n    ['', 'verbose', 'show details of components that were not merged legitimately'],\n    ['', 'skip-dependency-installation', 'do not install packages of the imported components'],\n    ['m', 'message <message>', 'EXPERIMENTAL. override the default message for the auto snap'],\n  ] as CommandOptions;\n  loader = true;\n\n  constructor(private merging: MergingMain) {}\n\n  async report(\n    [values = []]: [string[]],\n    {\n      ours = false,\n      theirs = false,\n      manual = false,\n      abort = false,\n      resolve = false,\n      build = false,\n      noSnap = false,\n      verbose = false,\n      message,\n      skipDependencyInstallation = false,\n    }: {\n      ours?: boolean;\n      theirs?: boolean;\n      manual?: boolean;\n      abort?: boolean;\n      resolve?: boolean;\n      build?: boolean;\n      noSnap?: boolean;\n      verbose?: boolean;\n      message: string;\n      skipDependencyInstallation?: boolean;\n    }\n  ) {\n    build = isFeatureEnabled(BUILD_ON_CI) ? Boolean(build) : true;\n    const mergeStrategy = getMergeStrategy(ours, theirs, manual);\n    if (abort && resolve) throw new BitError('unable to use \"abort\" and \"resolve\" flags together');\n    if (noSnap && message) throw new BitError('unable to use \"noSnap\" and \"message\" flags together');\n    const {\n      components,\n      failedComponents,\n      version,\n      resolvedComponents,\n      abortedComponents,\n      mergeSnapResults,\n    }: ApplyVersionResults = await this.merging.merge(\n      values,\n      mergeStrategy as any,\n      abort,\n      resolve,\n      noSnap,\n      message,\n      build,\n      skipDependencyInstallation\n    );\n    if (resolvedComponents) {\n      const title = 'successfully resolved component(s)\\n';\n      const componentsStr = resolvedComponents.map((c) => c.id.toStringWithoutVersion()).join('\\n');\n      return chalk.underline(title) + chalk.green(componentsStr);\n    }\n    if (abortedComponents) {\n      const title = 'successfully aborted the merge of the following component(s)\\n';\n      const componentsStr = abortedComponents.map((c) => c.id.toStringWithoutVersion()).join('\\n');\n      return chalk.underline(title) + chalk.green(componentsStr);\n    }\n\n    return mergeReport({\n      components,\n      failedComponents,\n      version,\n      mergeSnapResults,\n      verbose,\n    });\n  }\n}\n\nexport function mergeReport({\n  components,\n  failedComponents,\n  version,\n  mergeSnapResults,\n  leftUnresolvedConflicts,\n  verbose,\n}: ApplyVersionResults): string {\n  const getSuccessOutput = () => {\n    if (!components || !components.length) return '';\n    // @ts-ignore version is set in case of merge command\n    const title = `successfully merged components${version ? `from version ${chalk.bold(version)}` : ''}\\n`;\n    // @ts-ignore components is set in case of merge command\n    return chalk.underline(title) + chalk.green(applyVersionReport(components));\n  };\n\n  const getConflictSummary = () => {\n    if (!components || !components.length || !leftUnresolvedConflicts) return '';\n    const title = `\\nfiles with conflicts summary\\n`;\n    const suggestion = `\\n\\nthe merge process wasn't completed due to the conflicts above. fix them manually and then run \"bit install\".\nonce ready, snap/tag the components to complete the merge.`;\n    return chalk.underline(title) + conflictSummaryReport(components) + chalk.yellow(suggestion);\n  };\n\n  const getSnapsOutput = () => {\n    if (!mergeSnapResults || !mergeSnapResults.snappedComponents) return '';\n    const { snappedComponents, autoSnappedResults } = mergeSnapResults;\n    const outputComponents = (comps) => {\n      return comps\n        .map((component) => {\n          let componentOutput = `     > ${component.id.toString()}`;\n          const autoTag = autoSnappedResults.filter((result) =>\n            result.triggeredBy.searchWithoutScopeAndVersion(component.id)\n          );\n          if (autoTag.length) {\n            const autoTagComp = autoTag.map((a) => a.component.id.toString());\n            componentOutput += `\\n       ${AUTO_SNAPPED_MSG}: ${autoTagComp.join(', ')}`;\n          }\n          return componentOutput;\n        })\n        .join('\\n');\n    };\n\n    return `\\n${chalk.underline(\n      'merge-snapped components'\n    )}\\n(${'components that snapped as a result of the merge'})\\n${outputComponents(snappedComponents)}\\n`;\n  };\n\n  const getFailureOutput = () => {\n    if (!failedComponents || !failedComponents.length) return '';\n    const title = '\\nthe merge has been canceled on the following component(s)';\n    const body = compact(\n      failedComponents.map((failedComponent) => {\n        if (!verbose && failedComponent.unchangedLegitimately) return null;\n        const color = failedComponent.unchangedLegitimately ? 'white' : 'red';\n        return `${chalk.bold(failedComponent.id.toString())} - ${chalk[color](failedComponent.failureMessage)}`;\n      })\n    ).join('\\n');\n    return `\\n${chalk.underline(title)}\\n${body}\\n\\n`;\n  };\n\n  return getSuccessOutput() + getFailureOutput() + getSnapsOutput() + getConflictSummary();\n}\n"],"mappings":"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"}

package/dist/merging.main.runtime.d.ts

@@ -28,16 +28,16 @@ export declare class MergingMain {
      * if the first param is a version, then merge the component ids to that version.
      * otherwise, merge from the remote head to the local.
      */
-    merge(values: string[], mergeStrategy: MergeStrategy, abort: boolean, resolve: boolean, noSnap: boolean, message: string, build: boolean): Promise<ApplyVersionResults>;
+    merge(values: string[], mergeStrategy: MergeStrategy, abort: boolean, resolve: boolean, noSnap: boolean, message: string, build: boolean, skipDependencyInstallation: boolean): Promise<ApplyVersionResults>;
     /**
      * when user is on main, it merges the remote main components into local.
      * when user is on a lane, it merges the remote lane components into the local lane.
      */
-    mergeComponentsFromRemote(consumer: Consumer, bitIds: BitId[], mergeStrategy: MergeStrategy, noSnap: boolean, snapMessage: string, build: boolean): Promise<ApplyVersionResults>;
+    mergeComponentsFromRemote(consumer: Consumer, bitIds: BitId[], mergeStrategy: MergeStrategy, noSnap: boolean, snapMessage: string, build: boolean, skipDependencyInstallation: boolean): Promise<ApplyVersionResults>;
     /**
      * merge multiple components according to the "allComponentsStatus".
      */
-    mergeSnaps({ mergeStrategy, allComponentsStatus, remoteName, laneId, localLane, noSnap, snapMessage, build, }: {
+    mergeSnaps({ mergeStrategy, allComponentsStatus, remoteName, laneId, localLane, noSnap, snapMessage, build, skipDependencyInstallation, }: {
         mergeStrategy: MergeStrategy;
         allComponentsStatus: ComponentMergeStatus[];
         remoteName: string | null;
@@ -46,6 +46,7 @@ export declare class MergingMain {
         noSnap: boolean;
         snapMessage: string;
         build: boolean;
+        skipDependencyInstallation?: boolean;
     }): Promise<ApplyVersionResults>;
     /**
      * this function gets called from two different commands:

package/dist/merging.main.runtime.js

@@ -101,16 +101,6 @@ function _hasWildcard() {
   return data;
 }
 
-function _fsExtra() {
-  const data = _interopRequireDefault(require("fs-extra"));
-
-  _fsExtra = function () {
-    return data;
-  };
-
-  return data;
-}
-
 function _pMapSeries() {
   const data = _interopRequireDefault(require("p-map-series"));
 
@@ -121,16 +111,6 @@ function _pMapSeries() {
   return data;
 }
 
-function _path() {
-  const data = _interopRequireDefault(require("path"));
-
-  _path = function () {
-    return data;
-  };
-
-  return data;
-}
-
 function _bitId() {
   const data = require("@teambit/legacy/dist/bit-id");
 
@@ -141,16 +121,6 @@ function _bitId() {
   return data;
 }
 
-function _constants() {
-  const data = require("@teambit/legacy/dist/constants");
-
-  _constants = function () {
-    return data;
-  };
-
-  return data;
-}
-
 function _bitError() {
   const data = require("@teambit/bit-error");
 
@@ -315,7 +285,7 @@ class MergingMain {
    */
 
 
-  async merge(values, mergeStrategy, abort, resolve, noSnap, message, build) {
+  async merge(values, mergeStrategy, abort, resolve, noSnap, message, build, skipDependencyInstallation) {
     if (!this.workspace) throw new (_exceptions().ConsumerNotFound)();
     const consumer = this.workspace.consumer;
     let mergeResults;
@@ -329,7 +299,7 @@ class MergingMain {
     } else if (!_bitId().BitId.isValidVersion(firstValue)) {
       const bitIds = this.getComponentsToMerge(consumer, values); // @todo: version could be the lane only or remote/lane
 
-      mergeResults = await this.mergeComponentsFromRemote(consumer, bitIds, mergeStrategy, noSnap, message, build);
+      mergeResults = await this.mergeComponentsFromRemote(consumer, bitIds, mergeStrategy, noSnap, message, build, skipDependencyInstallation);
     } else {
       const version = firstValue;
 
@@ -348,7 +318,7 @@ class MergingMain {
    */
 
 
-  async mergeComponentsFromRemote(consumer, bitIds, mergeStrategy, noSnap, snapMessage, build) {
+  async mergeComponentsFromRemote(consumer, bitIds, mergeStrategy, noSnap, snapMessage, build, skipDependencyInstallation) {
     const currentLaneId = consumer.getCurrentLaneId();
     const currentLaneObject = await consumer.getCurrentLaneObject();
     const allComponentsStatus = await this.getAllComponentsStatus(bitIds, currentLaneId, currentLaneObject);
@@ -367,7 +337,8 @@ class MergingMain {
       localLane: currentLaneObject,
       noSnap,
       snapMessage,
-      build
+      build,
+      skipDependencyInstallation
     });
   }
   /**
@@ -383,7 +354,8 @@ class MergingMain {
     localLane,
     noSnap,
     snapMessage,
-    build
+    build,
+    skipDependencyInstallation
   }) {
     const consumer = this.workspace.consumer;
     const componentWithConflict = allComponentsStatus.find(component => component.mergeResults && component.mergeResults.hasConflicts);
@@ -419,6 +391,15 @@ class MergingMain {
       });
     });
     const leftUnresolvedConflicts = componentWithConflict && mergeStrategy === 'manual';
+
+    if (!skipDependencyInstallation && !leftUnresolvedConflicts) {
+      await this.workspace.install(undefined, {
+        dedupe: true,
+        updateExisting: false,
+        import: false
+      });
+    }
+
     if (localLane) consumer.scope.objects.add(localLane);
     await consumer.scope.objects.persist(); // persist anyway, if localLane is null it should save all main heads
 
@@ -480,10 +461,30 @@ class MergingMain {
     const existingBitMapId = consumer.bitMap.getBitIdIfExist(id, {
       ignoreVersion: true
     });
-    const existOnCurrentLane = existingBitMapId && consumer.bitMap.isIdAvailableOnCurrentLane(existingBitMapId);
     const componentOnLane = await modelComponent.loadVersion(version, consumer.scope.objects);
 
-    if (!existingBitMapId || !existOnCurrentLane) {
+    const getCurrentId = () => {
+      if (existingBitMapId) return existingBitMapId;
+
+      if (localLane) {
+        const idOnLane = localLane.getComponent(id);
+        if (!idOnLane) return null;
+        return idOnLane.id.changeVersion(idOnLane.head.toString());
+      } // it's on main
+
+
+      const head = modelComponent.getHeadAsTagIfExist();
+
+      if (head) {
+        return id.changeVersion(head);
+      }
+
+      return null;
+    };
+
+    const currentId = getCurrentId();
+
+    if (!currentId) {
       const divergeData = await (0, _getDivergeData().getDivergeData)(repo, modelComponent, otherLaneHead, null, false);
       return {
         componentFromFS: null,
@@ -492,26 +493,29 @@ class MergingMain {
         mergeResults: null,
         divergeData
       };
-    }
-
-    const currentlyUsedVersion = existingBitMapId.version;
-
-    if (currentlyUsedVersion === version) {
-      // @todo: maybe this check is not needed as we check for diverge later on
-      if (localLane || modelComponent.hasHead()) {
-        return returnUnmerged(`component ${id.toStringWithoutVersion()} is already merged`, true);
-      }
-    }
+    } // const currentlyUsedVersion = existingBitMapId.version;
+    // if (currentlyUsedVersion === version) {
+    //   // @todo: maybe this check is not needed as we check for diverge later on
+    //   if (localLane || modelComponent.hasHead()) {
+    //     return returnUnmerged(`component ${id.toStringWithoutVersion()} is already merged`, true);
+    //   }
+    // }
+
+
+    const getCurrentComponent = () => {
+      if (existingBitMapId) return consumer.loadComponent(existingBitMapId);
+      return consumer.scope.getConsumerComponent(currentId);
+    };
 
-    const component = await consumer.loadComponent(existingBitMapId);
+    const component = await getCurrentComponent();
     const componentModificationStatus = await consumer.getComponentStatusById(component.id);
 
     if (componentModificationStatus.modified) {
       return returnUnmerged(`unable to merge ${id.toStringWithoutVersion()}, the component is modified, please snap/tag it first`);
     }
 
-    const laneHeadIsDifferentThanCheckedOut = localLane && currentlyUsedVersion && ((_modelComponent$laneH = modelComponent.laneHeadLocal) === null || _modelComponent$laneH === void 0 ? void 0 : _modelComponent$laneH.toString()) !== currentlyUsedVersion;
-    const localHead = laneHeadIsDifferentThanCheckedOut ? _objects().Ref.from(currentlyUsedVersion) : null;
+    const laneHeadIsDifferentThanCheckedOut = localLane && (existingBitMapId === null || existingBitMapId === void 0 ? void 0 : existingBitMapId.version) && ((_modelComponent$laneH = modelComponent.laneHeadLocal) === null || _modelComponent$laneH === void 0 ? void 0 : _modelComponent$laneH.toString()) !== (existingBitMapId === null || existingBitMapId === void 0 ? void 0 : existingBitMapId.version);
+    const localHead = laneHeadIsDifferentThanCheckedOut ? _objects().Ref.from(existingBitMapId.version) : null;
 
     if (!otherLaneHead) {
       throw new Error(`merging: unable finding a hash for the version ${version} of ${id.toString()}`);
@@ -548,13 +552,13 @@ class MergingMain {
 
     const baseComponent = await modelComponent.loadVersion(baseSnap.toString(), repo);
     const otherComponent = await modelComponent.loadVersion(otherLaneHead.toString(), repo);
+    const currentLaneName = (localLane === null || localLane === void 0 ? void 0 : localLane.toLaneId().toString()) || 'main';
     const mergeResults = await (0, _threeWayMerge().default)({
       consumer,
       otherComponent,
-      // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!
       otherLabel: `${otherLaneHead.toString()} (${otherLaneName})`,
       currentComponent: component,
-      currentLabel: `${currentlyUsedVersion} (local)`,
+      currentLabel: `${currentId.version} (${currentLaneName})`,
       baseComponent
     });
     return {
@@ -610,30 +614,12 @@ class MergingMain {
     const remoteId = id.changeVersion(remoteHead.toString());
     const idToLoad = !mergeResults || mergeStrategy === _mergeVersion().MergeOptions.theirs ? remoteId : id;
     const componentWithDependencies = await consumer.loadComponentWithDependenciesFromModel(idToLoad);
-    const componentMap = componentFromFS && componentFromFS.componentMap;
-    if (componentFromFS && !componentMap) throw new (_generalError().default)('applyVersion: componentMap was not found');
 
-    if (componentMap && componentMap.origin === _constants().COMPONENT_ORIGINS.AUTHORED && !id.scope) {
+    if (!id.scope) {
       componentWithDependencies.dependencies = [];
       componentWithDependencies.devDependencies = [];
     }
 
-    const shouldWritePackageJson = async () => {
-      if (!componentMap) return true;
-      const rootDir = componentMap && componentMap.rootDir;
-      if (!rootDir) return false;
-
-      const packageJsonPath = _path().default.join(consumer.getPath(), rootDir, 'package.json');
-
-      return _fsExtra().default.pathExists(packageJsonPath);
-    };
-
-    const shouldInstallNpmPackages = () => {
-      if (componentMap && componentMap.origin === _constants().COMPONENT_ORIGINS.AUTHORED) return false;
-      return true;
-    };
-
-    const writePackageJson = await shouldWritePackageJson();
     const files = componentWithDependencies.component.files;
     files.forEach(file => {
       // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!
@@ -655,7 +641,7 @@ class MergingMain {
     const manyComponentsWriter = new (_manyComponentsWriter().default)({
       consumer,
       componentsWithDependencies: [componentWithDependencies],
-      installNpmPackages: shouldInstallNpmPackages(),
+      installNpmPackages: false,
       override: true,
       writeConfig: false,
       // @todo: should write if config exists before, needs to figure out how to do it.
@@ -663,7 +649,7 @@ class MergingMain {
       // @todo: do we need a flag here?
       writeDists: true,
       // @todo: do we need a flag here?
-      writePackageJson
+      writePackageJson: false
     });
     await manyComponentsWriter.writeAll(); // if mergeResults, the head snap is going to be updated on a later phase when snapping with two parents
     // otherwise, update the head of the current lane or main

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

@@ -1 +1 @@
-{"version":3,"names":["MergingMain","constructor","workspace","snapping","consumer","merge","values","mergeStrategy","abort","resolve","noSnap","message","build","ConsumerNotFound","mergeResults","firstValue","R","head","resolveMerge","abortMerge","BitId","isValidVersion","bitIds","getComponentsToMerge","mergeComponentsFromRemote","version","ids","tail","mergeVersion","onDestroy","snapMessage","currentLaneId","getCurrentLaneId","currentLaneObject","getCurrentLaneObject","allComponentsStatus","getAllComponentsStatus","failedComponents","filter","c","unmergedMessage","unmergedLegitimately","length","failureMsgs","map","failedComponent","chalk","bold","id","toString","red","join","BitError","mergeSnaps","remoteName","isDefault","scope","laneId","localLane","componentWithConflict","find","component","hasConflicts","getMergeStrategyInteractive","componentStatus","failureMessage","unchangedLegitimately","succeededComponents","componentsResults","mapSeries","componentFromFS","modelComponent","getModelComponent","applyVersion","remoteHead","getRef","leftUnresolvedConflicts","objects","add","persist","unmergedComponents","write","mergeSnapResults","snapResolvedComponents","components","getComponentMergeStatus","otherLaneName","returnUnmerged","msg","getModelComponentIfExist","unmerged","getEntry","name","resolved","toStringWithoutVersion","repo","otherLaneHead","existingBitMapId","bitMap","getBitIdIfExist","ignoreVersion","existOnCurrentLane","isIdAvailableOnCurrentLane","componentOnLane","loadVersion","divergeData","getDivergeData","componentFromModel","currentlyUsedVersion","hasHead","loadComponent","componentModificationStatus","getComponentStatusById","modified","laneHeadIsDifferentThanCheckedOut","laneHeadLocal","localHead","Ref","from","Error","err","isDiverged","isLocalAhead","isRemoteAhead","baseSnap","commonSnapBeforeDiverge","baseComponent","otherComponent","threeWayMerge","otherLabel","currentComponent","currentLabel","filesStatus","unmergedComponent","remote","lane","MergeOptions","ours","files","forEach","file","pathNormalizeToLinux","relative","FileStatus","unchanged","addEntry","remoteId","changeVersion","idToLoad","theirs","componentWithDependencies","loadComponentWithDependenciesFromModel","componentMap","GeneralError","origin","COMPONENT_ORIGINS","AUTHORED","dependencies","devDependencies","shouldWritePackageJson","rootDir","packageJsonPath","path","getPath","fs","pathExists","shouldInstallNpmPackages","writePackageJson","updated","modifiedStatus","modifiedFiles","applyModifiedVersion","shouldDependenciesSaveAsComponents","shouldDependenciesSavedAsComponents","dependenciesSavedAsComponents","saveDependenciesAsComponents","manyComponentsWriter","ManyComponentsWriter","componentsWithDependencies","installNpmPackages","override","writeConfig","verbose","writeDists","writeAll","manual","unmergedPaths","f","conflict","filePath","addComponent","setHead","markVersionAsLocal","getIdsForUnresolved","results","checkoutVersion","reset","removeComponent","abortedComponents","snappedComponents","snap","legacyBitIds","BitIds","fromArray","resolvedComponents","localLaneObject","tmp","Tmp","componentsStatus","Promise","all","bitId","remoteScopeName","remoteLaneId","LaneId","remoteLanes","laneIdStr","clear","getResolvedComponents","logger","debug","r","idsStr","getParsedId","entry","unresolvedComponents","getComponents","u","hasWildcard","componentsList","ComponentsList","listComponentsByIdsWithWildcard","provider","cli","merging","register","MergeCmd","CLIAspect","WorkspaceAspect","SnappingAspect","MainRuntime","MergingAspect","addRuntime"],"sources":["merging.main.runtime.ts"],"sourcesContent":["import { CLIAspect, CLIMain, MainRuntime } from '@teambit/cli';\nimport WorkspaceAspect, { Workspace } from '@teambit/workspace';\nimport R from 'ramda';\nimport { Consumer } from '@teambit/legacy/dist/consumer';\nimport ComponentsList from '@teambit/legacy/dist/consumer/component/components-list';\nimport {\n  ApplyVersionResults,\n  MergeStrategy,\n  mergeVersion,\n  ApplyVersionResult,\n  FailedComponents,\n  FileStatus,\n  getMergeStrategyInteractive,\n  MergeOptions,\n} from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport { ConsumerNotFound } from '@teambit/legacy/dist/consumer/exceptions';\nimport SnappingAspect, { SnappingMain } from '@teambit/snapping';\nimport hasWildcard from '@teambit/legacy/dist/utils/string/has-wildcard';\nimport fs from 'fs-extra';\nimport mapSeries from 'p-map-series';\nimport path from 'path';\nimport { BitId, BitIds } from '@teambit/legacy/dist/bit-id';\nimport { COMPONENT_ORIGINS } from '@teambit/legacy/dist/constants';\nimport { BitError } from '@teambit/bit-error';\nimport GeneralError from '@teambit/legacy/dist/error/general-error';\nimport { LaneId } from '@teambit/lane-id';\nimport logger from '@teambit/legacy/dist/logger/logger';\nimport { AutoTagResult } from '@teambit/legacy/dist/scope/component-ops/auto-tag';\nimport { getDivergeData } from '@teambit/legacy/dist/scope/component-ops/get-diverge-data';\nimport { UnmergedComponent } from '@teambit/legacy/dist/scope/lanes/unmerged-components';\nimport { Lane, Version } from '@teambit/legacy/dist/scope/models';\nimport { Ref } from '@teambit/legacy/dist/scope/objects';\nimport chalk from 'chalk';\nimport { Tmp } from '@teambit/legacy/dist/scope/repositories';\nimport { pathNormalizeToLinux } from '@teambit/legacy/dist/utils';\nimport ManyComponentsWriter from '@teambit/legacy/dist/consumer/component-ops/many-components-writer';\nimport Component from '@teambit/legacy/dist/consumer/component/consumer-component';\nimport checkoutVersion, { applyModifiedVersion } from '@teambit/legacy/dist/consumer/versions-ops/checkout-version';\nimport threeWayMerge, {\n  MergeResultsThreeWay,\n} from '@teambit/legacy/dist/consumer/versions-ops/merge-version/three-way-merge';\nimport { DivergeData } from '@teambit/legacy/dist/scope/component-ops/diverge-data';\nimport { MergeCmd } from './merge-cmd';\nimport { MergingAspect } from './merging.aspect';\n\nexport type ComponentMergeStatus = {\n  componentFromFS?: Component | null;\n  componentFromModel?: Version;\n  id: BitId;\n  unmergedMessage?: string;\n  unmergedLegitimately?: boolean; // failed to merge but for a legitimate reason, such as, up-to-date\n  mergeResults?: MergeResultsThreeWay | null;\n  divergeData?: DivergeData;\n};\n\nexport class MergingMain {\n  private consumer: Consumer;\n  constructor(private workspace: Workspace, private snapping: SnappingMain) {\n    this.consumer = this.workspace?.consumer;\n  }\n\n  /**\n   * merge components according to the \"values\" param.\n   * if the first param is a version, then merge the component ids to that version.\n   * otherwise, merge from the remote head to the local.\n   */\n  async merge(\n    values: string[],\n    mergeStrategy: MergeStrategy,\n    abort: boolean,\n    resolve: boolean,\n    noSnap: boolean,\n    message: string,\n    build: boolean\n  ): Promise<ApplyVersionResults> {\n    if (!this.workspace) throw new ConsumerNotFound();\n    const consumer: Consumer = this.workspace.consumer;\n    let mergeResults;\n    const firstValue = R.head(values);\n    if (resolve) {\n      mergeResults = await this.resolveMerge(consumer, values, message, build);\n    } else if (abort) {\n      mergeResults = await this.abortMerge(consumer, values);\n    } else if (!BitId.isValidVersion(firstValue)) {\n      const bitIds = this.getComponentsToMerge(consumer, values);\n      // @todo: version could be the lane only or remote/lane\n      mergeResults = await this.mergeComponentsFromRemote(consumer, bitIds, mergeStrategy, noSnap, message, build);\n    } else {\n      const version = firstValue;\n      const ids = R.tail(values);\n      const bitIds = this.getComponentsToMerge(consumer, ids);\n      mergeResults = await mergeVersion(consumer, version, bitIds, mergeStrategy);\n    }\n    await consumer.onDestroy();\n    return mergeResults;\n  }\n\n  /**\n   * when user is on main, it merges the remote main components into local.\n   * when user is on a lane, it merges the remote lane components into the local lane.\n   */\n  async mergeComponentsFromRemote(\n    consumer: Consumer,\n    bitIds: BitId[],\n    mergeStrategy: MergeStrategy,\n    noSnap: boolean,\n    snapMessage: string,\n    build: boolean\n  ): Promise<ApplyVersionResults> {\n    const currentLaneId = consumer.getCurrentLaneId();\n    const currentLaneObject = await consumer.getCurrentLaneObject();\n    const allComponentsStatus = await this.getAllComponentsStatus(bitIds, currentLaneId, currentLaneObject);\n    const failedComponents = allComponentsStatus.filter((c) => c.unmergedMessage && !c.unmergedLegitimately);\n    if (failedComponents.length) {\n      const failureMsgs = failedComponents\n        .map(\n          (failedComponent) =>\n            `${chalk.bold(failedComponent.id.toString())} - ${chalk.red(failedComponent.unmergedMessage as string)}`\n        )\n        .join('\\n');\n      throw new BitError(`unable to merge due to the following failures:\\n${failureMsgs}`);\n    }\n\n    return this.mergeSnaps({\n      mergeStrategy,\n      allComponentsStatus,\n      remoteName: currentLaneId.isDefault() ? null : currentLaneId.scope,\n      laneId: currentLaneId,\n      localLane: currentLaneObject,\n      noSnap,\n      snapMessage,\n      build,\n    });\n  }\n\n  /**\n   * merge multiple components according to the \"allComponentsStatus\".\n   */\n  async mergeSnaps({\n    mergeStrategy,\n    allComponentsStatus,\n    remoteName,\n    laneId,\n    localLane,\n    noSnap,\n    snapMessage,\n    build,\n  }: {\n    mergeStrategy: MergeStrategy;\n    allComponentsStatus: ComponentMergeStatus[];\n    remoteName: string | null;\n    laneId: LaneId;\n    localLane: Lane | null;\n    noSnap: boolean;\n    snapMessage: string;\n    build: boolean;\n  }): Promise<ApplyVersionResults> {\n    const consumer = this.workspace.consumer;\n    const componentWithConflict = allComponentsStatus.find(\n      (component) => component.mergeResults && component.mergeResults.hasConflicts\n    );\n    if (componentWithConflict && !mergeStrategy) {\n      mergeStrategy = await getMergeStrategyInteractive();\n    }\n    const failedComponents: FailedComponents[] = allComponentsStatus\n      .filter((componentStatus) => componentStatus.unmergedMessage)\n      .map((componentStatus) => ({\n        id: componentStatus.id,\n        failureMessage: componentStatus.unmergedMessage as string,\n        unchangedLegitimately: componentStatus.unmergedLegitimately,\n      }));\n    const succeededComponents = allComponentsStatus.filter((componentStatus) => !componentStatus.unmergedMessage);\n    // do not use Promise.all for applyVersion. otherwise, it'll write all components in parallel,\n    // which can be an issue when some components are also dependencies of others\n    const componentsResults = await mapSeries(succeededComponents, async ({ componentFromFS, id, mergeResults }) => {\n      const modelComponent = await consumer.scope.getModelComponent(id);\n      return this.applyVersion({\n        consumer,\n        componentFromFS,\n        id,\n        mergeResults,\n        mergeStrategy,\n        remoteHead: modelComponent.getRef(id.version as string) as Ref,\n        remoteName: remoteName || componentFromFS?.scope || null,\n        laneId,\n        localLane,\n      });\n    });\n\n    const leftUnresolvedConflicts = componentWithConflict && mergeStrategy === 'manual';\n\n    if (localLane) consumer.scope.objects.add(localLane);\n\n    await consumer.scope.objects.persist(); // persist anyway, if localLane is null it should save all main heads\n\n    await consumer.scope.objects.unmergedComponents.write();\n\n    // if one of the component has conflict, don't snap-merge. otherwise, some of the components would be snap-merged\n    // and some not. except the fact that it could by mistake tag dependent, it's a confusing state. better not snap.\n    const mergeSnapResults =\n      noSnap || leftUnresolvedConflicts ? null : await this.snapResolvedComponents(consumer, snapMessage, build);\n\n    return {\n      components: componentsResults,\n      failedComponents,\n      mergeSnapResults,\n      leftUnresolvedConflicts,\n    };\n  }\n\n  /**\n   * this function gets called from two different commands:\n   * 1. \"bit merge <ids...>\", when merging a component from a remote to the local.\n   * in this case, the remote and local are on the same lane or both on main.\n   * 2. \"bit lane merge\", when merging from one lane to another.\n   * @param id\n   * @param localLane\n   * @param otherLaneName\n   * @param existingOnWorkspaceOnly\n   * @returns\n   */\n  async getComponentMergeStatus(\n    id: BitId, // the id.version is the version we want to merge to the current component\n    localLane: Lane | null, // currently checked out lane. if on main, then it's null.\n    otherLaneName: string // the lane name we want to merged to our lane. (can be also \"main\").\n  ): Promise<ComponentMergeStatus> {\n    const consumer = this.workspace.consumer;\n    const componentStatus: ComponentMergeStatus = { id };\n    const returnUnmerged = (msg: string, unmergedLegitimately = false) => {\n      componentStatus.unmergedMessage = msg;\n      componentStatus.unmergedLegitimately = unmergedLegitimately;\n      return componentStatus;\n    };\n    const modelComponent = await consumer.scope.getModelComponentIfExist(id);\n    if (!modelComponent) {\n      return returnUnmerged(\n        `component ${id.toString()} is on the lane/main but its objects were not found, please re-import the lane`\n      );\n    }\n    const unmerged = consumer.scope.objects.unmergedComponents.getEntry(id.name);\n    if (unmerged && unmerged.resolved === false) {\n      return returnUnmerged(\n        `component ${id.toStringWithoutVersion()} has conflicts that need to be resolved first, please use bit merge --resolve/--abort`\n      );\n    }\n    const repo = consumer.scope.objects;\n    const version = id.version as string;\n    const otherLaneHead = modelComponent.getRef(version);\n    const existingBitMapId = consumer.bitMap.getBitIdIfExist(id, { ignoreVersion: true });\n    const existOnCurrentLane = existingBitMapId && consumer.bitMap.isIdAvailableOnCurrentLane(existingBitMapId);\n    const componentOnLane: Version = await modelComponent.loadVersion(version, consumer.scope.objects);\n    if (!existingBitMapId || !existOnCurrentLane) {\n      const divergeData = await getDivergeData(repo, modelComponent, otherLaneHead, null, false);\n      return { componentFromFS: null, componentFromModel: componentOnLane, id, mergeResults: null, divergeData };\n    }\n    const currentlyUsedVersion = existingBitMapId.version;\n    if (currentlyUsedVersion === version) {\n      // @todo: maybe this check is not needed as we check for diverge later on\n      if (localLane || modelComponent.hasHead()) {\n        return returnUnmerged(`component ${id.toStringWithoutVersion()} is already merged`, true);\n      }\n    }\n    const component = await consumer.loadComponent(existingBitMapId);\n    const componentModificationStatus = await consumer.getComponentStatusById(component.id);\n    if (componentModificationStatus.modified) {\n      return returnUnmerged(\n        `unable to merge ${id.toStringWithoutVersion()}, the component is modified, please snap/tag it first`\n      );\n    }\n    const laneHeadIsDifferentThanCheckedOut =\n      localLane && currentlyUsedVersion && modelComponent.laneHeadLocal?.toString() !== currentlyUsedVersion;\n    const localHead = laneHeadIsDifferentThanCheckedOut ? Ref.from(currentlyUsedVersion) : null;\n\n    if (!otherLaneHead) {\n      throw new Error(`merging: unable finding a hash for the version ${version} of ${id.toString()}`);\n    }\n    const divergeData = await getDivergeData(repo, modelComponent, otherLaneHead, localHead, false);\n    if (divergeData.err) {\n      return returnUnmerged(`unable to traverse ${component.id.toString()} history. error: ${divergeData.err.message}`);\n    }\n    if (!divergeData.isDiverged()) {\n      if (divergeData.isLocalAhead()) {\n        // do nothing!\n        return returnUnmerged(`component ${component.id.toString()} is ahead, nothing to merge`, true);\n      }\n      if (divergeData.isRemoteAhead()) {\n        // just override with the model data\n        return {\n          componentFromFS: component,\n          componentFromModel: componentOnLane,\n          id,\n          mergeResults: null,\n          divergeData,\n        };\n      }\n      // we know that localHead and remoteHead are set, so if none of them is ahead they must be equal\n      return returnUnmerged(`component ${component.id.toString()} is already merged`, true);\n    }\n    const baseSnap = divergeData.commonSnapBeforeDiverge as Ref; // must be set when isTrueMerge\n    const baseComponent: Version = await modelComponent.loadVersion(baseSnap.toString(), repo);\n    const otherComponent: Version = await modelComponent.loadVersion(otherLaneHead.toString(), repo);\n    const mergeResults = await threeWayMerge({\n      consumer,\n      otherComponent,\n      // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n      otherLabel: `${otherLaneHead.toString()} (${otherLaneName})`,\n      currentComponent: component,\n      currentLabel: `${currentlyUsedVersion} (local)`,\n      baseComponent,\n    });\n    return { componentFromFS: component, id, mergeResults, divergeData };\n  }\n\n  private async applyVersion({\n    consumer,\n    componentFromFS,\n    id,\n    mergeResults,\n    mergeStrategy,\n    remoteHead,\n    remoteName,\n    laneId,\n    localLane,\n  }: {\n    consumer: Consumer;\n    componentFromFS: Component | null | undefined;\n    id: BitId;\n    mergeResults: MergeResultsThreeWay | null | undefined;\n    mergeStrategy: MergeStrategy;\n    remoteHead: Ref;\n    remoteName: string | null;\n    laneId: LaneId;\n    localLane: Lane | null;\n  }): Promise<ApplyVersionResult> {\n    let filesStatus = {};\n    const unmergedComponent: UnmergedComponent = {\n      // @ts-ignore\n      id: { name: id.name, scope: id.scope },\n      // @ts-ignore\n      head: remoteHead,\n      // @ts-ignore\n      remote: remoteName,\n      lane: laneId.name,\n      resolved: false, // could be changed later\n    };\n    id = componentFromFS ? componentFromFS.id : id;\n    if (mergeResults && mergeResults.hasConflicts && mergeStrategy === MergeOptions.ours) {\n      if (!componentFromFS) throw new Error(`applyVersion expect to get componentFromFS for ${id.toString()}`);\n      componentFromFS.files.forEach((file) => {\n        // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n        filesStatus[pathNormalizeToLinux(file.relative)] = FileStatus.unchanged;\n      });\n      unmergedComponent.resolved = true;\n      consumer.scope.objects.unmergedComponents.addEntry(unmergedComponent);\n\n      return { id, filesStatus };\n    }\n    const remoteId = id.changeVersion(remoteHead.toString());\n    const idToLoad = !mergeResults || mergeStrategy === MergeOptions.theirs ? remoteId : id;\n    const componentWithDependencies = await consumer.loadComponentWithDependenciesFromModel(idToLoad);\n    const componentMap = componentFromFS && componentFromFS.componentMap;\n    if (componentFromFS && !componentMap) throw new GeneralError('applyVersion: componentMap was not found');\n    if (componentMap && componentMap.origin === COMPONENT_ORIGINS.AUTHORED && !id.scope) {\n      componentWithDependencies.dependencies = [];\n      componentWithDependencies.devDependencies = [];\n    }\n    const shouldWritePackageJson = async (): Promise<boolean> => {\n      if (!componentMap) return true;\n      const rootDir = componentMap && componentMap.rootDir;\n      if (!rootDir) return false;\n      const packageJsonPath = path.join(consumer.getPath(), rootDir, 'package.json');\n      return fs.pathExists(packageJsonPath);\n    };\n    const shouldInstallNpmPackages = (): boolean => {\n      if (componentMap && componentMap.origin === COMPONENT_ORIGINS.AUTHORED) return false;\n      return true;\n    };\n    const writePackageJson = await shouldWritePackageJson();\n\n    const files = componentWithDependencies.component.files;\n    files.forEach((file) => {\n      // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n      filesStatus[pathNormalizeToLinux(file.relative)] = FileStatus.updated;\n    });\n\n    if (mergeResults) {\n      // update files according to the merge results\n      const { filesStatus: modifiedStatus, modifiedFiles } = applyModifiedVersion(files, mergeResults, mergeStrategy);\n      componentWithDependencies.component.files = modifiedFiles;\n      filesStatus = { ...filesStatus, ...modifiedStatus };\n    }\n    const shouldDependenciesSaveAsComponents = await consumer.shouldDependenciesSavedAsComponents([id]);\n    componentWithDependencies.component.dependenciesSavedAsComponents =\n      shouldDependenciesSaveAsComponents[0].saveDependenciesAsComponents;\n\n    const manyComponentsWriter = new ManyComponentsWriter({\n      consumer,\n      componentsWithDependencies: [componentWithDependencies],\n      installNpmPackages: shouldInstallNpmPackages(),\n      override: true,\n      writeConfig: false, // @todo: should write if config exists before, needs to figure out how to do it.\n      verbose: false, // @todo: do we need a flag here?\n      writeDists: true, // @todo: do we need a flag here?\n      writePackageJson,\n    });\n    await manyComponentsWriter.writeAll();\n\n    // if mergeResults, the head snap is going to be updated on a later phase when snapping with two parents\n    // otherwise, update the head of the current lane or main\n    if (mergeResults) {\n      if (mergeResults.hasConflicts && mergeStrategy === MergeOptions.manual) {\n        unmergedComponent.resolved = false;\n        unmergedComponent.unmergedPaths = mergeResults.modifiedFiles.filter((f) => f.conflict).map((f) => f.filePath);\n      } else {\n        unmergedComponent.resolved = true;\n      }\n      consumer.scope.objects.unmergedComponents.addEntry(unmergedComponent);\n    } else if (localLane) {\n      localLane.addComponent({ id, head: remoteHead });\n    } else {\n      // this is main\n      const modelComponent = await consumer.scope.getModelComponent(id);\n      modelComponent.setHead(remoteHead);\n      // mark it as local, otherwise, when importing this component from a remote, it'll override it.\n      modelComponent.markVersionAsLocal(remoteHead.toString());\n      consumer.scope.objects.add(modelComponent);\n    }\n\n    return { id, filesStatus };\n  }\n\n  private async abortMerge(consumer: Consumer, values: string[]): Promise<ApplyVersionResults> {\n    const ids = this.getIdsForUnresolved(consumer, values);\n    // @ts-ignore not clear yet what to do with other flags\n    const results = await checkoutVersion(consumer, { ids, reset: true });\n    ids.forEach((id) => consumer.scope.objects.unmergedComponents.removeComponent(id.name));\n    await consumer.scope.objects.unmergedComponents.write();\n    return { abortedComponents: results.components };\n  }\n\n  private async resolveMerge(\n    consumer: Consumer,\n    values: string[],\n    snapMessage: string,\n    build: boolean\n  ): Promise<ApplyVersionResults> {\n    const ids = this.getIdsForUnresolved(consumer, values);\n    // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n    const { snappedComponents } = await this.snapping.snap({\n      legacyBitIds: BitIds.fromArray(ids),\n      build,\n      message: snapMessage,\n    });\n    return { resolvedComponents: snappedComponents };\n  }\n\n  private async getAllComponentsStatus(\n    bitIds: BitId[],\n    laneId: LaneId,\n    localLaneObject: Lane | null\n  ): Promise<ComponentMergeStatus[]> {\n    const tmp = new Tmp(this.consumer.scope);\n    try {\n      const componentsStatus = await Promise.all(\n        bitIds.map(async (bitId) => {\n          const remoteScopeName = laneId.isDefault() ? bitId.scope : laneId.scope;\n          const remoteLaneId = LaneId.from(laneId.name, remoteScopeName as string);\n          const remoteHead = await this.consumer.scope.objects.remoteLanes.getRef(remoteLaneId, bitId);\n          const laneIdStr = remoteLaneId.toString();\n          if (!remoteHead)\n            throw new BitError(`unable to find a remote head of \"${bitId.toStringWithoutVersion()}\" in \"${laneIdStr}\"`);\n          return this.getComponentMergeStatus(bitId.changeVersion(remoteHead.toString()), localLaneObject, laneIdStr);\n        })\n      );\n      await tmp.clear();\n      return componentsStatus;\n    } catch (err: any) {\n      await tmp.clear();\n      throw err;\n    }\n  }\n\n  private async snapResolvedComponents(\n    consumer: Consumer,\n    snapMessage: string,\n    build: boolean\n  ): Promise<null | { snappedComponents: Component[]; autoSnappedResults: AutoTagResult[] }> {\n    const resolvedComponents = consumer.scope.objects.unmergedComponents.getResolvedComponents();\n    logger.debug(`merge-snaps, snapResolvedComponents, total ${resolvedComponents.length.toString()} components`);\n    if (!resolvedComponents.length) return null;\n    const ids = BitIds.fromArray(resolvedComponents.map((r) => new BitId(r.id)));\n    return this.snapping.snap({\n      legacyBitIds: ids,\n      build,\n      message: snapMessage,\n    });\n  }\n\n  private getIdsForUnresolved(consumer: Consumer, idsStr?: string[]): BitId[] {\n    if (idsStr && idsStr.length) {\n      const bitIds = idsStr.map((id) => consumer.getParsedId(id));\n      bitIds.forEach((id) => {\n        const entry = consumer.scope.objects.unmergedComponents.getEntry(id.name);\n        if (!entry) {\n          throw new GeneralError(`unable to merge-resolve ${id.toString()}, it is not marked as unresolved`);\n        }\n      });\n      return bitIds;\n    }\n    const unresolvedComponents = consumer.scope.objects.unmergedComponents.getComponents();\n    if (!unresolvedComponents.length) throw new GeneralError(`all components are resolved already, nothing to do`);\n    return unresolvedComponents.map((u) => new BitId(u.id));\n  }\n\n  private getComponentsToMerge(consumer: Consumer, ids: string[]): BitId[] {\n    if (hasWildcard(ids)) {\n      const componentsList = new ComponentsList(consumer);\n      return componentsList.listComponentsByIdsWithWildcard(ids);\n    }\n    return ids.map((id) => consumer.getParsedId(id));\n  }\n\n  static slots = [];\n  static dependencies = [CLIAspect, WorkspaceAspect, SnappingAspect];\n  static runtime = MainRuntime;\n  static async provider([cli, workspace, snapping]: [CLIMain, Workspace, SnappingMain]) {\n    const merging = new MergingMain(workspace, snapping);\n    cli.register(new MergeCmd(merging));\n    return merging;\n  }\n}\n\nMergingAspect.addRuntime(MergingMain);\n"],"mappings":"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"}
+{"version":3,"names":["MergingMain","constructor","workspace","snapping","consumer","merge","values","mergeStrategy","abort","resolve","noSnap","message","build","skipDependencyInstallation","ConsumerNotFound","mergeResults","firstValue","R","head","resolveMerge","abortMerge","BitId","isValidVersion","bitIds","getComponentsToMerge","mergeComponentsFromRemote","version","ids","tail","mergeVersion","onDestroy","snapMessage","currentLaneId","getCurrentLaneId","currentLaneObject","getCurrentLaneObject","allComponentsStatus","getAllComponentsStatus","failedComponents","filter","c","unmergedMessage","unmergedLegitimately","length","failureMsgs","map","failedComponent","chalk","bold","id","toString","red","join","BitError","mergeSnaps","remoteName","isDefault","scope","laneId","localLane","componentWithConflict","find","component","hasConflicts","getMergeStrategyInteractive","componentStatus","failureMessage","unchangedLegitimately","succeededComponents","componentsResults","mapSeries","componentFromFS","modelComponent","getModelComponent","applyVersion","remoteHead","getRef","leftUnresolvedConflicts","install","undefined","dedupe","updateExisting","import","objects","add","persist","unmergedComponents","write","mergeSnapResults","snapResolvedComponents","components","getComponentMergeStatus","otherLaneName","returnUnmerged","msg","getModelComponentIfExist","unmerged","getEntry","name","resolved","toStringWithoutVersion","repo","otherLaneHead","existingBitMapId","bitMap","getBitIdIfExist","ignoreVersion","componentOnLane","loadVersion","getCurrentId","idOnLane","getComponent","changeVersion","getHeadAsTagIfExist","currentId","divergeData","getDivergeData","componentFromModel","getCurrentComponent","loadComponent","getConsumerComponent","componentModificationStatus","getComponentStatusById","modified","laneHeadIsDifferentThanCheckedOut","laneHeadLocal","localHead","Ref","from","Error","err","isDiverged","isLocalAhead","isRemoteAhead","baseSnap","commonSnapBeforeDiverge","baseComponent","otherComponent","currentLaneName","toLaneId","threeWayMerge","otherLabel","currentComponent","currentLabel","filesStatus","unmergedComponent","remote","lane","MergeOptions","ours","files","forEach","file","pathNormalizeToLinux","relative","FileStatus","unchanged","addEntry","remoteId","idToLoad","theirs","componentWithDependencies","loadComponentWithDependenciesFromModel","dependencies","devDependencies","updated","modifiedStatus","modifiedFiles","applyModifiedVersion","shouldDependenciesSaveAsComponents","shouldDependenciesSavedAsComponents","dependenciesSavedAsComponents","saveDependenciesAsComponents","manyComponentsWriter","ManyComponentsWriter","componentsWithDependencies","installNpmPackages","override","writeConfig","verbose","writeDists","writePackageJson","writeAll","manual","unmergedPaths","f","conflict","filePath","addComponent","setHead","markVersionAsLocal","getIdsForUnresolved","results","checkoutVersion","reset","removeComponent","abortedComponents","snappedComponents","snap","legacyBitIds","BitIds","fromArray","resolvedComponents","localLaneObject","tmp","Tmp","componentsStatus","Promise","all","bitId","remoteScopeName","remoteLaneId","LaneId","remoteLanes","laneIdStr","clear","getResolvedComponents","logger","debug","r","idsStr","getParsedId","entry","GeneralError","unresolvedComponents","getComponents","u","hasWildcard","componentsList","ComponentsList","listComponentsByIdsWithWildcard","provider","cli","merging","register","MergeCmd","CLIAspect","WorkspaceAspect","SnappingAspect","MainRuntime","MergingAspect","addRuntime"],"sources":["merging.main.runtime.ts"],"sourcesContent":["import { CLIAspect, CLIMain, MainRuntime } from '@teambit/cli';\nimport WorkspaceAspect, { Workspace } from '@teambit/workspace';\nimport R from 'ramda';\nimport { Consumer } from '@teambit/legacy/dist/consumer';\nimport ComponentsList from '@teambit/legacy/dist/consumer/component/components-list';\nimport {\n  ApplyVersionResults,\n  MergeStrategy,\n  mergeVersion,\n  ApplyVersionResult,\n  FailedComponents,\n  FileStatus,\n  getMergeStrategyInteractive,\n  MergeOptions,\n} from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport { ConsumerNotFound } from '@teambit/legacy/dist/consumer/exceptions';\nimport SnappingAspect, { SnappingMain } from '@teambit/snapping';\nimport hasWildcard from '@teambit/legacy/dist/utils/string/has-wildcard';\nimport mapSeries from 'p-map-series';\nimport { BitId, BitIds } from '@teambit/legacy/dist/bit-id';\nimport { BitError } from '@teambit/bit-error';\nimport GeneralError from '@teambit/legacy/dist/error/general-error';\nimport { LaneId } from '@teambit/lane-id';\nimport logger from '@teambit/legacy/dist/logger/logger';\nimport { AutoTagResult } from '@teambit/legacy/dist/scope/component-ops/auto-tag';\nimport { getDivergeData } from '@teambit/legacy/dist/scope/component-ops/get-diverge-data';\nimport { UnmergedComponent } from '@teambit/legacy/dist/scope/lanes/unmerged-components';\nimport { Lane, Version } from '@teambit/legacy/dist/scope/models';\nimport { Ref } from '@teambit/legacy/dist/scope/objects';\nimport chalk from 'chalk';\nimport { Tmp } from '@teambit/legacy/dist/scope/repositories';\nimport { pathNormalizeToLinux } from '@teambit/legacy/dist/utils';\nimport ManyComponentsWriter from '@teambit/legacy/dist/consumer/component-ops/many-components-writer';\nimport Component from '@teambit/legacy/dist/consumer/component/consumer-component';\nimport checkoutVersion, { applyModifiedVersion } from '@teambit/legacy/dist/consumer/versions-ops/checkout-version';\nimport threeWayMerge, {\n  MergeResultsThreeWay,\n} from '@teambit/legacy/dist/consumer/versions-ops/merge-version/three-way-merge';\nimport { DivergeData } from '@teambit/legacy/dist/scope/component-ops/diverge-data';\nimport { MergeCmd } from './merge-cmd';\nimport { MergingAspect } from './merging.aspect';\n\nexport type ComponentMergeStatus = {\n  componentFromFS?: Component | null;\n  componentFromModel?: Version;\n  id: BitId;\n  unmergedMessage?: string;\n  unmergedLegitimately?: boolean; // failed to merge but for a legitimate reason, such as, up-to-date\n  mergeResults?: MergeResultsThreeWay | null;\n  divergeData?: DivergeData;\n};\n\nexport class MergingMain {\n  private consumer: Consumer;\n  constructor(private workspace: Workspace, private snapping: SnappingMain) {\n    this.consumer = this.workspace?.consumer;\n  }\n\n  /**\n   * merge components according to the \"values\" param.\n   * if the first param is a version, then merge the component ids to that version.\n   * otherwise, merge from the remote head to the local.\n   */\n  async merge(\n    values: string[],\n    mergeStrategy: MergeStrategy,\n    abort: boolean,\n    resolve: boolean,\n    noSnap: boolean,\n    message: string,\n    build: boolean,\n    skipDependencyInstallation: boolean\n  ): Promise<ApplyVersionResults> {\n    if (!this.workspace) throw new ConsumerNotFound();\n    const consumer: Consumer = this.workspace.consumer;\n    let mergeResults;\n    const firstValue = R.head(values);\n    if (resolve) {\n      mergeResults = await this.resolveMerge(consumer, values, message, build);\n    } else if (abort) {\n      mergeResults = await this.abortMerge(consumer, values);\n    } else if (!BitId.isValidVersion(firstValue)) {\n      const bitIds = this.getComponentsToMerge(consumer, values);\n      // @todo: version could be the lane only or remote/lane\n      mergeResults = await this.mergeComponentsFromRemote(\n        consumer,\n        bitIds,\n        mergeStrategy,\n        noSnap,\n        message,\n        build,\n        skipDependencyInstallation\n      );\n    } else {\n      const version = firstValue;\n      const ids = R.tail(values);\n      const bitIds = this.getComponentsToMerge(consumer, ids);\n      mergeResults = await mergeVersion(consumer, version, bitIds, mergeStrategy);\n    }\n    await consumer.onDestroy();\n    return mergeResults;\n  }\n\n  /**\n   * when user is on main, it merges the remote main components into local.\n   * when user is on a lane, it merges the remote lane components into the local lane.\n   */\n  async mergeComponentsFromRemote(\n    consumer: Consumer,\n    bitIds: BitId[],\n    mergeStrategy: MergeStrategy,\n    noSnap: boolean,\n    snapMessage: string,\n    build: boolean,\n    skipDependencyInstallation: boolean\n  ): Promise<ApplyVersionResults> {\n    const currentLaneId = consumer.getCurrentLaneId();\n    const currentLaneObject = await consumer.getCurrentLaneObject();\n    const allComponentsStatus = await this.getAllComponentsStatus(bitIds, currentLaneId, currentLaneObject);\n    const failedComponents = allComponentsStatus.filter((c) => c.unmergedMessage && !c.unmergedLegitimately);\n    if (failedComponents.length) {\n      const failureMsgs = failedComponents\n        .map(\n          (failedComponent) =>\n            `${chalk.bold(failedComponent.id.toString())} - ${chalk.red(failedComponent.unmergedMessage as string)}`\n        )\n        .join('\\n');\n      throw new BitError(`unable to merge due to the following failures:\\n${failureMsgs}`);\n    }\n\n    return this.mergeSnaps({\n      mergeStrategy,\n      allComponentsStatus,\n      remoteName: currentLaneId.isDefault() ? null : currentLaneId.scope,\n      laneId: currentLaneId,\n      localLane: currentLaneObject,\n      noSnap,\n      snapMessage,\n      build,\n      skipDependencyInstallation,\n    });\n  }\n\n  /**\n   * merge multiple components according to the \"allComponentsStatus\".\n   */\n  async mergeSnaps({\n    mergeStrategy,\n    allComponentsStatus,\n    remoteName,\n    laneId,\n    localLane,\n    noSnap,\n    snapMessage,\n    build,\n    skipDependencyInstallation,\n  }: {\n    mergeStrategy: MergeStrategy;\n    allComponentsStatus: ComponentMergeStatus[];\n    remoteName: string | null;\n    laneId: LaneId;\n    localLane: Lane | null;\n    noSnap: boolean;\n    snapMessage: string;\n    build: boolean;\n    skipDependencyInstallation?: boolean;\n  }): Promise<ApplyVersionResults> {\n    const consumer = this.workspace.consumer;\n    const componentWithConflict = allComponentsStatus.find(\n      (component) => component.mergeResults && component.mergeResults.hasConflicts\n    );\n    if (componentWithConflict && !mergeStrategy) {\n      mergeStrategy = await getMergeStrategyInteractive();\n    }\n    const failedComponents: FailedComponents[] = allComponentsStatus\n      .filter((componentStatus) => componentStatus.unmergedMessage)\n      .map((componentStatus) => ({\n        id: componentStatus.id,\n        failureMessage: componentStatus.unmergedMessage as string,\n        unchangedLegitimately: componentStatus.unmergedLegitimately,\n      }));\n    const succeededComponents = allComponentsStatus.filter((componentStatus) => !componentStatus.unmergedMessage);\n    // do not use Promise.all for applyVersion. otherwise, it'll write all components in parallel,\n    // which can be an issue when some components are also dependencies of others\n    const componentsResults = await mapSeries(succeededComponents, async ({ componentFromFS, id, mergeResults }) => {\n      const modelComponent = await consumer.scope.getModelComponent(id);\n      return this.applyVersion({\n        consumer,\n        componentFromFS,\n        id,\n        mergeResults,\n        mergeStrategy,\n        remoteHead: modelComponent.getRef(id.version as string) as Ref,\n        remoteName: remoteName || componentFromFS?.scope || null,\n        laneId,\n        localLane,\n      });\n    });\n\n    const leftUnresolvedConflicts = componentWithConflict && mergeStrategy === 'manual';\n\n    if (!skipDependencyInstallation && !leftUnresolvedConflicts) {\n      await this.workspace.install(undefined, {\n        dedupe: true,\n        updateExisting: false,\n        import: false,\n      });\n    }\n\n    if (localLane) consumer.scope.objects.add(localLane);\n\n    await consumer.scope.objects.persist(); // persist anyway, if localLane is null it should save all main heads\n\n    await consumer.scope.objects.unmergedComponents.write();\n\n    // if one of the component has conflict, don't snap-merge. otherwise, some of the components would be snap-merged\n    // and some not. except the fact that it could by mistake tag dependent, it's a confusing state. better not snap.\n    const mergeSnapResults =\n      noSnap || leftUnresolvedConflicts ? null : await this.snapResolvedComponents(consumer, snapMessage, build);\n\n    return {\n      components: componentsResults,\n      failedComponents,\n      mergeSnapResults,\n      leftUnresolvedConflicts,\n    };\n  }\n\n  /**\n   * this function gets called from two different commands:\n   * 1. \"bit merge <ids...>\", when merging a component from a remote to the local.\n   * in this case, the remote and local are on the same lane or both on main.\n   * 2. \"bit lane merge\", when merging from one lane to another.\n   * @param id\n   * @param localLane\n   * @param otherLaneName\n   * @param existingOnWorkspaceOnly\n   * @returns\n   */\n  async getComponentMergeStatus(\n    id: BitId, // the id.version is the version we want to merge to the current component\n    localLane: Lane | null, // currently checked out lane. if on main, then it's null.\n    otherLaneName: string // the lane name we want to merged to our lane. (can be also \"main\").\n  ): Promise<ComponentMergeStatus> {\n    const consumer = this.workspace.consumer;\n    const componentStatus: ComponentMergeStatus = { id };\n    const returnUnmerged = (msg: string, unmergedLegitimately = false) => {\n      componentStatus.unmergedMessage = msg;\n      componentStatus.unmergedLegitimately = unmergedLegitimately;\n      return componentStatus;\n    };\n    const modelComponent = await consumer.scope.getModelComponentIfExist(id);\n    if (!modelComponent) {\n      return returnUnmerged(\n        `component ${id.toString()} is on the lane/main but its objects were not found, please re-import the lane`\n      );\n    }\n    const unmerged = consumer.scope.objects.unmergedComponents.getEntry(id.name);\n    if (unmerged && unmerged.resolved === false) {\n      return returnUnmerged(\n        `component ${id.toStringWithoutVersion()} has conflicts that need to be resolved first, please use bit merge --resolve/--abort`\n      );\n    }\n    const repo = consumer.scope.objects;\n    const version = id.version as string;\n    const otherLaneHead = modelComponent.getRef(version);\n    const existingBitMapId = consumer.bitMap.getBitIdIfExist(id, { ignoreVersion: true });\n    const componentOnLane: Version = await modelComponent.loadVersion(version, consumer.scope.objects);\n    const getCurrentId = () => {\n      if (existingBitMapId) return existingBitMapId;\n      if (localLane) {\n        const idOnLane = localLane.getComponent(id);\n        if (!idOnLane) return null;\n        return idOnLane.id.changeVersion(idOnLane.head.toString());\n      }\n      // it's on main\n      const head = modelComponent.getHeadAsTagIfExist();\n      if (head) {\n        return id.changeVersion(head);\n      }\n      return null;\n    };\n    const currentId = getCurrentId();\n    if (!currentId) {\n      const divergeData = await getDivergeData(repo, modelComponent, otherLaneHead, null, false);\n      return { componentFromFS: null, componentFromModel: componentOnLane, id, mergeResults: null, divergeData };\n    }\n\n    // const currentlyUsedVersion = existingBitMapId.version;\n    // if (currentlyUsedVersion === version) {\n    //   // @todo: maybe this check is not needed as we check for diverge later on\n    //   if (localLane || modelComponent.hasHead()) {\n    //     return returnUnmerged(`component ${id.toStringWithoutVersion()} is already merged`, true);\n    //   }\n    // }\n    const getCurrentComponent = () => {\n      if (existingBitMapId) return consumer.loadComponent(existingBitMapId);\n      return consumer.scope.getConsumerComponent(currentId);\n    };\n    const component = await getCurrentComponent();\n    const componentModificationStatus = await consumer.getComponentStatusById(component.id);\n    if (componentModificationStatus.modified) {\n      return returnUnmerged(\n        `unable to merge ${id.toStringWithoutVersion()}, the component is modified, please snap/tag it first`\n      );\n    }\n    const laneHeadIsDifferentThanCheckedOut =\n      localLane && existingBitMapId?.version && modelComponent.laneHeadLocal?.toString() !== existingBitMapId?.version;\n    const localHead = laneHeadIsDifferentThanCheckedOut ? Ref.from(existingBitMapId.version) : null;\n\n    if (!otherLaneHead) {\n      throw new Error(`merging: unable finding a hash for the version ${version} of ${id.toString()}`);\n    }\n    const divergeData = await getDivergeData(repo, modelComponent, otherLaneHead, localHead, false);\n    if (divergeData.err) {\n      return returnUnmerged(`unable to traverse ${component.id.toString()} history. error: ${divergeData.err.message}`);\n    }\n    if (!divergeData.isDiverged()) {\n      if (divergeData.isLocalAhead()) {\n        // do nothing!\n        return returnUnmerged(`component ${component.id.toString()} is ahead, nothing to merge`, true);\n      }\n      if (divergeData.isRemoteAhead()) {\n        // just override with the model data\n        return {\n          componentFromFS: component,\n          componentFromModel: componentOnLane,\n          id,\n          mergeResults: null,\n          divergeData,\n        };\n      }\n      // we know that localHead and remoteHead are set, so if none of them is ahead they must be equal\n      return returnUnmerged(`component ${component.id.toString()} is already merged`, true);\n    }\n    const baseSnap = divergeData.commonSnapBeforeDiverge as Ref; // must be set when isTrueMerge\n    const baseComponent: Version = await modelComponent.loadVersion(baseSnap.toString(), repo);\n    const otherComponent: Version = await modelComponent.loadVersion(otherLaneHead.toString(), repo);\n    const currentLaneName = localLane?.toLaneId().toString() || 'main';\n    const mergeResults = await threeWayMerge({\n      consumer,\n      otherComponent,\n      otherLabel: `${otherLaneHead.toString()} (${otherLaneName})`,\n      currentComponent: component,\n      currentLabel: `${currentId.version} (${currentLaneName})`,\n      baseComponent,\n    });\n    return { componentFromFS: component, id, mergeResults, divergeData };\n  }\n\n  private async applyVersion({\n    consumer,\n    componentFromFS,\n    id,\n    mergeResults,\n    mergeStrategy,\n    remoteHead,\n    remoteName,\n    laneId,\n    localLane,\n  }: {\n    consumer: Consumer;\n    componentFromFS: Component | null | undefined;\n    id: BitId;\n    mergeResults: MergeResultsThreeWay | null | undefined;\n    mergeStrategy: MergeStrategy;\n    remoteHead: Ref;\n    remoteName: string | null;\n    laneId: LaneId;\n    localLane: Lane | null;\n  }): Promise<ApplyVersionResult> {\n    let filesStatus = {};\n    const unmergedComponent: UnmergedComponent = {\n      // @ts-ignore\n      id: { name: id.name, scope: id.scope },\n      // @ts-ignore\n      head: remoteHead,\n      // @ts-ignore\n      remote: remoteName,\n      lane: laneId.name,\n      resolved: false, // could be changed later\n    };\n    id = componentFromFS ? componentFromFS.id : id;\n    if (mergeResults && mergeResults.hasConflicts && mergeStrategy === MergeOptions.ours) {\n      if (!componentFromFS) throw new Error(`applyVersion expect to get componentFromFS for ${id.toString()}`);\n      componentFromFS.files.forEach((file) => {\n        // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n        filesStatus[pathNormalizeToLinux(file.relative)] = FileStatus.unchanged;\n      });\n      unmergedComponent.resolved = true;\n      consumer.scope.objects.unmergedComponents.addEntry(unmergedComponent);\n\n      return { id, filesStatus };\n    }\n    const remoteId = id.changeVersion(remoteHead.toString());\n    const idToLoad = !mergeResults || mergeStrategy === MergeOptions.theirs ? remoteId : id;\n    const componentWithDependencies = await consumer.loadComponentWithDependenciesFromModel(idToLoad);\n    if (!id.scope) {\n      componentWithDependencies.dependencies = [];\n      componentWithDependencies.devDependencies = [];\n    }\n    const files = componentWithDependencies.component.files;\n    files.forEach((file) => {\n      // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n      filesStatus[pathNormalizeToLinux(file.relative)] = FileStatus.updated;\n    });\n\n    if (mergeResults) {\n      // update files according to the merge results\n      const { filesStatus: modifiedStatus, modifiedFiles } = applyModifiedVersion(files, mergeResults, mergeStrategy);\n      componentWithDependencies.component.files = modifiedFiles;\n      filesStatus = { ...filesStatus, ...modifiedStatus };\n    }\n    const shouldDependenciesSaveAsComponents = await consumer.shouldDependenciesSavedAsComponents([id]);\n    componentWithDependencies.component.dependenciesSavedAsComponents =\n      shouldDependenciesSaveAsComponents[0].saveDependenciesAsComponents;\n\n    const manyComponentsWriter = new ManyComponentsWriter({\n      consumer,\n      componentsWithDependencies: [componentWithDependencies],\n      installNpmPackages: false,\n      override: true,\n      writeConfig: false, // @todo: should write if config exists before, needs to figure out how to do it.\n      verbose: false, // @todo: do we need a flag here?\n      writeDists: true, // @todo: do we need a flag here?\n      writePackageJson: false,\n    });\n    await manyComponentsWriter.writeAll();\n\n    // if mergeResults, the head snap is going to be updated on a later phase when snapping with two parents\n    // otherwise, update the head of the current lane or main\n    if (mergeResults) {\n      if (mergeResults.hasConflicts && mergeStrategy === MergeOptions.manual) {\n        unmergedComponent.resolved = false;\n        unmergedComponent.unmergedPaths = mergeResults.modifiedFiles.filter((f) => f.conflict).map((f) => f.filePath);\n      } else {\n        unmergedComponent.resolved = true;\n      }\n      consumer.scope.objects.unmergedComponents.addEntry(unmergedComponent);\n    } else if (localLane) {\n      localLane.addComponent({ id, head: remoteHead });\n    } else {\n      // this is main\n      const modelComponent = await consumer.scope.getModelComponent(id);\n      modelComponent.setHead(remoteHead);\n      // mark it as local, otherwise, when importing this component from a remote, it'll override it.\n      modelComponent.markVersionAsLocal(remoteHead.toString());\n      consumer.scope.objects.add(modelComponent);\n    }\n\n    return { id, filesStatus };\n  }\n\n  private async abortMerge(consumer: Consumer, values: string[]): Promise<ApplyVersionResults> {\n    const ids = this.getIdsForUnresolved(consumer, values);\n    // @ts-ignore not clear yet what to do with other flags\n    const results = await checkoutVersion(consumer, { ids, reset: true });\n    ids.forEach((id) => consumer.scope.objects.unmergedComponents.removeComponent(id.name));\n    await consumer.scope.objects.unmergedComponents.write();\n    return { abortedComponents: results.components };\n  }\n\n  private async resolveMerge(\n    consumer: Consumer,\n    values: string[],\n    snapMessage: string,\n    build: boolean\n  ): Promise<ApplyVersionResults> {\n    const ids = this.getIdsForUnresolved(consumer, values);\n    // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n    const { snappedComponents } = await this.snapping.snap({\n      legacyBitIds: BitIds.fromArray(ids),\n      build,\n      message: snapMessage,\n    });\n    return { resolvedComponents: snappedComponents };\n  }\n\n  private async getAllComponentsStatus(\n    bitIds: BitId[],\n    laneId: LaneId,\n    localLaneObject: Lane | null\n  ): Promise<ComponentMergeStatus[]> {\n    const tmp = new Tmp(this.consumer.scope);\n    try {\n      const componentsStatus = await Promise.all(\n        bitIds.map(async (bitId) => {\n          const remoteScopeName = laneId.isDefault() ? bitId.scope : laneId.scope;\n          const remoteLaneId = LaneId.from(laneId.name, remoteScopeName as string);\n          const remoteHead = await this.consumer.scope.objects.remoteLanes.getRef(remoteLaneId, bitId);\n          const laneIdStr = remoteLaneId.toString();\n          if (!remoteHead)\n            throw new BitError(`unable to find a remote head of \"${bitId.toStringWithoutVersion()}\" in \"${laneIdStr}\"`);\n          return this.getComponentMergeStatus(bitId.changeVersion(remoteHead.toString()), localLaneObject, laneIdStr);\n        })\n      );\n      await tmp.clear();\n      return componentsStatus;\n    } catch (err: any) {\n      await tmp.clear();\n      throw err;\n    }\n  }\n\n  private async snapResolvedComponents(\n    consumer: Consumer,\n    snapMessage: string,\n    build: boolean\n  ): Promise<null | { snappedComponents: Component[]; autoSnappedResults: AutoTagResult[] }> {\n    const resolvedComponents = consumer.scope.objects.unmergedComponents.getResolvedComponents();\n    logger.debug(`merge-snaps, snapResolvedComponents, total ${resolvedComponents.length.toString()} components`);\n    if (!resolvedComponents.length) return null;\n    const ids = BitIds.fromArray(resolvedComponents.map((r) => new BitId(r.id)));\n    return this.snapping.snap({\n      legacyBitIds: ids,\n      build,\n      message: snapMessage,\n    });\n  }\n\n  private getIdsForUnresolved(consumer: Consumer, idsStr?: string[]): BitId[] {\n    if (idsStr && idsStr.length) {\n      const bitIds = idsStr.map((id) => consumer.getParsedId(id));\n      bitIds.forEach((id) => {\n        const entry = consumer.scope.objects.unmergedComponents.getEntry(id.name);\n        if (!entry) {\n          throw new GeneralError(`unable to merge-resolve ${id.toString()}, it is not marked as unresolved`);\n        }\n      });\n      return bitIds;\n    }\n    const unresolvedComponents = consumer.scope.objects.unmergedComponents.getComponents();\n    if (!unresolvedComponents.length) throw new GeneralError(`all components are resolved already, nothing to do`);\n    return unresolvedComponents.map((u) => new BitId(u.id));\n  }\n\n  private getComponentsToMerge(consumer: Consumer, ids: string[]): BitId[] {\n    if (hasWildcard(ids)) {\n      const componentsList = new ComponentsList(consumer);\n      return componentsList.listComponentsByIdsWithWildcard(ids);\n    }\n    return ids.map((id) => consumer.getParsedId(id));\n  }\n\n  static slots = [];\n  static dependencies = [CLIAspect, WorkspaceAspect, SnappingAspect];\n  static runtime = MainRuntime;\n  static async provider([cli, workspace, snapping]: [CLIMain, Workspace, SnappingMain]) {\n    const merging = new MergingMain(workspace, snapping);\n    cli.register(new MergeCmd(merging));\n    return merging;\n  }\n}\n\nMergingAspect.addRuntime(MergingMain);\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AAAA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AAEA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AAUA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AAEA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AAGA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AAEA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AAIA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;;;;;;;;;AAYO,MAAMA,WAAN,CAAkB;EAEvBC,WAAW,CAASC,SAAT,EAAuCC,QAAvC,EAA+D;IAAA;;IAAA,KAAtDD,SAAsD,GAAtDA,SAAsD;IAAA,KAAxBC,QAAwB,GAAxBA,QAAwB;IAAA;IACxE,KAAKC,QAAL,sBAAgB,KAAKF,SAArB,oDAAgB,gBAAgBE,QAAhC;EACD;EAED;AACF;AACA;AACA;AACA;;;EACa,MAALC,KAAK,CACTC,MADS,EAETC,aAFS,EAGTC,KAHS,EAITC,OAJS,EAKTC,MALS,EAMTC,OANS,EAOTC,KAPS,EAQTC,0BARS,EASqB;IAC9B,IAAI,CAAC,KAAKX,SAAV,EAAqB,MAAM,KAAIY,8BAAJ,GAAN;IACrB,MAAMV,QAAkB,GAAG,KAAKF,SAAL,CAAeE,QAA1C;IACA,IAAIW,YAAJ;;IACA,MAAMC,UAAU,GAAGC,gBAAA,CAAEC,IAAF,CAAOZ,MAAP,CAAnB;;IACA,IAAIG,OAAJ,EAAa;MACXM,YAAY,GAAG,MAAM,KAAKI,YAAL,CAAkBf,QAAlB,EAA4BE,MAA5B,EAAoCK,OAApC,EAA6CC,KAA7C,CAArB;IACD,CAFD,MAEO,IAAIJ,KAAJ,EAAW;MAChBO,YAAY,GAAG,MAAM,KAAKK,UAAL,CAAgBhB,QAAhB,EAA0BE,MAA1B,CAArB;IACD,CAFM,MAEA,IAAI,CAACe,cAAA,CAAMC,cAAN,CAAqBN,UAArB,CAAL,EAAuC;MAC5C,MAAMO,MAAM,GAAG,KAAKC,oBAAL,CAA0BpB,QAA1B,EAAoCE,MAApC,CAAf,CAD4C,CAE5C;;MACAS,YAAY,GAAG,MAAM,KAAKU,yBAAL,CACnBrB,QADmB,EAEnBmB,MAFmB,EAGnBhB,aAHmB,EAInBG,MAJmB,EAKnBC,OALmB,EAMnBC,KANmB,EAOnBC,0BAPmB,CAArB;IASD,CAZM,MAYA;MACL,MAAMa,OAAO,GAAGV,UAAhB;;MACA,MAAMW,GAAG,GAAGV,gBAAA,CAAEW,IAAF,CAAOtB,MAAP,CAAZ;;MACA,MAAMiB,MAAM,GAAG,KAAKC,oBAAL,CAA0BpB,QAA1B,EAAoCuB,GAApC,CAAf;MACAZ,YAAY,GAAG,MAAM,IAAAc,4BAAA,EAAazB,QAAb,EAAuBsB,OAAvB,EAAgCH,MAAhC,EAAwChB,aAAxC,CAArB;IACD;;IACD,MAAMH,QAAQ,CAAC0B,SAAT,EAAN;IACA,OAAOf,YAAP;EACD;EAED;AACF;AACA;AACA;;;EACiC,MAAzBU,yBAAyB,CAC7BrB,QAD6B,EAE7BmB,MAF6B,EAG7BhB,aAH6B,EAI7BG,MAJ6B,EAK7BqB,WAL6B,EAM7BnB,KAN6B,EAO7BC,0BAP6B,EAQC;IAC9B,MAAMmB,aAAa,GAAG5B,QAAQ,CAAC6B,gBAAT,EAAtB;IACA,MAAMC,iBAAiB,GAAG,MAAM9B,QAAQ,CAAC+B,oBAAT,EAAhC;IACA,MAAMC,mBAAmB,GAAG,MAAM,KAAKC,sBAAL,CAA4Bd,MAA5B,EAAoCS,aAApC,EAAmDE,iBAAnD,CAAlC;IACA,MAAMI,gBAAgB,GAAGF,mBAAmB,CAACG,MAApB,CAA4BC,CAAD,IAAOA,CAAC,CAACC,eAAF,IAAqB,CAACD,CAAC,CAACE,oBAA1D,CAAzB;;IACA,IAAIJ,gBAAgB,CAACK,MAArB,EAA6B;MAC3B,MAAMC,WAAW,GAAGN,gBAAgB,CACjCO,GADiB,CAEfC,eAAD,IACG,GAAEC,gBAAA,CAAMC,IAAN,CAAWF,eAAe,CAACG,EAAhB,CAAmBC,QAAnB,EAAX,CAA0C,MAAKH,gBAAA,CAAMI,GAAN,CAAUL,eAAe,CAACL,eAA1B,CAAqD,EAHzF,EAKjBW,IALiB,CAKZ,IALY,CAApB;MAMA,MAAM,KAAIC,oBAAJ,EAAc,mDAAkDT,WAAY,EAA5E,CAAN;IACD;;IAED,OAAO,KAAKU,UAAL,CAAgB;MACrB/C,aADqB;MAErB6B,mBAFqB;MAGrBmB,UAAU,EAAEvB,aAAa,CAACwB,SAAd,KAA4B,IAA5B,GAAmCxB,aAAa,CAACyB,KAHxC;MAIrBC,MAAM,EAAE1B,aAJa;MAKrB2B,SAAS,EAAEzB,iBALU;MAMrBxB,MANqB;MAOrBqB,WAPqB;MAQrBnB,KARqB;MASrBC;IATqB,CAAhB,CAAP;EAWD;EAED;AACF;AACA;;;EACkB,MAAVyC,UAAU,CAAC;IACf/C,aADe;IAEf6B,mBAFe;IAGfmB,UAHe;IAIfG,MAJe;IAKfC,SALe;IAMfjD,MANe;IAOfqB,WAPe;IAQfnB,KARe;IASfC;EATe,CAAD,EAoBiB;IAC/B,MAAMT,QAAQ,GAAG,KAAKF,SAAL,CAAeE,QAAhC;IACA,MAAMwD,qBAAqB,GAAGxB,mBAAmB,CAACyB,IAApB,CAC3BC,SAAD,IAAeA,SAAS,CAAC/C,YAAV,IAA0B+C,SAAS,CAAC/C,YAAV,CAAuBgD,YADpC,CAA9B;;IAGA,IAAIH,qBAAqB,IAAI,CAACrD,aAA9B,EAA6C;MAC3CA,aAAa,GAAG,MAAM,IAAAyD,2CAAA,GAAtB;IACD;;IACD,MAAM1B,gBAAoC,GAAGF,mBAAmB,CAC7DG,MAD0C,CAClC0B,eAAD,IAAqBA,eAAe,CAACxB,eADF,EAE1CI,GAF0C,CAErCoB,eAAD,KAAsB;MACzBhB,EAAE,EAAEgB,eAAe,CAAChB,EADK;MAEzBiB,cAAc,EAAED,eAAe,CAACxB,eAFP;MAGzB0B,qBAAqB,EAAEF,eAAe,CAACvB;IAHd,CAAtB,CAFsC,CAA7C;IAOA,MAAM0B,mBAAmB,GAAGhC,mBAAmB,CAACG,MAApB,CAA4B0B,eAAD,IAAqB,CAACA,eAAe,CAACxB,eAAjE,CAA5B,CAf+B,CAgB/B;IACA;;IACA,MAAM4B,iBAAiB,GAAG,MAAM,IAAAC,qBAAA,EAAUF,mBAAV,EAA+B,OAAO;MAAEG,eAAF;MAAmBtB,EAAnB;MAAuBlC;IAAvB,CAAP,KAAiD;MAC9G,MAAMyD,cAAc,GAAG,MAAMpE,QAAQ,CAACqD,KAAT,CAAegB,iBAAf,CAAiCxB,EAAjC,CAA7B;MACA,OAAO,KAAKyB,YAAL,CAAkB;QACvBtE,QADuB;QAEvBmE,eAFuB;QAGvBtB,EAHuB;QAIvBlC,YAJuB;QAKvBR,aALuB;QAMvBoE,UAAU,EAAEH,cAAc,CAACI,MAAf,CAAsB3B,EAAE,CAACvB,OAAzB,CANW;QAOvB6B,UAAU,EAAEA,UAAU,KAAIgB,eAAJ,aAAIA,eAAJ,uBAAIA,eAAe,CAAEd,KAArB,CAAV,IAAwC,IAP7B;QAQvBC,MARuB;QASvBC;MATuB,CAAlB,CAAP;IAWD,CAb+B,CAAhC;IAeA,MAAMkB,uBAAuB,GAAGjB,qBAAqB,IAAIrD,aAAa,KAAK,QAA3E;;IAEA,IAAI,CAACM,0BAAD,IAA+B,CAACgE,uBAApC,EAA6D;MAC3D,MAAM,KAAK3E,SAAL,CAAe4E,OAAf,CAAuBC,SAAvB,EAAkC;QACtCC,MAAM,EAAE,IAD8B;QAEtCC,cAAc,EAAE,KAFsB;QAGtCC,MAAM,EAAE;MAH8B,CAAlC,CAAN;IAKD;;IAED,IAAIvB,SAAJ,EAAevD,QAAQ,CAACqD,KAAT,CAAe0B,OAAf,CAAuBC,GAAvB,CAA2BzB,SAA3B;IAEf,MAAMvD,QAAQ,CAACqD,KAAT,CAAe0B,OAAf,CAAuBE,OAAvB,EAAN,CA7C+B,CA6CS;;IAExC,MAAMjF,QAAQ,CAACqD,KAAT,CAAe0B,OAAf,CAAuBG,kBAAvB,CAA0CC,KAA1C,EAAN,CA/C+B,CAiD/B;IACA;;IACA,MAAMC,gBAAgB,GACpB9E,MAAM,IAAImE,uBAAV,GAAoC,IAApC,GAA2C,MAAM,KAAKY,sBAAL,CAA4BrF,QAA5B,EAAsC2B,WAAtC,EAAmDnB,KAAnD,CADnD;IAGA,OAAO;MACL8E,UAAU,EAAErB,iBADP;MAEL/B,gBAFK;MAGLkD,gBAHK;MAILX;IAJK,CAAP;EAMD;EAED;AACF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;;EAC+B,MAAvBc,uBAAuB,CAC3B1C,EAD2B,EAChB;EACXU,SAF2B,EAEH;EACxBiC,aAH2B,EAII;IAAA;;IAC/B,MAAMxF,QAAQ,GAAG,KAAKF,SAAL,CAAeE,QAAhC;IACA,MAAM6D,eAAqC,GAAG;MAAEhB;IAAF,CAA9C;;IACA,MAAM4C,cAAc,GAAG,CAACC,GAAD,EAAcpD,oBAAoB,GAAG,KAArC,KAA+C;MACpEuB,eAAe,CAACxB,eAAhB,GAAkCqD,GAAlC;MACA7B,eAAe,CAACvB,oBAAhB,GAAuCA,oBAAvC;MACA,OAAOuB,eAAP;IACD,CAJD;;IAKA,MAAMO,cAAc,GAAG,MAAMpE,QAAQ,CAACqD,KAAT,CAAesC,wBAAf,CAAwC9C,EAAxC,CAA7B;;IACA,IAAI,CAACuB,cAAL,EAAqB;MACnB,OAAOqB,cAAc,CAClB,aAAY5C,EAAE,CAACC,QAAH,EAAc,gFADR,CAArB;IAGD;;IACD,MAAM8C,QAAQ,GAAG5F,QAAQ,CAACqD,KAAT,CAAe0B,OAAf,CAAuBG,kBAAvB,CAA0CW,QAA1C,CAAmDhD,EAAE,CAACiD,IAAtD,CAAjB;;IACA,IAAIF,QAAQ,IAAIA,QAAQ,CAACG,QAAT,KAAsB,KAAtC,EAA6C;MAC3C,OAAON,cAAc,CAClB,aAAY5C,EAAE,CAACmD,sBAAH,EAA4B,uFADtB,CAArB;IAGD;;IACD,MAAMC,IAAI,GAAGjG,QAAQ,CAACqD,KAAT,CAAe0B,OAA5B;IACA,MAAMzD,OAAO,GAAGuB,EAAE,CAACvB,OAAnB;IACA,MAAM4E,aAAa,GAAG9B,cAAc,CAACI,MAAf,CAAsBlD,OAAtB,CAAtB;IACA,MAAM6E,gBAAgB,GAAGnG,QAAQ,CAACoG,MAAT,CAAgBC,eAAhB,CAAgCxD,EAAhC,EAAoC;MAAEyD,aAAa,EAAE;IAAjB,CAApC,CAAzB;IACA,MAAMC,eAAwB,GAAG,MAAMnC,cAAc,CAACoC,WAAf,CAA2BlF,OAA3B,EAAoCtB,QAAQ,CAACqD,KAAT,CAAe0B,OAAnD,CAAvC;;IACA,MAAM0B,YAAY,GAAG,MAAM;MACzB,IAAIN,gBAAJ,EAAsB,OAAOA,gBAAP;;MACtB,IAAI5C,SAAJ,EAAe;QACb,MAAMmD,QAAQ,GAAGnD,SAAS,CAACoD,YAAV,CAAuB9D,EAAvB,CAAjB;QACA,IAAI,CAAC6D,QAAL,EAAe,OAAO,IAAP;QACf,OAAOA,QAAQ,CAAC7D,EAAT,CAAY+D,aAAZ,CAA0BF,QAAQ,CAAC5F,IAAT,CAAcgC,QAAd,EAA1B,CAAP;MACD,CANwB,CAOzB;;;MACA,MAAMhC,IAAI,GAAGsD,cAAc,CAACyC,mBAAf,EAAb;;MACA,IAAI/F,IAAJ,EAAU;QACR,OAAO+B,EAAE,CAAC+D,aAAH,CAAiB9F,IAAjB,CAAP;MACD;;MACD,OAAO,IAAP;IACD,CAbD;;IAcA,MAAMgG,SAAS,GAAGL,YAAY,EAA9B;;IACA,IAAI,CAACK,SAAL,EAAgB;MACd,MAAMC,WAAW,GAAG,MAAM,IAAAC,gCAAA,EAAef,IAAf,EAAqB7B,cAArB,EAAqC8B,aAArC,EAAoD,IAApD,EAA0D,KAA1D,CAA1B;MACA,OAAO;QAAE/B,eAAe,EAAE,IAAnB;QAAyB8C,kBAAkB,EAAEV,eAA7C;QAA8D1D,EAA9D;QAAkElC,YAAY,EAAE,IAAhF;QAAsFoG;MAAtF,CAAP;IACD,CA3C8B,CA6C/B;IACA;IACA;IACA;IACA;IACA;IACA;;;IACA,MAAMG,mBAAmB,GAAG,MAAM;MAChC,IAAIf,gBAAJ,EAAsB,OAAOnG,QAAQ,CAACmH,aAAT,CAAuBhB,gBAAvB,CAAP;MACtB,OAAOnG,QAAQ,CAACqD,KAAT,CAAe+D,oBAAf,CAAoCN,SAApC,CAAP;IACD,CAHD;;IAIA,MAAMpD,SAAS,GAAG,MAAMwD,mBAAmB,EAA3C;IACA,MAAMG,2BAA2B,GAAG,MAAMrH,QAAQ,CAACsH,sBAAT,CAAgC5D,SAAS,CAACb,EAA1C,CAA1C;;IACA,IAAIwE,2BAA2B,CAACE,QAAhC,EAA0C;MACxC,OAAO9B,cAAc,CAClB,mBAAkB5C,EAAE,CAACmD,sBAAH,EAA4B,uDAD5B,CAArB;IAGD;;IACD,MAAMwB,iCAAiC,GACrCjE,SAAS,KAAI4C,gBAAJ,aAAIA,gBAAJ,uBAAIA,gBAAgB,CAAE7E,OAAtB,CAAT,IAA0C,0BAAA8C,cAAc,CAACqD,aAAf,gFAA8B3E,QAA9B,SAA6CqD,gBAA7C,aAA6CA,gBAA7C,uBAA6CA,gBAAgB,CAAE7E,OAA/D,CAD5C;IAEA,MAAMoG,SAAS,GAAGF,iCAAiC,GAAGG,cAAA,CAAIC,IAAJ,CAASzB,gBAAgB,CAAC7E,OAA1B,CAAH,GAAwC,IAA3F;;IAEA,IAAI,CAAC4E,aAAL,EAAoB;MAClB,MAAM,IAAI2B,KAAJ,CAAW,kDAAiDvG,OAAQ,OAAMuB,EAAE,CAACC,QAAH,EAAc,EAAxF,CAAN;IACD;;IACD,MAAMiE,WAAW,GAAG,MAAM,IAAAC,gCAAA,EAAef,IAAf,EAAqB7B,cAArB,EAAqC8B,aAArC,EAAoDwB,SAApD,EAA+D,KAA/D,CAA1B;;IACA,IAAIX,WAAW,CAACe,GAAhB,EAAqB;MACnB,OAAOrC,cAAc,CAAE,sBAAqB/B,SAAS,CAACb,EAAV,CAAaC,QAAb,EAAwB,oBAAmBiE,WAAW,CAACe,GAAZ,CAAgBvH,OAAQ,EAA1F,CAArB;IACD;;IACD,IAAI,CAACwG,WAAW,CAACgB,UAAZ,EAAL,EAA+B;MAC7B,IAAIhB,WAAW,CAACiB,YAAZ,EAAJ,EAAgC;QAC9B;QACA,OAAOvC,cAAc,CAAE,aAAY/B,SAAS,CAACb,EAAV,CAAaC,QAAb,EAAwB,6BAAtC,EAAoE,IAApE,CAArB;MACD;;MACD,IAAIiE,WAAW,CAACkB,aAAZ,EAAJ,EAAiC;QAC/B;QACA,OAAO;UACL9D,eAAe,EAAET,SADZ;UAELuD,kBAAkB,EAAEV,eAFf;UAGL1D,EAHK;UAILlC,YAAY,EAAE,IAJT;UAKLoG;QALK,CAAP;MAOD,CAd4B,CAe7B;;;MACA,OAAOtB,cAAc,CAAE,aAAY/B,SAAS,CAACb,EAAV,CAAaC,QAAb,EAAwB,oBAAtC,EAA2D,IAA3D,CAArB;IACD;;IACD,MAAMoF,QAAQ,GAAGnB,WAAW,CAACoB,uBAA7B,CA5F+B,CA4F8B;;IAC7D,MAAMC,aAAsB,GAAG,MAAMhE,cAAc,CAACoC,WAAf,CAA2B0B,QAAQ,CAACpF,QAAT,EAA3B,EAAgDmD,IAAhD,CAArC;IACA,MAAMoC,cAAuB,GAAG,MAAMjE,cAAc,CAACoC,WAAf,CAA2BN,aAAa,CAACpD,QAAd,EAA3B,EAAqDmD,IAArD,CAAtC;IACA,MAAMqC,eAAe,GAAG,CAAA/E,SAAS,SAAT,IAAAA,SAAS,WAAT,YAAAA,SAAS,CAAEgF,QAAX,GAAsBzF,QAAtB,OAAoC,MAA5D;IACA,MAAMnC,YAAY,GAAG,MAAM,IAAA6H,wBAAA,EAAc;MACvCxI,QADuC;MAEvCqI,cAFuC;MAGvCI,UAAU,EAAG,GAAEvC,aAAa,CAACpD,QAAd,EAAyB,KAAI0C,aAAc,GAHnB;MAIvCkD,gBAAgB,EAAEhF,SAJqB;MAKvCiF,YAAY,EAAG,GAAE7B,SAAS,CAACxF,OAAQ,KAAIgH,eAAgB,GALhB;MAMvCF;IANuC,CAAd,CAA3B;IAQA,OAAO;MAAEjE,eAAe,EAAET,SAAnB;MAA8Bb,EAA9B;MAAkClC,YAAlC;MAAgDoG;IAAhD,CAAP;EACD;;EAEyB,MAAZzC,YAAY,CAAC;IACzBtE,QADyB;IAEzBmE,eAFyB;IAGzBtB,EAHyB;IAIzBlC,YAJyB;IAKzBR,aALyB;IAMzBoE,UANyB;IAOzBpB,UAPyB;IAQzBG,MARyB;IASzBC;EATyB,CAAD,EAoBM;IAC9B,IAAIqF,WAAW,GAAG,EAAlB;IACA,MAAMC,iBAAoC,GAAG;MAC3C;MACAhG,EAAE,EAAE;QAAEiD,IAAI,EAAEjD,EAAE,CAACiD,IAAX;QAAiBzC,KAAK,EAAER,EAAE,CAACQ;MAA3B,CAFuC;MAG3C;MACAvC,IAAI,EAAEyD,UAJqC;MAK3C;MACAuE,MAAM,EAAE3F,UANmC;MAO3C4F,IAAI,EAAEzF,MAAM,CAACwC,IAP8B;MAQ3CC,QAAQ,EAAE,KARiC,CAQ1B;;IAR0B,CAA7C;IAUAlD,EAAE,GAAGsB,eAAe,GAAGA,eAAe,CAACtB,EAAnB,GAAwBA,EAA5C;;IACA,IAAIlC,YAAY,IAAIA,YAAY,CAACgD,YAA7B,IAA6CxD,aAAa,KAAK6I,4BAAA,CAAaC,IAAhF,EAAsF;MACpF,IAAI,CAAC9E,eAAL,EAAsB,MAAM,IAAI0D,KAAJ,CAAW,kDAAiDhF,EAAE,CAACC,QAAH,EAAc,EAA1E,CAAN;MACtBqB,eAAe,CAAC+E,KAAhB,CAAsBC,OAAtB,CAA+BC,IAAD,IAAU;QACtC;QACAR,WAAW,CAAC,IAAAS,6BAAA,EAAqBD,IAAI,CAACE,QAA1B,CAAD,CAAX,GAAmDC,0BAAA,CAAWC,SAA9D;MACD,CAHD;MAIAX,iBAAiB,CAAC9C,QAAlB,GAA6B,IAA7B;MACA/F,QAAQ,CAACqD,KAAT,CAAe0B,OAAf,CAAuBG,kBAAvB,CAA0CuE,QAA1C,CAAmDZ,iBAAnD;MAEA,OAAO;QAAEhG,EAAF;QAAM+F;MAAN,CAAP;IACD;;IACD,MAAMc,QAAQ,GAAG7G,EAAE,CAAC+D,aAAH,CAAiBrC,UAAU,CAACzB,QAAX,EAAjB,CAAjB;IACA,MAAM6G,QAAQ,GAAG,CAAChJ,YAAD,IAAiBR,aAAa,KAAK6I,4BAAA,CAAaY,MAAhD,GAAyDF,QAAzD,GAAoE7G,EAArF;IACA,MAAMgH,yBAAyB,GAAG,MAAM7J,QAAQ,CAAC8J,sCAAT,CAAgDH,QAAhD,CAAxC;;IACA,IAAI,CAAC9G,EAAE,CAACQ,KAAR,EAAe;MACbwG,yBAAyB,CAACE,YAA1B,GAAyC,EAAzC;MACAF,yBAAyB,CAACG,eAA1B,GAA4C,EAA5C;IACD;;IACD,MAAMd,KAAK,GAAGW,yBAAyB,CAACnG,SAA1B,CAAoCwF,KAAlD;IACAA,KAAK,CAACC,OAAN,CAAeC,IAAD,IAAU;MACtB;MACAR,WAAW,CAAC,IAAAS,6BAAA,EAAqBD,IAAI,CAACE,QAA1B,CAAD,CAAX,GAAmDC,0BAAA,CAAWU,OAA9D;IACD,CAHD;;IAKA,IAAItJ,YAAJ,EAAkB;MAChB;MACA,MAAM;QAAEiI,WAAW,EAAEsB,cAAf;QAA+BC;MAA/B,IAAiD,IAAAC,uCAAA,EAAqBlB,KAArB,EAA4BvI,YAA5B,EAA0CR,aAA1C,CAAvD;MACA0J,yBAAyB,CAACnG,SAA1B,CAAoCwF,KAApC,GAA4CiB,aAA5C;MACAvB,WAAW,mCAAQA,WAAR,GAAwBsB,cAAxB,CAAX;IACD;;IACD,MAAMG,kCAAkC,GAAG,MAAMrK,QAAQ,CAACsK,mCAAT,CAA6C,CAACzH,EAAD,CAA7C,CAAjD;IACAgH,yBAAyB,CAACnG,SAA1B,CAAoC6G,6BAApC,GACEF,kCAAkC,CAAC,CAAD,CAAlC,CAAsCG,4BADxC;IAGA,MAAMC,oBAAoB,GAAG,KAAIC,+BAAJ,EAAyB;MACpD1K,QADoD;MAEpD2K,0BAA0B,EAAE,CAACd,yBAAD,CAFwB;MAGpDe,kBAAkB,EAAE,KAHgC;MAIpDC,QAAQ,EAAE,IAJ0C;MAKpDC,WAAW,EAAE,KALuC;MAKhC;MACpBC,OAAO,EAAE,KAN2C;MAMpC;MAChBC,UAAU,EAAE,IAPwC;MAOlC;MAClBC,gBAAgB,EAAE;IARkC,CAAzB,CAA7B;IAUA,MAAMR,oBAAoB,CAACS,QAArB,EAAN,CAzD8B,CA2D9B;IACA;;IACA,IAAIvK,YAAJ,EAAkB;MAChB,IAAIA,YAAY,CAACgD,YAAb,IAA6BxD,aAAa,KAAK6I,4BAAA,CAAamC,MAAhE,EAAwE;QACtEtC,iBAAiB,CAAC9C,QAAlB,GAA6B,KAA7B;QACA8C,iBAAiB,CAACuC,aAAlB,GAAkCzK,YAAY,CAACwJ,aAAb,CAA2BhI,MAA3B,CAAmCkJ,CAAD,IAAOA,CAAC,CAACC,QAA3C,EAAqD7I,GAArD,CAA0D4I,CAAD,IAAOA,CAAC,CAACE,QAAlE,CAAlC;MACD,CAHD,MAGO;QACL1C,iBAAiB,CAAC9C,QAAlB,GAA6B,IAA7B;MACD;;MACD/F,QAAQ,CAACqD,KAAT,CAAe0B,OAAf,CAAuBG,kBAAvB,CAA0CuE,QAA1C,CAAmDZ,iBAAnD;IACD,CARD,MAQO,IAAItF,SAAJ,EAAe;MACpBA,SAAS,CAACiI,YAAV,CAAuB;QAAE3I,EAAF;QAAM/B,IAAI,EAAEyD;MAAZ,CAAvB;IACD,CAFM,MAEA;MACL;MACA,MAAMH,cAAc,GAAG,MAAMpE,QAAQ,CAACqD,KAAT,CAAegB,iBAAf,CAAiCxB,EAAjC,CAA7B;MACAuB,cAAc,CAACqH,OAAf,CAAuBlH,UAAvB,EAHK,CAIL;;MACAH,cAAc,CAACsH,kBAAf,CAAkCnH,UAAU,CAACzB,QAAX,EAAlC;MACA9C,QAAQ,CAACqD,KAAT,CAAe0B,OAAf,CAAuBC,GAAvB,CAA2BZ,cAA3B;IACD;;IAED,OAAO;MAAEvB,EAAF;MAAM+F;IAAN,CAAP;EACD;;EAEuB,MAAV5H,UAAU,CAAChB,QAAD,EAAqBE,MAArB,EAAqE;IAC3F,MAAMqB,GAAG,GAAG,KAAKoK,mBAAL,CAAyB3L,QAAzB,EAAmCE,MAAnC,CAAZ,CAD2F,CAE3F;;IACA,MAAM0L,OAAO,GAAG,MAAM,IAAAC,0BAAA,EAAgB7L,QAAhB,EAA0B;MAAEuB,GAAF;MAAOuK,KAAK,EAAE;IAAd,CAA1B,CAAtB;IACAvK,GAAG,CAAC4H,OAAJ,CAAatG,EAAD,IAAQ7C,QAAQ,CAACqD,KAAT,CAAe0B,OAAf,CAAuBG,kBAAvB,CAA0C6G,eAA1C,CAA0DlJ,EAAE,CAACiD,IAA7D,CAApB;IACA,MAAM9F,QAAQ,CAACqD,KAAT,CAAe0B,OAAf,CAAuBG,kBAAvB,CAA0CC,KAA1C,EAAN;IACA,OAAO;MAAE6G,iBAAiB,EAAEJ,OAAO,CAACtG;IAA7B,CAAP;EACD;;EAEyB,MAAZvE,YAAY,CACxBf,QADwB,EAExBE,MAFwB,EAGxByB,WAHwB,EAIxBnB,KAJwB,EAKM;IAC9B,MAAMe,GAAG,GAAG,KAAKoK,mBAAL,CAAyB3L,QAAzB,EAAmCE,MAAnC,CAAZ,CAD8B,CAE9B;;IACA,MAAM;MAAE+L;IAAF,IAAwB,MAAM,KAAKlM,QAAL,CAAcmM,IAAd,CAAmB;MACrDC,YAAY,EAAEC,eAAA,CAAOC,SAAP,CAAiB9K,GAAjB,CADuC;MAErDf,KAFqD;MAGrDD,OAAO,EAAEoB;IAH4C,CAAnB,CAApC;IAKA,OAAO;MAAE2K,kBAAkB,EAAEL;IAAtB,CAAP;EACD;;EAEmC,MAAtBhK,sBAAsB,CAClCd,MADkC,EAElCmC,MAFkC,EAGlCiJ,eAHkC,EAID;IACjC,MAAMC,GAAG,GAAG,KAAIC,mBAAJ,EAAQ,KAAKzM,QAAL,CAAcqD,KAAtB,CAAZ;;IACA,IAAI;MACF,MAAMqJ,gBAAgB,GAAG,MAAMC,OAAO,CAACC,GAAR,CAC7BzL,MAAM,CAACsB,GAAP,CAAW,MAAOoK,KAAP,IAAiB;QAC1B,MAAMC,eAAe,GAAGxJ,MAAM,CAACF,SAAP,KAAqByJ,KAAK,CAACxJ,KAA3B,GAAmCC,MAAM,CAACD,KAAlE;;QACA,MAAM0J,YAAY,GAAGC,gBAAA,CAAOpF,IAAP,CAAYtE,MAAM,CAACwC,IAAnB,EAAyBgH,eAAzB,CAArB;;QACA,MAAMvI,UAAU,GAAG,MAAM,KAAKvE,QAAL,CAAcqD,KAAd,CAAoB0B,OAApB,CAA4BkI,WAA5B,CAAwCzI,MAAxC,CAA+CuI,YAA/C,EAA6DF,KAA7D,CAAzB;QACA,MAAMK,SAAS,GAAGH,YAAY,CAACjK,QAAb,EAAlB;QACA,IAAI,CAACyB,UAAL,EACE,MAAM,KAAItB,oBAAJ,EAAc,oCAAmC4J,KAAK,CAAC7G,sBAAN,EAA+B,SAAQkH,SAAU,GAAlG,CAAN;QACF,OAAO,KAAK3H,uBAAL,CAA6BsH,KAAK,CAACjG,aAAN,CAAoBrC,UAAU,CAACzB,QAAX,EAApB,CAA7B,EAAyEyJ,eAAzE,EAA0FW,SAA1F,CAAP;MACD,CARD,CAD6B,CAA/B;MAWA,MAAMV,GAAG,CAACW,KAAJ,EAAN;MACA,OAAOT,gBAAP;IACD,CAdD,CAcE,OAAO5E,GAAP,EAAiB;MACjB,MAAM0E,GAAG,CAACW,KAAJ,EAAN;MACA,MAAMrF,GAAN;IACD;EACF;;EAEmC,MAAtBzC,sBAAsB,CAClCrF,QADkC,EAElC2B,WAFkC,EAGlCnB,KAHkC,EAIuD;IACzF,MAAM8L,kBAAkB,GAAGtM,QAAQ,CAACqD,KAAT,CAAe0B,OAAf,CAAuBG,kBAAvB,CAA0CkI,qBAA1C,EAA3B;;IACAC,iBAAA,CAAOC,KAAP,CAAc,8CAA6ChB,kBAAkB,CAAC/J,MAAnB,CAA0BO,QAA1B,EAAqC,aAAhG;;IACA,IAAI,CAACwJ,kBAAkB,CAAC/J,MAAxB,EAAgC,OAAO,IAAP;;IAChC,MAAMhB,GAAG,GAAG6K,eAAA,CAAOC,SAAP,CAAiBC,kBAAkB,CAAC7J,GAAnB,CAAwB8K,CAAD,IAAO,KAAItM,cAAJ,EAAUsM,CAAC,CAAC1K,EAAZ,CAA9B,CAAjB,CAAZ;;IACA,OAAO,KAAK9C,QAAL,CAAcmM,IAAd,CAAmB;MACxBC,YAAY,EAAE5K,GADU;MAExBf,KAFwB;MAGxBD,OAAO,EAAEoB;IAHe,CAAnB,CAAP;EAKD;;EAEOgK,mBAAmB,CAAC3L,QAAD,EAAqBwN,MAArB,EAAiD;IAC1E,IAAIA,MAAM,IAAIA,MAAM,CAACjL,MAArB,EAA6B;MAC3B,MAAMpB,MAAM,GAAGqM,MAAM,CAAC/K,GAAP,CAAYI,EAAD,IAAQ7C,QAAQ,CAACyN,WAAT,CAAqB5K,EAArB,CAAnB,CAAf;MACA1B,MAAM,CAACgI,OAAP,CAAgBtG,EAAD,IAAQ;QACrB,MAAM6K,KAAK,GAAG1N,QAAQ,CAACqD,KAAT,CAAe0B,OAAf,CAAuBG,kBAAvB,CAA0CW,QAA1C,CAAmDhD,EAAE,CAACiD,IAAtD,CAAd;;QACA,IAAI,CAAC4H,KAAL,EAAY;UACV,MAAM,KAAIC,uBAAJ,EAAkB,2BAA0B9K,EAAE,CAACC,QAAH,EAAc,kCAA1D,CAAN;QACD;MACF,CALD;MAMA,OAAO3B,MAAP;IACD;;IACD,MAAMyM,oBAAoB,GAAG5N,QAAQ,CAACqD,KAAT,CAAe0B,OAAf,CAAuBG,kBAAvB,CAA0C2I,aAA1C,EAA7B;IACA,IAAI,CAACD,oBAAoB,CAACrL,MAA1B,EAAkC,MAAM,KAAIoL,uBAAJ,EAAkB,oDAAlB,CAAN;IAClC,OAAOC,oBAAoB,CAACnL,GAArB,CAA0BqL,CAAD,IAAO,KAAI7M,cAAJ,EAAU6M,CAAC,CAACjL,EAAZ,CAAhC,CAAP;EACD;;EAEOzB,oBAAoB,CAACpB,QAAD,EAAqBuB,GAArB,EAA6C;IACvE,IAAI,IAAAwM,sBAAA,EAAYxM,GAAZ,CAAJ,EAAsB;MACpB,MAAMyM,cAAc,GAAG,KAAIC,yBAAJ,EAAmBjO,QAAnB,CAAvB;MACA,OAAOgO,cAAc,CAACE,+BAAf,CAA+C3M,GAA/C,CAAP;IACD;;IACD,OAAOA,GAAG,CAACkB,GAAJ,CAASI,EAAD,IAAQ7C,QAAQ,CAACyN,WAAT,CAAqB5K,EAArB,CAAhB,CAAP;EACD;;EAKoB,aAARsL,QAAQ,CAAC,CAACC,GAAD,EAAMtO,SAAN,EAAiBC,QAAjB,CAAD,EAAiE;IACpF,MAAMsO,OAAO,GAAG,IAAIzO,WAAJ,CAAgBE,SAAhB,EAA2BC,QAA3B,CAAhB;IACAqO,GAAG,CAACE,QAAJ,CAAa,KAAIC,oBAAJ,EAAaF,OAAb,CAAb;IACA,OAAOA,OAAP;EACD;;AAnfsB;;;gCAAZzO,W,WA4eI,E;gCA5eJA,W,kBA6eW,CAAC4O,gBAAD,EAAYC,oBAAZ,EAA6BC,mBAA7B,C;gCA7eX9O,W,aA8eM+O,kB;;AAQnBC,wBAAA,CAAcC,UAAd,CAAyBjP,WAAzB"}

package/package.json

@@ -1,29 +1,29 @@
 {
   "name": "@teambit/merging",
-  "version": "0.0.126",
+  "version": "0.0.129",
   "homepage": "https://bit.dev/teambit/component/merging",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.component",
     "name": "merging",
-    "version": "0.0.126"
+    "version": "0.0.129"
   },
   "dependencies": {
     "chalk": "2.4.2",
-    "fs-extra": "10.0.0",
+    "lodash": "4.17.21",
     "p-map-series": "2.1.0",
     "ramda": "0.27.1",
     "@babel/runtime": "7.12.18",
     "core-js": "^3.0.0",
     "@teambit/harmony": "0.3.3",
     "@teambit/bit-error": "0.0.394",
-    "@teambit/cli": "0.0.541",
-    "@teambit/lane-id": "0.0.60",
-    "@teambit/snapping": "0.0.126",
-    "@teambit/workspace": "0.0.811"
+    "@teambit/cli": "0.0.544",
+    "@teambit/lane-id": "0.0.63",
+    "@teambit/snapping": "0.0.129",
+    "@teambit/workspace": "0.0.814"
   },
   "devDependencies": {
-    "@types/fs-extra": "9.0.7",
+    "@types/lodash": "4.14.165",
     "@types/mocha": "9.1.0",
     "@types/testing-library__jest-dom": "5.9.5",
     "@types/jest": "^26.0.0",
@@ -32,7 +32,7 @@
     "@types/node": "12.20.4"
   },
   "peerDependencies": {
-    "@teambit/legacy": "1.0.324",
+    "@teambit/legacy": "1.0.327",
     "react-dom": "^16.8.0 || ^17.0.0",
     "react": "^16.8.0 || ^17.0.0"
   },