@teambit/merge-lanes 1.0.525 → 1.0.526

package/dist/merge-lane-from-scope.cmd.js

@@ -41,8 +41,8 @@ function _bitError() {
 }
 const _excluded = ["id"];
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var s = Object.getOwnPropertySymbols(e); for (r = 0; r < s.length; r++) o = s[r], t.includes(o) || {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
-function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (e.includes(n)) continue; t[n] = r[n]; } return t; }
+function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var n = Object.getOwnPropertySymbols(e); for (r = 0; r < n.length; r++) o = n[r], -1 === t.indexOf(o) && {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
+function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (-1 !== e.indexOf(n)) continue; t[n] = r[n]; } return t; }
 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; }
 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; }
 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; }

package/dist/merge-lane-from-scope.cmd.js.map

@@ -1 +1 @@
-{"version":3,"names":["_chalk","data","_interopRequireDefault","require","_laneId","_lodash","_legacy","_bitError","_excluded","e","__esModule","default","_objectWithoutProperties","t","o","r","i","_objectWithoutPropertiesLoose","Object","getOwnPropertySymbols","s","length","includes","propertyIsEnumerable","call","n","hasOwnProperty","ownKeys","keys","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","defineProperty","_toPropertyKey","value","configurable","writable","_toPrimitive","Symbol","toPrimitive","TypeError","String","Number","MergeLaneFromScopeCmd","constructor","mergeLanes","name","description","DEFAULT_LANE","report","fromLane","toLane","pattern","keepReadme","noSquash","includeDeps","title","titleBase64","reMerge","BitError","titleBase64Decoded","fromBase64","undefined","mergedNow","unmerged","exportedIds","conflicts","mergeSnapError","mergeFromScope","snapMessage","mergedTitle","chalk","green","mergedOutput","join","nonMergedTitle","bold","nonMergedOutput","map","u","id","reason","conflictsTitle","conflictsOutput","files","config","mergeSnapErrorTitle","mergeSnapErrorOutput","red","message","exportedTitle","exportedOutput","compact","json","results","code","toString","mergedPreviously","_ref","rest","snappedIds","stack","err","logger","error","exports"],"sources":["merge-lane-from-scope.cmd.ts"],"sourcesContent":["import chalk from 'chalk';\nimport { DEFAULT_LANE } from '@teambit/lane-id';\nimport { Command, CommandOptions } from '@teambit/cli';\nimport { compact } from 'lodash';\nimport { fromBase64 } from '@teambit/legacy.utils';\nimport { BitError } from '@teambit/bit-error';\nimport { MergeFromScopeResult, MergeLanesMain } from './merge-lanes.main.runtime';\n\ntype Flags = {\n  pattern?: string;\n  push?: boolean;\n  keepReadme?: boolean;\n  noSquash: boolean;\n  includeDeps?: boolean;\n  title?: string;\n  titleBase64?: string;\n  reMerge?: boolean;\n};\n\n/**\n * private command. the underscore prefix is intended.\n */\nexport class MergeLaneFromScopeCmd implements Command {\n  name = '_merge-lane <from-lane> [to-lane]';\n  description = `merge a remote lane into another lane or main via a bare-scope (not workspace)`;\n  extendedDescription = `to merge from a workspace, use \"bit lane merge\" command.\nthis is intended to use from the UI, which will have a button to merge an existing lane.\nthe lane must be up-to-date with the other lane, otherwise, conflicts might occur which are not handled in this command`;\n  arguments = [\n    {\n      name: 'from-lane',\n      description: `lane-id to merge from or \"${DEFAULT_LANE}\"`,\n    },\n    {\n      name: 'to-lane',\n      description: `lane-id to merge to. default is \"${DEFAULT_LANE}\"`,\n    },\n  ];\n  alias = '';\n  options = [\n    ['', 'pattern <string>', 'partially merge the lane with the specified component-pattern'],\n    [\n      '',\n      'title <string>',\n      'if provided, it replaces the original message with this title and append squashed snaps messages',\n    ],\n    ['', 'title-base64 <string>', 'same as --title flag but the title is base64 encoded'],\n    ['', 'push', 'export the updated objects to the original scopes once done'],\n    ['', 'keep-readme', 'skip deleting the lane readme component after merging'],\n    ['', 'no-squash', 'relevant for merging lanes into main, which by default squash.'],\n    ['', 'include-deps', 'relevant for \"--pattern\". merge also dependencies of the given components'],\n    ['', 're-merge', 'helpful when last merge failed during export. do not skip components that seemed to be merged'],\n    ['j', 'json', 'output as json format'],\n  ] as CommandOptions;\n  loader = true;\n  private = true;\n  remoteOp = true;\n\n  constructor(private mergeLanes: MergeLanesMain) {}\n\n  async report(\n    [fromLane, toLane]: [string, string],\n    {\n      pattern,\n      push = false,\n      keepReadme = false,\n      noSquash = false,\n      includeDeps = false,\n      title,\n      titleBase64,\n      reMerge,\n    }: Flags\n  ): Promise<string> {\n    if (includeDeps && !pattern) {\n      throw new BitError(`\"--include-deps\" flag is relevant only for --pattern flag`);\n    }\n    if (fromLane === DEFAULT_LANE && !toLane) {\n      throw new BitError('to merge from the main lane, specify the target lane');\n    }\n\n    const titleBase64Decoded = titleBase64 ? fromBase64(titleBase64) : undefined;\n\n    const { mergedNow, unmerged, exportedIds, conflicts, mergeSnapError } = await this.mergeLanes.mergeFromScope(\n      fromLane,\n      toLane || DEFAULT_LANE,\n      {\n        push,\n        keepReadme,\n        noSquash,\n        pattern,\n        includeDeps,\n        snapMessage: titleBase64Decoded || title,\n        reMerge,\n      }\n    );\n\n    const mergedTitle = chalk.green(\n      `successfully merged ${mergedNow.length} components from ${fromLane} to ${toLane || DEFAULT_LANE}`\n    );\n    const mergedOutput = mergedNow.length ? `${mergedTitle}\\n${mergedNow.join('\\n')}` : '';\n\n    const nonMergedTitle = chalk.bold(`the following ${unmerged.length} components were not merged`);\n    const nonMergedOutput = unmerged.length\n      ? `${nonMergedTitle}\\n${unmerged.map((u) => `${u.id} (${u.reason})`).join('\\n')}`\n      : '';\n\n    const conflictsTitle = chalk.bold(\n      `the following ${conflicts?.length} components have conflicts, the merge was not completed`\n    );\n    const conflictsOutput = conflicts?.length\n      ? `${conflictsTitle}\\n${conflicts\n          .map((u) => `${u.id} (files: ${u.files.join(', ') || 'N/A'}) (config: ${u.config})`)\n          .join('\\n')}`\n      : '';\n\n    const mergeSnapErrorTitle = chalk.bold(`the following error was thrown while snapping the components:`);\n    const mergeSnapErrorOutput = mergeSnapError ? `${mergeSnapErrorTitle}\\n${chalk.red(mergeSnapError.message)}` : '';\n\n    const exportedTitle = chalk.bold(`successfully exported ${exportedIds.length} components`);\n    const exportedOutput = exportedIds.length ? `${exportedTitle}\\n${exportedIds.join('\\n')}` : '';\n\n    return compact([mergedOutput, nonMergedOutput, conflictsOutput, mergeSnapErrorOutput, exportedOutput]).join('\\n\\n');\n  }\n  async json(\n    [fromLane, toLane]: [string, string],\n    { pattern, push = false, keepReadme = false, noSquash = false, includeDeps = false, reMerge }: Flags\n  ) {\n    if (includeDeps && !pattern) {\n      throw new BitError(`\"--include-deps\" flag is relevant only for --pattern flag`);\n    }\n    let results: MergeFromScopeResult;\n    try {\n      results = await this.mergeLanes.mergeFromScope(fromLane, toLane || DEFAULT_LANE, {\n        push,\n        keepReadme,\n        noSquash,\n        pattern,\n        includeDeps,\n        reMerge,\n      });\n      return {\n        code: 0,\n        data: {\n          ...results,\n          mergedNow: results.mergedNow.map((id) => id.toString()),\n          mergedPreviously: results.mergedPreviously.map((id) => id.toString()),\n          exportedIds: results.exportedIds.map((id) => id.toString()),\n          unmerged: results.unmerged.map(({ id, reason }) => ({ id: id.toString(), reason })),\n          conflicts: results.conflicts?.map(({ id, ...rest }) => ({ id: id.toString(), ...rest })),\n          snappedIds: results.snappedIds?.map((id) => id.toString()),\n          mergeSnapError: results.mergeSnapError\n            ? { message: results.mergeSnapError.message, stack: results.mergeSnapError.stack }\n            : undefined,\n        },\n      };\n    } catch (err: any) {\n      this.mergeLanes.logger.error('merge-lane-from-scope.json, error: ', err);\n      return {\n        code: 1,\n        error: err.message,\n      };\n    }\n  }\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_chalk","data","_interopRequireDefault","require","_laneId","_lodash","_legacy","_bitError","_excluded","e","__esModule","default","_objectWithoutProperties","t","o","r","i","_objectWithoutPropertiesLoose","Object","getOwnPropertySymbols","n","length","indexOf","propertyIsEnumerable","call","hasOwnProperty","ownKeys","keys","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","defineProperty","_toPropertyKey","value","configurable","writable","_toPrimitive","Symbol","toPrimitive","TypeError","String","Number","MergeLaneFromScopeCmd","constructor","mergeLanes","name","description","DEFAULT_LANE","report","fromLane","toLane","pattern","keepReadme","noSquash","includeDeps","title","titleBase64","reMerge","BitError","titleBase64Decoded","fromBase64","undefined","mergedNow","unmerged","exportedIds","conflicts","mergeSnapError","mergeFromScope","snapMessage","mergedTitle","chalk","green","mergedOutput","join","nonMergedTitle","bold","nonMergedOutput","map","u","id","reason","conflictsTitle","conflictsOutput","files","config","mergeSnapErrorTitle","mergeSnapErrorOutput","red","message","exportedTitle","exportedOutput","compact","json","results","code","toString","mergedPreviously","_ref","rest","snappedIds","stack","err","logger","error","exports"],"sources":["merge-lane-from-scope.cmd.ts"],"sourcesContent":["import chalk from 'chalk';\nimport { DEFAULT_LANE } from '@teambit/lane-id';\nimport { Command, CommandOptions } from '@teambit/cli';\nimport { compact } from 'lodash';\nimport { fromBase64 } from '@teambit/legacy.utils';\nimport { BitError } from '@teambit/bit-error';\nimport { MergeFromScopeResult, MergeLanesMain } from './merge-lanes.main.runtime';\n\ntype Flags = {\n  pattern?: string;\n  push?: boolean;\n  keepReadme?: boolean;\n  noSquash: boolean;\n  includeDeps?: boolean;\n  title?: string;\n  titleBase64?: string;\n  reMerge?: boolean;\n};\n\n/**\n * private command. the underscore prefix is intended.\n */\nexport class MergeLaneFromScopeCmd implements Command {\n  name = '_merge-lane <from-lane> [to-lane]';\n  description = `merge a remote lane into another lane or main via a bare-scope (not workspace)`;\n  extendedDescription = `to merge from a workspace, use \"bit lane merge\" command.\nthis is intended to use from the UI, which will have a button to merge an existing lane.\nthe lane must be up-to-date with the other lane, otherwise, conflicts might occur which are not handled in this command`;\n  arguments = [\n    {\n      name: 'from-lane',\n      description: `lane-id to merge from or \"${DEFAULT_LANE}\"`,\n    },\n    {\n      name: 'to-lane',\n      description: `lane-id to merge to. default is \"${DEFAULT_LANE}\"`,\n    },\n  ];\n  alias = '';\n  options = [\n    ['', 'pattern <string>', 'partially merge the lane with the specified component-pattern'],\n    [\n      '',\n      'title <string>',\n      'if provided, it replaces the original message with this title and append squashed snaps messages',\n    ],\n    ['', 'title-base64 <string>', 'same as --title flag but the title is base64 encoded'],\n    ['', 'push', 'export the updated objects to the original scopes once done'],\n    ['', 'keep-readme', 'skip deleting the lane readme component after merging'],\n    ['', 'no-squash', 'relevant for merging lanes into main, which by default squash.'],\n    ['', 'include-deps', 'relevant for \"--pattern\". merge also dependencies of the given components'],\n    ['', 're-merge', 'helpful when last merge failed during export. do not skip components that seemed to be merged'],\n    ['j', 'json', 'output as json format'],\n  ] as CommandOptions;\n  loader = true;\n  private = true;\n  remoteOp = true;\n\n  constructor(private mergeLanes: MergeLanesMain) {}\n\n  async report(\n    [fromLane, toLane]: [string, string],\n    {\n      pattern,\n      push = false,\n      keepReadme = false,\n      noSquash = false,\n      includeDeps = false,\n      title,\n      titleBase64,\n      reMerge,\n    }: Flags\n  ): Promise<string> {\n    if (includeDeps && !pattern) {\n      throw new BitError(`\"--include-deps\" flag is relevant only for --pattern flag`);\n    }\n    if (fromLane === DEFAULT_LANE && !toLane) {\n      throw new BitError('to merge from the main lane, specify the target lane');\n    }\n\n    const titleBase64Decoded = titleBase64 ? fromBase64(titleBase64) : undefined;\n\n    const { mergedNow, unmerged, exportedIds, conflicts, mergeSnapError } = await this.mergeLanes.mergeFromScope(\n      fromLane,\n      toLane || DEFAULT_LANE,\n      {\n        push,\n        keepReadme,\n        noSquash,\n        pattern,\n        includeDeps,\n        snapMessage: titleBase64Decoded || title,\n        reMerge,\n      }\n    );\n\n    const mergedTitle = chalk.green(\n      `successfully merged ${mergedNow.length} components from ${fromLane} to ${toLane || DEFAULT_LANE}`\n    );\n    const mergedOutput = mergedNow.length ? `${mergedTitle}\\n${mergedNow.join('\\n')}` : '';\n\n    const nonMergedTitle = chalk.bold(`the following ${unmerged.length} components were not merged`);\n    const nonMergedOutput = unmerged.length\n      ? `${nonMergedTitle}\\n${unmerged.map((u) => `${u.id} (${u.reason})`).join('\\n')}`\n      : '';\n\n    const conflictsTitle = chalk.bold(\n      `the following ${conflicts?.length} components have conflicts, the merge was not completed`\n    );\n    const conflictsOutput = conflicts?.length\n      ? `${conflictsTitle}\\n${conflicts\n          .map((u) => `${u.id} (files: ${u.files.join(', ') || 'N/A'}) (config: ${u.config})`)\n          .join('\\n')}`\n      : '';\n\n    const mergeSnapErrorTitle = chalk.bold(`the following error was thrown while snapping the components:`);\n    const mergeSnapErrorOutput = mergeSnapError ? `${mergeSnapErrorTitle}\\n${chalk.red(mergeSnapError.message)}` : '';\n\n    const exportedTitle = chalk.bold(`successfully exported ${exportedIds.length} components`);\n    const exportedOutput = exportedIds.length ? `${exportedTitle}\\n${exportedIds.join('\\n')}` : '';\n\n    return compact([mergedOutput, nonMergedOutput, conflictsOutput, mergeSnapErrorOutput, exportedOutput]).join('\\n\\n');\n  }\n  async json(\n    [fromLane, toLane]: [string, string],\n    { pattern, push = false, keepReadme = false, noSquash = false, includeDeps = false, reMerge }: Flags\n  ) {\n    if (includeDeps && !pattern) {\n      throw new BitError(`\"--include-deps\" flag is relevant only for --pattern flag`);\n    }\n    let results: MergeFromScopeResult;\n    try {\n      results = await this.mergeLanes.mergeFromScope(fromLane, toLane || DEFAULT_LANE, {\n        push,\n        keepReadme,\n        noSquash,\n        pattern,\n        includeDeps,\n        reMerge,\n      });\n      return {\n        code: 0,\n        data: {\n          ...results,\n          mergedNow: results.mergedNow.map((id) => id.toString()),\n          mergedPreviously: results.mergedPreviously.map((id) => id.toString()),\n          exportedIds: results.exportedIds.map((id) => id.toString()),\n          unmerged: results.unmerged.map(({ id, reason }) => ({ id: id.toString(), reason })),\n          conflicts: results.conflicts?.map(({ id, ...rest }) => ({ id: id.toString(), ...rest })),\n          snappedIds: results.snappedIds?.map((id) => id.toString()),\n          mergeSnapError: results.mergeSnapError\n            ? { message: results.mergeSnapError.message, stack: results.mergeSnapError.stack }\n            : undefined,\n        },\n      };\n    } catch (err: any) {\n      this.mergeLanes.logger.error('merge-lane-from-scope.json, error: ', err);\n      return {\n        code: 1,\n        error: err.message,\n      };\n    }\n  }\n}\n"],"mappings":"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","ignoreList":[]}

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@teambit/merge-lanes",
-  "version": "1.0.525",
+  "version": "1.0.526",
   "homepage": "https://bit.cloud/teambit/lanes/merge-lanes",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.lanes",
     "name": "merge-lanes",
