@teambit/merging 1.0.281 → 1.0.283

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,4 +1,4 @@
1
1
  <?xml version="1.0" encoding="UTF-8"?>
2
2
  <testsuites tests="0" failures="0" errors="0" skipped="0">
3
- <testsuite name="teambit.component/merging@1.0.281" tests="0" failures="0" errors="0" skipped="0"/>
3
+ <testsuite name="teambit.component/merging@1.0.283" tests="0" failures="0" errors="0" skipped="0"/>
4
4
  </testsuites>
@@ -4236,7 +4236,7 @@
4236
4236
  "_legacy": {
4237
4237
  "scope": "teambit.component",
4238
4238
  "name": "merging",
4239
- "version": "1.0.281"
4239
+ "version": "1.0.283"
4240
4240
  },
4241
4241
  "_scope": "teambit.component"
4242
4242
  }
@@ -8004,7 +8004,7 @@
8004
8004
  "componentId": {
8005
8005
  "scope": "teambit.component",
8006
8006
  "name": "merging",
8007
- "version": "1.0.281"
8007
+ "version": "1.0.283"
8008
8008
  },
8009
8009
  "taggedModuleExports": []
8010
8010
  }
package/dist/merge-cmd.js CHANGED
@@ -47,8 +47,8 @@ function _bitError() {
47
47
  };
48
48
  return data;
49
49
  }
50
- function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
51
- function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
50
+ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
51
+ function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
52
52
  function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
53
53
  function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
