@teambit/merging 0.0.67 → 0.0.70

package/dist/merge-cmd.d.ts

@@ -4,9 +4,9 @@ import { MergingMain } from './merging.main.runtime';
 export declare class MergeCmd implements Command {
     private merging;
     name: string;
-    shortDescription: string;
-    group: string;
     description: string;
+    group: string;
+    extendedDescription: string;
     alias: string;
     options: CommandOptions;
     loader: boolean;

package/dist/merge-cmd.js

@@ -76,9 +76,9 @@ class MergeCmd {
   constructor(merging) {
     this.merging = merging;
     (0, _defineProperty2().default)(this, "name", 'merge [values...]');
-    (0, _defineProperty2().default)(this, "shortDescription", 'merge changes of different component versions');
+    (0, _defineProperty2().default)(this, "description", 'merge changes of different component versions');
     (0, _defineProperty2().default)(this, "group", 'development');
-    (0, _defineProperty2().default)(this, "description", `merge changes of different component versions
+    (0, _defineProperty2().default)(this, "extendedDescription", `merge changes of different component versions
   \`bit merge <version> [ids...]\` => merge changes of the given version into the checked out version
   \`bit merge [ids...]\` => EXPERIMENTAL. merge changes of the remote head into local, optionally use '--abort' or '--resolve'
   ${(0, _constants().WILDCARD_HELP)('merge 0.0.1')}`);

package/dist/merge-cmd.js.map

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

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@teambit/merging",
-  "version": "0.0.67",
+  "version": "0.0.70",
   "homepage": "https://bit.dev/teambit/component/merging",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.component",
     "name": "merging",
-    "version": "0.0.67"
+    "version": "0.0.70"
   },
   "dependencies": {
     "chalk": "2.4.2",
@@ -17,10 +17,10 @@
     "core-js": "^3.0.0",
     "@teambit/harmony": "0.3.3",
     "@teambit/bit-error": "0.0.394",
-    "@teambit/cli": "0.0.496",
-    "@teambit/lane-id": "0.0.15",
-    "@teambit/snapping": "0.0.67",
-    "@teambit/workspace": "0.0.752"
+    "@teambit/cli": "0.0.498",
+    "@teambit/lane-id": "0.0.17",
+    "@teambit/snapping": "0.0.70",
+    "@teambit/workspace": "0.0.755"
   },
   "devDependencies": {
     "@types/fs-extra": "9.0.7",
@@ -32,7 +32,7 @@
     "@types/node": "12.20.4"
   },
   "peerDependencies": {
-    "@teambit/legacy": "1.0.276",
+    "@teambit/legacy": "1.0.278",
     "react-dom": "^16.8.0 || ^17.0.0",
     "react": "^16.8.0 || ^17.0.0"
   },
@@ -60,7 +60,7 @@
         "react": "-"
       },
       "peerDependencies": {
-        "@teambit/legacy": "1.0.276",
+        "@teambit/legacy": "1.0.278",
         "react-dom": "^16.8.0 || ^17.0.0",
         "react": "^16.8.0 || ^17.0.0"
       }