-    "version": "1.0.525"
+    "version": "1.0.526"
   },
   "dependencies": {
     "chalk": "2.4.2",
@@ -23,24 +23,24 @@
     "@teambit/legacy.cli.prompts": "0.0.13",
     "@teambit/legacy.consumer": "0.0.24",
     "@teambit/legacy.scope": "0.0.24",
-    "@teambit/logger": "0.0.1195",
-    "@teambit/objects": "0.0.32",
-    "@teambit/scope": "1.0.525",
-    "@teambit/checkout": "1.0.525",
-    "@teambit/cli": "0.0.1102",
+    "@teambit/logger": "0.0.1196",
+    "@teambit/objects": "0.0.33",
+    "@teambit/scope": "1.0.526",
+    "@teambit/checkout": "1.0.526",
+    "@teambit/cli": "0.0.1103",
     "@teambit/legacy.utils": "0.0.15",
-    "@teambit/global-config": "0.0.1105",
+    "@teambit/global-config": "0.0.1106",
     "@teambit/legacy.constants": "0.0.8",
-    "@teambit/merging": "1.0.525",
-    "@teambit/remove": "1.0.525",
+    "@teambit/merging": "1.0.526",
+    "@teambit/remove": "1.0.526",
     "@teambit/component.snap-distance": "0.0.25",
-    "@teambit/config-merger": "0.0.392",
-    "@teambit/export": "1.0.525",
+    "@teambit/config-merger": "0.0.393",
+    "@teambit/export": "1.0.526",
     "@teambit/harmony.modules.feature-toggle": "0.0.16",
     "@teambit/harmony.modules.get-basic-log": "0.0.25",
-    "@teambit/importer": "1.0.525",
-    "@teambit/lanes": "1.0.525",
-    "@teambit/workspace": "1.0.525"
+    "@teambit/importer": "1.0.526",
+    "@teambit/lanes": "1.0.526",
+    "@teambit/workspace": "1.0.526"
   },
   "devDependencies": {
     "@types/fs-extra": "9.0.7",
@@ -49,7 +49,7 @@
     "@teambit/harmony.envs.core-aspect-env": "0.0.69",
     "@teambit/component.testing.mock-components": "0.0.284",
     "@teambit/harmony.testing.load-aspect": "0.0.279",
-    "@teambit/snapping": "1.0.525",
+    "@teambit/snapping": "1.0.526",
     "@teambit/workspace.testing.mock-workspace": "0.0.51"
   },
   "peerDependencies": {