54
54
  class MergeCmd {
@@ -1 +1 @@
1
- {"version":3,"names":["_chalk","data","_interopRequireDefault","require","_lodash","_constants","_mergeVersion","_bitError","obj","__esModule","default","_defineProperty","key","value","_toPropertyKey","Object","defineProperty","enumerable","configurable","writable","t","i","_toPrimitive","r","e","Symbol","toPrimitive","call","TypeError","String","Number","MergeCmd","constructor","merging","globalConfig","WILDCARD_HELP","report","ids","ours","theirs","manual","autoMergeResolve","abort","resolve","build","noSnap","verbose","message","skipDependencyInstallation","getBool","CFG_FORCE_LOCAL_BUILD","Boolean","BitError","components","failedComponents","version","resolvedComponents","abortedComponents","mergeSnapResults","mergeSnapError","merge","title","componentsStr","map","c","id","toStringWithoutVersion","join","chalk","underline","green","mergeReport","exports","removedComponents","leftUnresolvedConflicts","configMergeResults","workspaceConfigUpdateResult","getSuccessOutput","length","bold","fileChangesReport","applyVersionReport","componentsWithConflicts","getConflictSummary","suggestion","conflictSummary","conflictSummaryReport","conflictedComponents","conflictStr","yellow","configMergeWithConflicts","filter","hasConflicts","getConfigMergeConflictSummary","comps","compIdStr","MergeConfigFilename","getSnapsOutput","snappedComponents","autoSnappedResults","outputComponents","component","componentOutput","toString","autoTag","result","triggeredBy","searchWithoutVersion","autoTagComp","a","AUTO_SNAPPED_MSG","getFailureOutput","body","compact","failedComponent","white","unchangedMessage","getSummary","merged","unchangedLegitimately","f","autoSnapped","getConflictStr","ws","workspaceDepsConflicts","mergeConfig","mergedStr","unchangedLegitimatelyStr","autoSnappedStr","removedStr","getRemovedOutput","getWorkspaceConfigUpdateOutput","workspaceConfigConflictWriteError","workspaceDepsUpdates","workspaceDepsUnchanged","getWorkspaceConflictsOutput","red","getWorkspaceUnchangedDepsOutput","keys","pkgName","getWorkspaceDepsOutput","from","to","addName","showVersion","tab","fileChanges","name","files","filesStatus","file","FileStatus","unchanged","note","cyan","FILE_CHANGES_CHECKOUT_MSG","conflictedFiles","installationErrorOutput","installationError","subTitle","compilationErrorOutput","compilationError","getAddedOutput","addedComponents"],"sources":["merge-cmd.ts"],"sourcesContent":["import chalk from 'chalk';\nimport { Command, CommandOptions } from '@teambit/cli';\nimport { ComponentID } from '@teambit/component-id';\nimport { compact } from 'lodash';\nimport {\n WILDCARD_HELP,\n AUTO_SNAPPED_MSG,\n MergeConfigFilename,\n FILE_CHANGES_CHECKOUT_MSG,\n CFG_FORCE_LOCAL_BUILD,\n} from '@teambit/legacy/dist/constants';\nimport { FileStatus, MergeStrategy } from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport { GlobalConfigMain } from '@teambit/global-config';\nimport { ConfigMergeResult, WorkspaceConfigUpdateResult, WorkspaceDepsUpdates } from '@teambit/config-merger';\nimport { BitError } from '@teambit/bit-error';\nimport { ApplyVersionResults, MergingMain, ApplyVersionResult } from './merging.main.runtime';\n\nexport class MergeCmd implements Command {\n name = 'merge [ids...]';\n description = 'merge changes of the remote head into local - auto-snaps all merged components';\n helpUrl = 'reference/components/merging-changes';\n group = 'development';\n extendedDescription = `merge changes of the remote head into local when they are diverged. when on a lane, merge the remote head of the lane into the local\nand creates snaps for merged components that have diverged, on the lane.\nif no ids are specified, all pending-merge components will be merged. (run \"bit status\" to list them).\noptionally use '--abort' to revert the last merge. to revert a lane merge, use \"bit lane merge-abort\" command.\n${WILDCARD_HELP('merge')}`;\n alias = '';\n options = [\n ['', 'ours', 'DEPRECATED. use --auto-merge-resolve. in case of a conflict, keep the local modification'],\n [\n '',\n 'theirs',\n 'DEPRECATED. use --auto-merge-resolve. in case of a conflict, override the local modification with the specified version',\n ],\n [\n '',\n 'manual',\n 'same as \"--auto-merge-resolve manual\". in case of merge conflict, write the files with the conflict markers',\n ],\n [\n 'r',\n 'auto-merge-resolve <merge-strategy>',\n 'in case of a conflict, resolve according to the strategy: [ours, theirs, manual]',\n ],\n ['', 'abort', 'in case of an unresolved merge, revert to pre-merge state'],\n ['', 'resolve', 'mark an unresolved merge as resolved and create a new snap with the changes'],\n ['', 'no-snap', 'do not auto snap even if the merge completed without conflicts'],\n ['', 'build', 'in case of snap during the merge, run the build-pipeline (similar to bit snap --build)'],\n ['', 'verbose', 'show details of components that were not merged successfully'],\n ['x', 'skip-dependency-installation', 'do not install new dependencies resulting from the merge'],\n ['m', 'message <message>', 'override the default message for the auto snap'],\n ] as CommandOptions;\n loader = true;\n\n constructor(private merging: MergingMain, private globalConfig: GlobalConfigMain) {}\n\n async report(\n [ids = []]: [string[]],\n {\n ours = false,\n theirs = false,\n manual = false,\n autoMergeResolve,\n abort = false,\n resolve = false,\n build = false,\n noSnap = false,\n verbose = false,\n message,\n skipDependencyInstallation = false,\n }: {\n ours?: boolean;\n theirs?: boolean;\n manual?: boolean;\n autoMergeResolve?: MergeStrategy;\n abort?: boolean;\n resolve?: boolean;\n build?: boolean;\n noSnap?: boolean;\n verbose?: boolean;\n message: string;\n skipDependencyInstallation?: boolean;\n }\n ) {\n build = (await this.globalConfig.getBool(CFG_FORCE_LOCAL_BUILD)) || Boolean(build);\n if (ours || theirs) {\n throw new BitError('the \"--ours\" and \"--theirs\" flags are deprecated. use \"--auto-merge-resolve\" instead');\n }\n if (\n autoMergeResolve &&\n autoMergeResolve !== 'ours' &&\n autoMergeResolve !== 'theirs' &&\n autoMergeResolve !== 'manual'\n ) {\n throw new BitError('--auto-merge-resolve must be one of the following: [ours, theirs, manual]');\n }\n if (manual) autoMergeResolve = '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 mergeSnapError,\n }: ApplyVersionResults = await this.merging.merge(\n ids,\n autoMergeResolve as any,\n abort,\n resolve,\n noSnap,\n message,\n build,\n skipDependencyInstallation\n );\n if (resolvedComponents) {\n const title = 'successfully resolved component(s)\\n';\n const componentsStr = resolvedComponents.map((c) => c.id.toStringWithoutVersion()).join('\\n');\n return chalk.underline(title) + chalk.green(componentsStr);\n }\n if (abortedComponents) {\n const title = 'successfully aborted the merge of the following component(s)\\n';\n const componentsStr = abortedComponents.map((c) => c.id.toStringWithoutVersion()).join('\\n');\n return chalk.underline(title) + chalk.green(componentsStr);\n }\n\n return mergeReport({\n components,\n failedComponents,\n version,\n mergeSnapResults,\n mergeSnapError,\n verbose,\n });\n }\n}\n\nexport function mergeReport({\n components,\n failedComponents,\n removedComponents,\n version,\n mergeSnapResults,\n mergeSnapError,\n leftUnresolvedConflicts,\n verbose,\n configMergeResults,\n workspaceConfigUpdateResult,\n}: ApplyVersionResults & { configMergeResults?: ConfigMergeResult[] }): string {\n const getSuccessOutput = () => {\n if (!components || !components.length) return '';\n const title = `successfully merged ${components.length} components${\n version ? `from version ${chalk.bold(version)}` : ''\n }\\n`;\n const fileChangesReport = applyVersionReport(components);\n\n return chalk.bold(title) + fileChangesReport;\n };\n\n let componentsWithConflicts = 0;\n const getConflictSummary = () => {\n if (!components || !components.length || !leftUnresolvedConflicts) return '';\n const title = `files with conflicts summary\\n`;\n const suggestion = `\\n\\nmerge process not completed due to the conflicts above. fix conflicts manually and then run \"bit install\".\nonce ready, snap/tag the components to complete the merge.`;\n const conflictSummary = conflictSummaryReport(components);\n componentsWithConflicts = conflictSummary.conflictedComponents;\n return chalk.underline(title) + conflictSummary.conflictStr + chalk.yellow(suggestion);\n };\n\n const configMergeWithConflicts = configMergeResults?.filter((c) => c.hasConflicts()) || [];\n const getConfigMergeConflictSummary = () => {\n if (!configMergeWithConflicts.length) return '';\n const comps = configMergeWithConflicts.map((c) => c.compIdStr).join('\\n');\n const title = `components with config-merge conflicts\\n`;\n const suggestion = `\\nconflicts were found while trying to merge the config. fix them manually by editing the ${MergeConfigFilename} file in the workspace root.\nonce ready, snap/tag the components to complete the merge.`;\n return chalk.underline(title) + comps + chalk.yellow(suggestion);\n };\n\n const getSnapsOutput = () => {\n if (mergeSnapError) {\n return `${chalk.bold(\n 'snapping merged components failed with the following error, please fix the issues and snap manually'\n )}\n${mergeSnapError.message}\n`;\n }\n if (!mergeSnapResults || !mergeSnapResults.snappedComponents) return '';\n const { snappedComponents, autoSnappedResults } = mergeSnapResults;\n const outputComponents = (comps) => {\n return comps\n .map((component) => {\n let componentOutput = ` > ${component.id.toString()}`;\n const autoTag = autoSnappedResults.filter((result) => result.triggeredBy.searchWithoutVersion(component.id));\n if (autoTag.length) {\n const autoTagComp = autoTag.map((a) => a.component.id.toString());\n componentOutput += `\\n ${AUTO_SNAPPED_MSG}: ${autoTagComp.join(', ')}`;\n }\n return componentOutput;\n })\n .join('\\n');\n };\n\n return `${chalk.underline(\n 'merge-snapped components'\n )}\\n(${'components snapped as a result of the merge'})\\n${outputComponents(snappedComponents)}`;\n };\n\n const getFailureOutput = () => {\n if (!failedComponents || !failedComponents.length) return '';\n const title = '\\nmerge skipped for the following component(s)';\n const body = compact(\n failedComponents.map((failedComponent) => {\n // all failures here are \"unchangedLegitimately\". otherwise, it would have been thrown as an error\n if (!verbose) return null;\n return `${chalk.bold(failedComponent.id.toString())} - ${chalk.white(failedComponent.unchangedMessage)}`;\n })\n ).join('\\n');\n if (!body) {\n return `${chalk.bold(`\\nmerge skipped legitimately for ${failedComponents.length} component(s)`)}\n(use --verbose to list them next time)`;\n }\n return `${chalk.underline(title)}\\n${body}`;\n };\n\n const getSummary = () => {\n const merged = components?.length || 0;\n const unchangedLegitimately = failedComponents?.filter((f) => f.unchangedLegitimately).length || 0;\n const autoSnapped =\n (mergeSnapResults?.snappedComponents.length || 0) + (mergeSnapResults?.autoSnappedResults.length || 0);\n const getConflictStr = () => {\n const comps = componentsWithConflicts ? `${componentsWithConflicts} components` : '';\n const ws = workspaceConfigUpdateResult?.workspaceDepsConflicts ? 'workspace.jsonc file' : '';\n const mergeConfig = configMergeWithConflicts.length ? `${MergeConfigFilename} file` : '';\n return compact([comps, ws, mergeConfig]).join(', ');\n };\n\n const title = chalk.bold.underline('Merge Summary');\n const mergedStr = `\\nTotal Merged: ${chalk.bold(merged.toString())}`;\n const unchangedLegitimatelyStr = `\\nTotal Unchanged: ${chalk.bold(unchangedLegitimately.toString())}`;\n const autoSnappedStr = `\\nTotal Snapped: ${chalk.bold(autoSnapped.toString())}`;\n const removedStr = `\\nTotal Removed: ${chalk.bold(removedComponents?.length.toString() || '0')}`;\n const conflictStr = `\\nConflicts: ${chalk.bold(getConflictStr() || 'none')}`;\n\n return title + mergedStr + unchangedLegitimatelyStr + autoSnappedStr + removedStr + conflictStr;\n };\n\n return compact([\n getSuccessOutput(),\n getFailureOutput(),\n getRemovedOutput(removedComponents),\n getSnapsOutput(),\n getConfigMergeConflictSummary(),\n getWorkspaceConfigUpdateOutput(workspaceConfigUpdateResult),\n getConflictSummary(),\n getSummary(),\n ]).join('\\n\\n');\n}\n\nexport function getWorkspaceConfigUpdateOutput(workspaceConfigUpdateResult?: WorkspaceConfigUpdateResult): string {\n if (!workspaceConfigUpdateResult) return '';\n const { workspaceConfigConflictWriteError, workspaceDepsConflicts, workspaceDepsUpdates, workspaceDepsUnchanged } =\n workspaceConfigUpdateResult;\n\n const getWorkspaceConflictsOutput = () => {\n if (!workspaceDepsConflicts && !workspaceConfigConflictWriteError) return '';\n if (workspaceConfigConflictWriteError) {\n return `${chalk.red(workspaceConfigConflictWriteError.message)}`;\n }\n return chalk.yellow('workspace.jsonc has conflicts, please edit the file and fix them');\n };\n\n const getWorkspaceUnchangedDepsOutput = () => {\n if (!workspaceDepsUnchanged) return '';\n const title = '\\nworkspace.jsonc was unable to update the following dependencies';\n const body = Object.keys(workspaceDepsUnchanged)\n .map((pkgName) => {\n return ` ${pkgName}: ${workspaceDepsUnchanged[pkgName]}`;\n })\n .join('\\n');\n\n return `${chalk.underline(title)}\\n${body}`;\n };\n\n return compact([\n getWorkspaceUnchangedDepsOutput(),\n getWorkspaceDepsOutput(workspaceDepsUpdates),\n getWorkspaceConflictsOutput(),\n ]).join('\\n\\n');\n}\n\nfunction getWorkspaceDepsOutput(workspaceDepsUpdates?: WorkspaceDepsUpdates): string {\n if (!workspaceDepsUpdates) return '';\n\n const title = '\\nworkspace.jsonc has been updated with the following dependencies';\n const body = Object.keys(workspaceDepsUpdates)\n .map((pkgName) => {\n const [from, to] = workspaceDepsUpdates[pkgName];\n return ` ${pkgName}: ${from} => ${to}`;\n })\n .join('\\n');\n\n return `${chalk.underline(title)}\\n${body}`;\n}\n\n/**\n * shows only the file-changes section.\n * if all files are \"unchanged\", it returns an empty string\n */\nexport function applyVersionReport(components: ApplyVersionResult[], addName = true, showVersion = false): string {\n const tab = addName ? '\\t' : '';\n const fileChanges = compact(\n components.map((component: ApplyVersionResult) => {\n const name = showVersion ? component.id.toString() : component.id.toStringWithoutVersion();\n const files = compact(\n Object.keys(component.filesStatus).map((file) => {\n if (component.filesStatus[file] === FileStatus.unchanged) return null;\n const note =\n component.filesStatus[file] === FileStatus.manual\n ? chalk.white('automatic merge failed. please fix conflicts manually and then run \"bit install\"')\n : '';\n return `${tab}${String(component.filesStatus[file])} ${chalk.bold(file)} ${note}`;\n })\n ).join('\\n');\n if (!files) return null;\n return `${addName ? name : ''}\\n${chalk.cyan(files)}`;\n })\n ).join('\\n\\n');\n if (!fileChanges) {\n return '';\n }\n const title = `\\n${FILE_CHANGES_CHECKOUT_MSG}\\n`;\n return chalk.underline(title) + fileChanges;\n}\n\nexport function conflictSummaryReport(components: ApplyVersionResult[]): {\n conflictedComponents: number;\n conflictedFiles: number;\n conflictStr: string;\n} {\n const tab = '\\t';\n let conflictedComponents = 0;\n let conflictedFiles = 0;\n const conflictStr = compact(\n components.map((component: ApplyVersionResult) => {\n const name = component.id.toStringWithoutVersion();\n const files = compact(\n Object.keys(component.filesStatus).map((file) => {\n if (component.filesStatus[file] === FileStatus.manual) {\n conflictedFiles += 1;\n return `${tab}${String(component.filesStatus[file])} ${chalk.bold(file)}`;\n }\n return null;\n })\n );\n if (!files.length) return null;\n conflictedComponents += 1;\n return `${name}\\n${chalk.cyan(files.join('\\n'))}`;\n })\n ).join('\\n');\n\n return { conflictedComponents, conflictedFiles, conflictStr };\n}\n\nexport function installationErrorOutput(installationError?: Error) {\n if (!installationError) return '';\n const title = chalk.underline('Installation Error');\n const subTitle = 'The following error was thrown by the package manager:';\n const body = chalk.red(installationError.message);\n const suggestion =\n 'Use \"bit install\" to complete the installation, remove the imported components using \"bit remove <comp id>\" or remove the missing dependencies from their source code';\n return `${title}\\n${subTitle}\\n${body}\\n${suggestion}`;\n}\n\nexport function compilationErrorOutput(compilationError?: Error) {\n if (!compilationError) return '';\n const title = chalk.underline('Compilation Error');\n const subTitle = 'The following error was thrown by the compiler';\n const body = chalk.red(compilationError.message);\n const suggestion = 'Please fix the issue and run \"bit compile\"';\n return `${title}\\n${subTitle}\\n${body}\\n${suggestion}`;\n}\n\nexport function getRemovedOutput(removedComponents?: ComponentID[]) {\n if (!removedComponents?.length) return '';\n const title = `the following ${removedComponents.length} component(s) have been removed`;\n const body = removedComponents.join('\\n');\n return `${chalk.underline(title)}\\n${body}`;\n}\n\nexport function getAddedOutput(addedComponents?: ComponentID[]) {\n if (!addedComponents?.length) return '';\n const title = `the following ${addedComponents.length} component(s) have been added`;\n const body = addedComponents.join('\\n');\n return `${chalk.underline(title)}\\n${body}`;\n}\n"],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"names":["_chalk","data","_interopRequireDefault","require","_lodash","_constants","_mergeVersion","_bitError","e","__esModule","default","_defineProperty","r","t","_toPropertyKey","Object","defineProperty","value","enumerable","configurable","writable","i","_toPrimitive","Symbol","toPrimitive","call","TypeError","String","Number","MergeCmd","constructor","merging","globalConfig","WILDCARD_HELP","report","ids","ours","theirs","manual","autoMergeResolve","abort","resolve","build","noSnap","verbose","message","skipDependencyInstallation","getBool","CFG_FORCE_LOCAL_BUILD","Boolean","BitError","components","failedComponents","version","resolvedComponents","abortedComponents","mergeSnapResults","mergeSnapError","merge","title","componentsStr","map","c","id","toStringWithoutVersion","join","chalk","underline","green","mergeReport","exports","removedComponents","leftUnresolvedConflicts","configMergeResults","workspaceConfigUpdateResult","getSuccessOutput","length","bold","fileChangesReport","applyVersionReport","componentsWithConflicts","getConflictSummary","suggestion","conflictSummary","conflictSummaryReport","conflictedComponents","conflictStr","yellow","configMergeWithConflicts","filter","hasConflicts","getConfigMergeConflictSummary","comps","compIdStr","MergeConfigFilename","getSnapsOutput","snappedComponents","autoSnappedResults","outputComponents","component","componentOutput","toString","autoTag","result","triggeredBy","searchWithoutVersion","autoTagComp","a","AUTO_SNAPPED_MSG","getFailureOutput","body","compact","failedComponent","white","unchangedMessage","getSummary","merged","unchangedLegitimately","f","autoSnapped","getConflictStr","ws","workspaceDepsConflicts","mergeConfig","mergedStr","unchangedLegitimatelyStr","autoSnappedStr","removedStr","getRemovedOutput","getWorkspaceConfigUpdateOutput","workspaceConfigConflictWriteError","workspaceDepsUpdates","workspaceDepsUnchanged","getWorkspaceConflictsOutput","red","getWorkspaceUnchangedDepsOutput","keys","pkgName","getWorkspaceDepsOutput","from","to","addName","showVersion","tab","fileChanges","name","files","filesStatus","file","FileStatus","unchanged","note","cyan","FILE_CHANGES_CHECKOUT_MSG","conflictedFiles","installationErrorOutput","installationError","subTitle","compilationErrorOutput","compilationError","getAddedOutput","addedComponents"],"sources":["merge-cmd.ts"],"sourcesContent":["import chalk from 'chalk';\nimport { Command, CommandOptions } from '@teambit/cli';\nimport { ComponentID } from '@teambit/component-id';\nimport { compact } from 'lodash';\nimport {\n WILDCARD_HELP,\n AUTO_SNAPPED_MSG,\n MergeConfigFilename,\n FILE_CHANGES_CHECKOUT_MSG,\n CFG_FORCE_LOCAL_BUILD,\n} from '@teambit/legacy/dist/constants';\nimport { FileStatus, MergeStrategy } from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport { GlobalConfigMain } from '@teambit/global-config';\nimport { ConfigMergeResult, WorkspaceConfigUpdateResult, WorkspaceDepsUpdates } from '@teambit/config-merger';\nimport { BitError } from '@teambit/bit-error';\nimport { ApplyVersionResults, MergingMain, ApplyVersionResult } from './merging.main.runtime';\n\nexport class MergeCmd implements Command {\n name = 'merge [ids...]';\n description = 'merge changes of the remote head into local - auto-snaps all merged components';\n helpUrl = 'reference/components/merging-changes';\n group = 'development';\n extendedDescription = `merge changes of the remote head into local when they are diverged. when on a lane, merge the remote head of the lane into the local\nand creates snaps for merged components that have diverged, on the lane.\nif no ids are specified, all pending-merge components will be merged. (run \"bit status\" to list them).\noptionally use '--abort' to revert the last merge. to revert a lane merge, use \"bit lane merge-abort\" command.\n${WILDCARD_HELP('merge')}`;\n alias = '';\n options = [\n ['', 'ours', 'DEPRECATED. use --auto-merge-resolve. in case of a conflict, keep the local modification'],\n [\n '',\n 'theirs',\n 'DEPRECATED. use --auto-merge-resolve. in case of a conflict, override the local modification with the specified version',\n ],\n [\n '',\n 'manual',\n 'same as \"--auto-merge-resolve manual\". in case of merge conflict, write the files with the conflict markers',\n ],\n [\n 'r',\n 'auto-merge-resolve <merge-strategy>',\n 'in case of a conflict, resolve according to the strategy: [ours, theirs, manual]',\n ],\n ['', 'abort', 'in case of an unresolved merge, revert to pre-merge state'],\n ['', 'resolve', 'mark an unresolved merge as resolved and create a new snap with the changes'],\n ['', 'no-snap', 'do not auto snap even if the merge completed without conflicts'],\n ['', 'build', 'in case of snap during the merge, run the build-pipeline (similar to bit snap --build)'],\n ['', 'verbose', 'show details of components that were not merged successfully'],\n ['x', 'skip-dependency-installation', 'do not install new dependencies resulting from the merge'],\n ['m', 'message <message>', 'override the default message for the auto snap'],\n ] as CommandOptions;\n loader = true;\n\n constructor(private merging: MergingMain, private globalConfig: GlobalConfigMain) {}\n\n async report(\n [ids = []]: [string[]],\n {\n ours = false,\n theirs = false,\n manual = false,\n autoMergeResolve,\n abort = false,\n resolve = false,\n build = false,\n noSnap = false,\n verbose = false,\n message,\n skipDependencyInstallation = false,\n }: {\n ours?: boolean;\n theirs?: boolean;\n manual?: boolean;\n autoMergeResolve?: MergeStrategy;\n abort?: boolean;\n resolve?: boolean;\n build?: boolean;\n noSnap?: boolean;\n verbose?: boolean;\n message: string;\n skipDependencyInstallation?: boolean;\n }\n ) {\n build = (await this.globalConfig.getBool(CFG_FORCE_LOCAL_BUILD)) || Boolean(build);\n if (ours || theirs) {\n throw new BitError('the \"--ours\" and \"--theirs\" flags are deprecated. use \"--auto-merge-resolve\" instead');\n }\n if (\n autoMergeResolve &&\n autoMergeResolve !== 'ours' &&\n autoMergeResolve !== 'theirs' &&\n autoMergeResolve !== 'manual'\n ) {\n throw new BitError('--auto-merge-resolve must be one of the following: [ours, theirs, manual]');\n }\n if (manual) autoMergeResolve = '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 mergeSnapError,\n }: ApplyVersionResults = await this.merging.merge(\n ids,\n autoMergeResolve as any,\n abort,\n resolve,\n noSnap,\n message,\n build,\n skipDependencyInstallation\n );\n if (resolvedComponents) {\n const title = 'successfully resolved component(s)\\n';\n const componentsStr = resolvedComponents.map((c) => c.id.toStringWithoutVersion()).join('\\n');\n return chalk.underline(title) + chalk.green(componentsStr);\n }\n if (abortedComponents) {\n const title = 'successfully aborted the merge of the following component(s)\\n';\n const componentsStr = abortedComponents.map((c) => c.id.toStringWithoutVersion()).join('\\n');\n return chalk.underline(title) + chalk.green(componentsStr);\n }\n\n return mergeReport({\n components,\n failedComponents,\n version,\n mergeSnapResults,\n mergeSnapError,\n verbose,\n });\n }\n}\n\nexport function mergeReport({\n components,\n failedComponents,\n removedComponents,\n version,\n mergeSnapResults,\n mergeSnapError,\n leftUnresolvedConflicts,\n verbose,\n configMergeResults,\n workspaceConfigUpdateResult,\n}: ApplyVersionResults & { configMergeResults?: ConfigMergeResult[] }): string {\n const getSuccessOutput = () => {\n if (!components || !components.length) return '';\n const title = `successfully merged ${components.length} components${\n version ? `from version ${chalk.bold(version)}` : ''\n }\\n`;\n const fileChangesReport = applyVersionReport(components);\n\n return chalk.bold(title) + fileChangesReport;\n };\n\n let componentsWithConflicts = 0;\n const getConflictSummary = () => {\n if (!components || !components.length || !leftUnresolvedConflicts) return '';\n const title = `files with conflicts summary\\n`;\n const suggestion = `\\n\\nmerge process not completed due to the conflicts above. fix conflicts manually and then run \"bit install\".\nonce ready, snap/tag the components to complete the merge.`;\n const conflictSummary = conflictSummaryReport(components);\n componentsWithConflicts = conflictSummary.conflictedComponents;\n return chalk.underline(title) + conflictSummary.conflictStr + chalk.yellow(suggestion);\n };\n\n const configMergeWithConflicts = configMergeResults?.filter((c) => c.hasConflicts()) || [];\n const getConfigMergeConflictSummary = () => {\n if (!configMergeWithConflicts.length) return '';\n const comps = configMergeWithConflicts.map((c) => c.compIdStr).join('\\n');\n const title = `components with config-merge conflicts\\n`;\n const suggestion = `\\nconflicts were found while trying to merge the config. fix them manually by editing the ${MergeConfigFilename} file in the workspace root.\nonce ready, snap/tag the components to complete the merge.`;\n return chalk.underline(title) + comps + chalk.yellow(suggestion);\n };\n\n const getSnapsOutput = () => {\n if (mergeSnapError) {\n return `${chalk.bold(\n 'snapping merged components failed with the following error, please fix the issues and snap manually'\n )}\n${mergeSnapError.message}\n`;\n }\n if (!mergeSnapResults || !mergeSnapResults.snappedComponents) return '';\n const { snappedComponents, autoSnappedResults } = mergeSnapResults;\n const outputComponents = (comps) => {\n return comps\n .map((component) => {\n let componentOutput = ` > ${component.id.toString()}`;\n const autoTag = autoSnappedResults.filter((result) => result.triggeredBy.searchWithoutVersion(component.id));\n if (autoTag.length) {\n const autoTagComp = autoTag.map((a) => a.component.id.toString());\n componentOutput += `\\n ${AUTO_SNAPPED_MSG}: ${autoTagComp.join(', ')}`;\n }\n return componentOutput;\n })\n .join('\\n');\n };\n\n return `${chalk.underline(\n 'merge-snapped components'\n )}\\n(${'components snapped as a result of the merge'})\\n${outputComponents(snappedComponents)}`;\n };\n\n const getFailureOutput = () => {\n if (!failedComponents || !failedComponents.length) return '';\n const title = '\\nmerge skipped for the following component(s)';\n const body = compact(\n failedComponents.map((failedComponent) => {\n // all failures here are \"unchangedLegitimately\". otherwise, it would have been thrown as an error\n if (!verbose) return null;\n return `${chalk.bold(failedComponent.id.toString())} - ${chalk.white(failedComponent.unchangedMessage)}`;\n })\n ).join('\\n');\n if (!body) {\n return `${chalk.bold(`\\nmerge skipped legitimately for ${failedComponents.length} component(s)`)}\n(use --verbose to list them next time)`;\n }\n return `${chalk.underline(title)}\\n${body}`;\n };\n\n const getSummary = () => {\n const merged = components?.length || 0;\n const unchangedLegitimately = failedComponents?.filter((f) => f.unchangedLegitimately).length || 0;\n const autoSnapped =\n (mergeSnapResults?.snappedComponents.length || 0) + (mergeSnapResults?.autoSnappedResults.length || 0);\n const getConflictStr = () => {\n const comps = componentsWithConflicts ? `${componentsWithConflicts} components` : '';\n const ws = workspaceConfigUpdateResult?.workspaceDepsConflicts ? 'workspace.jsonc file' : '';\n const mergeConfig = configMergeWithConflicts.length ? `${MergeConfigFilename} file` : '';\n return compact([comps, ws, mergeConfig]).join(', ');\n };\n\n const title = chalk.bold.underline('Merge Summary');\n const mergedStr = `\\nTotal Merged: ${chalk.bold(merged.toString())}`;\n const unchangedLegitimatelyStr = `\\nTotal Unchanged: ${chalk.bold(unchangedLegitimately.toString())}`;\n const autoSnappedStr = `\\nTotal Snapped: ${chalk.bold(autoSnapped.toString())}`;\n const removedStr = `\\nTotal Removed: ${chalk.bold(removedComponents?.length.toString() || '0')}`;\n const conflictStr = `\\nConflicts: ${chalk.bold(getConflictStr() || 'none')}`;\n\n return title + mergedStr + unchangedLegitimatelyStr + autoSnappedStr + removedStr + conflictStr;\n };\n\n return compact([\n getSuccessOutput(),\n getFailureOutput(),\n getRemovedOutput(removedComponents),\n getSnapsOutput(),\n getConfigMergeConflictSummary(),\n getWorkspaceConfigUpdateOutput(workspaceConfigUpdateResult),\n getConflictSummary(),\n getSummary(),\n ]).join('\\n\\n');\n}\n\nexport function getWorkspaceConfigUpdateOutput(workspaceConfigUpdateResult?: WorkspaceConfigUpdateResult): string {\n if (!workspaceConfigUpdateResult) return '';\n const { workspaceConfigConflictWriteError, workspaceDepsConflicts, workspaceDepsUpdates, workspaceDepsUnchanged } =\n workspaceConfigUpdateResult;\n\n const getWorkspaceConflictsOutput = () => {\n if (!workspaceDepsConflicts && !workspaceConfigConflictWriteError) return '';\n if (workspaceConfigConflictWriteError) {\n return `${chalk.red(workspaceConfigConflictWriteError.message)}`;\n }\n return chalk.yellow('workspace.jsonc has conflicts, please edit the file and fix them');\n };\n\n const getWorkspaceUnchangedDepsOutput = () => {\n if (!workspaceDepsUnchanged) return '';\n const title = '\\nworkspace.jsonc was unable to update the following dependencies';\n const body = Object.keys(workspaceDepsUnchanged)\n .map((pkgName) => {\n return ` ${pkgName}: ${workspaceDepsUnchanged[pkgName]}`;\n })\n .join('\\n');\n\n return `${chalk.underline(title)}\\n${body}`;\n };\n\n return compact([\n getWorkspaceUnchangedDepsOutput(),\n getWorkspaceDepsOutput(workspaceDepsUpdates),\n getWorkspaceConflictsOutput(),\n ]).join('\\n\\n');\n}\n\nfunction getWorkspaceDepsOutput(workspaceDepsUpdates?: WorkspaceDepsUpdates): string {\n if (!workspaceDepsUpdates) return '';\n\n const title = '\\nworkspace.jsonc has been updated with the following dependencies';\n const body = Object.keys(workspaceDepsUpdates)\n .map((pkgName) => {\n const [from, to] = workspaceDepsUpdates[pkgName];\n return ` ${pkgName}: ${from} => ${to}`;\n })\n .join('\\n');\n\n return `${chalk.underline(title)}\\n${body}`;\n}\n\n/**\n * shows only the file-changes section.\n * if all files are \"unchanged\", it returns an empty string\n */\nexport function applyVersionReport(components: ApplyVersionResult[], addName = true, showVersion = false): string {\n const tab = addName ? '\\t' : '';\n const fileChanges = compact(\n components.map((component: ApplyVersionResult) => {\n const name = showVersion ? component.id.toString() : component.id.toStringWithoutVersion();\n const files = compact(\n Object.keys(component.filesStatus).map((file) => {\n if (component.filesStatus[file] === FileStatus.unchanged) return null;\n const note =\n component.filesStatus[file] === FileStatus.manual\n ? chalk.white('automatic merge failed. please fix conflicts manually and then run \"bit install\"')\n : '';\n return `${tab}${String(component.filesStatus[file])} ${chalk.bold(file)} ${note}`;\n })\n ).join('\\n');\n if (!files) return null;\n return `${addName ? name : ''}\\n${chalk.cyan(files)}`;\n })\n ).join('\\n\\n');\n if (!fileChanges) {\n return '';\n }\n const title = `\\n${FILE_CHANGES_CHECKOUT_MSG}\\n`;\n return chalk.underline(title) + fileChanges;\n}\n\nexport function conflictSummaryReport(components: ApplyVersionResult[]): {\n conflictedComponents: number;\n conflictedFiles: number;\n conflictStr: string;\n} {\n const tab = '\\t';\n let conflictedComponents = 0;\n let conflictedFiles = 0;\n const conflictStr = compact(\n components.map((component: ApplyVersionResult) => {\n const name = component.id.toStringWithoutVersion();\n const files = compact(\n Object.keys(component.filesStatus).map((file) => {\n if (component.filesStatus[file] === FileStatus.manual) {\n conflictedFiles += 1;\n return `${tab}${String(component.filesStatus[file])} ${chalk.bold(file)}`;\n }\n return null;\n })\n );\n if (!files.length) return null;\n conflictedComponents += 1;\n return `${name}\\n${chalk.cyan(files.join('\\n'))}`;\n })\n ).join('\\n');\n\n return { conflictedComponents, conflictedFiles, conflictStr };\n}\n\nexport function installationErrorOutput(installationError?: Error) {\n if (!installationError) return '';\n const title = chalk.underline('Installation Error');\n const subTitle = 'The following error was thrown by the package manager:';\n const body = chalk.red(installationError.message);\n const suggestion =\n 'Use \"bit install\" to complete the installation, remove the imported components using \"bit remove <comp id>\" or remove the missing dependencies from their source code';\n return `${title}\\n${subTitle}\\n${body}\\n${suggestion}`;\n}\n\nexport function compilationErrorOutput(compilationError?: Error) {\n if (!compilationError) return '';\n const title = chalk.underline('Compilation Error');\n const subTitle = 'The following error was thrown by the compiler';\n const body = chalk.red(compilationError.message);\n const suggestion = 'Please fix the issue and run \"bit compile\"';\n return `${title}\\n${subTitle}\\n${body}\\n${suggestion}`;\n}\n\nexport function getRemovedOutput(removedComponents?: ComponentID[]) {\n if (!removedComponents?.length) return '';\n const title = `the following ${removedComponents.length} component(s) have been removed`;\n const body = removedComponents.join('\\n');\n return `${chalk.underline(title)}\\n${body}`;\n}\n\nexport function getAddedOutput(addedComponents?: ComponentID[]) {\n if (!addedComponents?.length) return '';\n const title = `the following ${addedComponents.length} component(s) have been added`;\n const body = addedComponents.join('\\n');\n return `${chalk.underline(title)}\\n${body}`;\n}\n"],"mappings":"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","ignoreList":[]}
@@ -67,10 +67,10 @@ function _configMerger() {
67
67
  };
68
68
  return data;
69
69
  }
70
- function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
70
+ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
71
71
  function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
72
72
  function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
73
- function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
73
+ function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
74
74
  function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
75
75
  function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
76
76
  const compIsAlreadyMergedMsg = exports.compIsAlreadyMergedMsg = 'component is already merged';
@@ -1 +1 @@
1
- {"version":3,"names":["_pMapSeries","data","_interopRequireDefault","require","_componentId","_laneId","_getDivergeData","_repositories","_lodash","_threeWayMerge","_noCommonSnap","_configMerger","obj","__esModule","default","ownKeys","e","r","t","Object","keys","getOwnPropertySymbols","o","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","defineProperty","key","value","_toPropertyKey","configurable","writable","i","_toPrimitive","Symbol","toPrimitive","call","TypeError","String","Number","compIsAlreadyMergedMsg","exports","MergeStatusProvider","constructor","scope","logger","importer","options","workspace","currentLane","otherLane","getStatus","bitIds","importObjectsFromMainIfExist","toBitIds","toVersionLatest","componentStatusBeforeMergeAttempt","mapSeries","id","getComponentStatusBeforeMergeAttempt","shouldImportHistoryOfOtherLane","shouldSquash","toImport","map","compStatus","divergeData","versionsToImport","commonSnapBeforeDiverge","snapsOnTargetOnly","compact","v","changeVersion","toString","flat","reason","legacyScope","scopeImporter","importWithoutDeps","ComponentIdList","fromArray","lane","cache","includeVersionHistory","compStatusNotNeedMerge","c","mergeProps","compStatusNeedMerge","getComponentsStatusNeedMerge","tmp","Tmp","componentsStatus","Promise","all","getComponentMergeStatus","clear","err","results","componentMergeStatusBeforeMergeAttempt","currentComponent","Error","otherLaneHead","currentId","modelComponent","repo","objects","baseSnap","debug","toStringWithoutVersion","version","baseComponent","loadVersion","otherComponent","currentLaneName","toLaneId","otherLaneName","DEFAULT_LANE","currentLabel","otherLabel","workspaceIds","listIds","toComponentIds","configMerger","ComponentConfigMerger","extensions","mergeStrategy","configMergeResult","merge","mergeResults","threeWayMerge","returnUnmerged","msg","unmergedLegitimately","componentStatus","unchangedMessage","unchangedLegitimately","consumer","getModelComponentIfExist","unmerged","unmergedComponents","getEntry","getRef","existingBitMapId","bitMap","getComponentIdIfExist","ignoreVersion","componentOnOther","idOnCurrentLane","getComponent","isRemoved","shouldMerge","shouldRemoveFromMain","shouldBeRemoved","getCurrentId","head","getHeadAsTagIfExist","getDivergeData","targetHead","throws","componentFromModel","componentMap","getComponentIfExist","isLocallyRemoved","getCurrentComponent","loadComponent","getConsumerComponent","isTargetNotAhead","isTargetAhead","shouldIgnore","isModified","undefined","componentModificationStatus","getComponentStatusById","modified","isSourceCodeModified","isComponentSourceCodeModified","modifiedType","ignoreConfigChanges","sourceHead","NoCommonSnap","resolveUnrelated","message","handleNoCommonSnap","isDiverged","isSourceAhead","mainHead","returnAccordingToOurs","headToSaveInLane","unrelatedHead","unrelatedLaneId","resolvedUnrelated","strategy","headOnCurrentLane","returnAccordingToTheirs","resolvedRef","unrelatedHeadRef","currentVersionRef","otherVersionRef","hasResolvedFromMain","hashToCompare","divergeDataFromMain","hasResolvedLocally","getHeadRegardlessOfLane","hasResolvedRemotely","refToSaveInLane"],"sources":["merge-status-provider.ts"],"sourcesContent":["import { Workspace } from '@teambit/workspace';\nimport { MergeStrategy } from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport mapSeries from 'p-map-series';\nimport { ComponentID, ComponentIdList } from '@teambit/component-id';\nimport { DEFAULT_LANE, LaneId } from '@teambit/lane-id';\nimport { getDivergeData } from '@teambit/legacy/dist/scope/component-ops/get-diverge-data';\nimport { Lane, ModelComponent, Version } from '@teambit/legacy/dist/scope/models';\nimport { Ref } from '@teambit/legacy/dist/scope/objects';\nimport { Tmp } from '@teambit/legacy/dist/scope/repositories';\nimport ConsumerComponent from '@teambit/legacy/dist/consumer/component/consumer-component';\nimport { ImporterMain } from '@teambit/importer';\nimport { Logger } from '@teambit/logger';\nimport { compact } from 'lodash';\nimport threeWayMerge from '@teambit/legacy/dist/consumer/versions-ops/merge-version/three-way-merge';\nimport { SnapsDistance } from '@teambit/legacy/dist/scope/component-ops/snaps-distance';\nimport { NoCommonSnap } from '@teambit/legacy/dist/scope/exceptions/no-common-snap';\nimport { ComponentConfigMerger } from '@teambit/config-merger';\nimport { ScopeMain } from '@teambit/scope';\nimport { ComponentMergeStatus, ComponentMergeStatusBeforeMergeAttempt } from './merging.main.runtime';\n\nexport type MergeStatusProviderOptions = {\n resolveUnrelated?: MergeStrategy;\n mergeStrategy: MergeStrategy;\n ignoreConfigChanges?: boolean;\n shouldSquash?: boolean;\n};\n\nexport const compIsAlreadyMergedMsg = 'component is already merged';\nexport class MergeStatusProvider {\n constructor(\n private scope: ScopeMain,\n private logger: Logger,\n private importer: ImporterMain,\n private options: MergeStatusProviderOptions,\n private workspace?: Workspace,\n private currentLane?: Lane, // currently checked out lane. if on main, then it's undefined.\n private otherLane?: Lane // the lane we want to merged to our lane. (undefined if it's \"main\").\n ) {}\n\n async getStatus(\n bitIds: ComponentID[] // the id.version is the version we want to merge to the current component\n ): Promise<ComponentMergeStatus[]> {\n if (!this.currentLane && this.otherLane) {\n await this.importer.importObjectsFromMainIfExist(this.otherLane.toBitIds().toVersionLatest());\n }\n const componentStatusBeforeMergeAttempt = await mapSeries(bitIds, (id) =>\n this.getComponentStatusBeforeMergeAttempt(id)\n );\n // whether or not we need to import the gap between the common-snap and the other lane.\n // the common-snap itself we need anyway in order to get the files hash/content for checking conflicts.\n const shouldImportHistoryOfOtherLane =\n !this.options?.shouldSquash && // when squashing, no need for all history, only the head is going to be pushed\n (!this.currentLane || // on main. we need all history in order to push each component to its remote\n this.currentLane.scope !== this.otherLane?.scope); // on lane, but the other lane is from a different scope. we need all history in order to push to the current lane's scope\n const toImport = componentStatusBeforeMergeAttempt\n .map((compStatus) => {\n if (!compStatus.divergeData) return [];\n const versionsToImport = [compStatus.divergeData.commonSnapBeforeDiverge];\n if (shouldImportHistoryOfOtherLane) {\n versionsToImport.push(...compStatus.divergeData.snapsOnTargetOnly);\n }\n return compact(versionsToImport).map((v) => compStatus.id.changeVersion(v.toString()));\n })\n .flat();\n const reason = shouldImportHistoryOfOtherLane\n ? `for filling the gap between the common-snap and the head of ${this.otherLane?.id() || 'main'}`\n : `for getting the common-snap between ${this.currentLane?.id() || 'main'} and ${this.otherLane?.id() || 'main'}`;\n await this.scope.legacyScope.scopeImporter.importWithoutDeps(ComponentIdList.fromArray(toImport), {\n lane: this.otherLane,\n cache: true,\n includeVersionHistory: false,\n reason,\n });\n\n const compStatusNotNeedMerge = componentStatusBeforeMergeAttempt.filter(\n (c) => !c.mergeProps\n ) as ComponentMergeStatus[];\n const compStatusNeedMerge = componentStatusBeforeMergeAttempt.filter((c) => c.mergeProps);\n\n const getComponentsStatusNeedMerge = async (): Promise<ComponentMergeStatus[]> => {\n const tmp = new Tmp(this.scope.legacyScope);\n try {\n const componentsStatus = await Promise.all(\n compStatusNeedMerge.map((compStatus) => this.getComponentMergeStatus(compStatus))\n );\n await tmp.clear();\n return componentsStatus;\n } catch (err: any) {\n await tmp.clear();\n throw err;\n }\n };\n const results = await getComponentsStatusNeedMerge();\n\n results.push(...compStatusNotNeedMerge);\n return results;\n }\n\n private async getComponentMergeStatus(\n componentMergeStatusBeforeMergeAttempt: ComponentMergeStatusBeforeMergeAttempt\n ) {\n const { id, divergeData, currentComponent, mergeProps } = componentMergeStatusBeforeMergeAttempt;\n if (!mergeProps) throw new Error(`getDivergedMergeStatus, mergeProps is missing for ${id.toString()}`);\n const { otherLaneHead, currentId, modelComponent } = mergeProps;\n const repo = this.scope.legacyScope.objects;\n if (!divergeData) throw new Error(`getDivergedMergeStatus, divergeData is missing for ${id.toString()}`);\n if (!currentComponent) throw new Error(`getDivergedMergeStatus, currentComponent is missing for ${id.toString()}`);\n\n const baseSnap = divergeData.commonSnapBeforeDiverge as Ref; // must be set when isTrueMerge\n this.logger.debug(`merging snaps details:\nid: ${id.toStringWithoutVersion()}\nbase: ${baseSnap.toString()}\ncurrent: ${currentId.version}\nother: ${otherLaneHead.toString()}`);\n const baseComponent: Version = await modelComponent.loadVersion(baseSnap.toString(), repo);\n const otherComponent: Version = await modelComponent.loadVersion(otherLaneHead.toString(), repo);\n\n const currentLaneName = this.currentLane?.toLaneId().toString() || 'main';\n const otherLaneName = this.otherLane ? this.otherLane.toLaneId().toString() : DEFAULT_LANE;\n const currentLabel = `${currentId.version} (${currentLaneName === otherLaneName ? 'current' : currentLaneName})`;\n const otherLabel = `${otherLaneHead.toString()} (${\n otherLaneName === currentLaneName ? 'incoming' : otherLaneName\n })`;\n const workspaceIds = this.workspace?.listIds() || this.currentLane?.toComponentIds() || [];\n const configMerger = new ComponentConfigMerger(\n id.toStringWithoutVersion(),\n workspaceIds,\n this.otherLane,\n currentComponent.extensions,\n baseComponent.extensions,\n otherComponent.extensions,\n currentLabel,\n otherLabel,\n this.logger,\n this.options.mergeStrategy\n );\n const configMergeResult = configMerger.merge();\n\n const mergeResults = await threeWayMerge({\n scope: this.scope.legacyScope,\n otherComponent,\n otherLabel,\n currentComponent,\n currentLabel,\n baseComponent,\n });\n return {\n currentComponent,\n id,\n mergeResults,\n divergeData,\n configMergeResult,\n };\n }\n\n private returnUnmerged(\n id: ComponentID,\n msg: string,\n unmergedLegitimately = false\n ): ComponentMergeStatusBeforeMergeAttempt {\n const componentStatus: ComponentMergeStatusBeforeMergeAttempt = { id };\n componentStatus.unchangedMessage = msg;\n componentStatus.unchangedLegitimately = unmergedLegitimately;\n return componentStatus;\n }\n\n private async getComponentStatusBeforeMergeAttempt(\n id: ComponentID // the id.version is the version we want to merge to the current component\n ): Promise<ComponentMergeStatusBeforeMergeAttempt> {\n const consumer = this.workspace?.consumer;\n const componentStatus: ComponentMergeStatusBeforeMergeAttempt = { id };\n const modelComponent = await this.scope.legacyScope.getModelComponentIfExist(id);\n if (!modelComponent) {\n return this.returnUnmerged(\n id,\n `component ${id.toString()} is on the lane/main but its objects were not found, please re-import the lane`\n );\n }\n const unmerged = this.scope.legacyScope.objects.unmergedComponents.getEntry(id);\n if (unmerged) {\n return this.returnUnmerged(\n id,\n `component ${id.toStringWithoutVersion()} is in during-merge state a previous merge, please snap/tag it first (or use bit merge --resolve/--abort/ bit lane merge-abort)`\n );\n }\n const repo = this.scope.legacyScope.objects;\n const version = id.version as string;\n const otherLaneHead = modelComponent.getRef(version);\n const existingBitMapId = consumer?.bitMap.getComponentIdIfExist(id, { ignoreVersion: true });\n const componentOnOther: Version = await modelComponent.loadVersion(version, this.scope.legacyScope.objects);\n const idOnCurrentLane = this.currentLane?.getComponent(id);\n\n if (componentOnOther.isRemoved()) {\n // if exist in current lane, we want the current lane to get the soft-remove update.\n // or if it was removed with --update-main, we want to merge it so then main will get the update.\n const shouldMerge = idOnCurrentLane || componentOnOther.shouldRemoveFromMain();\n if (shouldMerge) {\n // remove the component from the workspace if exist.\n componentStatus.shouldBeRemoved = true;\n } else {\n // on main, don't merge soft-removed components unless it's marked with removeOnMain.\n // on lane, if it's not part of the current lane, don't merge it.\n return this.returnUnmerged(id, `component has been removed`, true);\n }\n }\n const getCurrentId = () => {\n if (existingBitMapId) return existingBitMapId;\n if (this.currentLane) {\n if (!idOnCurrentLane) return null;\n return idOnCurrentLane.id.changeVersion(idOnCurrentLane.head.toString());\n }\n // it's on main\n const head = modelComponent.getHeadAsTagIfExist();\n if (head) {\n return id.changeVersion(head);\n }\n return null;\n };\n const currentId = getCurrentId();\n if (!currentId) {\n const divergeData = await getDivergeData({ repo, modelComponent, targetHead: otherLaneHead, throws: false });\n return { ...componentStatus, componentFromModel: componentOnOther, divergeData };\n }\n const componentMap = consumer?.bitMap.getComponentIfExist(currentId, { ignoreVersion: true });\n const isLocallyRemoved = componentMap?.isRemoved();\n if (isLocallyRemoved) {\n return this.returnUnmerged(\n id,\n `component is locally deleted, please snap and export first or undo by bit recover`\n );\n }\n const getCurrentComponent = () => {\n // eslint-disable-next-line @typescript-eslint/no-non-null-assertion\n if (existingBitMapId) return consumer!.loadComponent(existingBitMapId);\n return this.scope.legacyScope.getConsumerComponent(currentId);\n };\n const currentComponent = await getCurrentComponent();\n if (currentComponent.isRemoved()) {\n // we have a few options:\n // 1. \"other\" is main. in this case, we don't care what happens on main, we want the component to stay deleted on\n // this lane. (even when main is ahead, we don't want to merge it).\n // 2. other is ahead. in this case, other recovered the component. so we can continue with the merge.\n // it is possible that it is diverged, in which case, still continue with the merge, and later on, the\n // merge-config will show a config conflict of the remove aspect.\n // 3. other is not ahead. in this case, just ignore this component, no point to merge it, we want it removed.\n const divergeData = await getDivergeData({ repo, modelComponent, targetHead: otherLaneHead, throws: false });\n const isTargetNotAhead = !divergeData.err && !divergeData.isTargetAhead();\n const shouldIgnore = this.otherLane\n ? isTargetNotAhead // option #2 and #3 above\n : true; // it's main. option #1 above.\n if (shouldIgnore) {\n return this.returnUnmerged(id, `component has been removed`, true);\n }\n }\n\n const isModified = async (): Promise<undefined | 'code' | 'config'> => {\n if (!consumer || !this.workspace) return undefined;\n const componentModificationStatus = await this.workspace.getComponentStatusById(currentComponent.id);\n if (!componentModificationStatus.modified) return undefined;\n if (!existingBitMapId) return undefined;\n const baseComponent = await modelComponent.loadVersion(\n existingBitMapId.version as string,\n consumer.scope.objects\n );\n const isSourceCodeModified = await consumer.isComponentSourceCodeModified(baseComponent, currentComponent);\n if (isSourceCodeModified) return 'code';\n return 'config';\n };\n\n const modifiedType = await isModified();\n if (modifiedType === 'config' && !this.options?.ignoreConfigChanges) {\n return this.returnUnmerged(\n id,\n `component has config changes, please snap/tag it first. alternatively, use --ignore-config-changes flag to bypass`\n );\n }\n if (modifiedType === 'code') {\n return this.returnUnmerged(id, `component is modified, please snap/tag it first`);\n }\n\n if (!otherLaneHead) {\n throw new Error(`merging: unable finding a hash for the version ${version} of ${id.toString()}`);\n }\n const divergeData = await getDivergeData({\n repo,\n modelComponent,\n sourceHead: this.workspace ? undefined : modelComponent.getRef(currentId.version as string), // not sure if needs to check for this.workspace\n targetHead: otherLaneHead,\n throws: false,\n });\n if (divergeData.err) {\n if (!(divergeData.err instanceof NoCommonSnap) || !this.options?.resolveUnrelated) {\n return this.returnUnmerged(id, `unable to traverse history. error: ${divergeData.err.message}`);\n }\n return this.handleNoCommonSnap(\n modelComponent,\n id,\n otherLaneHead,\n currentComponent,\n componentOnOther,\n divergeData\n );\n }\n if (!divergeData.isDiverged()) {\n if (divergeData.isSourceAhead()) {\n // component is ahead nothing to merge.\n return this.returnUnmerged(id, compIsAlreadyMergedMsg, true);\n }\n if (divergeData.isTargetAhead()) {\n // just override with the model data\n return {\n ...componentStatus,\n currentComponent,\n componentFromModel: componentOnOther,\n divergeData,\n };\n }\n // we know that localHead and remoteHead are set, so if none of them is ahead they must be equal\n return this.returnUnmerged(id, compIsAlreadyMergedMsg, true);\n }\n\n // it's diverged and needs merge operation\n const mergeProps = {\n otherLaneHead,\n currentId,\n modelComponent,\n };\n\n return { ...componentStatus, currentComponent, mergeProps, divergeData };\n }\n\n private async handleNoCommonSnap(\n modelComponent: ModelComponent,\n id: ComponentID,\n otherLaneHead: Ref,\n currentComponent: ConsumerComponent,\n componentOnOther?: Version,\n divergeData?: SnapsDistance\n ): Promise<ComponentMergeStatusBeforeMergeAttempt> {\n let { resolveUnrelated } = this.options || {};\n if (currentComponent.isRemoved()) {\n resolveUnrelated = 'theirs';\n }\n if (!resolveUnrelated) throw new Error(`handleNoCommonSnap expects resolveUnrelated to be set`);\n const repo = this.scope.legacyScope.objects;\n const mainHead = modelComponent.head;\n\n const returnAccordingToOurs = (\n headToSaveInLane: Ref,\n unrelatedHead: Ref,\n unrelatedLaneId: LaneId\n ): ComponentMergeStatusBeforeMergeAttempt => {\n return {\n currentComponent,\n id,\n divergeData,\n resolvedUnrelated: {\n strategy: 'ours',\n headOnCurrentLane: headToSaveInLane,\n unrelatedHead,\n unrelatedLaneId,\n },\n };\n };\n const returnAccordingToTheirs = (\n resolvedRef: Ref,\n unrelatedHeadRef: Ref,\n unrelatedLaneId: LaneId\n ): ComponentMergeStatusBeforeMergeAttempt => {\n // just override with the model data\n return {\n currentComponent,\n componentFromModel: componentOnOther,\n id,\n divergeData,\n resolvedUnrelated: {\n strategy: 'theirs',\n headOnCurrentLane: resolvedRef,\n unrelatedHead: unrelatedHeadRef,\n unrelatedLaneId,\n },\n };\n };\n\n const currentVersionRef = modelComponent.getRef(currentComponent.id.version as string);\n if (!currentVersionRef)\n throw new Error(\n `handleNoCommonSnap, unable to get ref of current version \"${\n currentComponent.id.version\n }\" for \"${id.toString()}\"`\n );\n const otherVersionRef = modelComponent.getRef(id.version as string);\n if (!otherVersionRef)\n throw new Error(`handleNoCommonSnap, unable to get ref of other version \"${id.version}\" for \"${id.toString()}\"`);\n\n if (mainHead) {\n const hasResolvedFromMain = async (hashToCompare: Ref | null) => {\n const divergeDataFromMain = await getDivergeData({\n repo,\n modelComponent,\n sourceHead: hashToCompare,\n targetHead: mainHead,\n throws: false,\n });\n if (!divergeDataFromMain.err) return true;\n return !(divergeDataFromMain.err instanceof NoCommonSnap);\n };\n const hasResolvedLocally = await hasResolvedFromMain(modelComponent.getHeadRegardlessOfLane() as Ref);\n const hasResolvedRemotely = await hasResolvedFromMain(otherLaneHead);\n if (!hasResolvedLocally && !hasResolvedRemotely) {\n return this.returnUnmerged(\n id,\n `unable to traverse ${currentComponent.id.toString()} history. the main-head ${mainHead.toString()} doesn't appear in both lanes.\nit was probably created in each lane separately and it also exists on main. please merge main first to one of these lanes`\n );\n }\n const refToSaveInLane = hasResolvedLocally ? currentVersionRef : otherVersionRef;\n const unrelatedHeadRef = hasResolvedLocally ? otherVersionRef : currentVersionRef;\n if (resolveUnrelated === 'ours') {\n return returnAccordingToOurs(refToSaveInLane, unrelatedHeadRef, this.currentLane?.toLaneId() as LaneId);\n }\n if (resolveUnrelated === 'theirs') {\n return returnAccordingToTheirs(refToSaveInLane, unrelatedHeadRef, this.currentLane?.toLaneId() as LaneId);\n }\n throw new Error(\n `unsupported strategy \"${resolveUnrelated}\" of resolve-unrelated. supported strategies are: [ours, theirs]`\n );\n }\n\n const refToSaveInLane = resolveUnrelated === 'ours' ? currentVersionRef : otherVersionRef;\n const unrelatedHeadRef = resolveUnrelated === 'ours' ? otherVersionRef : currentVersionRef;\n if (resolveUnrelated === 'ours') {\n return returnAccordingToOurs(refToSaveInLane, unrelatedHeadRef, this.otherLane?.toLaneId() as LaneId);\n }\n if (resolveUnrelated === 'theirs') {\n return returnAccordingToTheirs(refToSaveInLane, unrelatedHeadRef, this.currentLane?.toLaneId() as LaneId);\n }\n throw new Error(\n `unsupported strategy \"${resolveUnrelated}\" of resolve-unrelated. supported strategies are: [ours, theirs]`\n );\n }\n}\n"],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"names":["_pMapSeries","data","_interopRequireDefault","require","_componentId","_laneId","_getDivergeData","_repositories","_lodash","_threeWayMerge","_noCommonSnap","_configMerger","e","__esModule","default","ownKeys","r","t","Object","keys","getOwnPropertySymbols","o","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","defineProperty","_toPropertyKey","value","configurable","writable","i","_toPrimitive","Symbol","toPrimitive","call","TypeError","String","Number","compIsAlreadyMergedMsg","exports","MergeStatusProvider","constructor","scope","logger","importer","options","workspace","currentLane","otherLane","getStatus","bitIds","importObjectsFromMainIfExist","toBitIds","toVersionLatest","componentStatusBeforeMergeAttempt","mapSeries","id","getComponentStatusBeforeMergeAttempt","shouldImportHistoryOfOtherLane","shouldSquash","toImport","map","compStatus","divergeData","versionsToImport","commonSnapBeforeDiverge","snapsOnTargetOnly","compact","v","changeVersion","toString","flat","reason","legacyScope","scopeImporter","importWithoutDeps","ComponentIdList","fromArray","lane","cache","includeVersionHistory","compStatusNotNeedMerge","c","mergeProps","compStatusNeedMerge","getComponentsStatusNeedMerge","tmp","Tmp","componentsStatus","Promise","all","getComponentMergeStatus","clear","err","results","componentMergeStatusBeforeMergeAttempt","currentComponent","Error","otherLaneHead","currentId","modelComponent","repo","objects","baseSnap","debug","toStringWithoutVersion","version","baseComponent","loadVersion","otherComponent","currentLaneName","toLaneId","otherLaneName","DEFAULT_LANE","currentLabel","otherLabel","workspaceIds","listIds","toComponentIds","configMerger","ComponentConfigMerger","extensions","mergeStrategy","configMergeResult","merge","mergeResults","threeWayMerge","returnUnmerged","msg","unmergedLegitimately","componentStatus","unchangedMessage","unchangedLegitimately","consumer","getModelComponentIfExist","unmerged","unmergedComponents","getEntry","getRef","existingBitMapId","bitMap","getComponentIdIfExist","ignoreVersion","componentOnOther","idOnCurrentLane","getComponent","isRemoved","shouldMerge","shouldRemoveFromMain","shouldBeRemoved","getCurrentId","head","getHeadAsTagIfExist","getDivergeData","targetHead","throws","componentFromModel","componentMap","getComponentIfExist","isLocallyRemoved","getCurrentComponent","loadComponent","getConsumerComponent","isTargetNotAhead","isTargetAhead","shouldIgnore","isModified","undefined","componentModificationStatus","getComponentStatusById","modified","isSourceCodeModified","isComponentSourceCodeModified","modifiedType","ignoreConfigChanges","sourceHead","NoCommonSnap","resolveUnrelated","message","handleNoCommonSnap","isDiverged","isSourceAhead","mainHead","returnAccordingToOurs","headToSaveInLane","unrelatedHead","unrelatedLaneId","resolvedUnrelated","strategy","headOnCurrentLane","returnAccordingToTheirs","resolvedRef","unrelatedHeadRef","currentVersionRef","otherVersionRef","hasResolvedFromMain","hashToCompare","divergeDataFromMain","hasResolvedLocally","getHeadRegardlessOfLane","hasResolvedRemotely","refToSaveInLane"],"sources":["merge-status-provider.ts"],"sourcesContent":["import { Workspace } from '@teambit/workspace';\nimport { MergeStrategy } from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport mapSeries from 'p-map-series';\nimport { ComponentID, ComponentIdList } from '@teambit/component-id';\nimport { DEFAULT_LANE, LaneId } from '@teambit/lane-id';\nimport { getDivergeData } from '@teambit/legacy/dist/scope/component-ops/get-diverge-data';\nimport { Lane, ModelComponent, Version } from '@teambit/legacy/dist/scope/models';\nimport { Ref } from '@teambit/legacy/dist/scope/objects';\nimport { Tmp } from '@teambit/legacy/dist/scope/repositories';\nimport ConsumerComponent from '@teambit/legacy/dist/consumer/component/consumer-component';\nimport { ImporterMain } from '@teambit/importer';\nimport { Logger } from '@teambit/logger';\nimport { compact } from 'lodash';\nimport threeWayMerge from '@teambit/legacy/dist/consumer/versions-ops/merge-version/three-way-merge';\nimport { SnapsDistance } from '@teambit/legacy/dist/scope/component-ops/snaps-distance';\nimport { NoCommonSnap } from '@teambit/legacy/dist/scope/exceptions/no-common-snap';\nimport { ComponentConfigMerger } from '@teambit/config-merger';\nimport { ScopeMain } from '@teambit/scope';\nimport { ComponentMergeStatus, ComponentMergeStatusBeforeMergeAttempt } from './merging.main.runtime';\n\nexport type MergeStatusProviderOptions = {\n resolveUnrelated?: MergeStrategy;\n mergeStrategy: MergeStrategy;\n ignoreConfigChanges?: boolean;\n shouldSquash?: boolean;\n};\n\nexport const compIsAlreadyMergedMsg = 'component is already merged';\nexport class MergeStatusProvider {\n constructor(\n private scope: ScopeMain,\n private logger: Logger,\n private importer: ImporterMain,\n private options: MergeStatusProviderOptions,\n private workspace?: Workspace,\n private currentLane?: Lane, // currently checked out lane. if on main, then it's undefined.\n private otherLane?: Lane // the lane we want to merged to our lane. (undefined if it's \"main\").\n ) {}\n\n async getStatus(\n bitIds: ComponentID[] // the id.version is the version we want to merge to the current component\n ): Promise<ComponentMergeStatus[]> {\n if (!this.currentLane && this.otherLane) {\n await this.importer.importObjectsFromMainIfExist(this.otherLane.toBitIds().toVersionLatest());\n }\n const componentStatusBeforeMergeAttempt = await mapSeries(bitIds, (id) =>\n this.getComponentStatusBeforeMergeAttempt(id)\n );\n // whether or not we need to import the gap between the common-snap and the other lane.\n // the common-snap itself we need anyway in order to get the files hash/content for checking conflicts.\n const shouldImportHistoryOfOtherLane =\n !this.options?.shouldSquash && // when squashing, no need for all history, only the head is going to be pushed\n (!this.currentLane || // on main. we need all history in order to push each component to its remote\n this.currentLane.scope !== this.otherLane?.scope); // on lane, but the other lane is from a different scope. we need all history in order to push to the current lane's scope\n const toImport = componentStatusBeforeMergeAttempt\n .map((compStatus) => {\n if (!compStatus.divergeData) return [];\n const versionsToImport = [compStatus.divergeData.commonSnapBeforeDiverge];\n if (shouldImportHistoryOfOtherLane) {\n versionsToImport.push(...compStatus.divergeData.snapsOnTargetOnly);\n }\n return compact(versionsToImport).map((v) => compStatus.id.changeVersion(v.toString()));\n })\n .flat();\n const reason = shouldImportHistoryOfOtherLane\n ? `for filling the gap between the common-snap and the head of ${this.otherLane?.id() || 'main'}`\n : `for getting the common-snap between ${this.currentLane?.id() || 'main'} and ${this.otherLane?.id() || 'main'}`;\n await this.scope.legacyScope.scopeImporter.importWithoutDeps(ComponentIdList.fromArray(toImport), {\n lane: this.otherLane,\n cache: true,\n includeVersionHistory: false,\n reason,\n });\n\n const compStatusNotNeedMerge = componentStatusBeforeMergeAttempt.filter(\n (c) => !c.mergeProps\n ) as ComponentMergeStatus[];\n const compStatusNeedMerge = componentStatusBeforeMergeAttempt.filter((c) => c.mergeProps);\n\n const getComponentsStatusNeedMerge = async (): Promise<ComponentMergeStatus[]> => {\n const tmp = new Tmp(this.scope.legacyScope);\n try {\n const componentsStatus = await Promise.all(\n compStatusNeedMerge.map((compStatus) => this.getComponentMergeStatus(compStatus))\n );\n await tmp.clear();\n return componentsStatus;\n } catch (err: any) {\n await tmp.clear();\n throw err;\n }\n };\n const results = await getComponentsStatusNeedMerge();\n\n results.push(...compStatusNotNeedMerge);\n return results;\n }\n\n private async getComponentMergeStatus(\n componentMergeStatusBeforeMergeAttempt: ComponentMergeStatusBeforeMergeAttempt\n ) {\n const { id, divergeData, currentComponent, mergeProps } = componentMergeStatusBeforeMergeAttempt;\n if (!mergeProps) throw new Error(`getDivergedMergeStatus, mergeProps is missing for ${id.toString()}`);\n const { otherLaneHead, currentId, modelComponent } = mergeProps;\n const repo = this.scope.legacyScope.objects;\n if (!divergeData) throw new Error(`getDivergedMergeStatus, divergeData is missing for ${id.toString()}`);\n if (!currentComponent) throw new Error(`getDivergedMergeStatus, currentComponent is missing for ${id.toString()}`);\n\n const baseSnap = divergeData.commonSnapBeforeDiverge as Ref; // must be set when isTrueMerge\n this.logger.debug(`merging snaps details:\nid: ${id.toStringWithoutVersion()}\nbase: ${baseSnap.toString()}\ncurrent: ${currentId.version}\nother: ${otherLaneHead.toString()}`);\n const baseComponent: Version = await modelComponent.loadVersion(baseSnap.toString(), repo);\n const otherComponent: Version = await modelComponent.loadVersion(otherLaneHead.toString(), repo);\n\n const currentLaneName = this.currentLane?.toLaneId().toString() || 'main';\n const otherLaneName = this.otherLane ? this.otherLane.toLaneId().toString() : DEFAULT_LANE;\n const currentLabel = `${currentId.version} (${currentLaneName === otherLaneName ? 'current' : currentLaneName})`;\n const otherLabel = `${otherLaneHead.toString()} (${\n otherLaneName === currentLaneName ? 'incoming' : otherLaneName\n })`;\n const workspaceIds = this.workspace?.listIds() || this.currentLane?.toComponentIds() || [];\n const configMerger = new ComponentConfigMerger(\n id.toStringWithoutVersion(),\n workspaceIds,\n this.otherLane,\n currentComponent.extensions,\n baseComponent.extensions,\n otherComponent.extensions,\n currentLabel,\n otherLabel,\n this.logger,\n this.options.mergeStrategy\n );\n const configMergeResult = configMerger.merge();\n\n const mergeResults = await threeWayMerge({\n scope: this.scope.legacyScope,\n otherComponent,\n otherLabel,\n currentComponent,\n currentLabel,\n baseComponent,\n });\n return {\n currentComponent,\n id,\n mergeResults,\n divergeData,\n configMergeResult,\n };\n }\n\n private returnUnmerged(\n id: ComponentID,\n msg: string,\n unmergedLegitimately = false\n ): ComponentMergeStatusBeforeMergeAttempt {\n const componentStatus: ComponentMergeStatusBeforeMergeAttempt = { id };\n componentStatus.unchangedMessage = msg;\n componentStatus.unchangedLegitimately = unmergedLegitimately;\n return componentStatus;\n }\n\n private async getComponentStatusBeforeMergeAttempt(\n id: ComponentID // the id.version is the version we want to merge to the current component\n ): Promise<ComponentMergeStatusBeforeMergeAttempt> {\n const consumer = this.workspace?.consumer;\n const componentStatus: ComponentMergeStatusBeforeMergeAttempt = { id };\n const modelComponent = await this.scope.legacyScope.getModelComponentIfExist(id);\n if (!modelComponent) {\n return this.returnUnmerged(\n id,\n `component ${id.toString()} is on the lane/main but its objects were not found, please re-import the lane`\n );\n }\n const unmerged = this.scope.legacyScope.objects.unmergedComponents.getEntry(id);\n if (unmerged) {\n return this.returnUnmerged(\n id,\n `component ${id.toStringWithoutVersion()} is in during-merge state a previous merge, please snap/tag it first (or use bit merge --resolve/--abort/ bit lane merge-abort)`\n );\n }\n const repo = this.scope.legacyScope.objects;\n const version = id.version as string;\n const otherLaneHead = modelComponent.getRef(version);\n const existingBitMapId = consumer?.bitMap.getComponentIdIfExist(id, { ignoreVersion: true });\n const componentOnOther: Version = await modelComponent.loadVersion(version, this.scope.legacyScope.objects);\n const idOnCurrentLane = this.currentLane?.getComponent(id);\n\n if (componentOnOther.isRemoved()) {\n // if exist in current lane, we want the current lane to get the soft-remove update.\n // or if it was removed with --update-main, we want to merge it so then main will get the update.\n const shouldMerge = idOnCurrentLane || componentOnOther.shouldRemoveFromMain();\n if (shouldMerge) {\n // remove the component from the workspace if exist.\n componentStatus.shouldBeRemoved = true;\n } else {\n // on main, don't merge soft-removed components unless it's marked with removeOnMain.\n // on lane, if it's not part of the current lane, don't merge it.\n return this.returnUnmerged(id, `component has been removed`, true);\n }\n }\n const getCurrentId = () => {\n if (existingBitMapId) return existingBitMapId;\n if (this.currentLane) {\n if (!idOnCurrentLane) return null;\n return idOnCurrentLane.id.changeVersion(idOnCurrentLane.head.toString());\n }\n // it's on main\n const head = modelComponent.getHeadAsTagIfExist();\n if (head) {\n return id.changeVersion(head);\n }\n return null;\n };\n const currentId = getCurrentId();\n if (!currentId) {\n const divergeData = await getDivergeData({ repo, modelComponent, targetHead: otherLaneHead, throws: false });\n return { ...componentStatus, componentFromModel: componentOnOther, divergeData };\n }\n const componentMap = consumer?.bitMap.getComponentIfExist(currentId, { ignoreVersion: true });\n const isLocallyRemoved = componentMap?.isRemoved();\n if (isLocallyRemoved) {\n return this.returnUnmerged(\n id,\n `component is locally deleted, please snap and export first or undo by bit recover`\n );\n }\n const getCurrentComponent = () => {\n // eslint-disable-next-line @typescript-eslint/no-non-null-assertion\n if (existingBitMapId) return consumer!.loadComponent(existingBitMapId);\n return this.scope.legacyScope.getConsumerComponent(currentId);\n };\n const currentComponent = await getCurrentComponent();\n if (currentComponent.isRemoved()) {\n // we have a few options:\n // 1. \"other\" is main. in this case, we don't care what happens on main, we want the component to stay deleted on\n // this lane. (even when main is ahead, we don't want to merge it).\n // 2. other is ahead. in this case, other recovered the component. so we can continue with the merge.\n // it is possible that it is diverged, in which case, still continue with the merge, and later on, the\n // merge-config will show a config conflict of the remove aspect.\n // 3. other is not ahead. in this case, just ignore this component, no point to merge it, we want it removed.\n const divergeData = await getDivergeData({ repo, modelComponent, targetHead: otherLaneHead, throws: false });\n const isTargetNotAhead = !divergeData.err && !divergeData.isTargetAhead();\n const shouldIgnore = this.otherLane\n ? isTargetNotAhead // option #2 and #3 above\n : true; // it's main. option #1 above.\n if (shouldIgnore) {\n return this.returnUnmerged(id, `component has been removed`, true);\n }\n }\n\n const isModified = async (): Promise<undefined | 'code' | 'config'> => {\n if (!consumer || !this.workspace) return undefined;\n const componentModificationStatus = await this.workspace.getComponentStatusById(currentComponent.id);\n if (!componentModificationStatus.modified) return undefined;\n if (!existingBitMapId) return undefined;\n const baseComponent = await modelComponent.loadVersion(\n existingBitMapId.version as string,\n consumer.scope.objects\n );\n const isSourceCodeModified = await consumer.isComponentSourceCodeModified(baseComponent, currentComponent);\n if (isSourceCodeModified) return 'code';\n return 'config';\n };\n\n const modifiedType = await isModified();\n if (modifiedType === 'config' && !this.options?.ignoreConfigChanges) {\n return this.returnUnmerged(\n id,\n `component has config changes, please snap/tag it first. alternatively, use --ignore-config-changes flag to bypass`\n );\n }\n if (modifiedType === 'code') {\n return this.returnUnmerged(id, `component is modified, please snap/tag it first`);\n }\n\n if (!otherLaneHead) {\n throw new Error(`merging: unable finding a hash for the version ${version} of ${id.toString()}`);\n }\n const divergeData = await getDivergeData({\n repo,\n modelComponent,\n sourceHead: this.workspace ? undefined : modelComponent.getRef(currentId.version as string), // not sure if needs to check for this.workspace\n targetHead: otherLaneHead,\n throws: false,\n });\n if (divergeData.err) {\n if (!(divergeData.err instanceof NoCommonSnap) || !this.options?.resolveUnrelated) {\n return this.returnUnmerged(id, `unable to traverse history. error: ${divergeData.err.message}`);\n }\n return this.handleNoCommonSnap(\n modelComponent,\n id,\n otherLaneHead,\n currentComponent,\n componentOnOther,\n divergeData\n );\n }\n if (!divergeData.isDiverged()) {\n if (divergeData.isSourceAhead()) {\n // component is ahead nothing to merge.\n return this.returnUnmerged(id, compIsAlreadyMergedMsg, true);\n }\n if (divergeData.isTargetAhead()) {\n // just override with the model data\n return {\n ...componentStatus,\n currentComponent,\n componentFromModel: componentOnOther,\n divergeData,\n };\n }\n // we know that localHead and remoteHead are set, so if none of them is ahead they must be equal\n return this.returnUnmerged(id, compIsAlreadyMergedMsg, true);\n }\n\n // it's diverged and needs merge operation\n const mergeProps = {\n otherLaneHead,\n currentId,\n modelComponent,\n };\n\n return { ...componentStatus, currentComponent, mergeProps, divergeData };\n }\n\n private async handleNoCommonSnap(\n modelComponent: ModelComponent,\n id: ComponentID,\n otherLaneHead: Ref,\n currentComponent: ConsumerComponent,\n componentOnOther?: Version,\n divergeData?: SnapsDistance\n ): Promise<ComponentMergeStatusBeforeMergeAttempt> {\n let { resolveUnrelated } = this.options || {};\n if (currentComponent.isRemoved()) {\n resolveUnrelated = 'theirs';\n }\n if (!resolveUnrelated) throw new Error(`handleNoCommonSnap expects resolveUnrelated to be set`);\n const repo = this.scope.legacyScope.objects;\n const mainHead = modelComponent.head;\n\n const returnAccordingToOurs = (\n headToSaveInLane: Ref,\n unrelatedHead: Ref,\n unrelatedLaneId: LaneId\n ): ComponentMergeStatusBeforeMergeAttempt => {\n return {\n currentComponent,\n id,\n divergeData,\n resolvedUnrelated: {\n strategy: 'ours',\n headOnCurrentLane: headToSaveInLane,\n unrelatedHead,\n unrelatedLaneId,\n },\n };\n };\n const returnAccordingToTheirs = (\n resolvedRef: Ref,\n unrelatedHeadRef: Ref,\n unrelatedLaneId: LaneId\n ): ComponentMergeStatusBeforeMergeAttempt => {\n // just override with the model data\n return {\n currentComponent,\n componentFromModel: componentOnOther,\n id,\n divergeData,\n resolvedUnrelated: {\n strategy: 'theirs',\n headOnCurrentLane: resolvedRef,\n unrelatedHead: unrelatedHeadRef,\n unrelatedLaneId,\n },\n };\n };\n\n const currentVersionRef = modelComponent.getRef(currentComponent.id.version as string);\n if (!currentVersionRef)\n throw new Error(\n `handleNoCommonSnap, unable to get ref of current version \"${\n currentComponent.id.version\n }\" for \"${id.toString()}\"`\n );\n const otherVersionRef = modelComponent.getRef(id.version as string);\n if (!otherVersionRef)\n throw new Error(`handleNoCommonSnap, unable to get ref of other version \"${id.version}\" for \"${id.toString()}\"`);\n\n if (mainHead) {\n const hasResolvedFromMain = async (hashToCompare: Ref | null) => {\n const divergeDataFromMain = await getDivergeData({\n repo,\n modelComponent,\n sourceHead: hashToCompare,\n targetHead: mainHead,\n throws: false,\n });\n if (!divergeDataFromMain.err) return true;\n return !(divergeDataFromMain.err instanceof NoCommonSnap);\n };\n const hasResolvedLocally = await hasResolvedFromMain(modelComponent.getHeadRegardlessOfLane() as Ref);\n const hasResolvedRemotely = await hasResolvedFromMain(otherLaneHead);\n if (!hasResolvedLocally && !hasResolvedRemotely) {\n return this.returnUnmerged(\n id,\n `unable to traverse ${currentComponent.id.toString()} history. the main-head ${mainHead.toString()} doesn't appear in both lanes.\nit was probably created in each lane separately and it also exists on main. please merge main first to one of these lanes`\n );\n }\n const refToSaveInLane = hasResolvedLocally ? currentVersionRef : otherVersionRef;\n const unrelatedHeadRef = hasResolvedLocally ? otherVersionRef : currentVersionRef;\n if (resolveUnrelated === 'ours') {\n return returnAccordingToOurs(refToSaveInLane, unrelatedHeadRef, this.currentLane?.toLaneId() as LaneId);\n }\n if (resolveUnrelated === 'theirs') {\n return returnAccordingToTheirs(refToSaveInLane, unrelatedHeadRef, this.currentLane?.toLaneId() as LaneId);\n }\n throw new Error(\n `unsupported strategy \"${resolveUnrelated}\" of resolve-unrelated. supported strategies are: [ours, theirs]`\n );\n }\n\n const refToSaveInLane = resolveUnrelated === 'ours' ? currentVersionRef : otherVersionRef;\n const unrelatedHeadRef = resolveUnrelated === 'ours' ? otherVersionRef : currentVersionRef;\n if (resolveUnrelated === 'ours') {\n return returnAccordingToOurs(refToSaveInLane, unrelatedHeadRef, this.otherLane?.toLaneId() as LaneId);\n }\n if (resolveUnrelated === 'theirs') {\n return returnAccordingToTheirs(refToSaveInLane, unrelatedHeadRef, this.currentLane?.toLaneId() as LaneId);\n }\n throw new Error(\n `unsupported strategy \"${resolveUnrelated}\" of resolve-unrelated. supported strategies are: [ours, theirs]`\n );\n }\n}\n"],"mappings":"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","ignoreList":[]}
@@ -207,10 +207,10 @@ function _mergeStatusProvider() {
207
207
  };
208
208
  return data;
209
209
  }
210
- function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
210
+ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
211
211
  function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
212
212
  function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
213
- function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
213
+ function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
214
214
  function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
215
215
  function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
216
216
  // fileName is PathLinux. TS doesn't let anything else in the keys other than string and number
@@ -1 +1 @@
1
- {"version":3,"names":["_cli","data","require","_workspace","_componentsList","_interopRequireDefault","_mergeVersion","_snapping","_hasWildcard","_pMapSeries","_componentId","_bitError","_laneId","_chalk","_config","_remove","_utils","_componentWriter","_importer","_logger","_globalConfig","_lodash","_checkout","_deleteComponentFiles","_configMerger","_componentIdToPackageName","_dependencyResolver","_install","_scope","_mergeCmd","_merging","_mergeStatusProvider","obj","__esModule","default","ownKeys","e","r","t","Object","keys","getOwnPropertySymbols","o","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","defineProperty","key","value","_toPropertyKey","configurable","writable","i","_toPrimitive","Symbol","toPrimitive","call","TypeError","String","Number","MergingMain","constructor","workspace","scope","install","snapping","checkout","logger","componentWriter","importer","config","remove","configMerger","depResolver","merge","ids","mergeStrategy","abort","resolve","noSnap","message","build","skipDependencyInstallation","OutsideWorkspaceError","consumer","mergeResults","resolveMerge","abortMerge","bitIds","getComponentsToMerge","mergeComponentsFromRemote","onDestroy","snapMessage","currentLaneId","getCurrentLaneId","currentLaneObject","getCurrentLaneObject","allComponentsStatus","getAllComponentsStatus","failedComponents","c","unchangedMessage","unchangedLegitimately","failureMsgs","map","failedComponent","chalk","bold","id","toString","red","join","BitError","mergeSnaps","otherLaneId","currentLane","tag","legacyScope","componentWithConflict","find","component","hasConflicts","getMergeStrategyInteractive","componentStatus","shouldBeRemoved","componentIdsToRemove","changeVersion","undefined","succeededComponents","currentLaneIdsBeforeMerge","toComponentIds","componentsResults","applyVersionMultiple","allConfigMerge","compact","configMergeResult","workspaceDepsUpdates","workspaceDepsConflicts","workspaceDepsUnchanged","updateWorkspaceJsoncWithDepsIfNeeded","workspaceConfigConflictWriteError","writeWorkspaceJsoncWithConflictsGracefully","generateConfigMergeConflictFileForAll","objects","add","persist","unmergedComponents","write","writeBitMap","removeFromWsJsonPolicyIfExists","compBitIdsToRemove","ComponentIdList","fromArray","deleteComponentsFiles","cleanFromBitMap","componentsHasConfigMergeConflicts","some","leftUnresolvedConflicts","dedupe","updateExisting","import","err","error","consoleFailure","getSnapOrTagResults","idsToTag","results","tagAllLaneComponent","taggedComponents","autoTaggedResults","removedComponents","snappedComponents","autoSnappedResults","snapResolvedComponents","toLaneId","mergeSnapResults","mergeSnapError","bitMapSnapshot","bitMap","takeSnapshot","restoreFromSnapshot","components","applyVersionResult","workspaceConfigUpdateResult","newlyIntroducedIds","hasWithoutVersion","newlyIntroducedComponentIds","legacyCompToWrite","packages","componentIdToPackageName","isRemoved","removeFromRootPolicy","persistConfig","getMergeStatus","options","otherLane","mergeStatusProvider","MergeStatusProvider","getStatus","mapSeries","currentComponent","resolvedUnrelated","modelComponent","getModelComponent","updatedLaneId","isDefault","LaneId","from","name","applyVersion","remoteHead","getRef","version","compsToWrite","manyComponentsWriterOpts","writeConfig","reasonForBitmapChange","writeMany","filesStatus","unmergedComponent","fullName","head","laneId","addToCurrentLane","Error","isPartOfLane","isEqualWithoutVersion","addComponent","handleResolveUnrelated","headOnCurrentLane","unrelated","unrelatedHead","unrelatedLaneId","addEntry","markAllFilesAsUnchanged","files","file","pathNormalizeToLinux","relative","FileStatus","unchanged","MergeOptions","ours","strategy","remoteId","idToLoad","theirs","legacyComponent","loadComponentFromModelImportIfNeeded","getConsumerComponent","updateFileStatus","modifiedStatus","modifiedFiles","applyModifiedVersion","removeFilesIfNeeded","successfullyMergedConfig","getSuccessfullyMergedConfig","mergedConfig","manual","unmergedPaths","f","conflict","filePath","setHead","markVersionAsLocal","values","getIdsForUnmerged","reset","removeComponent","abortedComponents","snap","legacyBitIds","resolvedComponents","localLaneObject","Promise","all","bitId","remoteScopeName","remoteLaneId","remoteLanes","laneIdStr","toStringWithoutVersion","shouldSquash","getComponents","debug","ComponentID","fromObject","snapFromScope","componentId","lane","tagMessage","unmodified","idsStr","componentIds","resolveMultipleComponentIds","entry","getEntry","unresolvedComponents","u","componentsList","ComponentsList","mergePending","listMergePendingComponents","hasWildcard","listComponentsByIdsWithWildcard","getParsedId","provider","cli","loggerMain","compWriter","globalConfig","createLogger","MergingAspect","merging","register","MergeCmd","exports","CLIAspect","WorkspaceAspect","ScopeAspect","SnappingAspect","CheckoutAspect","InstallAspect","LoggerAspect","ComponentWriterAspect","ImporterAspect","ConfigAspect","RemoveAspect","GlobalConfigAspect","ConfigMergerAspect","DependencyResolverAspect","MainRuntime","addRuntime"],"sources":["merging.main.runtime.ts"],"sourcesContent":["import { CLIAspect, CLIMain, MainRuntime } from '@teambit/cli';\nimport { WorkspaceAspect, OutsideWorkspaceError, Workspace } from '@teambit/workspace';\nimport { Consumer } from '@teambit/legacy/dist/consumer';\nimport ComponentsList from '@teambit/legacy/dist/consumer/component/components-list';\nimport {\n MergeStrategy,\n FileStatus,\n getMergeStrategyInteractive,\n MergeOptions,\n} from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport { SnappingAspect, SnappingMain, TagResults } from '@teambit/snapping';\nimport hasWildcard from '@teambit/legacy/dist/utils/string/has-wildcard';\nimport mapSeries from 'p-map-series';\nimport { ComponentID, ComponentIdList } from '@teambit/component-id';\nimport { BitError } from '@teambit/bit-error';\nimport { LaneId } from '@teambit/lane-id';\nimport { AutoTagResult } from '@teambit/legacy/dist/scope/component-ops/auto-tag';\nimport { UnmergedComponent } from '@teambit/legacy/dist/scope/lanes/unmerged-components';\nimport { Lane, ModelComponent } from '@teambit/legacy/dist/scope/models';\nimport { Ref } from '@teambit/legacy/dist/scope/objects';\nimport chalk from 'chalk';\nimport { ConfigAspect, ConfigMain } from '@teambit/config';\nimport { RemoveAspect, RemoveMain } from '@teambit/remove';\nimport { pathNormalizeToLinux } from '@teambit/legacy/dist/utils';\nimport { ComponentWriterAspect, ComponentWriterMain } from '@teambit/component-writer';\nimport ConsumerComponent from '@teambit/legacy/dist/consumer/component/consumer-component';\nimport { ImporterAspect, ImporterMain } from '@teambit/importer';\nimport { Logger, LoggerAspect, LoggerMain } from '@teambit/logger';\nimport { GlobalConfigAspect, GlobalConfigMain } from '@teambit/global-config';\nimport { compact } from 'lodash';\nimport { MergeResultsThreeWay } from '@teambit/legacy/dist/consumer/versions-ops/merge-version/three-way-merge';\nimport {\n ApplyVersionWithComps,\n CheckoutAspect,\n CheckoutMain,\n ComponentStatusBase,\n applyModifiedVersion,\n removeFilesIfNeeded,\n updateFileStatus,\n} from '@teambit/checkout';\nimport deleteComponentsFiles from '@teambit/legacy/dist/consumer/component-ops/delete-component-files';\nimport {\n ConfigMergerAspect,\n ConfigMergerMain,\n ConfigMergeResult,\n WorkspaceConfigUpdateResult,\n} from '@teambit/config-merger';\nimport { SnapsDistance } from '@teambit/legacy/dist/scope/component-ops/snaps-distance';\nimport componentIdToPackageName from '@teambit/legacy/dist/utils/bit/component-id-to-package-name';\nimport { DependencyResolverAspect, DependencyResolverMain } from '@teambit/dependency-resolver';\nimport { InstallMain, InstallAspect } from '@teambit/install';\nimport { ScopeAspect, ScopeMain } from '@teambit/scope';\nimport { MergeCmd } from './merge-cmd';\nimport { MergingAspect } from './merging.aspect';\nimport { MergeStatusProvider, MergeStatusProviderOptions } from './merge-status-provider';\n\ntype ResolveUnrelatedData = {\n strategy: MergeStrategy;\n headOnCurrentLane: Ref;\n unrelatedHead: Ref;\n unrelatedLaneId: LaneId;\n};\n\nexport type ComponentMergeStatus = ComponentStatusBase & {\n mergeResults?: MergeResultsThreeWay | null;\n divergeData?: SnapsDistance;\n resolvedUnrelated?: ResolveUnrelatedData;\n configMergeResult?: ConfigMergeResult;\n};\n\nexport type ComponentMergeStatusBeforeMergeAttempt = ComponentStatusBase & {\n divergeData?: SnapsDistance;\n resolvedUnrelated?: ResolveUnrelatedData;\n mergeProps?: {\n otherLaneHead: Ref;\n currentId: ComponentID;\n modelComponent: ModelComponent;\n };\n};\n\nexport type FailedComponents = { id: ComponentID; unchangedMessage: string; unchangedLegitimately?: boolean };\n\n// fileName is PathLinux. TS doesn't let anything else in the keys other than string and number\nexport type FilesStatus = { [fileName: string]: keyof typeof FileStatus };\n\nexport type MergeSnapResults = {\n snappedComponents: ConsumerComponent[];\n autoSnappedResults: AutoTagResult[];\n removedComponents?: ComponentIdList;\n exportedIds?: ComponentID[];\n} | null;\n\nexport type ApplyVersionResult = { id: ComponentID; filesStatus: FilesStatus };\n\nexport type ApplyVersionResults = {\n components?: ApplyVersionResult[];\n version?: string;\n failedComponents?: FailedComponents[];\n removedComponents?: ComponentID[];\n addedComponents?: ComponentID[]; // relevant when restoreMissingComponents is true (e.g. bit lane merge-abort)\n resolvedComponents?: ConsumerComponent[]; // relevant for bit merge --resolve\n abortedComponents?: ApplyVersionResult[]; // relevant for bit merge --abort\n mergeSnapResults?: MergeSnapResults;\n mergeSnapError?: Error;\n leftUnresolvedConflicts?: boolean;\n verbose?: boolean;\n newFromLane?: string[];\n newFromLaneAdded?: boolean;\n installationError?: Error; // in case the package manager failed, it won't throw, instead, it'll return error here\n compilationError?: Error; // in case the compiler failed, it won't throw, instead, it'll return error here\n workspaceConfigUpdateResult?: WorkspaceConfigUpdateResult;\n};\n\nexport class MergingMain {\n constructor(\n private workspace: Workspace,\n private scope: ScopeMain,\n private install: InstallMain,\n private snapping: SnappingMain,\n private checkout: CheckoutMain,\n private logger: Logger,\n private componentWriter: ComponentWriterMain,\n private importer: ImporterMain,\n private config: ConfigMain,\n private remove: RemoveMain,\n private configMerger: ConfigMergerMain,\n private depResolver: DependencyResolverMain\n ) {}\n\n async merge(\n ids: string[],\n mergeStrategy: MergeStrategy,\n abort: boolean,\n resolve: boolean,\n noSnap: boolean,\n message: string,\n build: boolean,\n skipDependencyInstallation: boolean\n ): Promise<ApplyVersionResults> {\n if (!this.workspace) throw new OutsideWorkspaceError();\n const consumer: Consumer = this.workspace.consumer;\n let mergeResults;\n if (resolve) {\n mergeResults = await this.resolveMerge(ids, message, build);\n } else if (abort) {\n mergeResults = await this.abortMerge(ids);\n } else {\n const bitIds = await this.getComponentsToMerge(consumer, ids);\n mergeResults = await this.mergeComponentsFromRemote(\n consumer,\n bitIds,\n mergeStrategy,\n noSnap,\n message,\n build,\n skipDependencyInstallation\n );\n }\n await consumer.onDestroy('merge');\n return mergeResults;\n }\n\n /**\n * when user is on main, it merges the remote main components into local.\n * when user is on a lane, it merges the remote lane components into the local lane.\n */\n async mergeComponentsFromRemote(\n consumer: Consumer,\n bitIds: ComponentID[],\n mergeStrategy: MergeStrategy,\n noSnap: boolean,\n snapMessage: string,\n build: boolean,\n skipDependencyInstallation: boolean\n ): Promise<ApplyVersionResults> {\n const currentLaneId = consumer.getCurrentLaneId();\n const currentLaneObject = await consumer.getCurrentLaneObject();\n const allComponentsStatus = await this.getAllComponentsStatus(\n bitIds,\n currentLaneId,\n currentLaneObject,\n mergeStrategy\n );\n const failedComponents = allComponentsStatus.filter((c) => c.unchangedMessage && !c.unchangedLegitimately);\n if (failedComponents.length) {\n const failureMsgs = failedComponents\n .map(\n (failedComponent) =>\n `${chalk.bold(failedComponent.id.toString())} - ${chalk.red(failedComponent.unchangedMessage as string)}`\n )\n .join('\\n');\n throw new BitError(`unable to merge due to the following failures:\\n${failureMsgs}`);\n }\n\n return this.mergeSnaps({\n mergeStrategy,\n allComponentsStatus,\n otherLaneId: currentLaneId,\n currentLane: 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 otherLaneId,\n currentLane,\n noSnap,\n tag,\n snapMessage,\n build,\n skipDependencyInstallation,\n }: {\n mergeStrategy: MergeStrategy;\n allComponentsStatus: ComponentMergeStatus[];\n otherLaneId: LaneId;\n currentLane?: Lane;\n noSnap: boolean;\n tag?: boolean;\n snapMessage: string;\n build: boolean;\n skipDependencyInstallation?: boolean;\n }): Promise<ApplyVersionResults> {\n const consumer = this.workspace?.consumer;\n const legacyScope = this.scope.legacyScope;\n const componentWithConflict = allComponentsStatus.find(\n (component) => component.mergeResults && component.mergeResults.hasConflicts\n );\n if (componentWithConflict && !mergeStrategy) {\n mergeStrategy = await getMergeStrategyInteractive();\n }\n const failedComponents: FailedComponents[] = allComponentsStatus\n .filter((componentStatus) => componentStatus.unchangedMessage)\n .filter((componentStatus) => !componentStatus.shouldBeRemoved)\n .map((componentStatus) => ({\n id: componentStatus.id,\n unchangedMessage: componentStatus.unchangedMessage as string,\n unchangedLegitimately: componentStatus.unchangedLegitimately,\n }));\n\n const componentIdsToRemove = allComponentsStatus\n .filter((componentStatus) => componentStatus.shouldBeRemoved)\n .map((c) => c.id.changeVersion(undefined));\n\n const succeededComponents = allComponentsStatus.filter((componentStatus) => !componentStatus.unchangedMessage);\n\n const currentLaneIdsBeforeMerge = currentLane?.toComponentIds();\n\n const componentsResults = await this.applyVersionMultiple(\n succeededComponents,\n otherLaneId,\n mergeStrategy,\n currentLane\n );\n\n const allConfigMerge = compact(succeededComponents.map((c) => c.configMergeResult));\n\n const { workspaceDepsUpdates, workspaceDepsConflicts, workspaceDepsUnchanged } = this.workspace\n ? await this.configMerger.updateWorkspaceJsoncWithDepsIfNeeded(allConfigMerge)\n : { workspaceDepsUpdates: undefined, workspaceDepsConflicts: undefined, workspaceDepsUnchanged: undefined };\n\n let workspaceConfigConflictWriteError: Error | undefined;\n if (workspaceDepsConflicts) {\n workspaceConfigConflictWriteError = await this.configMerger.writeWorkspaceJsoncWithConflictsGracefully(\n workspaceDepsConflicts\n );\n }\n if (this.workspace) await this.configMerger.generateConfigMergeConflictFileForAll(allConfigMerge);\n\n if (currentLane) legacyScope.objects.add(currentLane);\n\n await legacyScope.objects.persist(); // persist anyway, if currentLane is null it should save all main heads\n\n await legacyScope.objects.unmergedComponents.write();\n\n if (this.workspace) {\n await consumer.writeBitMap(`merge ${otherLaneId.toString()}`);\n await this.removeFromWsJsonPolicyIfExists(componentsResults, currentLane, currentLaneIdsBeforeMerge);\n }\n\n if (componentIdsToRemove.length && this.workspace) {\n const compBitIdsToRemove = ComponentIdList.fromArray(componentIdsToRemove);\n await deleteComponentsFiles(consumer, compBitIdsToRemove);\n await consumer.cleanFromBitMap(compBitIdsToRemove);\n }\n\n const componentsHasConfigMergeConflicts = allComponentsStatus.some((c) => c.configMergeResult?.hasConflicts());\n const leftUnresolvedConflicts = componentWithConflict && mergeStrategy === 'manual';\n if (!skipDependencyInstallation && !leftUnresolvedConflicts && !componentsHasConfigMergeConflicts) {\n try {\n await this.install.install(undefined, {\n dedupe: true,\n updateExisting: false,\n import: false,\n });\n } catch (err: any) {\n this.logger.error(`failed installing packages`, err);\n this.logger.consoleFailure(\n `failed installing packages, see the log for full stacktrace. error: ${err.message}`\n );\n }\n }\n\n const getSnapOrTagResults = async (): Promise<MergeSnapResults> => {\n // if one of the component has conflict, don't snap-merge. otherwise, some of the components would be snap-merged\n // and some not. besides the fact that it could by mistake tag dependent, it's a confusing state. better not snap.\n if (noSnap || leftUnresolvedConflicts || componentsHasConfigMergeConflicts) {\n return null;\n }\n if (tag) {\n const idsToTag = allComponentsStatus.map((c) => c.id);\n const results = await this.tagAllLaneComponent(idsToTag, snapMessage, build);\n if (!results) return null;\n const { taggedComponents, autoTaggedResults, removedComponents } = results;\n return { snappedComponents: taggedComponents, autoSnappedResults: autoTaggedResults, removedComponents };\n }\n return this.snapResolvedComponents(snapMessage, build, currentLane?.toLaneId());\n };\n let mergeSnapResults: MergeSnapResults = null;\n let mergeSnapError: Error | undefined;\n const bitMapSnapshot = this.workspace ? this.workspace.bitMap.takeSnapshot() : null;\n try {\n mergeSnapResults = await getSnapOrTagResults();\n } catch (err: any) {\n this.logger.error('failed running snap. mergeSnapError:', err);\n mergeSnapError = err;\n if (bitMapSnapshot) this.workspace.bitMap.restoreFromSnapshot(bitMapSnapshot);\n }\n\n return {\n components: componentsResults.map((c) => c.applyVersionResult),\n failedComponents,\n removedComponents: [...componentIdsToRemove, ...(mergeSnapResults?.removedComponents || [])],\n mergeSnapResults,\n mergeSnapError,\n workspaceConfigUpdateResult: {\n workspaceDepsUpdates,\n workspaceDepsConflicts,\n workspaceDepsUnchanged,\n workspaceConfigConflictWriteError,\n },\n leftUnresolvedConflicts,\n };\n }\n\n async removeFromWsJsonPolicyIfExists(\n componentsResults: ApplyVersionWithComps[],\n currentLane?: Lane,\n currentLaneIdsBeforeMerge?: ComponentIdList\n ) {\n const newlyIntroducedIds = currentLane\n ?.toComponentIds()\n .filter((id) => !currentLaneIdsBeforeMerge?.hasWithoutVersion(id));\n const newlyIntroducedComponentIds = ComponentIdList.fromArray(newlyIntroducedIds || []);\n const components = compact(\n componentsResults\n .map((c) => c.legacyCompToWrite)\n .filter((c) => c && newlyIntroducedComponentIds.hasWithoutVersion(c.id))\n );\n const packages = components.map((c) => componentIdToPackageName(c));\n const isRemoved = this.depResolver.removeFromRootPolicy(packages);\n if (isRemoved) await this.depResolver.persistConfig('merge (remove packages)');\n }\n\n /**\n * this function gets called from two different commands:\n * 1. \"bit merge <ids...>\", when merging a component from a remote to the local.\n * in this case, the remote and local are on the same lane or both on main.\n * 2. \"bit lane merge\", when merging from one lane to another.\n */\n async getMergeStatus(\n bitIds: ComponentID[], // the id.version is the version we want to merge to the current component\n options: MergeStatusProviderOptions,\n currentLane?: Lane, // currently checked out lane. if on main, then it's null.\n otherLane?: Lane // the lane we want to merged to our lane. (null if it's \"main\").\n ): Promise<ComponentMergeStatus[]> {\n const mergeStatusProvider = new MergeStatusProvider(\n this.scope,\n this.logger,\n this.importer,\n options,\n this.workspace,\n currentLane,\n otherLane\n );\n return mergeStatusProvider.getStatus(bitIds);\n }\n\n private async applyVersionMultiple(\n succeededComponents: ComponentMergeStatus[],\n otherLaneId: LaneId,\n mergeStrategy: MergeStrategy,\n currentLane?: Lane\n ): Promise<ApplyVersionWithComps[]> {\n const componentsResults = await mapSeries(\n succeededComponents,\n async ({ currentComponent, id, mergeResults, resolvedUnrelated, configMergeResult }) => {\n const modelComponent = await this.scope.legacyScope.getModelComponent(id);\n const updatedLaneId = otherLaneId.isDefault() ? LaneId.from(otherLaneId.name, id.scope as string) : otherLaneId;\n return this.applyVersion({\n currentComponent,\n id,\n mergeResults,\n mergeStrategy,\n remoteHead: modelComponent.getRef(id.version as string) as Ref,\n otherLaneId: updatedLaneId,\n currentLane,\n resolvedUnrelated,\n configMergeResult,\n });\n }\n );\n\n if (this.workspace) {\n const compsToWrite = compact(componentsResults.map((c) => c.legacyCompToWrite));\n const manyComponentsWriterOpts = {\n consumer: this.workspace.consumer,\n components: compsToWrite,\n skipDependencyInstallation: true,\n writeConfig: false, // @todo: should write if config exists before, needs to figure out how to do it.\n reasonForBitmapChange: 'merge',\n };\n await this.componentWriter.writeMany(manyComponentsWriterOpts);\n }\n\n return componentsResults;\n }\n\n private async applyVersion({\n currentComponent,\n id,\n mergeResults,\n mergeStrategy,\n remoteHead,\n otherLaneId,\n currentLane,\n resolvedUnrelated,\n configMergeResult,\n }: {\n currentComponent: ConsumerComponent | null | undefined;\n id: ComponentID;\n mergeResults: MergeResultsThreeWay | null | undefined;\n mergeStrategy: MergeStrategy;\n remoteHead: Ref;\n otherLaneId: LaneId;\n currentLane?: Lane;\n resolvedUnrelated?: ResolveUnrelatedData;\n configMergeResult?: ConfigMergeResult;\n }): Promise<ApplyVersionWithComps> {\n const legacyScope = this.scope.legacyScope;\n let filesStatus = {};\n const unmergedComponent: UnmergedComponent = {\n id: { name: id.fullName, scope: id.scope },\n head: remoteHead,\n laneId: otherLaneId,\n };\n id = currentComponent ? currentComponent.id : id;\n const modelComponent = await legacyScope.getModelComponent(id);\n\n const addToCurrentLane = (head: Ref) => {\n if (!currentLane) throw new Error('currentLane must be defined when adding to the lane');\n if (otherLaneId.isDefault()) {\n const isPartOfLane = currentLane.components.find((c) => c.id.isEqualWithoutVersion(id));\n if (!isPartOfLane) return;\n }\n currentLane.addComponent({ id, head });\n };\n\n const handleResolveUnrelated = (legacyCompToWrite?: ConsumerComponent) => {\n if (!currentComponent) throw new Error('currentComponent must be defined when resolvedUnrelated');\n // because when on a main, we don't allow merging lanes with unrelated. we asks users to switch to the lane\n // first and then merge with --resolve-unrelated\n if (!currentLane) throw new Error('currentLane must be defined when resolvedUnrelated');\n if (!resolvedUnrelated) throw new Error('resolvedUnrelated must be populated');\n addToCurrentLane(resolvedUnrelated.headOnCurrentLane);\n unmergedComponent.unrelated = {\n unrelatedHead: resolvedUnrelated.unrelatedHead,\n headOnCurrentLane: resolvedUnrelated.headOnCurrentLane,\n unrelatedLaneId: resolvedUnrelated.unrelatedLaneId,\n };\n legacyScope.objects.unmergedComponents.addEntry(unmergedComponent);\n return { applyVersionResult: { id, filesStatus }, component: currentComponent, legacyCompToWrite };\n };\n\n const markAllFilesAsUnchanged = () => {\n if (!currentComponent) throw new Error(`applyVersion expect to get currentComponent for ${id.toString()}`);\n currentComponent.files.forEach((file) => {\n filesStatus[pathNormalizeToLinux(file.relative)] = FileStatus.unchanged;\n });\n };\n if (mergeResults && mergeResults.hasConflicts && mergeStrategy === MergeOptions.ours) {\n markAllFilesAsUnchanged();\n legacyScope.objects.unmergedComponents.addEntry(unmergedComponent);\n return { applyVersionResult: { id, filesStatus }, component: currentComponent || undefined };\n }\n if (resolvedUnrelated?.strategy === 'ours') {\n markAllFilesAsUnchanged();\n return handleResolveUnrelated();\n }\n const remoteId = id.changeVersion(remoteHead.toString());\n const idToLoad = !mergeResults || mergeStrategy === MergeOptions.theirs ? remoteId : id;\n const legacyComponent = this.workspace\n ? await this.workspace.consumer.loadComponentFromModelImportIfNeeded(idToLoad)\n : await legacyScope.getConsumerComponent(idToLoad); // when loading from the scope, we import all needed components first, so it should be fine. otherwise, change the code to import it here\n if (mergeResults && mergeStrategy === MergeOptions.theirs) {\n // in this case, we don't want to update .bitmap with the version of the remote. we want to keep the same version\n legacyComponent.version = id.version;\n }\n const files = legacyComponent.files;\n updateFileStatus(files, filesStatus, currentComponent || undefined);\n\n if (mergeResults) {\n // update files according to the merge results\n const { filesStatus: modifiedStatus, modifiedFiles } = applyModifiedVersion(files, mergeResults, mergeStrategy);\n legacyComponent.files = modifiedFiles;\n filesStatus = { ...filesStatus, ...modifiedStatus };\n }\n\n if (this.workspace) await removeFilesIfNeeded(filesStatus, this.workspace.consumer, currentComponent || undefined);\n\n if (configMergeResult) {\n const successfullyMergedConfig = configMergeResult.getSuccessfullyMergedConfig();\n if (successfullyMergedConfig) {\n unmergedComponent.mergedConfig = successfullyMergedConfig;\n // no need to `unmergedComponents.addEntry` here. it'll be added in the next lines inside `if (mergeResults)`.\n // because if `configMergeResult` is set, `mergeResults` must be set as well. both happen on diverge.\n }\n }\n\n // if mergeResults, the head snap is going to be updated on a later phase when snapping with two parents\n // otherwise, update the head of the current lane or main\n if (mergeResults) {\n if (mergeResults.hasConflicts && mergeStrategy === MergeOptions.manual) {\n unmergedComponent.unmergedPaths = mergeResults.modifiedFiles.filter((f) => f.conflict).map((f) => f.filePath);\n }\n legacyScope.objects.unmergedComponents.addEntry(unmergedComponent);\n } else if (currentLane) {\n if (resolvedUnrelated) {\n // must be \"theirs\"\n return handleResolveUnrelated(legacyComponent);\n }\n addToCurrentLane(remoteHead);\n } else {\n // this is main\n modelComponent.setHead(remoteHead);\n // mark it as local, otherwise, when importing this component from a remote, it'll override it.\n modelComponent.markVersionAsLocal(remoteHead.toString());\n legacyScope.objects.add(modelComponent);\n }\n\n return {\n applyVersionResult: { id: idToLoad, filesStatus },\n component: currentComponent || undefined,\n legacyCompToWrite: legacyComponent,\n };\n }\n\n private async abortMerge(values: string[]): Promise<ApplyVersionResults> {\n const consumer = this.workspace.consumer;\n const ids = await this.getIdsForUnmerged(values);\n const results = await this.checkout.checkout({ ids, reset: true });\n ids.forEach((id) => consumer.scope.objects.unmergedComponents.removeComponent(id));\n await consumer.scope.objects.unmergedComponents.write();\n return { abortedComponents: results.components };\n }\n\n private async resolveMerge(values: string[], snapMessage: string, build: boolean): Promise<ApplyVersionResults> {\n const ids = await this.getIdsForUnmerged(values);\n // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n const { snappedComponents } = await this.snapping.snap({\n legacyBitIds: ComponentIdList.fromArray(ids.map((id) => id)),\n build,\n message: snapMessage,\n });\n return { resolvedComponents: snappedComponents };\n }\n\n private async getAllComponentsStatus(\n bitIds: ComponentID[],\n laneId: LaneId,\n localLaneObject: Lane | undefined,\n mergeStrategy: MergeStrategy\n ): Promise<ComponentMergeStatus[]> {\n const ids = await Promise.all(\n bitIds.map(async (bitId) => {\n const remoteScopeName = laneId.isDefault() ? bitId.scope : laneId.scope;\n const remoteLaneId = LaneId.from(laneId.name, remoteScopeName as string);\n const remoteHead = await this.workspace.consumer.scope.objects.remoteLanes.getRef(remoteLaneId, bitId);\n const laneIdStr = remoteLaneId.toString();\n if (!remoteHead) {\n throw new BitError(`unable to find a remote head of \"${bitId.toStringWithoutVersion()}\" in \"${laneIdStr}\"`);\n }\n return bitId.changeVersion(remoteHead.toString());\n })\n );\n\n return this.getMergeStatus(ids, { shouldSquash: false, mergeStrategy }, localLaneObject, localLaneObject);\n }\n\n private async snapResolvedComponents(\n snapMessage: string,\n build: boolean,\n laneId?: LaneId\n ): Promise<MergeSnapResults> {\n const unmergedComponents = this.scope.legacyScope.objects.unmergedComponents.getComponents();\n this.logger.debug(`merge-snaps, snapResolvedComponents, total ${unmergedComponents.length.toString()} components`);\n if (!unmergedComponents.length) return null;\n const ids = ComponentIdList.fromArray(unmergedComponents.map((r) => ComponentID.fromObject(r.id)));\n if (!this.workspace) {\n const results = await this.snapping.snapFromScope(\n ids.map((id) => ({ componentId: id.toString() })),\n {\n message: snapMessage,\n build,\n lane: laneId?.toString(),\n }\n );\n return { ...results, autoSnappedResults: [] };\n }\n return this.snapping.snap({\n legacyBitIds: ids,\n build,\n message: snapMessage,\n });\n }\n\n private async tagAllLaneComponent(\n idsToTag: ComponentID[],\n tagMessage: string,\n build: boolean\n ): Promise<TagResults | null> {\n const ids = idsToTag.map((id) => {\n return id.toStringWithoutVersion();\n });\n this.logger.debug(`merge-snaps, tagResolvedComponents, total ${idsToTag.length.toString()} components`);\n return this.snapping.tag({\n ids,\n build,\n message: tagMessage,\n unmodified: true,\n });\n }\n\n private async getIdsForUnmerged(idsStr?: string[]): Promise<ComponentID[]> {\n if (idsStr && idsStr.length) {\n const componentIds = await this.workspace.resolveMultipleComponentIds(idsStr);\n componentIds.forEach((id) => {\n const entry = this.workspace.consumer.scope.objects.unmergedComponents.getEntry(id);\n if (!entry) {\n throw new BitError(`unable to merge-resolve ${id.toString()}, it is not marked as unresolved`);\n }\n });\n return componentIds;\n }\n const unresolvedComponents = this.workspace.consumer.scope.objects.unmergedComponents.getComponents();\n if (!unresolvedComponents.length) throw new BitError(`all components are resolved already, nothing to do`);\n return unresolvedComponents.map((u) => ComponentID.fromObject(u.id));\n }\n\n private async getComponentsToMerge(consumer: Consumer, ids: string[]): Promise<ComponentID[]> {\n const componentsList = new ComponentsList(consumer);\n if (!ids.length) {\n const mergePending = await componentsList.listMergePendingComponents();\n return mergePending.map((c) => c.id);\n }\n if (hasWildcard(ids)) {\n return componentsList.listComponentsByIdsWithWildcard(ids);\n }\n return ids.map((id) => consumer.getParsedId(id));\n }\n\n static slots = [];\n static dependencies = [\n CLIAspect,\n WorkspaceAspect,\n ScopeAspect,\n SnappingAspect,\n CheckoutAspect,\n InstallAspect,\n LoggerAspect,\n ComponentWriterAspect,\n ImporterAspect,\n ConfigAspect,\n RemoveAspect,\n GlobalConfigAspect,\n ConfigMergerAspect,\n DependencyResolverAspect,\n ];\n static runtime = MainRuntime;\n static async provider([\n cli,\n workspace,\n scope,\n snapping,\n checkout,\n install,\n loggerMain,\n compWriter,\n importer,\n config,\n remove,\n globalConfig,\n configMerger,\n depResolver,\n ]: [\n CLIMain,\n Workspace,\n ScopeMain,\n SnappingMain,\n CheckoutMain,\n InstallMain,\n LoggerMain,\n ComponentWriterMain,\n ImporterMain,\n ConfigMain,\n RemoveMain,\n GlobalConfigMain,\n ConfigMergerMain,\n DependencyResolverMain\n ]) {\n const logger = loggerMain.createLogger(MergingAspect.id);\n const merging = new MergingMain(\n workspace,\n scope,\n install,\n snapping,\n checkout,\n logger,\n compWriter,\n importer,\n config,\n remove,\n configMerger,\n depResolver\n );\n cli.register(new MergeCmd(merging, globalConfig));\n return merging;\n }\n}\n\nMergingAspect.addRuntime(MergingMain);\n"],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"names":["_cli","data","require","_workspace","_componentsList","_interopRequireDefault","_mergeVersion","_snapping","_hasWildcard","_pMapSeries","_componentId","_bitError","_laneId","_chalk","_config","_remove","_utils","_componentWriter","_importer","_logger","_globalConfig","_lodash","_checkout","_deleteComponentFiles","_configMerger","_componentIdToPackageName","_dependencyResolver","_install","_scope","_mergeCmd","_merging","_mergeStatusProvider","e","__esModule","default","ownKeys","r","t","Object","keys","getOwnPropertySymbols","o","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","defineProperty","_toPropertyKey","value","configurable","writable","i","_toPrimitive","Symbol","toPrimitive","call","TypeError","String","Number","MergingMain","constructor","workspace","scope","install","snapping","checkout","logger","componentWriter","importer","config","remove","configMerger","depResolver","merge","ids","mergeStrategy","abort","resolve","noSnap","message","build","skipDependencyInstallation","OutsideWorkspaceError","consumer","mergeResults","resolveMerge","abortMerge","bitIds","getComponentsToMerge","mergeComponentsFromRemote","onDestroy","snapMessage","currentLaneId","getCurrentLaneId","currentLaneObject","getCurrentLaneObject","allComponentsStatus","getAllComponentsStatus","failedComponents","c","unchangedMessage","unchangedLegitimately","failureMsgs","map","failedComponent","chalk","bold","id","toString","red","join","BitError","mergeSnaps","otherLaneId","currentLane","tag","legacyScope","componentWithConflict","find","component","hasConflicts","getMergeStrategyInteractive","componentStatus","shouldBeRemoved","componentIdsToRemove","changeVersion","undefined","succeededComponents","currentLaneIdsBeforeMerge","toComponentIds","componentsResults","applyVersionMultiple","allConfigMerge","compact","configMergeResult","workspaceDepsUpdates","workspaceDepsConflicts","workspaceDepsUnchanged","updateWorkspaceJsoncWithDepsIfNeeded","workspaceConfigConflictWriteError","writeWorkspaceJsoncWithConflictsGracefully","generateConfigMergeConflictFileForAll","objects","add","persist","unmergedComponents","write","writeBitMap","removeFromWsJsonPolicyIfExists","compBitIdsToRemove","ComponentIdList","fromArray","deleteComponentsFiles","cleanFromBitMap","componentsHasConfigMergeConflicts","some","leftUnresolvedConflicts","dedupe","updateExisting","import","err","error","consoleFailure","getSnapOrTagResults","idsToTag","results","tagAllLaneComponent","taggedComponents","autoTaggedResults","removedComponents","snappedComponents","autoSnappedResults","snapResolvedComponents","toLaneId","mergeSnapResults","mergeSnapError","bitMapSnapshot","bitMap","takeSnapshot","restoreFromSnapshot","components","applyVersionResult","workspaceConfigUpdateResult","newlyIntroducedIds","hasWithoutVersion","newlyIntroducedComponentIds","legacyCompToWrite","packages","componentIdToPackageName","isRemoved","removeFromRootPolicy","persistConfig","getMergeStatus","options","otherLane","mergeStatusProvider","MergeStatusProvider","getStatus","mapSeries","currentComponent","resolvedUnrelated","modelComponent","getModelComponent","updatedLaneId","isDefault","LaneId","from","name","applyVersion","remoteHead","getRef","version","compsToWrite","manyComponentsWriterOpts","writeConfig","reasonForBitmapChange","writeMany","filesStatus","unmergedComponent","fullName","head","laneId","addToCurrentLane","Error","isPartOfLane","isEqualWithoutVersion","addComponent","handleResolveUnrelated","headOnCurrentLane","unrelated","unrelatedHead","unrelatedLaneId","addEntry","markAllFilesAsUnchanged","files","file","pathNormalizeToLinux","relative","FileStatus","unchanged","MergeOptions","ours","strategy","remoteId","idToLoad","theirs","legacyComponent","loadComponentFromModelImportIfNeeded","getConsumerComponent","updateFileStatus","modifiedStatus","modifiedFiles","applyModifiedVersion","removeFilesIfNeeded","successfullyMergedConfig","getSuccessfullyMergedConfig","mergedConfig","manual","unmergedPaths","f","conflict","filePath","setHead","markVersionAsLocal","values","getIdsForUnmerged","reset","removeComponent","abortedComponents","snap","legacyBitIds","resolvedComponents","localLaneObject","Promise","all","bitId","remoteScopeName","remoteLaneId","remoteLanes","laneIdStr","toStringWithoutVersion","shouldSquash","getComponents","debug","ComponentID","fromObject","snapFromScope","componentId","lane","tagMessage","unmodified","idsStr","componentIds","resolveMultipleComponentIds","entry","getEntry","unresolvedComponents","u","componentsList","ComponentsList","mergePending","listMergePendingComponents","hasWildcard","listComponentsByIdsWithWildcard","getParsedId","provider","cli","loggerMain","compWriter","globalConfig","createLogger","MergingAspect","merging","register","MergeCmd","exports","CLIAspect","WorkspaceAspect","ScopeAspect","SnappingAspect","CheckoutAspect","InstallAspect","LoggerAspect","ComponentWriterAspect","ImporterAspect","ConfigAspect","RemoveAspect","GlobalConfigAspect","ConfigMergerAspect","DependencyResolverAspect","MainRuntime","addRuntime"],"sources":["merging.main.runtime.ts"],"sourcesContent":["import { CLIAspect, CLIMain, MainRuntime } from '@teambit/cli';\nimport { WorkspaceAspect, OutsideWorkspaceError, Workspace } from '@teambit/workspace';\nimport { Consumer } from '@teambit/legacy/dist/consumer';\nimport ComponentsList from '@teambit/legacy/dist/consumer/component/components-list';\nimport {\n MergeStrategy,\n FileStatus,\n getMergeStrategyInteractive,\n MergeOptions,\n} from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport { SnappingAspect, SnappingMain, TagResults } from '@teambit/snapping';\nimport hasWildcard from '@teambit/legacy/dist/utils/string/has-wildcard';\nimport mapSeries from 'p-map-series';\nimport { ComponentID, ComponentIdList } from '@teambit/component-id';\nimport { BitError } from '@teambit/bit-error';\nimport { LaneId } from '@teambit/lane-id';\nimport { AutoTagResult } from '@teambit/legacy/dist/scope/component-ops/auto-tag';\nimport { UnmergedComponent } from '@teambit/legacy/dist/scope/lanes/unmerged-components';\nimport { Lane, ModelComponent } from '@teambit/legacy/dist/scope/models';\nimport { Ref } from '@teambit/legacy/dist/scope/objects';\nimport chalk from 'chalk';\nimport { ConfigAspect, ConfigMain } from '@teambit/config';\nimport { RemoveAspect, RemoveMain } from '@teambit/remove';\nimport { pathNormalizeToLinux } from '@teambit/legacy/dist/utils';\nimport { ComponentWriterAspect, ComponentWriterMain } from '@teambit/component-writer';\nimport ConsumerComponent from '@teambit/legacy/dist/consumer/component/consumer-component';\nimport { ImporterAspect, ImporterMain } from '@teambit/importer';\nimport { Logger, LoggerAspect, LoggerMain } from '@teambit/logger';\nimport { GlobalConfigAspect, GlobalConfigMain } from '@teambit/global-config';\nimport { compact } from 'lodash';\nimport { MergeResultsThreeWay } from '@teambit/legacy/dist/consumer/versions-ops/merge-version/three-way-merge';\nimport {\n ApplyVersionWithComps,\n CheckoutAspect,\n CheckoutMain,\n ComponentStatusBase,\n applyModifiedVersion,\n removeFilesIfNeeded,\n updateFileStatus,\n} from '@teambit/checkout';\nimport deleteComponentsFiles from '@teambit/legacy/dist/consumer/component-ops/delete-component-files';\nimport {\n ConfigMergerAspect,\n ConfigMergerMain,\n ConfigMergeResult,\n WorkspaceConfigUpdateResult,\n} from '@teambit/config-merger';\nimport { SnapsDistance } from '@teambit/legacy/dist/scope/component-ops/snaps-distance';\nimport componentIdToPackageName from '@teambit/legacy/dist/utils/bit/component-id-to-package-name';\nimport { DependencyResolverAspect, DependencyResolverMain } from '@teambit/dependency-resolver';\nimport { InstallMain, InstallAspect } from '@teambit/install';\nimport { ScopeAspect, ScopeMain } from '@teambit/scope';\nimport { MergeCmd } from './merge-cmd';\nimport { MergingAspect } from './merging.aspect';\nimport { MergeStatusProvider, MergeStatusProviderOptions } from './merge-status-provider';\n\ntype ResolveUnrelatedData = {\n strategy: MergeStrategy;\n headOnCurrentLane: Ref;\n unrelatedHead: Ref;\n unrelatedLaneId: LaneId;\n};\n\nexport type ComponentMergeStatus = ComponentStatusBase & {\n mergeResults?: MergeResultsThreeWay | null;\n divergeData?: SnapsDistance;\n resolvedUnrelated?: ResolveUnrelatedData;\n configMergeResult?: ConfigMergeResult;\n};\n\nexport type ComponentMergeStatusBeforeMergeAttempt = ComponentStatusBase & {\n divergeData?: SnapsDistance;\n resolvedUnrelated?: ResolveUnrelatedData;\n mergeProps?: {\n otherLaneHead: Ref;\n currentId: ComponentID;\n modelComponent: ModelComponent;\n };\n};\n\nexport type FailedComponents = { id: ComponentID; unchangedMessage: string; unchangedLegitimately?: boolean };\n\n// fileName is PathLinux. TS doesn't let anything else in the keys other than string and number\nexport type FilesStatus = { [fileName: string]: keyof typeof FileStatus };\n\nexport type MergeSnapResults = {\n snappedComponents: ConsumerComponent[];\n autoSnappedResults: AutoTagResult[];\n removedComponents?: ComponentIdList;\n exportedIds?: ComponentID[];\n} | null;\n\nexport type ApplyVersionResult = { id: ComponentID; filesStatus: FilesStatus };\n\nexport type ApplyVersionResults = {\n components?: ApplyVersionResult[];\n version?: string;\n failedComponents?: FailedComponents[];\n removedComponents?: ComponentID[];\n addedComponents?: ComponentID[]; // relevant when restoreMissingComponents is true (e.g. bit lane merge-abort)\n resolvedComponents?: ConsumerComponent[]; // relevant for bit merge --resolve\n abortedComponents?: ApplyVersionResult[]; // relevant for bit merge --abort\n mergeSnapResults?: MergeSnapResults;\n mergeSnapError?: Error;\n leftUnresolvedConflicts?: boolean;\n verbose?: boolean;\n newFromLane?: string[];\n newFromLaneAdded?: boolean;\n installationError?: Error; // in case the package manager failed, it won't throw, instead, it'll return error here\n compilationError?: Error; // in case the compiler failed, it won't throw, instead, it'll return error here\n workspaceConfigUpdateResult?: WorkspaceConfigUpdateResult;\n};\n\nexport class MergingMain {\n constructor(\n private workspace: Workspace,\n private scope: ScopeMain,\n private install: InstallMain,\n private snapping: SnappingMain,\n private checkout: CheckoutMain,\n private logger: Logger,\n private componentWriter: ComponentWriterMain,\n private importer: ImporterMain,\n private config: ConfigMain,\n private remove: RemoveMain,\n private configMerger: ConfigMergerMain,\n private depResolver: DependencyResolverMain\n ) {}\n\n async merge(\n ids: string[],\n mergeStrategy: MergeStrategy,\n abort: boolean,\n resolve: boolean,\n noSnap: boolean,\n message: string,\n build: boolean,\n skipDependencyInstallation: boolean\n ): Promise<ApplyVersionResults> {\n if (!this.workspace) throw new OutsideWorkspaceError();\n const consumer: Consumer = this.workspace.consumer;\n let mergeResults;\n if (resolve) {\n mergeResults = await this.resolveMerge(ids, message, build);\n } else if (abort) {\n mergeResults = await this.abortMerge(ids);\n } else {\n const bitIds = await this.getComponentsToMerge(consumer, ids);\n mergeResults = await this.mergeComponentsFromRemote(\n consumer,\n bitIds,\n mergeStrategy,\n noSnap,\n message,\n build,\n skipDependencyInstallation\n );\n }\n await consumer.onDestroy('merge');\n return mergeResults;\n }\n\n /**\n * when user is on main, it merges the remote main components into local.\n * when user is on a lane, it merges the remote lane components into the local lane.\n */\n async mergeComponentsFromRemote(\n consumer: Consumer,\n bitIds: ComponentID[],\n mergeStrategy: MergeStrategy,\n noSnap: boolean,\n snapMessage: string,\n build: boolean,\n skipDependencyInstallation: boolean\n ): Promise<ApplyVersionResults> {\n const currentLaneId = consumer.getCurrentLaneId();\n const currentLaneObject = await consumer.getCurrentLaneObject();\n const allComponentsStatus = await this.getAllComponentsStatus(\n bitIds,\n currentLaneId,\n currentLaneObject,\n mergeStrategy\n );\n const failedComponents = allComponentsStatus.filter((c) => c.unchangedMessage && !c.unchangedLegitimately);\n if (failedComponents.length) {\n const failureMsgs = failedComponents\n .map(\n (failedComponent) =>\n `${chalk.bold(failedComponent.id.toString())} - ${chalk.red(failedComponent.unchangedMessage as string)}`\n )\n .join('\\n');\n throw new BitError(`unable to merge due to the following failures:\\n${failureMsgs}`);\n }\n\n return this.mergeSnaps({\n mergeStrategy,\n allComponentsStatus,\n otherLaneId: currentLaneId,\n currentLane: 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 otherLaneId,\n currentLane,\n noSnap,\n tag,\n snapMessage,\n build,\n skipDependencyInstallation,\n }: {\n mergeStrategy: MergeStrategy;\n allComponentsStatus: ComponentMergeStatus[];\n otherLaneId: LaneId;\n currentLane?: Lane;\n noSnap: boolean;\n tag?: boolean;\n snapMessage: string;\n build: boolean;\n skipDependencyInstallation?: boolean;\n }): Promise<ApplyVersionResults> {\n const consumer = this.workspace?.consumer;\n const legacyScope = this.scope.legacyScope;\n const componentWithConflict = allComponentsStatus.find(\n (component) => component.mergeResults && component.mergeResults.hasConflicts\n );\n if (componentWithConflict && !mergeStrategy) {\n mergeStrategy = await getMergeStrategyInteractive();\n }\n const failedComponents: FailedComponents[] = allComponentsStatus\n .filter((componentStatus) => componentStatus.unchangedMessage)\n .filter((componentStatus) => !componentStatus.shouldBeRemoved)\n .map((componentStatus) => ({\n id: componentStatus.id,\n unchangedMessage: componentStatus.unchangedMessage as string,\n unchangedLegitimately: componentStatus.unchangedLegitimately,\n }));\n\n const componentIdsToRemove = allComponentsStatus\n .filter((componentStatus) => componentStatus.shouldBeRemoved)\n .map((c) => c.id.changeVersion(undefined));\n\n const succeededComponents = allComponentsStatus.filter((componentStatus) => !componentStatus.unchangedMessage);\n\n const currentLaneIdsBeforeMerge = currentLane?.toComponentIds();\n\n const componentsResults = await this.applyVersionMultiple(\n succeededComponents,\n otherLaneId,\n mergeStrategy,\n currentLane\n );\n\n const allConfigMerge = compact(succeededComponents.map((c) => c.configMergeResult));\n\n const { workspaceDepsUpdates, workspaceDepsConflicts, workspaceDepsUnchanged } = this.workspace\n ? await this.configMerger.updateWorkspaceJsoncWithDepsIfNeeded(allConfigMerge)\n : { workspaceDepsUpdates: undefined, workspaceDepsConflicts: undefined, workspaceDepsUnchanged: undefined };\n\n let workspaceConfigConflictWriteError: Error | undefined;\n if (workspaceDepsConflicts) {\n workspaceConfigConflictWriteError = await this.configMerger.writeWorkspaceJsoncWithConflictsGracefully(\n workspaceDepsConflicts\n );\n }\n if (this.workspace) await this.configMerger.generateConfigMergeConflictFileForAll(allConfigMerge);\n\n if (currentLane) legacyScope.objects.add(currentLane);\n\n await legacyScope.objects.persist(); // persist anyway, if currentLane is null it should save all main heads\n\n await legacyScope.objects.unmergedComponents.write();\n\n if (this.workspace) {\n await consumer.writeBitMap(`merge ${otherLaneId.toString()}`);\n await this.removeFromWsJsonPolicyIfExists(componentsResults, currentLane, currentLaneIdsBeforeMerge);\n }\n\n if (componentIdsToRemove.length && this.workspace) {\n const compBitIdsToRemove = ComponentIdList.fromArray(componentIdsToRemove);\n await deleteComponentsFiles(consumer, compBitIdsToRemove);\n await consumer.cleanFromBitMap(compBitIdsToRemove);\n }\n\n const componentsHasConfigMergeConflicts = allComponentsStatus.some((c) => c.configMergeResult?.hasConflicts());\n const leftUnresolvedConflicts = componentWithConflict && mergeStrategy === 'manual';\n if (!skipDependencyInstallation && !leftUnresolvedConflicts && !componentsHasConfigMergeConflicts) {\n try {\n await this.install.install(undefined, {\n dedupe: true,\n updateExisting: false,\n import: false,\n });\n } catch (err: any) {\n this.logger.error(`failed installing packages`, err);\n this.logger.consoleFailure(\n `failed installing packages, see the log for full stacktrace. error: ${err.message}`\n );\n }\n }\n\n const getSnapOrTagResults = async (): Promise<MergeSnapResults> => {\n // if one of the component has conflict, don't snap-merge. otherwise, some of the components would be snap-merged\n // and some not. besides the fact that it could by mistake tag dependent, it's a confusing state. better not snap.\n if (noSnap || leftUnresolvedConflicts || componentsHasConfigMergeConflicts) {\n return null;\n }\n if (tag) {\n const idsToTag = allComponentsStatus.map((c) => c.id);\n const results = await this.tagAllLaneComponent(idsToTag, snapMessage, build);\n if (!results) return null;\n const { taggedComponents, autoTaggedResults, removedComponents } = results;\n return { snappedComponents: taggedComponents, autoSnappedResults: autoTaggedResults, removedComponents };\n }\n return this.snapResolvedComponents(snapMessage, build, currentLane?.toLaneId());\n };\n let mergeSnapResults: MergeSnapResults = null;\n let mergeSnapError: Error | undefined;\n const bitMapSnapshot = this.workspace ? this.workspace.bitMap.takeSnapshot() : null;\n try {\n mergeSnapResults = await getSnapOrTagResults();\n } catch (err: any) {\n this.logger.error('failed running snap. mergeSnapError:', err);\n mergeSnapError = err;\n if (bitMapSnapshot) this.workspace.bitMap.restoreFromSnapshot(bitMapSnapshot);\n }\n\n return {\n components: componentsResults.map((c) => c.applyVersionResult),\n failedComponents,\n removedComponents: [...componentIdsToRemove, ...(mergeSnapResults?.removedComponents || [])],\n mergeSnapResults,\n mergeSnapError,\n workspaceConfigUpdateResult: {\n workspaceDepsUpdates,\n workspaceDepsConflicts,\n workspaceDepsUnchanged,\n workspaceConfigConflictWriteError,\n },\n leftUnresolvedConflicts,\n };\n }\n\n async removeFromWsJsonPolicyIfExists(\n componentsResults: ApplyVersionWithComps[],\n currentLane?: Lane,\n currentLaneIdsBeforeMerge?: ComponentIdList\n ) {\n const newlyIntroducedIds = currentLane\n ?.toComponentIds()\n .filter((id) => !currentLaneIdsBeforeMerge?.hasWithoutVersion(id));\n const newlyIntroducedComponentIds = ComponentIdList.fromArray(newlyIntroducedIds || []);\n const components = compact(\n componentsResults\n .map((c) => c.legacyCompToWrite)\n .filter((c) => c && newlyIntroducedComponentIds.hasWithoutVersion(c.id))\n );\n const packages = components.map((c) => componentIdToPackageName(c));\n const isRemoved = this.depResolver.removeFromRootPolicy(packages);\n if (isRemoved) await this.depResolver.persistConfig('merge (remove packages)');\n }\n\n /**\n * this function gets called from two different commands:\n * 1. \"bit merge <ids...>\", when merging a component from a remote to the local.\n * in this case, the remote and local are on the same lane or both on main.\n * 2. \"bit lane merge\", when merging from one lane to another.\n */\n async getMergeStatus(\n bitIds: ComponentID[], // the id.version is the version we want to merge to the current component\n options: MergeStatusProviderOptions,\n currentLane?: Lane, // currently checked out lane. if on main, then it's null.\n otherLane?: Lane // the lane we want to merged to our lane. (null if it's \"main\").\n ): Promise<ComponentMergeStatus[]> {\n const mergeStatusProvider = new MergeStatusProvider(\n this.scope,\n this.logger,\n this.importer,\n options,\n this.workspace,\n currentLane,\n otherLane\n );\n return mergeStatusProvider.getStatus(bitIds);\n }\n\n private async applyVersionMultiple(\n succeededComponents: ComponentMergeStatus[],\n otherLaneId: LaneId,\n mergeStrategy: MergeStrategy,\n currentLane?: Lane\n ): Promise<ApplyVersionWithComps[]> {\n const componentsResults = await mapSeries(\n succeededComponents,\n async ({ currentComponent, id, mergeResults, resolvedUnrelated, configMergeResult }) => {\n const modelComponent = await this.scope.legacyScope.getModelComponent(id);\n const updatedLaneId = otherLaneId.isDefault() ? LaneId.from(otherLaneId.name, id.scope as string) : otherLaneId;\n return this.applyVersion({\n currentComponent,\n id,\n mergeResults,\n mergeStrategy,\n remoteHead: modelComponent.getRef(id.version as string) as Ref,\n otherLaneId: updatedLaneId,\n currentLane,\n resolvedUnrelated,\n configMergeResult,\n });\n }\n );\n\n if (this.workspace) {\n const compsToWrite = compact(componentsResults.map((c) => c.legacyCompToWrite));\n const manyComponentsWriterOpts = {\n consumer: this.workspace.consumer,\n components: compsToWrite,\n skipDependencyInstallation: true,\n writeConfig: false, // @todo: should write if config exists before, needs to figure out how to do it.\n reasonForBitmapChange: 'merge',\n };\n await this.componentWriter.writeMany(manyComponentsWriterOpts);\n }\n\n return componentsResults;\n }\n\n private async applyVersion({\n currentComponent,\n id,\n mergeResults,\n mergeStrategy,\n remoteHead,\n otherLaneId,\n currentLane,\n resolvedUnrelated,\n configMergeResult,\n }: {\n currentComponent: ConsumerComponent | null | undefined;\n id: ComponentID;\n mergeResults: MergeResultsThreeWay | null | undefined;\n mergeStrategy: MergeStrategy;\n remoteHead: Ref;\n otherLaneId: LaneId;\n currentLane?: Lane;\n resolvedUnrelated?: ResolveUnrelatedData;\n configMergeResult?: ConfigMergeResult;\n }): Promise<ApplyVersionWithComps> {\n const legacyScope = this.scope.legacyScope;\n let filesStatus = {};\n const unmergedComponent: UnmergedComponent = {\n id: { name: id.fullName, scope: id.scope },\n head: remoteHead,\n laneId: otherLaneId,\n };\n id = currentComponent ? currentComponent.id : id;\n const modelComponent = await legacyScope.getModelComponent(id);\n\n const addToCurrentLane = (head: Ref) => {\n if (!currentLane) throw new Error('currentLane must be defined when adding to the lane');\n if (otherLaneId.isDefault()) {\n const isPartOfLane = currentLane.components.find((c) => c.id.isEqualWithoutVersion(id));\n if (!isPartOfLane) return;\n }\n currentLane.addComponent({ id, head });\n };\n\n const handleResolveUnrelated = (legacyCompToWrite?: ConsumerComponent) => {\n if (!currentComponent) throw new Error('currentComponent must be defined when resolvedUnrelated');\n // because when on a main, we don't allow merging lanes with unrelated. we asks users to switch to the lane\n // first and then merge with --resolve-unrelated\n if (!currentLane) throw new Error('currentLane must be defined when resolvedUnrelated');\n if (!resolvedUnrelated) throw new Error('resolvedUnrelated must be populated');\n addToCurrentLane(resolvedUnrelated.headOnCurrentLane);\n unmergedComponent.unrelated = {\n unrelatedHead: resolvedUnrelated.unrelatedHead,\n headOnCurrentLane: resolvedUnrelated.headOnCurrentLane,\n unrelatedLaneId: resolvedUnrelated.unrelatedLaneId,\n };\n legacyScope.objects.unmergedComponents.addEntry(unmergedComponent);\n return { applyVersionResult: { id, filesStatus }, component: currentComponent, legacyCompToWrite };\n };\n\n const markAllFilesAsUnchanged = () => {\n if (!currentComponent) throw new Error(`applyVersion expect to get currentComponent for ${id.toString()}`);\n currentComponent.files.forEach((file) => {\n filesStatus[pathNormalizeToLinux(file.relative)] = FileStatus.unchanged;\n });\n };\n if (mergeResults && mergeResults.hasConflicts && mergeStrategy === MergeOptions.ours) {\n markAllFilesAsUnchanged();\n legacyScope.objects.unmergedComponents.addEntry(unmergedComponent);\n return { applyVersionResult: { id, filesStatus }, component: currentComponent || undefined };\n }\n if (resolvedUnrelated?.strategy === 'ours') {\n markAllFilesAsUnchanged();\n return handleResolveUnrelated();\n }\n const remoteId = id.changeVersion(remoteHead.toString());\n const idToLoad = !mergeResults || mergeStrategy === MergeOptions.theirs ? remoteId : id;\n const legacyComponent = this.workspace\n ? await this.workspace.consumer.loadComponentFromModelImportIfNeeded(idToLoad)\n : await legacyScope.getConsumerComponent(idToLoad); // when loading from the scope, we import all needed components first, so it should be fine. otherwise, change the code to import it here\n if (mergeResults && mergeStrategy === MergeOptions.theirs) {\n // in this case, we don't want to update .bitmap with the version of the remote. we want to keep the same version\n legacyComponent.version = id.version;\n }\n const files = legacyComponent.files;\n updateFileStatus(files, filesStatus, currentComponent || undefined);\n\n if (mergeResults) {\n // update files according to the merge results\n const { filesStatus: modifiedStatus, modifiedFiles } = applyModifiedVersion(files, mergeResults, mergeStrategy);\n legacyComponent.files = modifiedFiles;\n filesStatus = { ...filesStatus, ...modifiedStatus };\n }\n\n if (this.workspace) await removeFilesIfNeeded(filesStatus, this.workspace.consumer, currentComponent || undefined);\n\n if (configMergeResult) {\n const successfullyMergedConfig = configMergeResult.getSuccessfullyMergedConfig();\n if (successfullyMergedConfig) {\n unmergedComponent.mergedConfig = successfullyMergedConfig;\n // no need to `unmergedComponents.addEntry` here. it'll be added in the next lines inside `if (mergeResults)`.\n // because if `configMergeResult` is set, `mergeResults` must be set as well. both happen on diverge.\n }\n }\n\n // if mergeResults, the head snap is going to be updated on a later phase when snapping with two parents\n // otherwise, update the head of the current lane or main\n if (mergeResults) {\n if (mergeResults.hasConflicts && mergeStrategy === MergeOptions.manual) {\n unmergedComponent.unmergedPaths = mergeResults.modifiedFiles.filter((f) => f.conflict).map((f) => f.filePath);\n }\n legacyScope.objects.unmergedComponents.addEntry(unmergedComponent);\n } else if (currentLane) {\n if (resolvedUnrelated) {\n // must be \"theirs\"\n return handleResolveUnrelated(legacyComponent);\n }\n addToCurrentLane(remoteHead);\n } else {\n // this is main\n modelComponent.setHead(remoteHead);\n // mark it as local, otherwise, when importing this component from a remote, it'll override it.\n modelComponent.markVersionAsLocal(remoteHead.toString());\n legacyScope.objects.add(modelComponent);\n }\n\n return {\n applyVersionResult: { id: idToLoad, filesStatus },\n component: currentComponent || undefined,\n legacyCompToWrite: legacyComponent,\n };\n }\n\n private async abortMerge(values: string[]): Promise<ApplyVersionResults> {\n const consumer = this.workspace.consumer;\n const ids = await this.getIdsForUnmerged(values);\n const results = await this.checkout.checkout({ ids, reset: true });\n ids.forEach((id) => consumer.scope.objects.unmergedComponents.removeComponent(id));\n await consumer.scope.objects.unmergedComponents.write();\n return { abortedComponents: results.components };\n }\n\n private async resolveMerge(values: string[], snapMessage: string, build: boolean): Promise<ApplyVersionResults> {\n const ids = await this.getIdsForUnmerged(values);\n // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n const { snappedComponents } = await this.snapping.snap({\n legacyBitIds: ComponentIdList.fromArray(ids.map((id) => id)),\n build,\n message: snapMessage,\n });\n return { resolvedComponents: snappedComponents };\n }\n\n private async getAllComponentsStatus(\n bitIds: ComponentID[],\n laneId: LaneId,\n localLaneObject: Lane | undefined,\n mergeStrategy: MergeStrategy\n ): Promise<ComponentMergeStatus[]> {\n const ids = await Promise.all(\n bitIds.map(async (bitId) => {\n const remoteScopeName = laneId.isDefault() ? bitId.scope : laneId.scope;\n const remoteLaneId = LaneId.from(laneId.name, remoteScopeName as string);\n const remoteHead = await this.workspace.consumer.scope.objects.remoteLanes.getRef(remoteLaneId, bitId);\n const laneIdStr = remoteLaneId.toString();\n if (!remoteHead) {\n throw new BitError(`unable to find a remote head of \"${bitId.toStringWithoutVersion()}\" in \"${laneIdStr}\"`);\n }\n return bitId.changeVersion(remoteHead.toString());\n })\n );\n\n return this.getMergeStatus(ids, { shouldSquash: false, mergeStrategy }, localLaneObject, localLaneObject);\n }\n\n private async snapResolvedComponents(\n snapMessage: string,\n build: boolean,\n laneId?: LaneId\n ): Promise<MergeSnapResults> {\n const unmergedComponents = this.scope.legacyScope.objects.unmergedComponents.getComponents();\n this.logger.debug(`merge-snaps, snapResolvedComponents, total ${unmergedComponents.length.toString()} components`);\n if (!unmergedComponents.length) return null;\n const ids = ComponentIdList.fromArray(unmergedComponents.map((r) => ComponentID.fromObject(r.id)));\n if (!this.workspace) {\n const results = await this.snapping.snapFromScope(\n ids.map((id) => ({ componentId: id.toString() })),\n {\n message: snapMessage,\n build,\n lane: laneId?.toString(),\n }\n );\n return { ...results, autoSnappedResults: [] };\n }\n return this.snapping.snap({\n legacyBitIds: ids,\n build,\n message: snapMessage,\n });\n }\n\n private async tagAllLaneComponent(\n idsToTag: ComponentID[],\n tagMessage: string,\n build: boolean\n ): Promise<TagResults | null> {\n const ids = idsToTag.map((id) => {\n return id.toStringWithoutVersion();\n });\n this.logger.debug(`merge-snaps, tagResolvedComponents, total ${idsToTag.length.toString()} components`);\n return this.snapping.tag({\n ids,\n build,\n message: tagMessage,\n unmodified: true,\n });\n }\n\n private async getIdsForUnmerged(idsStr?: string[]): Promise<ComponentID[]> {\n if (idsStr && idsStr.length) {\n const componentIds = await this.workspace.resolveMultipleComponentIds(idsStr);\n componentIds.forEach((id) => {\n const entry = this.workspace.consumer.scope.objects.unmergedComponents.getEntry(id);\n if (!entry) {\n throw new BitError(`unable to merge-resolve ${id.toString()}, it is not marked as unresolved`);\n }\n });\n return componentIds;\n }\n const unresolvedComponents = this.workspace.consumer.scope.objects.unmergedComponents.getComponents();\n if (!unresolvedComponents.length) throw new BitError(`all components are resolved already, nothing to do`);\n return unresolvedComponents.map((u) => ComponentID.fromObject(u.id));\n }\n\n private async getComponentsToMerge(consumer: Consumer, ids: string[]): Promise<ComponentID[]> {\n const componentsList = new ComponentsList(consumer);\n if (!ids.length) {\n const mergePending = await componentsList.listMergePendingComponents();\n return mergePending.map((c) => c.id);\n }\n if (hasWildcard(ids)) {\n return componentsList.listComponentsByIdsWithWildcard(ids);\n }\n return ids.map((id) => consumer.getParsedId(id));\n }\n\n static slots = [];\n static dependencies = [\n CLIAspect,\n WorkspaceAspect,\n ScopeAspect,\n SnappingAspect,\n CheckoutAspect,\n InstallAspect,\n LoggerAspect,\n ComponentWriterAspect,\n ImporterAspect,\n ConfigAspect,\n RemoveAspect,\n GlobalConfigAspect,\n ConfigMergerAspect,\n DependencyResolverAspect,\n ];\n static runtime = MainRuntime;\n static async provider([\n cli,\n workspace,\n scope,\n snapping,\n checkout,\n install,\n loggerMain,\n compWriter,\n importer,\n config,\n remove,\n globalConfig,\n configMerger,\n depResolver,\n ]: [\n CLIMain,\n Workspace,\n ScopeMain,\n SnappingMain,\n CheckoutMain,\n InstallMain,\n LoggerMain,\n ComponentWriterMain,\n ImporterMain,\n ConfigMain,\n RemoveMain,\n GlobalConfigMain,\n ConfigMergerMain,\n DependencyResolverMain\n ]) {\n const logger = loggerMain.createLogger(MergingAspect.id);\n const merging = new MergingMain(\n workspace,\n scope,\n install,\n snapping,\n checkout,\n logger,\n compWriter,\n importer,\n config,\n remove,\n configMerger,\n depResolver\n );\n cli.register(new MergeCmd(merging, globalConfig));\n return merging;\n }\n}\n\nMergingAspect.addRuntime(MergingMain);\n"],"mappings":"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","ignoreList":[]}
package/package.json CHANGED
@@ -1,12 +1,12 @@
1
1
  {
2
2
  "name": "@teambit/merging",
3
- "version": "1.0.281",
3
+ "version": "1.0.283",
4
4
  "homepage": "https://bit.cloud/teambit/component/merging",
5
5
  "main": "dist/index.js",
6
6
  "componentId": {
7
7
  "scope": "teambit.component",
8
8
  "name": "merging",
9
- "version": "1.0.281"
9
+ "version": "1.0.283"
10
10
  },
11
11
  "dependencies": {
12
12
  "chalk": "2.4.2",
@@ -17,19 +17,19 @@
17
17
  "@teambit/lane-id": "0.0.311",
18
18
  "@teambit/harmony": "0.4.6",
19
19
  "@teambit/cli": "0.0.865",
20
- "@teambit/config-merger": "0.0.148",
20
+ "@teambit/config-merger": "0.0.150",
21
21
  "@teambit/global-config": "0.0.868",
22
- "@teambit/importer": "1.0.281",
22
+ "@teambit/importer": "1.0.283",
23
23
  "@teambit/logger": "0.0.958",
24
- "@teambit/scope": "1.0.281",
25
- "@teambit/workspace": "1.0.281",
26
- "@teambit/checkout": "1.0.281",
27
- "@teambit/component-writer": "1.0.281",
28
- "@teambit/config": "0.0.1032",
29
- "@teambit/dependency-resolver": "1.0.281",
30
- "@teambit/install": "1.0.281",
31
- "@teambit/remove": "1.0.281",
32
- "@teambit/snapping": "1.0.281"
24
+ "@teambit/scope": "1.0.283",
25
+ "@teambit/workspace": "1.0.283",
26
+ "@teambit/checkout": "1.0.283",
27
+ "@teambit/component-writer": "1.0.283",
28
+ "@teambit/config": "0.0.1034",
29
+ "@teambit/dependency-resolver": "1.0.283",
30
+ "@teambit/install": "1.0.283",
31
+ "@teambit/remove": "1.0.283",
32
+ "@teambit/snapping": "1.0.283"
33
33
  },
34
34
  "devDependencies": {
35
35
  "@types/lodash": "4.14.165",