@teambit/merge-lanes 0.0.288 → 0.0.290

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.
@@ -0,0 +1,21 @@
1
+ import { Command, CommandOptions } from '@teambit/cli';
2
+ import { MergeLanesMain } from './merge-lanes.main.runtime';
3
+ export declare class MergeAbortLaneCmd implements Command {
4
+ private mergeLanes;
5
+ name: string;
6
+ description: string;
7
+ extendedDescription: string;
8
+ alias: string;
9
+ options: CommandOptions;
10
+ loader: boolean;
11
+ private: boolean;
12
+ migration: boolean;
13
+ remoteOp: boolean;
14
+ constructor(mergeLanes: MergeLanesMain);
15
+ report(_: any, { skipDependencyInstallation, verbose, silent, }: {
16
+ skipDependencyInstallation?: boolean;
17
+ verbose?: boolean;
18
+ silent?: boolean;
19
+ }): Promise<string>;
20
+ private prompt;
21
+ }
@@ -0,0 +1,96 @@
1
+ "use strict";
2
+
3
+ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4
+ require("core-js/modules/es.promise.js");
5
+ Object.defineProperty(exports, "__esModule", {
6
+ value: true
7
+ });
8
+ exports.MergeAbortLaneCmd = void 0;
9
+ function _defineProperty2() {
10
+ const data = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
11
+ _defineProperty2 = function () {
12
+ return data;
13
+ };
14
+ return data;
15
+ }
16
+ function _chalk() {
17
+ const data = _interopRequireDefault(require("chalk"));
18
+ _chalk = function () {
19
+ return data;
20
+ };
21
+ return data;
22
+ }
23
+ function _yesno() {
24
+ const data = _interopRequireDefault(require("yesno"));
25
+ _yesno = function () {
26
+ return data;
27
+ };
28
+ return data;
29
+ }
30
+ function _checkout() {
31
+ const data = require("@teambit/checkout");
32
+ _checkout = function () {
33
+ return data;
34
+ };
35
+ return data;
36
+ }
37
+ function _exceptions() {
38
+ const data = require("@teambit/legacy/dist/prompts/exceptions");
39
+ _exceptions = function () {
40
+ return data;
41
+ };
42
+ return data;
43
+ }
44
+ class MergeAbortLaneCmd {
45
+ constructor(mergeLanes) {
46
+ this.mergeLanes = mergeLanes;
47
+ (0, _defineProperty2().default)(this, "name", 'merge-abort');
48
+ (0, _defineProperty2().default)(this, "description", `abort the recent lane-merge. revert the lane object and checkout accordingly`);
49
+ (0, _defineProperty2().default)(this, "extendedDescription", `restore the lane-object same as it was before the last "bit lane merge" command.
50
+ also, checkout the workspace components according to the restored lane`);
51
+ (0, _defineProperty2().default)(this, "alias", '');
52
+ (0, _defineProperty2().default)(this, "options", [['', 'verbose', 'show details of components that were not merged legitimately'], ['s', 'silent', 'skip confirmation'], ['x', 'skip-dependency-installation', 'do not install packages of the imported components']]);
53
+ (0, _defineProperty2().default)(this, "loader", true);
54
+ (0, _defineProperty2().default)(this, "private", true);
55
+ (0, _defineProperty2().default)(this, "migration", true);
56
+ (0, _defineProperty2().default)(this, "remoteOp", true);
57
+ }
58
+ async report(_, {
59
+ skipDependencyInstallation = false,
60
+ verbose = false,
61
+ silent = false
62
+ }) {
63
+ if (!silent) {
64
+ await this.prompt();
65
+ }
66
+ const checkoutProps = {
67
+ reset: true,
68
+ all: true,
69
+ verbose,
70
+ skipNpmInstall: skipDependencyInstallation
71
+ };
72
+ const {
73
+ checkoutResults,
74
+ restoredItems
75
+ } = await this.mergeLanes.abortLaneMerge(checkoutProps);
76
+ const checkoutOutputStr = (0, _checkout().checkoutOutput)(checkoutResults, checkoutProps);
77
+ const restoredItemsTitle = _chalk().default.underline('The following have been restored:');
78
+ const restoredItemsOutput = restoredItems.map(item => `[-] ${item}`).join('\n');
79
+ return `${checkoutOutputStr}\n\n${restoredItemsTitle}\n${restoredItemsOutput}`;
80
+ }
81
+ async prompt() {
82
+ this.mergeLanes.logger.clearStatusLine();
83
+ const ok = await (0, _yesno().default)({
84
+ question: `Code changes that were done since the last lane-merge will be lost.
85
+ The .bitmap and workspace.jsonc files will be restored to the state before the merge.
86
+ This action is irreversible.
87
+ ${_chalk().default.bold('Do you want to continue? [yes(y)/no(n)]')}`
88
+ });
89
+ if (!ok) {
90
+ throw new (_exceptions().PromptCanceled)();
91
+ }
92
+ }
93
+ }
94
+ exports.MergeAbortLaneCmd = MergeAbortLaneCmd;
95
+
96
+ //# sourceMappingURL=merge-abort.cmd.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"names":["MergeAbortLaneCmd","constructor","mergeLanes","report","_","skipDependencyInstallation","verbose","silent","prompt","checkoutProps","reset","all","skipNpmInstall","checkoutResults","restoredItems","abortLaneMerge","checkoutOutputStr","checkoutOutput","restoredItemsTitle","chalk","underline","restoredItemsOutput","map","item","join","logger","clearStatusLine","ok","yesno","question","bold","PromptCanceled"],"sources":["merge-abort.cmd.ts"],"sourcesContent":["import chalk from 'chalk';\nimport yesno from 'yesno';\nimport { CheckoutProps, checkoutOutput } from '@teambit/checkout';\nimport { PromptCanceled } from '@teambit/legacy/dist/prompts/exceptions';\nimport { Command, CommandOptions } from '@teambit/cli';\nimport { MergeLanesMain } from './merge-lanes.main.runtime';\n\nexport class MergeAbortLaneCmd implements Command {\n name = 'merge-abort';\n description = `abort the recent lane-merge. revert the lane object and checkout accordingly`;\n extendedDescription = `restore the lane-object same as it was before the last \"bit lane merge\" command.\nalso, checkout the workspace components according to the restored lane`;\n alias = '';\n options = [\n ['', 'verbose', 'show details of components that were not merged legitimately'],\n ['s', 'silent', 'skip confirmation'],\n ['x', 'skip-dependency-installation', 'do not install packages of the imported components'],\n ] as CommandOptions;\n loader = true;\n private = true;\n migration = true;\n remoteOp = true;\n\n constructor(private mergeLanes: MergeLanesMain) {}\n\n async report(\n _,\n {\n skipDependencyInstallation = false,\n verbose = false,\n silent = false,\n }: {\n skipDependencyInstallation?: boolean;\n verbose?: boolean;\n silent?: boolean;\n }\n ): Promise<string> {\n if (!silent) {\n await this.prompt();\n }\n const checkoutProps: CheckoutProps = {\n reset: true,\n all: true,\n verbose,\n skipNpmInstall: skipDependencyInstallation,\n };\n const { checkoutResults, restoredItems } = await this.mergeLanes.abortLaneMerge(checkoutProps);\n\n const checkoutOutputStr = checkoutOutput(checkoutResults, checkoutProps);\n const restoredItemsTitle = chalk.underline('The following have been restored:');\n const restoredItemsOutput = restoredItems.map((item) => `[-] ${item}`).join('\\n');\n\n return `${checkoutOutputStr}\\n\\n${restoredItemsTitle}\\n${restoredItemsOutput}`;\n }\n\n private async prompt() {\n this.mergeLanes.logger.clearStatusLine();\n const ok = await yesno({\n question: `Code changes that were done since the last lane-merge will be lost.\nThe .bitmap and workspace.jsonc files will be restored to the state before the merge.\nThis action is irreversible.\n${chalk.bold('Do you want to continue? [yes(y)/no(n)]')}`,\n });\n if (!ok) {\n throw new PromptCanceled();\n }\n }\n}\n"],"mappings":";;;;;;;;;;;;;;;AAAA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AACA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AACA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AACA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AAIO,MAAMA,iBAAiB,CAAoB;EAgBhDC,WAAW,CAASC,UAA0B,EAAE;IAAA,KAA5BA,UAA0B,GAA1BA,UAA0B;IAAA,8CAfvC,aAAa;IAAA,qDACL,8EAA6E;IAAA,6DACrE;AACzB,uEAAuE;IAAA,+CAC7D,EAAE;IAAA,iDACA,CACR,CAAC,EAAE,EAAE,SAAS,EAAE,8DAA8D,CAAC,EAC/E,CAAC,GAAG,EAAE,QAAQ,EAAE,mBAAmB,CAAC,EACpC,CAAC,GAAG,EAAE,8BAA8B,EAAE,oDAAoD,CAAC,CAC5F;IAAA,gDACQ,IAAI;IAAA,iDACH,IAAI;IAAA,mDACF,IAAI;IAAA,kDACL,IAAI;EAEkC;EAEjD,MAAMC,MAAM,CACVC,CAAC,EACD;IACEC,0BAA0B,GAAG,KAAK;IAClCC,OAAO,GAAG,KAAK;IACfC,MAAM,GAAG;EAKX,CAAC,EACgB;IACjB,IAAI,CAACA,MAAM,EAAE;MACX,MAAM,IAAI,CAACC,MAAM,EAAE;IACrB;IACA,MAAMC,aAA4B,GAAG;MACnCC,KAAK,EAAE,IAAI;MACXC,GAAG,EAAE,IAAI;MACTL,OAAO;MACPM,cAAc,EAAEP;IAClB,CAAC;IACD,MAAM;MAAEQ,eAAe;MAAEC;IAAc,CAAC,GAAG,MAAM,IAAI,CAACZ,UAAU,CAACa,cAAc,CAACN,aAAa,CAAC;IAE9F,MAAMO,iBAAiB,GAAG,IAAAC,0BAAc,EAACJ,eAAe,EAAEJ,aAAa,CAAC;IACxE,MAAMS,kBAAkB,GAAGC,gBAAK,CAACC,SAAS,CAAC,mCAAmC,CAAC;IAC/E,MAAMC,mBAAmB,GAAGP,aAAa,CAACQ,GAAG,CAAEC,IAAI,IAAM,OAAMA,IAAK,EAAC,CAAC,CAACC,IAAI,CAAC,IAAI,CAAC;IAEjF,OAAQ,GAAER,iBAAkB,OAAME,kBAAmB,KAAIG,mBAAoB,EAAC;EAChF;EAEA,MAAcb,MAAM,GAAG;IACrB,IAAI,CAACN,UAAU,CAACuB,MAAM,CAACC,eAAe,EAAE;IACxC,MAAMC,EAAE,GAAG,MAAM,IAAAC,gBAAK,EAAC;MACrBC,QAAQ,EAAG;AACjB;AACA;AACA,EAAEV,gBAAK,CAACW,IAAI,CAAC,yCAAyC,CAAE;IACpD,CAAC,CAAC;IACF,IAAI,CAACH,EAAE,EAAE;MACP,MAAM,KAAII,4BAAc,GAAE;IAC5B;EACF;AACF;AAAC"}
@@ -6,6 +6,7 @@ declare type Flags = {
6
6
  keepReadme?: boolean;
7
7
  noSquash: boolean;
8
8
  includeDeps?: boolean;
9
+ title?: string;
9
10
  };
10
11
  /**
11
12
  * private command. the underscore prefix is intended.
@@ -26,7 +27,7 @@ export declare class MergeLaneFromScopeCmd implements Command {
26
27
  migration: boolean;
27
28
  remoteOp: boolean;
28
29
  constructor(mergeLanes: MergeLanesMain);
29
- report([fromLane, toLane]: [string, string], { pattern, push, keepReadme, noSquash, includeDeps }: Flags): Promise<string>;
30
+ report([fromLane, toLane]: [string, string], { pattern, push, keepReadme, noSquash, includeDeps, title }: Flags): Promise<string>;
30
31
  json([fromLane, toLane]: [string, string], { pattern, push, keepReadme, noSquash, includeDeps }: Flags): Promise<{
31
32
  code: number;
32
33
  data: any;
@@ -54,7 +54,7 @@ the lane must be up-to-date with the other lane, otherwise, conflicts might occu
54
54
  description: `lane-id to merge to. default is "${_laneId().DEFAULT_LANE}"`
55
55
  }]);
56
56
  (0, _defineProperty2().default)(this, "alias", '');
57
- (0, _defineProperty2().default)(this, "options", [['', 'pattern <string>', 'partially merge the lane with the specified component-pattern'], ['', 'push', 'export the updated objects to the original scopes once done'], ['', 'keep-readme', 'skip deleting the lane readme component after merging'], ['', 'no-squash', 'relevant for merging lanes into main, which by default squash.'], ['', 'include-deps', 'relevant for "--pattern". merge also dependencies of the given components'], ['j', 'json', 'output as json format']]);
57
+ (0, _defineProperty2().default)(this, "options", [['', 'pattern <string>', 'partially merge the lane with the specified component-pattern'], ['', 'title <string>', 'if provided, it replaces the original message with this title and append squashed snaps messages'], ['', 'push', 'export the updated objects to the original scopes once done'], ['', 'keep-readme', 'skip deleting the lane readme component after merging'], ['', 'no-squash', 'relevant for merging lanes into main, which by default squash.'], ['', 'include-deps', 'relevant for "--pattern". merge also dependencies of the given components'], ['j', 'json', 'output as json format']]);
58
58
  (0, _defineProperty2().default)(this, "loader", true);
59
59
  (0, _defineProperty2().default)(this, "private", true);
60
60
  (0, _defineProperty2().default)(this, "migration", true);
@@ -65,7 +65,8 @@ the lane must be up-to-date with the other lane, otherwise, conflicts might occu
65
65
  push = false,
66
66
  keepReadme = false,
67
67
  noSquash = false,
68
- includeDeps = false
68
+ includeDeps = false,
69
+ title
69
70
  }) {
70
71
  if (includeDeps && !pattern) {
71
72
  throw new (_bitError().BitError)(`"--include-deps" flag is relevant only for --pattern flag`);
@@ -79,7 +80,8 @@ the lane must be up-to-date with the other lane, otherwise, conflicts might occu
79
80
  keepReadme,
80
81
  noSquash,
81
82
  pattern,
82
- includeDeps
83
+ includeDeps,
84
+ snapMessage: title
83
85
  });
84
86
  const mergedTitle = _chalk().default.green(`successfully merged ${mergedNow.length} components from ${fromLane} to ${toLane || _laneId().DEFAULT_LANE}`);
85
87
  const mergedOutput = mergedNow.length ? `${mergedTitle}\n${mergedNow.join('\n')}` : '';
@@ -1 +1 @@
1
- {"version":3,"names":["MergeLaneFromScopeCmd","constructor","mergeLanes","name","description","DEFAULT_LANE","report","fromLane","toLane","pattern","push","keepReadme","noSquash","includeDeps","BitError","mergedNow","mergedPreviously","exportedIds","mergeFromScope","mergedTitle","chalk","green","length","mergedOutput","join","nonMergedTitle","bold","nonMergedOutput","exportedTitle","exportedOutput","json","results","code","data","err","error","message"],"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 { BitError } from '@teambit/bit-error';\nimport { 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};\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',\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 ['', '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 ['j', 'json', 'output as json format'],\n ] as CommandOptions;\n loader = true;\n private = true;\n migration = true;\n remoteOp = true;\n\n constructor(private mergeLanes: MergeLanesMain) {}\n\n async report(\n [fromLane, toLane]: [string, string],\n { pattern, push = false, keepReadme = false, noSquash = false, includeDeps = false }: Flags\n ): Promise<string> {\n if (includeDeps && !pattern) {\n throw new BitError(`\"--include-deps\" flag is relevant only for --pattern flag`);\n }\n\n const { mergedNow, mergedPreviously, exportedIds } = await this.mergeLanes.mergeFromScope(\n fromLane,\n toLane || DEFAULT_LANE,\n {\n push,\n keepReadme,\n noSquash,\n pattern,\n includeDeps,\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(\n `the following ${mergedPreviously.length} components were already merged before, they were left intact`\n );\n const nonMergedOutput = mergedPreviously.length ? `\\n${nonMergedTitle}\\n${mergedPreviously.join('\\n')}` : '';\n\n const exportedTitle = chalk.green(`successfully exported ${exportedIds.length} components`);\n const exportedOutput = exportedIds.length ? `\\n${exportedTitle}\\n${exportedIds.join('\\n')}` : '';\n\n return mergedOutput + nonMergedOutput + exportedOutput;\n }\n async json(\n [fromLane, toLane]: [string, string],\n { pattern, push = false, keepReadme = false, noSquash = false, includeDeps = false }: Flags\n ) {\n if (includeDeps && !pattern) {\n throw new BitError(`\"--include-deps\" flag is relevant only for --pattern flag`);\n }\n let results: any;\n try {\n results = await this.mergeLanes.mergeFromScope(fromLane, toLane || DEFAULT_LANE, {\n push,\n keepReadme,\n noSquash,\n pattern,\n includeDeps,\n });\n return {\n code: 0,\n data: results,\n };\n } catch (err: any) {\n return {\n code: 1,\n error: err.message,\n };\n }\n }\n}\n"],"mappings":"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"}
1
+ {"version":3,"names":["MergeLaneFromScopeCmd","constructor","mergeLanes","name","description","DEFAULT_LANE","report","fromLane","toLane","pattern","push","keepReadme","noSquash","includeDeps","title","BitError","mergedNow","mergedPreviously","exportedIds","mergeFromScope","snapMessage","mergedTitle","chalk","green","length","mergedOutput","join","nonMergedTitle","bold","nonMergedOutput","exportedTitle","exportedOutput","json","results","code","data","err","error","message"],"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 { BitError } from '@teambit/bit-error';\nimport { 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};\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',\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 ['', '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 ['j', 'json', 'output as json format'],\n ] as CommandOptions;\n loader = true;\n private = true;\n migration = true;\n remoteOp = true;\n\n constructor(private mergeLanes: MergeLanesMain) {}\n\n async report(\n [fromLane, toLane]: [string, string],\n { pattern, push = false, keepReadme = false, noSquash = false, includeDeps = false, title }: Flags\n ): Promise<string> {\n if (includeDeps && !pattern) {\n throw new BitError(`\"--include-deps\" flag is relevant only for --pattern flag`);\n }\n\n const { mergedNow, mergedPreviously, exportedIds } = await this.mergeLanes.mergeFromScope(\n fromLane,\n toLane || DEFAULT_LANE,\n {\n push,\n keepReadme,\n noSquash,\n pattern,\n includeDeps,\n snapMessage: title,\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(\n `the following ${mergedPreviously.length} components were already merged before, they were left intact`\n );\n const nonMergedOutput = mergedPreviously.length ? `\\n${nonMergedTitle}\\n${mergedPreviously.join('\\n')}` : '';\n\n const exportedTitle = chalk.green(`successfully exported ${exportedIds.length} components`);\n const exportedOutput = exportedIds.length ? `\\n${exportedTitle}\\n${exportedIds.join('\\n')}` : '';\n\n return mergedOutput + nonMergedOutput + exportedOutput;\n }\n async json(\n [fromLane, toLane]: [string, string],\n { pattern, push = false, keepReadme = false, noSquash = false, includeDeps = false }: Flags\n ) {\n if (includeDeps && !pattern) {\n throw new BitError(`\"--include-deps\" flag is relevant only for --pattern flag`);\n }\n let results: any;\n try {\n results = await this.mergeLanes.mergeFromScope(fromLane, toLane || DEFAULT_LANE, {\n push,\n keepReadme,\n noSquash,\n pattern,\n includeDeps,\n });\n return {\n code: 0,\n data: results,\n };\n } catch (err: any) {\n return {\n code: 1,\n error: err.message,\n };\n }\n }\n}\n"],"mappings":"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"}
@@ -6,6 +6,7 @@ import { Workspace } from '@teambit/workspace';
6
6
  import { MergeStrategy } from '@teambit/legacy/dist/consumer/versions-ops/merge-version';
7
7
  import { ScopeMain } from '@teambit/scope';
8
8
  import { Logger, LoggerMain } from '@teambit/logger';
9
+ import { CheckoutMain, CheckoutProps } from '@teambit/checkout';
9
10
  import { RemoveMain } from '@teambit/remove';
10
11
  import { ExportMain } from '@teambit/export';
11
12
  export declare type MergeLaneOptions = {
@@ -29,17 +30,26 @@ export declare class MergeLanesMain {
29
30
  private workspace;
30
31
  private merging;
31
32
  private lanes;
32
- private logger;
33
+ readonly logger: Logger;
33
34
  private remove;
34
35
  private scope;
35
36
  private exporter;
36
37
  private importer;
37
- constructor(workspace: Workspace | undefined, merging: MergingMain, lanes: LanesMain, logger: Logger, remove: RemoveMain, scope: ScopeMain, exporter: ExportMain, importer: ImporterMain);
38
+ private checkout;
39
+ constructor(workspace: Workspace | undefined, merging: MergingMain, lanes: LanesMain, logger: Logger, remove: RemoveMain, scope: ScopeMain, exporter: ExportMain, importer: ImporterMain, checkout: CheckoutMain);
38
40
  mergeLane(laneName: string, options: MergeLaneOptions): Promise<{
39
41
  mergeResults: ApplyVersionResults;
40
42
  deleteResults: any;
41
43
  configMergeResults: ConfigMergeResult[];
42
44
  }>;
45
+ abortLaneMerge(checkoutProps: CheckoutProps): Promise<{
46
+ checkoutResults: ApplyVersionResults;
47
+ restoredItems: string[];
48
+ }>;
49
+ private getLastMergedLaneContentIfExists;
50
+ private getLastMergedBitmapFilename;
51
+ private getLastMergedWorkspaceFilename;
52
+ private getLastMergedLaneFilename;
43
53
  private getMainIdsToMerge;
44
54
  mergeFromScope(fromLane: string, toLane: string, options: Partial<MergeLaneOptions> & {
45
55
  push?: boolean;
@@ -52,7 +62,7 @@ export declare class MergeLanesMain {
52
62
  static slots: never[];
53
63
  static dependencies: import("@teambit/harmony").Aspect[];
54
64
  static runtime: import("@teambit/harmony").RuntimeDefinition;
55
- static provider([lanes, cli, workspace, merging, loggerMain, remove, scope, exporter, importer]: [
65
+ static provider([lanes, cli, workspace, merging, loggerMain, remove, scope, exporter, importer, checkout]: [
56
66
  LanesMain,
57
67
  CLIMain,
58
68
  Workspace,
@@ -61,7 +71,8 @@ export declare class MergeLanesMain {
61
71
  RemoveMain,
62
72
  ScopeMain,
63
73
  ExportMain,
64
- ImporterMain
74
+ ImporterMain,
75
+ CheckoutMain
65
76
  ]): Promise<MergeLanesMain>;
66
77
  }
67
78
  export default MergeLanesMain;
@@ -23,6 +23,27 @@ function _bitError() {
23
23
  };
24
24
  return data;
25
25
  }
26
+ function _fsExtra() {
27
+ const data = _interopRequireDefault(require("fs-extra"));
28
+ _fsExtra = function () {
29
+ return data;
30
+ };
31
+ return data;
32
+ }
33
+ function _tempy() {
34
+ const data = _interopRequireDefault(require("tempy"));
35
+ _tempy = function () {
36
+ return data;
37
+ };
38
+ return data;
39
+ }
40
+ function _path() {
41
+ const data = _interopRequireDefault(require("path"));
42
+ _path = function () {
43
+ return data;
44
+ };
45
+ return data;
46
+ }
26
47
  function _cli() {
27
48
  const data = require("@teambit/cli");
28
49
  _cli = function () {
@@ -52,7 +73,7 @@ function _merging() {
52
73
  return data;
53
74
  }
54
75
  function _workspace() {
55
- const data = _interopRequireDefault(require("@teambit/workspace"));
76
+ const data = _interopRequireWildcard(require("@teambit/workspace"));
56
77
  _workspace = function () {
57
78
  return data;
58
79
  };
@@ -114,6 +135,13 @@ function _logger() {
114
135
  };
115
136
  return data;
116
137
  }
138
+ function _checkout() {
139
+ const data = _interopRequireDefault(require("@teambit/checkout"));
140
+ _checkout = function () {
141
+ return data;
142
+ };
143
+ return data;
144
+ }
117
145
  function _remove() {
118
146
  const data = require("@teambit/remove");
119
147
  _remove = function () {
@@ -135,6 +163,13 @@ function _export() {
135
163
  };
136
164
  return data;
137
165
  }
166
+ function _objects() {
167
+ const data = require("@teambit/legacy/dist/scope/objects");
168
+ _objects = function () {
169
+ return data;
170
+ };
171
+ return data;
172
+ }
138
173
  function _getDivergeData() {
139
174
  const data = require("@teambit/legacy/dist/scope/component-ops/get-diverge-data");
140
175
  _getDivergeData = function () {
@@ -170,10 +205,21 @@ function _missingCompsToMerge() {
170
205
  };
171
206
  return data;
172
207
  }
208
+ function _mergeAbort() {
209
+ const data = require("./merge-abort.cmd");
210
+ _mergeAbort = function () {
211
+ return data;
212
+ };
213
+ return data;
214
+ }
215
+ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
216
+ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
173
217
  function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
174
218
  function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2().default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
219
+ const LAST_MERGED_LANE_FILENAME = 'lane';
220
+ const LAST_MERGED_BITMAP_FILENAME = 'bitmap';
175
221
  class MergeLanesMain {
176
- constructor(workspace, merging, lanes, logger, remove, scope, exporter, importer) {
222
+ constructor(workspace, merging, lanes, logger, remove, scope, exporter, importer, checkout) {
177
223
  this.workspace = workspace;
178
224
  this.merging = merging;
179
225
  this.lanes = lanes;
@@ -182,6 +228,7 @@ class MergeLanesMain {
182
228
  this.scope = scope;
183
229
  this.exporter = exporter;
184
230
  this.importer = importer;
231
+ this.checkout = checkout;
185
232
  }
186
233
  async mergeLane(laneName, options) {
187
234
  if (!this.workspace) {
@@ -283,6 +330,11 @@ class MergeLanesMain {
283
330
  if (shouldSquash) {
284
331
  await squashSnaps(allComponentsStatus, otherLaneId, consumer);
285
332
  }
333
+ const copyOfCurrentLane = currentLane ? currentLane.clone() : undefined;
334
+ const copyOfBitmap = _tempy().default.file();
335
+ const copyOfWorkspaceJsonc = _tempy().default.file();
336
+ await _fsExtra().default.copyFile(consumer.bitMap.mapPath, copyOfBitmap);
337
+ await _fsExtra().default.copyFile(consumer.config.path, copyOfWorkspaceJsonc);
286
338
  const mergeResults = await this.merging.mergeSnaps({
287
339
  mergeStrategy,
288
340
  allComponentsStatus,
@@ -294,6 +346,14 @@ class MergeLanesMain {
294
346
  build,
295
347
  skipDependencyInstallation
296
348
  });
349
+ await _fsExtra().default.remove(this.scope.getLastMergedPath());
350
+ await _fsExtra().default.ensureDir(this.scope.getLastMergedPath());
351
+ await _fsExtra().default.copyFile(copyOfBitmap, this.getLastMergedBitmapFilename());
352
+ await _fsExtra().default.copyFile(copyOfWorkspaceJsonc, this.getLastMergedWorkspaceFilename());
353
+ if (copyOfCurrentLane) {
354
+ const compressed = await copyOfCurrentLane.compress();
355
+ await _fsExtra().default.outputFile(this.getLastMergedLaneFilename(), compressed);
356
+ }
297
357
  const mergedSuccessfully = !mergeResults.failedComponents || mergeResults.failedComponents.length === 0 || mergeResults.failedComponents.every(failedComponent => failedComponent.unchangedLegitimately);
298
358
  let deleteResults = {};
299
359
  if (!keepReadme && otherLane && otherLane.readmeComponent && mergedSuccessfully) {
@@ -320,6 +380,63 @@ class MergeLanesMain {
320
380
  }
321
381
  }
322
382
  }
383
+ async abortLaneMerge(checkoutProps) {
384
+ if (!this.workspace) throw new (_workspace().OutsideWorkspaceError)();
385
+ if (!_fsExtra().default.pathExistsSync(this.scope.getLastMergedPath())) {
386
+ throw new (_bitError().BitError)(`unable to abort the last lane-merge because "bit export" was running since then`);
387
+ }
388
+ const lastLane = await this.getLastMergedLaneContentIfExists();
389
+ const currentLane = await this.lanes.getCurrentLane();
390
+ if (!_fsExtra().default.pathExistsSync(this.getLastMergedBitmapFilename())) {
391
+ throw new (_bitError().BitError)(`unable to abort the last lane-merge because the ${LAST_MERGED_BITMAP_FILENAME} is missing from ${this.scope.getLastMergedPath()}`);
392
+ }
393
+ if (!_fsExtra().default.pathExistsSync(this.getLastMergedWorkspaceFilename())) {
394
+ throw new (_bitError().BitError)(`unable to abort the last lane-merge because the workspace.jsonc is missing from ${this.scope.getLastMergedPath()}`);
395
+ }
396
+ if (currentLane) {
397
+ if (!lastLane) {
398
+ throw new (_bitError().BitError)(`unable to abort the last lane-merge because the ${LAST_MERGED_LANE_FILENAME} is missing from ${this.scope.getLastMergedPath()}`);
399
+ }
400
+ const laneFromBackup = await _objects().BitObject.parseObject(lastLane, LAST_MERGED_LANE_FILENAME);
401
+ await this.workspace.scope.legacyScope.objects.writeObjectsToTheFS([laneFromBackup]);
402
+ }
403
+ await _fsExtra().default.copyFile(this.getLastMergedBitmapFilename(), this.workspace.consumer.bitMap.mapPath);
404
+ await _fsExtra().default.copyFile(this.getLastMergedWorkspaceFilename(), this.workspace.consumer.config.path);
405
+ await _fsExtra().default.remove(this.scope.getLastMergedPath());
406
+ await this.workspace._reloadConsumer();
407
+ this.workspace.consumer.scope.objects.unmergedComponents.removeAllComponents();
408
+ await this.workspace.consumer.scope.objects.unmergedComponents.write();
409
+ const configMergeFile = this.workspace.getConflictMergeFile();
410
+ await configMergeFile.delete();
411
+ checkoutProps.ids = await this.workspace.listIds();
412
+ const checkoutResults = await this.checkout.checkout(checkoutProps);
413
+ const restoredItems = [`${_path().default.basename(this.workspace.consumer.bitMap.mapPath)} file`, `${_path().default.basename(this.workspace.consumer.config.path)} file`];
414
+ if (currentLane) {
415
+ restoredItems.push(`${currentLane.id()} lane object`);
416
+ }
417
+ return {
418
+ checkoutResults,
419
+ restoredItems
420
+ };
421
+ }
422
+ async getLastMergedLaneContentIfExists() {
423
+ const filename = this.getLastMergedLaneFilename();
424
+ try {
425
+ return await _fsExtra().default.readFile(filename);
426
+ } catch (err) {
427
+ if (err.code === 'ENOENT') return null;
428
+ throw err;
429
+ }
430
+ }
431
+ getLastMergedBitmapFilename() {
432
+ return _path().default.join(this.scope.getLastMergedPath(), LAST_MERGED_BITMAP_FILENAME);
433
+ }
434
+ getLastMergedWorkspaceFilename() {
435
+ return _path().default.join(this.scope.getLastMergedPath(), 'workspace.jsonc');
436
+ }
437
+ getLastMergedLaneFilename() {
438
+ return _path().default.join(this.scope.getLastMergedPath(), LAST_MERGED_LANE_FILENAME);
439
+ }
323
440
  async getMainIdsToMerge(lane) {
324
441
  const laneIds = lane.toBitIds();
325
442
  if (!this.workspace) {
@@ -387,9 +504,6 @@ class MergeLanesMain {
387
504
  mergedPreviously.push(id);
388
505
  return undefined;
389
506
  }
390
- // this might be confusing, we pass the toLaneHead as the sourceHead and the fromLaneHead as the targetHead.
391
- // this is because normally, in the workspace, we merge another lane (target) into the current lane (source).
392
- // so effectively, in the workspace, we merge fromLane=target into toLane=source.
393
507
  const divergeData = await (0, _getDivergeData().getDivergeData)({
394
508
  repo,
395
509
  modelComponent,
@@ -397,7 +511,7 @@ class MergeLanesMain {
397
511
  targetHead: fromLaneHead,
398
512
  throwForNoCommonSnap: true
399
513
  });
400
- const modifiedVersion = shouldSquash ? await squashOneComp(_laneId().DEFAULT_LANE, fromLaneId, id, divergeData, log, this.scope.legacyScope, fromVersionObj) : undefined;
514
+ const modifiedVersion = shouldSquash ? await squashOneComp(_laneId().DEFAULT_LANE, fromLaneId, id, divergeData, log, this.scope.legacyScope, fromVersionObj, options.snapMessage) : undefined;
401
515
  const objects = [];
402
516
  if (modifiedVersion) objects.push(modifiedVersion);
403
517
  if (toLaneObj) {
@@ -457,19 +571,20 @@ class MergeLanesMain {
457
571
  ${compsNotUpToDate.map(s => s.componentId.toString()).join('\n')}`);
458
572
  }
459
573
  }
460
- static async provider([lanes, cli, workspace, merging, loggerMain, remove, scope, exporter, importer]) {
461
- var _lanesCommand$command;
574
+ static async provider([lanes, cli, workspace, merging, loggerMain, remove, scope, exporter, importer, checkout]) {
575
+ var _lanesCommand$command, _lanesCommand$command2;
462
576
  const logger = loggerMain.createLogger(_mergeLanes().MergeLanesAspect.id);
463
577
  const lanesCommand = cli.getCommand('lane');
464
- const mergeLanesMain = new MergeLanesMain(workspace, merging, lanes, logger, remove, scope, exporter, importer);
578
+ const mergeLanesMain = new MergeLanesMain(workspace, merging, lanes, logger, remove, scope, exporter, importer, checkout);
465
579
  lanesCommand === null || lanesCommand === void 0 ? void 0 : (_lanesCommand$command = lanesCommand.commands) === null || _lanesCommand$command === void 0 ? void 0 : _lanesCommand$command.push(new (_mergeLane().MergeLaneCmd)(mergeLanesMain));
580
+ lanesCommand === null || lanesCommand === void 0 ? void 0 : (_lanesCommand$command2 = lanesCommand.commands) === null || _lanesCommand$command2 === void 0 ? void 0 : _lanesCommand$command2.push(new (_mergeAbort().MergeAbortLaneCmd)(mergeLanesMain));
466
581
  cli.register(new (_mergeLaneFromScope().MergeLaneFromScopeCmd)(mergeLanesMain));
467
582
  return mergeLanesMain;
468
583
  }
469
584
  }
470
585
  exports.MergeLanesMain = MergeLanesMain;
471
586
  (0, _defineProperty2().default)(MergeLanesMain, "slots", []);
472
- (0, _defineProperty2().default)(MergeLanesMain, "dependencies", [_lanes().LanesAspect, _cli().CLIAspect, _workspace().default, _merging().default, _logger().LoggerAspect, _remove().RemoveAspect, _scope().ScopeAspect, _export().ExportAspect, _importer().default]);
587
+ (0, _defineProperty2().default)(MergeLanesMain, "dependencies", [_lanes().LanesAspect, _cli().CLIAspect, _workspace().default, _merging().default, _logger().LoggerAspect, _remove().RemoveAspect, _scope().ScopeAspect, _export().ExportAspect, _importer().default, _checkout().default]);
473
588
  (0, _defineProperty2().default)(MergeLanesMain, "runtime", _cli().MainRuntime);
474
589
  async function filterComponentsStatus(allComponentsStatus, compIdsToKeep, allBitIds, workspace, includeDeps = false, otherLane,
475
590
  // lane that gets merged into the current lane. if not provided, it's main that gets merged into the current lane
@@ -595,7 +710,7 @@ async function squashSnaps(allComponentsStatus, otherLaneId, consumer) {
595
710
  /**
596
711
  * returns Version object if it was modified. otherwise, returns undefined
597
712
  */
598
- async function squashOneComp(currentLaneName, otherLaneId, id, divergeData, log, scope, componentFromModel) {
713
+ async function squashOneComp(currentLaneName, otherLaneId, id, divergeData, log, scope, componentFromModel, messageTitle) {
599
714
  if (divergeData.isDiverged()) {
600
715
  throw new (_bitError().BitError)(`unable to squash because ${id.toString()} is diverged in history.
601
716
  consider switching to "${otherLaneId.name}" first, merging "${currentLaneName}", then switching back to "${currentLaneName}" and merging "${otherLaneId.name}"
@@ -614,6 +729,20 @@ alternatively, use "--no-squash" flag to keep the entire history of "${otherLane
614
729
  if (remoteSnaps.length === 0) {
615
730
  throw new Error(`remote is ahead but it has no snaps. it's impossible`);
616
731
  }
732
+ const getAllMessages = async () => {
733
+ if (!messageTitle) return [];
734
+ await scope.scopeImporter.importManyObjects({
735
+ [otherLaneId.scope]: remoteSnaps.map(s => s.toString())
736
+ });
737
+ const versionObjects = await Promise.all(remoteSnaps.map(s => scope.objects.load(s)));
738
+ return (0, _lodash().compact)(versionObjects).map(v => v.log.message);
739
+ };
740
+ const getFinalMessage = async () => {
741
+ if (!messageTitle) return undefined;
742
+ const allMessage = await getAllMessages();
743
+ const allMessageStr = (0, _lodash().compact)(allMessage).map(m => `[*] ${m}`).join('\n');
744
+ return `${messageTitle}\n${allMessageStr}`;
745
+ };
617
746
  // no need to check this case. even if it has only one snap ahead, we want to do the "squash", and run "addAsOnlyParent"
618
747
  // to make sure it doesn't not have two parents.
619
748
  // if (remoteSnaps.length === 1) {
@@ -642,10 +771,11 @@ alternatively, use "--no-squash" flag to keep the entire history of "${otherLane
642
771
  componentFromModel.parents.forEach(ref => componentFromModel.removeParent(ref));
643
772
  };
644
773
  await doSquash();
774
+ const finalMessage = await getFinalMessage();
645
775
  componentFromModel.setSquashed({
646
776
  previousParents: currentParents,
647
777
  laneId: otherLaneId
648
- }, log);
778
+ }, log, finalMessage);
649
779
  return componentFromModel;
650
780
  }
651
781
  _mergeLanes().MergeLanesAspect.addRuntime(MergeLanesMain);
@@ -1 +1 @@
1
- {"version":3,"names":["MergeLanesMain","constructor","workspace","merging","lanes","logger","remove","scope","exporter","importer","mergeLane","laneName","options","BitError","consumer","mergeStrategy","noSnap","tag","snapMessage","existingOnWorkspaceOnly","build","keepReadme","squash","noSquash","pattern","includeDeps","skipDependencyInstallation","resolveUnrelated","ignoreConfigChanges","skipFetch","currentLaneId","getCurrentLaneId","isDefault","toString","otherLaneId","getParsedLaneId","isEqual","currentLane","loadLane","isDefaultLane","getOtherLane","importObjectsFromMainIfExist","toBitIds","toVersionLatest","undefined","lane","shouldFetch","isNew","otherLane","fetchLaneWithItsComponents","importHeadArtifactsFromLane","getBitIds","Error","DEFAULT_LANE","getMainIdsToMerge","bitIds","debug","allComponentsStatus","getMergeStatus","shouldSquash","componentIds","resolveMultipleComponentIds","compIdsFromPattern","filterIdsFromPoolIdsByPattern","filterComponentsStatus","forEach","bitId","find","c","id","isEqualWithoutVersion","push","unmergedLegitimately","unmergedMessage","workspaceIds","listIds","filter","_legacy","throwForFailures","squashSnaps","mergeResults","mergeSnaps","laneId","localLane","mergedSuccessfully","failedComponents","length","every","failedComponent","unchangedLegitimately","deleteResults","readmeComponent","readmeComponentId","changeVersion","head","hash","removeLocallyByIds","readmeResult","name","configMergeResults","map","configMergeResult","onDestroy","compact","failureMsgs","chalk","bold","red","join","laneIds","mainNotOnLane","ids","hasScope","modelComponents","Promise","all","legacyScope","getModelComponent","toBitId","mergeFromScope","fromLane","toLane","fromLaneId","LaneId","parse","fromLaneObj","importLaneObject","toLaneId","getDefaultLaneId","toLaneObj","fromLaneBitIds","getIdsToMerge","laneCompIds","BitIds","fromArray","idsToMerge","scopeComponentsImporter","ScopeComponentsImporter","getInstance","importWithoutDeps","cache","ignoreMissingHead","includeVersionHistory","throwIfNotUpToDate","repo","objects","mergedPreviously","mergedNow","log","getLogForSquash","bitObjectsPerComp","pMapSeries","modelComponent","fromVersionObj","loadVersion","version","isRemoved","fromLaneHead","getRef","toLaneHead","getComponent","divergeData","getDivergeData","sourceHead","targetHead","throwForNoCommonSnap","modifiedVersion","squashOneComp","addComponent","setHead","bitObjects","b","bitObjectsFlat","flat","writeObjectsToTheFS","exportedIds","exported","exportMany","idsWithFutureScope","laneObject","allVersions","exportHeadsOnly","ignoreMissingExternalArtifacts","exportOrigin","status","diffStatus","skipChanges","compsNotUpToDate","componentsStatus","s","upToDate","componentId","provider","cli","loggerMain","createLogger","MergeLanesAspect","lanesCommand","getCommand","mergeLanesMain","commands","MergeLaneCmd","register","MergeLaneFromScopeCmd","LanesAspect","CLIAspect","WorkspaceAspect","MergingAspect","LoggerAspect","RemoveAspect","ScopeAspect","ExportAspect","ImporterAspect","MainRuntime","compIdsToKeep","allBitIds","bitIdsFromPattern","bitIdsNotFromPattern","hasWithoutVersion","filteredComponentStatus","depsToAdd","missingDepsFromHead","missingDepsFromHistory","compId","fromStatus","targetVersions","snapsOnTargetOnly","headOnTarget","remoteVersion","versionObj","flattenedDeps","getAllFlattenedDependencies","depsNotIncludeInPattern","depsOnLane","dep","isOnLane","isIdOnLane","depsOnLaneStr","toStringWithoutVersion","Object","keys","MissingCompsToMerge","uniq","depsWithoutVersion","d","depsUniqWithoutVersion","uniqFromArray","basicLog","getBasicLog","message","currentLaneName","succeededComponents","componentFromModel","modifiedComp","add","versionHistory","updateRebasedVersionHistory","isDiverged","isSourceAhead","isTargetAhead","remoteSnaps","currentParents","parents","doSquash","commonSnapBeforeDiverge","addAsOnlyParent","getModelComponentIfExist","ref","removeParent","setSquashed","previousParents","addRuntime"],"sources":["merge-lanes.main.runtime.ts"],"sourcesContent":["import { BitError } from '@teambit/bit-error';\nimport { CLIAspect, CLIMain, MainRuntime } from '@teambit/cli';\nimport ImporterAspect, { ImporterMain } from '@teambit/importer';\nimport { LanesAspect, LanesMain } from '@teambit/lanes';\nimport MergingAspect, {\n MergingMain,\n ComponentMergeStatus,\n ConfigMergeResult,\n ApplyVersionResults,\n} from '@teambit/merging';\nimport WorkspaceAspect, { Workspace } from '@teambit/workspace';\nimport chalk from 'chalk';\nimport { getBasicLog } from '@teambit/snapping';\nimport { BitId } from '@teambit/legacy-bit-id';\nimport { Log } from '@teambit/legacy/dist/scope/models/version';\nimport pMapSeries from 'p-map-series';\nimport { Scope as LegacyScope } from '@teambit/legacy/dist/scope';\nimport { Consumer } from '@teambit/legacy/dist/consumer';\nimport { MergeStrategy } from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport { BitIds } from '@teambit/legacy/dist/bit-id';\nimport { ScopeAspect, ScopeMain } from '@teambit/scope';\nimport ScopeComponentsImporter from '@teambit/legacy/dist/scope/component-ops/scope-components-importer';\nimport { ComponentID } from '@teambit/component-id';\nimport { DEFAULT_LANE, LaneId } from '@teambit/lane-id';\nimport { Lane, Version } from '@teambit/legacy/dist/scope/models';\nimport { Logger, LoggerAspect, LoggerMain } from '@teambit/logger';\nimport { SnapsDistance } from '@teambit/legacy/dist/scope/component-ops/snaps-distance';\nimport { RemoveAspect, RemoveMain } from '@teambit/remove';\nimport { compact, uniq } from 'lodash';\nimport { ExportAspect, ExportMain } from '@teambit/export';\nimport { BitObject } from '@teambit/legacy/dist/scope/objects';\nimport { getDivergeData } from '@teambit/legacy/dist/scope/component-ops/get-diverge-data';\nimport { MergeLanesAspect } from './merge-lanes.aspect';\nimport { MergeLaneCmd } from './merge-lane.cmd';\nimport { MergeLaneFromScopeCmd } from './merge-lane-from-scope.cmd';\nimport { MissingCompsToMerge } from './exceptions/missing-comps-to-merge';\n\nexport type MergeLaneOptions = {\n mergeStrategy: MergeStrategy;\n noSnap: boolean;\n snapMessage: string;\n existingOnWorkspaceOnly: boolean;\n build: boolean;\n keepReadme: boolean;\n squash?: boolean;\n noSquash: boolean;\n tag?: boolean;\n pattern?: string;\n includeDeps?: boolean;\n skipDependencyInstallation?: boolean;\n resolveUnrelated?: MergeStrategy;\n ignoreConfigChanges?: boolean;\n skipFetch?: boolean;\n};\n\nexport class MergeLanesMain {\n constructor(\n private workspace: Workspace | undefined,\n private merging: MergingMain,\n private lanes: LanesMain,\n private logger: Logger,\n private remove: RemoveMain,\n private scope: ScopeMain,\n private exporter: ExportMain,\n private importer: ImporterMain\n ) {}\n\n async mergeLane(\n laneName: string,\n options: MergeLaneOptions\n ): Promise<{ mergeResults: ApplyVersionResults; deleteResults: any; configMergeResults: ConfigMergeResult[] }> {\n if (!this.workspace) {\n throw new BitError(`unable to merge a lane outside of Bit workspace`);\n }\n const consumer = this.workspace.consumer;\n\n const {\n mergeStrategy,\n noSnap,\n tag,\n snapMessage,\n existingOnWorkspaceOnly,\n build,\n keepReadme,\n squash,\n noSquash,\n pattern,\n includeDeps,\n skipDependencyInstallation,\n resolveUnrelated,\n ignoreConfigChanges,\n skipFetch,\n } = options;\n\n const currentLaneId = consumer.getCurrentLaneId();\n if (tag && !currentLaneId.isDefault()) {\n throw new BitError(`--tag only possible when on main. currently checked out to ${currentLaneId.toString()}`);\n }\n const otherLaneId = await consumer.getParsedLaneId(laneName);\n if (otherLaneId.isEqual(currentLaneId)) {\n throw new BitError(\n `unable to merge lane \"${otherLaneId.toString()}\", you're already at this lane. to get updates, simply run \"bit checkout head\"`\n );\n }\n if (resolveUnrelated && currentLaneId.isDefault()) {\n throw new BitError(\n `unable to resolve unrelated when on main. switch to ${otherLaneId.toString()} and run \"bit lane merge main --resolve-unrelated\"`\n );\n }\n const currentLane = currentLaneId.isDefault() ? null : await consumer.scope.loadLane(currentLaneId);\n const isDefaultLane = otherLaneId.isDefault();\n const getOtherLane = async () => {\n if (isDefaultLane) {\n if (!skipFetch) {\n await this.importer.importObjectsFromMainIfExist(currentLane?.toBitIds().toVersionLatest() || []);\n }\n return undefined;\n }\n let lane = await consumer.scope.loadLane(otherLaneId);\n const shouldFetch = !lane || (!skipFetch && !lane.isNew);\n if (shouldFetch) {\n // don't assign `lane` to the result of this command. otherwise, if you have local snaps, it'll ignore them and use the remote-lane.\n const otherLane = await this.lanes.fetchLaneWithItsComponents(otherLaneId);\n\n await this.importer.importHeadArtifactsFromLane(otherLane, true);\n\n lane = await consumer.scope.loadLane(otherLaneId);\n }\n return lane;\n };\n const otherLane = await getOtherLane();\n const getBitIds = async () => {\n if (isDefaultLane) {\n if (!currentLane) throw new Error(`unable to merge ${DEFAULT_LANE}, the current lane was not found`);\n return this.getMainIdsToMerge(currentLane);\n }\n if (!otherLane) throw new Error(`lane must be defined for non-default`);\n return otherLane.toBitIds();\n };\n const bitIds = await getBitIds();\n this.logger.debug(`merging the following bitIds: ${bitIds.toString()}`);\n\n let allComponentsStatus = await this.merging.getMergeStatus(bitIds, currentLane, otherLane, {\n resolveUnrelated,\n ignoreConfigChanges,\n });\n const shouldSquash = squash || (currentLaneId.isDefault() && !noSquash);\n\n if (pattern) {\n const componentIds = await this.workspace.resolveMultipleComponentIds(bitIds);\n const compIdsFromPattern = this.workspace.scope.filterIdsFromPoolIdsByPattern(pattern, componentIds);\n allComponentsStatus = await filterComponentsStatus(\n allComponentsStatus,\n compIdsFromPattern,\n bitIds,\n this.workspace,\n includeDeps,\n otherLane || undefined,\n shouldSquash\n );\n bitIds.forEach((bitId) => {\n if (!allComponentsStatus.find((c) => c.id.isEqualWithoutVersion(bitId))) {\n allComponentsStatus.push({ id: bitId, unmergedLegitimately: true, unmergedMessage: `excluded by pattern` });\n }\n });\n }\n if (existingOnWorkspaceOnly) {\n const workspaceIds = await this.workspace.listIds();\n const compIdsFromPattern = workspaceIds.filter((id) =>\n allComponentsStatus.find((c) => c.id.isEqualWithoutVersion(id._legacy))\n );\n allComponentsStatus = await filterComponentsStatus(\n allComponentsStatus,\n compIdsFromPattern,\n bitIds,\n this.workspace,\n includeDeps,\n otherLane || undefined,\n shouldSquash\n );\n bitIds.forEach((bitId) => {\n if (!allComponentsStatus.find((c) => c.id.isEqualWithoutVersion(bitId))) {\n allComponentsStatus.push({ id: bitId, unmergedLegitimately: true, unmergedMessage: `not in the workspace` });\n }\n });\n }\n\n throwForFailures();\n\n if (shouldSquash) {\n await squashSnaps(allComponentsStatus, otherLaneId, consumer);\n }\n\n const mergeResults = await this.merging.mergeSnaps({\n mergeStrategy,\n allComponentsStatus,\n laneId: otherLaneId,\n localLane: currentLane,\n noSnap,\n tag,\n snapMessage,\n build,\n skipDependencyInstallation,\n });\n\n const mergedSuccessfully =\n !mergeResults.failedComponents ||\n mergeResults.failedComponents.length === 0 ||\n mergeResults.failedComponents.every((failedComponent) => failedComponent.unchangedLegitimately);\n\n let deleteResults = {};\n\n if (!keepReadme && otherLane && otherLane.readmeComponent && mergedSuccessfully) {\n const readmeComponentId = otherLane.readmeComponent.id.changeVersion(otherLane.readmeComponent?.head?.hash);\n deleteResults = await this.remove.removeLocallyByIds([readmeComponentId]);\n } else if (otherLane && !otherLane.readmeComponent) {\n deleteResults = { readmeResult: `\\nlane ${otherLane.name} doesn't have a readme component` };\n }\n const configMergeResults = allComponentsStatus.map((c) => c.configMergeResult);\n\n await this.workspace.consumer.onDestroy();\n\n return { mergeResults, deleteResults, configMergeResults: compact(configMergeResults) };\n\n function throwForFailures() {\n const failedComponents = allComponentsStatus.filter((c) => c.unmergedMessage && !c.unmergedLegitimately);\n if (failedComponents.length) {\n const failureMsgs = failedComponents\n .map(\n (failedComponent) =>\n `${chalk.bold(failedComponent.id.toString())} - ${chalk.red(failedComponent.unmergedMessage as string)}`\n )\n .join('\\n');\n throw new BitError(`unable to merge due to the following failures:\\n${failureMsgs}`);\n }\n }\n }\n\n private async getMainIdsToMerge(lane: Lane) {\n const laneIds = lane.toBitIds();\n if (!this.workspace) {\n throw new BitError(`getMainIdsToMerge needs workspace`);\n }\n const workspaceIds = (await this.workspace.listIds()).map((id) => id._legacy);\n const mainNotOnLane = workspaceIds.filter((id) => !laneIds.find((laneId) => laneId.isEqualWithoutVersion(id)));\n const ids = [...laneIds, ...mainNotOnLane].filter((id) => id.hasScope());\n const modelComponents = await Promise.all(ids.map((id) => this.scope.legacyScope.getModelComponent(id)));\n return compact(\n modelComponents.map((c) => {\n if (!c.head) return null; // probably the component was never merged to main\n return c.toBitId().changeVersion(c.head.toString());\n })\n );\n }\n\n async mergeFromScope(\n fromLane: string,\n toLane: string,\n options: Partial<MergeLaneOptions> & { push?: boolean }\n ): Promise<{\n mergedPreviously: string[];\n mergedNow: string[];\n exportedIds: string[];\n }> {\n if (this.workspace) {\n throw new BitError(\n `unable to run this command from a workspace, please create a new bare-scope and run it from there`\n );\n }\n const fromLaneId = LaneId.parse(fromLane);\n const fromLaneObj = await this.lanes.importLaneObject(fromLaneId);\n const toLaneId = toLane === DEFAULT_LANE ? this.lanes.getDefaultLaneId() : LaneId.parse(toLane);\n const toLaneObj = toLaneId.isDefault() ? undefined : await this.lanes.importLaneObject(toLaneId);\n const fromLaneBitIds = fromLaneObj.toBitIds();\n const getIdsToMerge = async (): Promise<BitIds> => {\n if (!options.pattern) return fromLaneBitIds;\n const laneCompIds = await this.scope.resolveMultipleComponentIds(fromLaneBitIds);\n const ids = this.scope.filterIdsFromPoolIdsByPattern(options.pattern, laneCompIds);\n return BitIds.fromArray(ids.map((id) => id._legacy));\n };\n const idsToMerge = await getIdsToMerge();\n const scopeComponentsImporter = ScopeComponentsImporter.getInstance(this.scope.legacyScope);\n await scopeComponentsImporter.importWithoutDeps(idsToMerge.toVersionLatest(), {\n cache: false,\n lane: fromLaneObj,\n ignoreMissingHead: true,\n includeVersionHistory: true,\n });\n\n // get their main/to-lane as well\n await scopeComponentsImporter.importWithoutDeps(idsToMerge.toVersionLatest(), {\n cache: false,\n lane: toLaneObj,\n ignoreMissingHead: true,\n includeVersionHistory: true,\n });\n await this.importer.importHeadArtifactsFromLane(fromLaneObj, true);\n await this.throwIfNotUpToDate(fromLaneId, toLaneId);\n const repo = this.scope.legacyScope.objects;\n // loop through all components, make sure they're all ahead of main (it might not be on main yet).\n // then, change the version object to include an extra parent to point to the main.\n // then, change the component object head to point to this changed version\n const mergedPreviously: BitId[] = [];\n const mergedNow: BitId[] = [];\n const shouldSquash = !toLaneObj && !options.noSquash; // only when merging to main we squash.\n const log = await getLogForSquash(fromLaneId);\n const bitObjectsPerComp = await pMapSeries(idsToMerge, async (id) => {\n const modelComponent = await this.scope.legacyScope.getModelComponent(id);\n const fromVersionObj = await modelComponent.loadVersion(id.version as string, repo);\n if (fromVersionObj.isRemoved()) return undefined;\n const fromLaneHead = modelComponent.getRef(id.version as string);\n if (!fromLaneHead) throw new Error(`lane head must be defined for ${id.toString()}`);\n const toLaneHead = toLaneObj ? toLaneObj.getComponent(id)?.head : modelComponent.head || null;\n if (toLaneHead?.isEqual(fromLaneHead)) {\n mergedPreviously.push(id);\n return undefined;\n }\n // this might be confusing, we pass the toLaneHead as the sourceHead and the fromLaneHead as the targetHead.\n // this is because normally, in the workspace, we merge another lane (target) into the current lane (source).\n // so effectively, in the workspace, we merge fromLane=target into toLane=source.\n const divergeData = await getDivergeData({\n repo,\n modelComponent,\n sourceHead: toLaneHead,\n targetHead: fromLaneHead,\n throwForNoCommonSnap: true,\n });\n const modifiedVersion = shouldSquash\n ? await squashOneComp(DEFAULT_LANE, fromLaneId, id, divergeData, log, this.scope.legacyScope, fromVersionObj)\n : undefined;\n const objects: BitObject[] = [];\n if (modifiedVersion) objects.push(modifiedVersion);\n if (toLaneObj) {\n toLaneObj.addComponent({ id: id.changeVersion(undefined), head: fromLaneHead });\n } else {\n modelComponent.setHead(fromLaneHead);\n objects.push(modelComponent);\n }\n mergedNow.push(id);\n return { id, objects };\n });\n const bitObjects = compact(bitObjectsPerComp).map((b) => b.objects);\n const bitObjectsFlat = bitObjects.flat();\n if (toLaneObj) bitObjectsFlat.push(toLaneObj);\n await repo.writeObjectsToTheFS(bitObjectsFlat);\n let exportedIds: string[] = [];\n if (options.push) {\n const ids = compact(bitObjectsPerComp).map((b) => b.id);\n const bitIds = BitIds.fromArray(ids);\n const { exported } = await this.exporter.exportMany({\n scope: this.scope.legacyScope,\n ids: shouldSquash ? bitIds : new BitIds(),\n idsWithFutureScope: shouldSquash ? bitIds : new BitIds(),\n laneObject: toLaneObj,\n allVersions: false,\n // no need to export anything else other than the head. the normal calculation of what to export won't apply here\n // as it is done from the scope.\n exportHeadsOnly: shouldSquash,\n // all artifacts must be pushed. they're all considered \"external\" in this case, because it's running from a\n // bare-scope, but we don't want to ignore them, otherwise, they'll be missing from the component-scopes.\n ignoreMissingExternalArtifacts: false,\n exportOrigin: 'lane-merge',\n });\n exportedIds = exported.map((id) => id.toString());\n }\n\n return {\n mergedPreviously: mergedPreviously.map((id) => id.toString()),\n mergedNow: mergedNow.map((id) => id.toString()),\n exportedIds,\n };\n }\n private async throwIfNotUpToDate(fromLaneId: LaneId, toLaneId: LaneId) {\n const status = await this.lanes.diffStatus(fromLaneId, toLaneId, { skipChanges: true });\n const compsNotUpToDate = status.componentsStatus.filter((s) => !s.upToDate);\n if (compsNotUpToDate.length) {\n throw new Error(`unable to merge, the following components are not up-to-date:\n${compsNotUpToDate.map((s) => s.componentId.toString()).join('\\n')}`);\n }\n }\n\n static slots = [];\n static dependencies = [\n LanesAspect,\n CLIAspect,\n WorkspaceAspect,\n MergingAspect,\n LoggerAspect,\n RemoveAspect,\n ScopeAspect,\n ExportAspect,\n ImporterAspect,\n ];\n static runtime = MainRuntime;\n\n static async provider([lanes, cli, workspace, merging, loggerMain, remove, scope, exporter, importer]: [\n LanesMain,\n CLIMain,\n Workspace,\n MergingMain,\n LoggerMain,\n RemoveMain,\n ScopeMain,\n ExportMain,\n ImporterMain\n ]) {\n const logger = loggerMain.createLogger(MergeLanesAspect.id);\n const lanesCommand = cli.getCommand('lane');\n const mergeLanesMain = new MergeLanesMain(workspace, merging, lanes, logger, remove, scope, exporter, importer);\n lanesCommand?.commands?.push(new MergeLaneCmd(mergeLanesMain));\n cli.register(new MergeLaneFromScopeCmd(mergeLanesMain));\n return mergeLanesMain;\n }\n}\n\nasync function filterComponentsStatus(\n allComponentsStatus: ComponentMergeStatus[],\n compIdsToKeep: ComponentID[],\n allBitIds: BitId[],\n workspace: Workspace,\n includeDeps = false,\n otherLane?: Lane, // lane that gets merged into the current lane. if not provided, it's main that gets merged into the current lane\n shouldSquash?: boolean\n): Promise<ComponentMergeStatus[]> {\n const bitIdsFromPattern = BitIds.fromArray(compIdsToKeep.map((c) => c._legacy));\n const bitIdsNotFromPattern = allBitIds.filter((bitId) => !bitIdsFromPattern.hasWithoutVersion(bitId));\n const filteredComponentStatus: ComponentMergeStatus[] = [];\n const depsToAdd: BitId[] = [];\n const missingDepsFromHead = {};\n const missingDepsFromHistory: string[] = [];\n await pMapSeries(compIdsToKeep, async (compId) => {\n const fromStatus = allComponentsStatus.find((c) => c.id.isEqualWithoutVersion(compId._legacy));\n if (!fromStatus) {\n throw new Error(`filterComponentsStatus: unable to find ${compId.toString()} in component-status`);\n }\n filteredComponentStatus.push(fromStatus);\n if (fromStatus.unmergedMessage) {\n return;\n }\n if (!otherLane) {\n // if merging main, no need to check whether the deps are included in the pattern.\n return;\n }\n const { divergeData } = fromStatus;\n if (!divergeData) {\n throw new Error(`filterComponentsStatus: unable to find divergeData for ${compId.toString()}`);\n }\n let targetVersions = divergeData.snapsOnTargetOnly;\n if (!targetVersions.length) {\n return;\n }\n const modelComponent = await workspace.consumer.scope.getModelComponent(compId._legacy);\n if (shouldSquash) {\n // no need to check all versions, we merge only the head\n const headOnTarget = otherLane ? otherLane.getComponent(compId._legacy)?.head : modelComponent.head;\n if (!headOnTarget) {\n throw new Error(`filterComponentsStatus: unable to find head for ${compId.toString()}`);\n }\n targetVersions = [headOnTarget];\n }\n\n await pMapSeries(targetVersions, async (remoteVersion) => {\n const versionObj = await modelComponent.loadVersion(remoteVersion.toString(), workspace.consumer.scope.objects);\n const flattenedDeps = versionObj.getAllFlattenedDependencies();\n const depsNotIncludeInPattern = flattenedDeps.filter((id) =>\n bitIdsNotFromPattern.find((bitId) => bitId.isEqualWithoutVersion(id))\n );\n if (!depsNotIncludeInPattern.length) {\n return;\n }\n const depsOnLane: BitId[] = [];\n await Promise.all(\n depsNotIncludeInPattern.map(async (dep) => {\n const isOnLane = await workspace.consumer.scope.isIdOnLane(dep, otherLane);\n if (isOnLane) {\n depsOnLane.push(dep);\n }\n })\n );\n if (!depsOnLane.length) {\n return;\n }\n if (includeDeps) {\n depsToAdd.push(...depsOnLane);\n } else {\n const headOnTarget = otherLane ? otherLane.getComponent(compId._legacy)?.head : modelComponent.head;\n const depsOnLaneStr = depsOnLane.map((dep) => dep.toStringWithoutVersion());\n if (headOnTarget?.isEqual(remoteVersion)) {\n depsOnLaneStr.forEach((dep) => {\n (missingDepsFromHead[dep] ||= []).push(compId.toStringWithoutVersion());\n });\n } else {\n missingDepsFromHistory.push(...depsOnLaneStr);\n }\n }\n });\n });\n if (Object.keys(missingDepsFromHead).length || missingDepsFromHistory.length) {\n throw new MissingCompsToMerge(missingDepsFromHead, uniq(missingDepsFromHistory));\n }\n\n if (depsToAdd.length) {\n // remove the version, otherwise, the uniq gives duplicate components with different versions.\n const depsWithoutVersion = depsToAdd.map((d) => d.changeVersion(undefined));\n const depsUniqWithoutVersion = BitIds.uniqFromArray(depsWithoutVersion);\n depsUniqWithoutVersion.forEach((id) => {\n const fromStatus = allComponentsStatus.find((c) => c.id.isEqualWithoutVersion(id));\n if (!fromStatus) {\n throw new Error(`filterComponentsStatus: unable to find ${id.toString()} in component-status`);\n }\n filteredComponentStatus.push(fromStatus);\n });\n }\n return filteredComponentStatus;\n}\n\nasync function getLogForSquash(otherLaneId: LaneId) {\n const basicLog = await getBasicLog();\n const log = {\n ...basicLog,\n message: `squashed during merge from ${otherLaneId.toString()}`,\n };\n return log;\n}\n\nasync function squashSnaps(allComponentsStatus: ComponentMergeStatus[], otherLaneId: LaneId, consumer: Consumer) {\n const currentLaneName = consumer.getCurrentLaneId().name;\n const succeededComponents = allComponentsStatus.filter((c) => !c.unmergedMessage);\n const log = await getLogForSquash(otherLaneId);\n\n await Promise.all(\n succeededComponents.map(async ({ id, divergeData, componentFromModel }) => {\n if (!divergeData) {\n throw new Error(`unable to squash. divergeData is missing from ${id.toString()}`);\n }\n\n const modifiedComp = await squashOneComp(\n currentLaneName,\n otherLaneId,\n id,\n divergeData,\n log,\n consumer.scope,\n componentFromModel\n );\n if (modifiedComp) {\n consumer.scope.objects.add(modifiedComp);\n const modelComponent = await consumer.scope.getModelComponent(id);\n const versionHistory = await modelComponent.updateRebasedVersionHistory(consumer.scope.objects, [modifiedComp]);\n if (versionHistory) consumer.scope.objects.add(versionHistory);\n }\n })\n );\n}\n\n/**\n * returns Version object if it was modified. otherwise, returns undefined\n */\nasync function squashOneComp(\n currentLaneName: string,\n otherLaneId: LaneId,\n id: BitId,\n divergeData: SnapsDistance,\n log: Log,\n scope: LegacyScope,\n componentFromModel?: Version\n): Promise<Version | undefined> {\n if (divergeData.isDiverged()) {\n throw new BitError(`unable to squash because ${id.toString()} is diverged in history.\nconsider switching to \"${\n otherLaneId.name\n }\" first, merging \"${currentLaneName}\", then switching back to \"${currentLaneName}\" and merging \"${\n otherLaneId.name\n }\"\nalternatively, use \"--no-squash\" flag to keep the entire history of \"${otherLaneId.name}\"`);\n }\n if (divergeData.isSourceAhead()) {\n // nothing to do. current is ahead, nothing to merge. (it was probably filtered out already as a \"failedComponent\")\n return undefined;\n }\n if (!divergeData.isTargetAhead()) {\n // nothing to do. current and remote are the same, nothing to merge. (it was probably filtered out already as a \"failedComponent\")\n return undefined;\n }\n // remote is ahead and was not diverge.\n const remoteSnaps = divergeData.snapsOnTargetOnly;\n if (remoteSnaps.length === 0) {\n throw new Error(`remote is ahead but it has no snaps. it's impossible`);\n }\n // no need to check this case. even if it has only one snap ahead, we want to do the \"squash\", and run \"addAsOnlyParent\"\n // to make sure it doesn't not have two parents.\n // if (remoteSnaps.length === 1) {\n // // nothing to squash. it has only one commit.\n // return;\n // }\n if (!componentFromModel) {\n throw new Error('unable to squash, the componentFromModel is missing');\n }\n\n const currentParents = componentFromModel.parents;\n\n const doSquash = async () => {\n if (divergeData.commonSnapBeforeDiverge) {\n componentFromModel.addAsOnlyParent(divergeData.commonSnapBeforeDiverge);\n return;\n }\n if (currentLaneName !== DEFAULT_LANE) {\n // when squashing into lane, we have to take main into account\n const modelComponent = await scope.getModelComponentIfExist(id);\n if (!modelComponent) throw new Error(`missing ModelComponent for ${id.toString()}`);\n if (modelComponent.head) {\n componentFromModel.addAsOnlyParent(modelComponent.head);\n return;\n }\n }\n // there is no commonSnapBeforeDiverge. the local has no snaps, all are remote, no need for parents. keep only head.\n componentFromModel.parents.forEach((ref) => componentFromModel.removeParent(ref));\n };\n\n await doSquash();\n\n componentFromModel.setSquashed({ previousParents: currentParents, laneId: otherLaneId }, log);\n return componentFromModel;\n}\n\nMergeLanesAspect.addRuntime(MergeLanesMain);\n\nexport default MergeLanesMain;\n"],"mappings":"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"}
1
+ {"version":3,"names":["LAST_MERGED_LANE_FILENAME","LAST_MERGED_BITMAP_FILENAME","MergeLanesMain","constructor","workspace","merging","lanes","logger","remove","scope","exporter","importer","checkout","mergeLane","laneName","options","BitError","consumer","mergeStrategy","noSnap","tag","snapMessage","existingOnWorkspaceOnly","build","keepReadme","squash","noSquash","pattern","includeDeps","skipDependencyInstallation","resolveUnrelated","ignoreConfigChanges","skipFetch","currentLaneId","getCurrentLaneId","isDefault","toString","otherLaneId","getParsedLaneId","isEqual","currentLane","loadLane","isDefaultLane","getOtherLane","importObjectsFromMainIfExist","toBitIds","toVersionLatest","undefined","lane","shouldFetch","isNew","otherLane","fetchLaneWithItsComponents","importHeadArtifactsFromLane","getBitIds","Error","DEFAULT_LANE","getMainIdsToMerge","bitIds","debug","allComponentsStatus","getMergeStatus","shouldSquash","componentIds","resolveMultipleComponentIds","compIdsFromPattern","filterIdsFromPoolIdsByPattern","filterComponentsStatus","forEach","bitId","find","c","id","isEqualWithoutVersion","push","unmergedLegitimately","unmergedMessage","workspaceIds","listIds","filter","_legacy","throwForFailures","squashSnaps","copyOfCurrentLane","clone","copyOfBitmap","tempy","file","copyOfWorkspaceJsonc","fs","copyFile","bitMap","mapPath","config","path","mergeResults","mergeSnaps","laneId","localLane","getLastMergedPath","ensureDir","getLastMergedBitmapFilename","getLastMergedWorkspaceFilename","compressed","compress","outputFile","getLastMergedLaneFilename","mergedSuccessfully","failedComponents","length","every","failedComponent","unchangedLegitimately","deleteResults","readmeComponent","readmeComponentId","changeVersion","head","hash","removeLocallyByIds","readmeResult","name","configMergeResults","map","configMergeResult","onDestroy","compact","failureMsgs","chalk","bold","red","join","abortLaneMerge","checkoutProps","OutsideWorkspaceError","pathExistsSync","lastLane","getLastMergedLaneContentIfExists","getCurrentLane","laneFromBackup","BitObject","parseObject","legacyScope","objects","writeObjectsToTheFS","_reloadConsumer","unmergedComponents","removeAllComponents","write","configMergeFile","getConflictMergeFile","delete","ids","checkoutResults","restoredItems","basename","filename","readFile","err","code","laneIds","mainNotOnLane","hasScope","modelComponents","Promise","all","getModelComponent","toBitId","mergeFromScope","fromLane","toLane","fromLaneId","LaneId","parse","fromLaneObj","importLaneObject","toLaneId","getDefaultLaneId","toLaneObj","fromLaneBitIds","getIdsToMerge","laneCompIds","BitIds","fromArray","idsToMerge","scopeComponentsImporter","ScopeComponentsImporter","getInstance","importWithoutDeps","cache","ignoreMissingHead","includeVersionHistory","throwIfNotUpToDate","repo","mergedPreviously","mergedNow","log","getLogForSquash","bitObjectsPerComp","pMapSeries","modelComponent","fromVersionObj","loadVersion","version","isRemoved","fromLaneHead","getRef","toLaneHead","getComponent","divergeData","getDivergeData","sourceHead","targetHead","throwForNoCommonSnap","modifiedVersion","squashOneComp","addComponent","setHead","bitObjects","b","bitObjectsFlat","flat","exportedIds","exported","exportMany","idsWithFutureScope","laneObject","allVersions","exportHeadsOnly","ignoreMissingExternalArtifacts","exportOrigin","status","diffStatus","skipChanges","compsNotUpToDate","componentsStatus","s","upToDate","componentId","provider","cli","loggerMain","createLogger","MergeLanesAspect","lanesCommand","getCommand","mergeLanesMain","commands","MergeLaneCmd","MergeAbortLaneCmd","register","MergeLaneFromScopeCmd","LanesAspect","CLIAspect","WorkspaceAspect","MergingAspect","LoggerAspect","RemoveAspect","ScopeAspect","ExportAspect","ImporterAspect","CheckoutAspect","MainRuntime","compIdsToKeep","allBitIds","bitIdsFromPattern","bitIdsNotFromPattern","hasWithoutVersion","filteredComponentStatus","depsToAdd","missingDepsFromHead","missingDepsFromHistory","compId","fromStatus","targetVersions","snapsOnTargetOnly","headOnTarget","remoteVersion","versionObj","flattenedDeps","getAllFlattenedDependencies","depsNotIncludeInPattern","depsOnLane","dep","isOnLane","isIdOnLane","depsOnLaneStr","toStringWithoutVersion","Object","keys","MissingCompsToMerge","uniq","depsWithoutVersion","d","depsUniqWithoutVersion","uniqFromArray","basicLog","getBasicLog","message","currentLaneName","succeededComponents","componentFromModel","modifiedComp","add","versionHistory","updateRebasedVersionHistory","messageTitle","isDiverged","isSourceAhead","isTargetAhead","remoteSnaps","getAllMessages","scopeImporter","importManyObjects","versionObjects","load","v","getFinalMessage","allMessage","allMessageStr","m","currentParents","parents","doSquash","commonSnapBeforeDiverge","addAsOnlyParent","getModelComponentIfExist","ref","removeParent","finalMessage","setSquashed","previousParents","addRuntime"],"sources":["merge-lanes.main.runtime.ts"],"sourcesContent":["import { BitError } from '@teambit/bit-error';\nimport fs from 'fs-extra';\nimport tempy from 'tempy';\nimport path from 'path';\nimport { CLIAspect, CLIMain, MainRuntime } from '@teambit/cli';\nimport ImporterAspect, { ImporterMain } from '@teambit/importer';\nimport { LanesAspect, LanesMain } from '@teambit/lanes';\nimport MergingAspect, {\n MergingMain,\n ComponentMergeStatus,\n ConfigMergeResult,\n ApplyVersionResults,\n} from '@teambit/merging';\nimport WorkspaceAspect, { OutsideWorkspaceError, Workspace } from '@teambit/workspace';\nimport chalk from 'chalk';\nimport { getBasicLog } from '@teambit/snapping';\nimport { BitId } from '@teambit/legacy-bit-id';\nimport { Log } from '@teambit/legacy/dist/scope/models/version';\nimport pMapSeries from 'p-map-series';\nimport { Scope as LegacyScope } from '@teambit/legacy/dist/scope';\nimport { Consumer } from '@teambit/legacy/dist/consumer';\nimport { MergeStrategy } from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport { BitIds } from '@teambit/legacy/dist/bit-id';\nimport { ScopeAspect, ScopeMain } from '@teambit/scope';\nimport ScopeComponentsImporter from '@teambit/legacy/dist/scope/component-ops/scope-components-importer';\nimport { ComponentID } from '@teambit/component-id';\nimport { DEFAULT_LANE, LaneId } from '@teambit/lane-id';\nimport { Lane, Version } from '@teambit/legacy/dist/scope/models';\nimport { Logger, LoggerAspect, LoggerMain } from '@teambit/logger';\nimport CheckoutAspect, { CheckoutMain, CheckoutProps } from '@teambit/checkout';\nimport { SnapsDistance } from '@teambit/legacy/dist/scope/component-ops/snaps-distance';\nimport { RemoveAspect, RemoveMain } from '@teambit/remove';\nimport { compact, uniq } from 'lodash';\nimport { ExportAspect, ExportMain } from '@teambit/export';\nimport { BitObject } from '@teambit/legacy/dist/scope/objects';\nimport { getDivergeData } from '@teambit/legacy/dist/scope/component-ops/get-diverge-data';\nimport { MergeLanesAspect } from './merge-lanes.aspect';\nimport { MergeLaneCmd } from './merge-lane.cmd';\nimport { MergeLaneFromScopeCmd } from './merge-lane-from-scope.cmd';\nimport { MissingCompsToMerge } from './exceptions/missing-comps-to-merge';\nimport { MergeAbortLaneCmd } from './merge-abort.cmd';\n\nexport type MergeLaneOptions = {\n mergeStrategy: MergeStrategy;\n noSnap: boolean;\n snapMessage: string;\n existingOnWorkspaceOnly: boolean;\n build: boolean;\n keepReadme: boolean;\n squash?: boolean;\n noSquash: boolean;\n tag?: boolean;\n pattern?: string;\n includeDeps?: boolean;\n skipDependencyInstallation?: boolean;\n resolveUnrelated?: MergeStrategy;\n ignoreConfigChanges?: boolean;\n skipFetch?: boolean;\n};\n\nconst LAST_MERGED_LANE_FILENAME = 'lane';\nconst LAST_MERGED_BITMAP_FILENAME = 'bitmap';\n\nexport class MergeLanesMain {\n constructor(\n private workspace: Workspace | undefined,\n private merging: MergingMain,\n private lanes: LanesMain,\n readonly logger: Logger,\n private remove: RemoveMain,\n private scope: ScopeMain,\n private exporter: ExportMain,\n private importer: ImporterMain,\n private checkout: CheckoutMain\n ) {}\n\n async mergeLane(\n laneName: string,\n options: MergeLaneOptions\n ): Promise<{ mergeResults: ApplyVersionResults; deleteResults: any; configMergeResults: ConfigMergeResult[] }> {\n if (!this.workspace) {\n throw new BitError(`unable to merge a lane outside of Bit workspace`);\n }\n const consumer = this.workspace.consumer;\n\n const {\n mergeStrategy,\n noSnap,\n tag,\n snapMessage,\n existingOnWorkspaceOnly,\n build,\n keepReadme,\n squash,\n noSquash,\n pattern,\n includeDeps,\n skipDependencyInstallation,\n resolveUnrelated,\n ignoreConfigChanges,\n skipFetch,\n } = options;\n\n const currentLaneId = consumer.getCurrentLaneId();\n if (tag && !currentLaneId.isDefault()) {\n throw new BitError(`--tag only possible when on main. currently checked out to ${currentLaneId.toString()}`);\n }\n const otherLaneId = await consumer.getParsedLaneId(laneName);\n if (otherLaneId.isEqual(currentLaneId)) {\n throw new BitError(\n `unable to merge lane \"${otherLaneId.toString()}\", you're already at this lane. to get updates, simply run \"bit checkout head\"`\n );\n }\n if (resolveUnrelated && currentLaneId.isDefault()) {\n throw new BitError(\n `unable to resolve unrelated when on main. switch to ${otherLaneId.toString()} and run \"bit lane merge main --resolve-unrelated\"`\n );\n }\n const currentLane = currentLaneId.isDefault() ? null : await consumer.scope.loadLane(currentLaneId);\n const isDefaultLane = otherLaneId.isDefault();\n const getOtherLane = async () => {\n if (isDefaultLane) {\n if (!skipFetch) {\n await this.importer.importObjectsFromMainIfExist(currentLane?.toBitIds().toVersionLatest() || []);\n }\n return undefined;\n }\n let lane = await consumer.scope.loadLane(otherLaneId);\n const shouldFetch = !lane || (!skipFetch && !lane.isNew);\n if (shouldFetch) {\n // don't assign `lane` to the result of this command. otherwise, if you have local snaps, it'll ignore them and use the remote-lane.\n const otherLane = await this.lanes.fetchLaneWithItsComponents(otherLaneId);\n\n await this.importer.importHeadArtifactsFromLane(otherLane, true);\n\n lane = await consumer.scope.loadLane(otherLaneId);\n }\n return lane;\n };\n const otherLane = await getOtherLane();\n const getBitIds = async () => {\n if (isDefaultLane) {\n if (!currentLane) throw new Error(`unable to merge ${DEFAULT_LANE}, the current lane was not found`);\n return this.getMainIdsToMerge(currentLane);\n }\n if (!otherLane) throw new Error(`lane must be defined for non-default`);\n return otherLane.toBitIds();\n };\n const bitIds = await getBitIds();\n this.logger.debug(`merging the following bitIds: ${bitIds.toString()}`);\n\n let allComponentsStatus = await this.merging.getMergeStatus(bitIds, currentLane, otherLane, {\n resolveUnrelated,\n ignoreConfigChanges,\n });\n const shouldSquash = squash || (currentLaneId.isDefault() && !noSquash);\n\n if (pattern) {\n const componentIds = await this.workspace.resolveMultipleComponentIds(bitIds);\n const compIdsFromPattern = this.workspace.scope.filterIdsFromPoolIdsByPattern(pattern, componentIds);\n allComponentsStatus = await filterComponentsStatus(\n allComponentsStatus,\n compIdsFromPattern,\n bitIds,\n this.workspace,\n includeDeps,\n otherLane || undefined,\n shouldSquash\n );\n bitIds.forEach((bitId) => {\n if (!allComponentsStatus.find((c) => c.id.isEqualWithoutVersion(bitId))) {\n allComponentsStatus.push({ id: bitId, unmergedLegitimately: true, unmergedMessage: `excluded by pattern` });\n }\n });\n }\n if (existingOnWorkspaceOnly) {\n const workspaceIds = await this.workspace.listIds();\n const compIdsFromPattern = workspaceIds.filter((id) =>\n allComponentsStatus.find((c) => c.id.isEqualWithoutVersion(id._legacy))\n );\n allComponentsStatus = await filterComponentsStatus(\n allComponentsStatus,\n compIdsFromPattern,\n bitIds,\n this.workspace,\n includeDeps,\n otherLane || undefined,\n shouldSquash\n );\n bitIds.forEach((bitId) => {\n if (!allComponentsStatus.find((c) => c.id.isEqualWithoutVersion(bitId))) {\n allComponentsStatus.push({ id: bitId, unmergedLegitimately: true, unmergedMessage: `not in the workspace` });\n }\n });\n }\n\n throwForFailures();\n\n if (shouldSquash) {\n await squashSnaps(allComponentsStatus, otherLaneId, consumer);\n }\n\n const copyOfCurrentLane = currentLane ? currentLane.clone() : undefined;\n const copyOfBitmap = tempy.file();\n const copyOfWorkspaceJsonc = tempy.file();\n await fs.copyFile(consumer.bitMap.mapPath, copyOfBitmap);\n await fs.copyFile(consumer.config.path, copyOfWorkspaceJsonc);\n\n const mergeResults = await this.merging.mergeSnaps({\n mergeStrategy,\n allComponentsStatus,\n laneId: otherLaneId,\n localLane: currentLane,\n noSnap,\n tag,\n snapMessage,\n build,\n skipDependencyInstallation,\n });\n\n await fs.remove(this.scope.getLastMergedPath());\n await fs.ensureDir(this.scope.getLastMergedPath());\n await fs.copyFile(copyOfBitmap, this.getLastMergedBitmapFilename());\n await fs.copyFile(copyOfWorkspaceJsonc, this.getLastMergedWorkspaceFilename());\n if (copyOfCurrentLane) {\n const compressed = await copyOfCurrentLane.compress();\n await fs.outputFile(this.getLastMergedLaneFilename(), compressed);\n }\n\n const mergedSuccessfully =\n !mergeResults.failedComponents ||\n mergeResults.failedComponents.length === 0 ||\n mergeResults.failedComponents.every((failedComponent) => failedComponent.unchangedLegitimately);\n\n let deleteResults = {};\n\n if (!keepReadme && otherLane && otherLane.readmeComponent && mergedSuccessfully) {\n const readmeComponentId = otherLane.readmeComponent.id.changeVersion(otherLane.readmeComponent?.head?.hash);\n deleteResults = await this.remove.removeLocallyByIds([readmeComponentId]);\n } else if (otherLane && !otherLane.readmeComponent) {\n deleteResults = { readmeResult: `\\nlane ${otherLane.name} doesn't have a readme component` };\n }\n const configMergeResults = allComponentsStatus.map((c) => c.configMergeResult);\n\n await this.workspace.consumer.onDestroy();\n\n return { mergeResults, deleteResults, configMergeResults: compact(configMergeResults) };\n\n function throwForFailures() {\n const failedComponents = allComponentsStatus.filter((c) => c.unmergedMessage && !c.unmergedLegitimately);\n if (failedComponents.length) {\n const failureMsgs = failedComponents\n .map(\n (failedComponent) =>\n `${chalk.bold(failedComponent.id.toString())} - ${chalk.red(failedComponent.unmergedMessage as string)}`\n )\n .join('\\n');\n throw new BitError(`unable to merge due to the following failures:\\n${failureMsgs}`);\n }\n }\n }\n\n async abortLaneMerge(checkoutProps: CheckoutProps) {\n if (!this.workspace) throw new OutsideWorkspaceError();\n if (!fs.pathExistsSync(this.scope.getLastMergedPath())) {\n throw new BitError(`unable to abort the last lane-merge because \"bit export\" was running since then`);\n }\n const lastLane = await this.getLastMergedLaneContentIfExists();\n\n const currentLane = await this.lanes.getCurrentLane();\n\n if (!fs.pathExistsSync(this.getLastMergedBitmapFilename())) {\n throw new BitError(\n `unable to abort the last lane-merge because the ${LAST_MERGED_BITMAP_FILENAME} is missing from ${this.scope.getLastMergedPath()}`\n );\n }\n if (!fs.pathExistsSync(this.getLastMergedWorkspaceFilename())) {\n throw new BitError(\n `unable to abort the last lane-merge because the workspace.jsonc is missing from ${this.scope.getLastMergedPath()}`\n );\n }\n if (currentLane) {\n if (!lastLane) {\n throw new BitError(\n `unable to abort the last lane-merge because the ${LAST_MERGED_LANE_FILENAME} is missing from ${this.scope.getLastMergedPath()}`\n );\n }\n const laneFromBackup = await BitObject.parseObject(lastLane, LAST_MERGED_LANE_FILENAME);\n await this.workspace.scope.legacyScope.objects.writeObjectsToTheFS([laneFromBackup]);\n }\n await fs.copyFile(this.getLastMergedBitmapFilename(), this.workspace.consumer.bitMap.mapPath);\n await fs.copyFile(this.getLastMergedWorkspaceFilename(), this.workspace.consumer.config.path);\n\n await fs.remove(this.scope.getLastMergedPath());\n\n await this.workspace._reloadConsumer();\n\n this.workspace.consumer.scope.objects.unmergedComponents.removeAllComponents();\n await this.workspace.consumer.scope.objects.unmergedComponents.write();\n\n const configMergeFile = this.workspace.getConflictMergeFile();\n await configMergeFile.delete();\n\n checkoutProps.ids = await this.workspace.listIds();\n const checkoutResults = await this.checkout.checkout(checkoutProps);\n\n const restoredItems = [\n `${path.basename(this.workspace.consumer.bitMap.mapPath)} file`,\n `${path.basename(this.workspace.consumer.config.path)} file`,\n ];\n if (currentLane) {\n restoredItems.push(`${currentLane.id()} lane object`);\n }\n\n return { checkoutResults, restoredItems };\n }\n\n private async getLastMergedLaneContentIfExists(): Promise<Buffer | null> {\n const filename = this.getLastMergedLaneFilename();\n try {\n return await fs.readFile(filename);\n } catch (err: any) {\n if (err.code === 'ENOENT') return null;\n throw err;\n }\n }\n\n private getLastMergedBitmapFilename() {\n return path.join(this.scope.getLastMergedPath(), LAST_MERGED_BITMAP_FILENAME);\n }\n private getLastMergedWorkspaceFilename() {\n return path.join(this.scope.getLastMergedPath(), 'workspace.jsonc');\n }\n private getLastMergedLaneFilename() {\n return path.join(this.scope.getLastMergedPath(), LAST_MERGED_LANE_FILENAME);\n }\n private async getMainIdsToMerge(lane: Lane) {\n const laneIds = lane.toBitIds();\n if (!this.workspace) {\n throw new BitError(`getMainIdsToMerge needs workspace`);\n }\n const workspaceIds = (await this.workspace.listIds()).map((id) => id._legacy);\n const mainNotOnLane = workspaceIds.filter((id) => !laneIds.find((laneId) => laneId.isEqualWithoutVersion(id)));\n const ids = [...laneIds, ...mainNotOnLane].filter((id) => id.hasScope());\n const modelComponents = await Promise.all(ids.map((id) => this.scope.legacyScope.getModelComponent(id)));\n return compact(\n modelComponents.map((c) => {\n if (!c.head) return null; // probably the component was never merged to main\n return c.toBitId().changeVersion(c.head.toString());\n })\n );\n }\n\n async mergeFromScope(\n fromLane: string,\n toLane: string,\n options: Partial<MergeLaneOptions> & { push?: boolean }\n ): Promise<{\n mergedPreviously: string[];\n mergedNow: string[];\n exportedIds: string[];\n }> {\n if (this.workspace) {\n throw new BitError(\n `unable to run this command from a workspace, please create a new bare-scope and run it from there`\n );\n }\n const fromLaneId = LaneId.parse(fromLane);\n const fromLaneObj = await this.lanes.importLaneObject(fromLaneId);\n const toLaneId = toLane === DEFAULT_LANE ? this.lanes.getDefaultLaneId() : LaneId.parse(toLane);\n const toLaneObj = toLaneId.isDefault() ? undefined : await this.lanes.importLaneObject(toLaneId);\n const fromLaneBitIds = fromLaneObj.toBitIds();\n const getIdsToMerge = async (): Promise<BitIds> => {\n if (!options.pattern) return fromLaneBitIds;\n const laneCompIds = await this.scope.resolveMultipleComponentIds(fromLaneBitIds);\n const ids = this.scope.filterIdsFromPoolIdsByPattern(options.pattern, laneCompIds);\n return BitIds.fromArray(ids.map((id) => id._legacy));\n };\n const idsToMerge = await getIdsToMerge();\n const scopeComponentsImporter = ScopeComponentsImporter.getInstance(this.scope.legacyScope);\n await scopeComponentsImporter.importWithoutDeps(idsToMerge.toVersionLatest(), {\n cache: false,\n lane: fromLaneObj,\n ignoreMissingHead: true,\n includeVersionHistory: true,\n });\n\n // get their main/to-lane as well\n await scopeComponentsImporter.importWithoutDeps(idsToMerge.toVersionLatest(), {\n cache: false,\n lane: toLaneObj,\n ignoreMissingHead: true,\n includeVersionHistory: true,\n });\n await this.importer.importHeadArtifactsFromLane(fromLaneObj, true);\n await this.throwIfNotUpToDate(fromLaneId, toLaneId);\n const repo = this.scope.legacyScope.objects;\n // loop through all components, make sure they're all ahead of main (it might not be on main yet).\n // then, change the version object to include an extra parent to point to the main.\n // then, change the component object head to point to this changed version\n const mergedPreviously: BitId[] = [];\n const mergedNow: BitId[] = [];\n const shouldSquash = !toLaneObj && !options.noSquash; // only when merging to main we squash.\n const log = await getLogForSquash(fromLaneId);\n const bitObjectsPerComp = await pMapSeries(idsToMerge, async (id) => {\n const modelComponent = await this.scope.legacyScope.getModelComponent(id);\n const fromVersionObj = await modelComponent.loadVersion(id.version as string, repo);\n if (fromVersionObj.isRemoved()) return undefined;\n const fromLaneHead = modelComponent.getRef(id.version as string);\n if (!fromLaneHead) throw new Error(`lane head must be defined for ${id.toString()}`);\n const toLaneHead = toLaneObj ? toLaneObj.getComponent(id)?.head : modelComponent.head || null;\n if (toLaneHead?.isEqual(fromLaneHead)) {\n mergedPreviously.push(id);\n return undefined;\n }\n\n const divergeData = await getDivergeData({\n repo,\n modelComponent,\n sourceHead: toLaneHead,\n targetHead: fromLaneHead,\n throwForNoCommonSnap: true,\n });\n const modifiedVersion = shouldSquash\n ? await squashOneComp(\n DEFAULT_LANE,\n fromLaneId,\n id,\n divergeData,\n log,\n this.scope.legacyScope,\n fromVersionObj,\n options.snapMessage\n )\n : undefined;\n const objects: BitObject[] = [];\n if (modifiedVersion) objects.push(modifiedVersion);\n if (toLaneObj) {\n toLaneObj.addComponent({ id: id.changeVersion(undefined), head: fromLaneHead });\n } else {\n modelComponent.setHead(fromLaneHead);\n objects.push(modelComponent);\n }\n mergedNow.push(id);\n return { id, objects };\n });\n const bitObjects = compact(bitObjectsPerComp).map((b) => b.objects);\n const bitObjectsFlat = bitObjects.flat();\n if (toLaneObj) bitObjectsFlat.push(toLaneObj);\n await repo.writeObjectsToTheFS(bitObjectsFlat);\n let exportedIds: string[] = [];\n if (options.push) {\n const ids = compact(bitObjectsPerComp).map((b) => b.id);\n const bitIds = BitIds.fromArray(ids);\n const { exported } = await this.exporter.exportMany({\n scope: this.scope.legacyScope,\n ids: shouldSquash ? bitIds : new BitIds(),\n idsWithFutureScope: shouldSquash ? bitIds : new BitIds(),\n laneObject: toLaneObj,\n allVersions: false,\n // no need to export anything else other than the head. the normal calculation of what to export won't apply here\n // as it is done from the scope.\n exportHeadsOnly: shouldSquash,\n // all artifacts must be pushed. they're all considered \"external\" in this case, because it's running from a\n // bare-scope, but we don't want to ignore them, otherwise, they'll be missing from the component-scopes.\n ignoreMissingExternalArtifacts: false,\n exportOrigin: 'lane-merge',\n });\n exportedIds = exported.map((id) => id.toString());\n }\n\n return {\n mergedPreviously: mergedPreviously.map((id) => id.toString()),\n mergedNow: mergedNow.map((id) => id.toString()),\n exportedIds,\n };\n }\n private async throwIfNotUpToDate(fromLaneId: LaneId, toLaneId: LaneId) {\n const status = await this.lanes.diffStatus(fromLaneId, toLaneId, { skipChanges: true });\n const compsNotUpToDate = status.componentsStatus.filter((s) => !s.upToDate);\n if (compsNotUpToDate.length) {\n throw new Error(`unable to merge, the following components are not up-to-date:\n${compsNotUpToDate.map((s) => s.componentId.toString()).join('\\n')}`);\n }\n }\n\n static slots = [];\n static dependencies = [\n LanesAspect,\n CLIAspect,\n WorkspaceAspect,\n MergingAspect,\n LoggerAspect,\n RemoveAspect,\n ScopeAspect,\n ExportAspect,\n ImporterAspect,\n CheckoutAspect,\n ];\n static runtime = MainRuntime;\n\n static async provider([lanes, cli, workspace, merging, loggerMain, remove, scope, exporter, importer, checkout]: [\n LanesMain,\n CLIMain,\n Workspace,\n MergingMain,\n LoggerMain,\n RemoveMain,\n ScopeMain,\n ExportMain,\n ImporterMain,\n CheckoutMain\n ]) {\n const logger = loggerMain.createLogger(MergeLanesAspect.id);\n const lanesCommand = cli.getCommand('lane');\n const mergeLanesMain = new MergeLanesMain(\n workspace,\n merging,\n lanes,\n logger,\n remove,\n scope,\n exporter,\n importer,\n checkout\n );\n lanesCommand?.commands?.push(new MergeLaneCmd(mergeLanesMain));\n lanesCommand?.commands?.push(new MergeAbortLaneCmd(mergeLanesMain));\n cli.register(new MergeLaneFromScopeCmd(mergeLanesMain));\n return mergeLanesMain;\n }\n}\n\nasync function filterComponentsStatus(\n allComponentsStatus: ComponentMergeStatus[],\n compIdsToKeep: ComponentID[],\n allBitIds: BitId[],\n workspace: Workspace,\n includeDeps = false,\n otherLane?: Lane, // lane that gets merged into the current lane. if not provided, it's main that gets merged into the current lane\n shouldSquash?: boolean\n): Promise<ComponentMergeStatus[]> {\n const bitIdsFromPattern = BitIds.fromArray(compIdsToKeep.map((c) => c._legacy));\n const bitIdsNotFromPattern = allBitIds.filter((bitId) => !bitIdsFromPattern.hasWithoutVersion(bitId));\n const filteredComponentStatus: ComponentMergeStatus[] = [];\n const depsToAdd: BitId[] = [];\n const missingDepsFromHead = {};\n const missingDepsFromHistory: string[] = [];\n await pMapSeries(compIdsToKeep, async (compId) => {\n const fromStatus = allComponentsStatus.find((c) => c.id.isEqualWithoutVersion(compId._legacy));\n if (!fromStatus) {\n throw new Error(`filterComponentsStatus: unable to find ${compId.toString()} in component-status`);\n }\n filteredComponentStatus.push(fromStatus);\n if (fromStatus.unmergedMessage) {\n return;\n }\n if (!otherLane) {\n // if merging main, no need to check whether the deps are included in the pattern.\n return;\n }\n const { divergeData } = fromStatus;\n if (!divergeData) {\n throw new Error(`filterComponentsStatus: unable to find divergeData for ${compId.toString()}`);\n }\n let targetVersions = divergeData.snapsOnTargetOnly;\n if (!targetVersions.length) {\n return;\n }\n const modelComponent = await workspace.consumer.scope.getModelComponent(compId._legacy);\n if (shouldSquash) {\n // no need to check all versions, we merge only the head\n const headOnTarget = otherLane ? otherLane.getComponent(compId._legacy)?.head : modelComponent.head;\n if (!headOnTarget) {\n throw new Error(`filterComponentsStatus: unable to find head for ${compId.toString()}`);\n }\n targetVersions = [headOnTarget];\n }\n\n await pMapSeries(targetVersions, async (remoteVersion) => {\n const versionObj = await modelComponent.loadVersion(remoteVersion.toString(), workspace.consumer.scope.objects);\n const flattenedDeps = versionObj.getAllFlattenedDependencies();\n const depsNotIncludeInPattern = flattenedDeps.filter((id) =>\n bitIdsNotFromPattern.find((bitId) => bitId.isEqualWithoutVersion(id))\n );\n if (!depsNotIncludeInPattern.length) {\n return;\n }\n const depsOnLane: BitId[] = [];\n await Promise.all(\n depsNotIncludeInPattern.map(async (dep) => {\n const isOnLane = await workspace.consumer.scope.isIdOnLane(dep, otherLane);\n if (isOnLane) {\n depsOnLane.push(dep);\n }\n })\n );\n if (!depsOnLane.length) {\n return;\n }\n if (includeDeps) {\n depsToAdd.push(...depsOnLane);\n } else {\n const headOnTarget = otherLane ? otherLane.getComponent(compId._legacy)?.head : modelComponent.head;\n const depsOnLaneStr = depsOnLane.map((dep) => dep.toStringWithoutVersion());\n if (headOnTarget?.isEqual(remoteVersion)) {\n depsOnLaneStr.forEach((dep) => {\n (missingDepsFromHead[dep] ||= []).push(compId.toStringWithoutVersion());\n });\n } else {\n missingDepsFromHistory.push(...depsOnLaneStr);\n }\n }\n });\n });\n if (Object.keys(missingDepsFromHead).length || missingDepsFromHistory.length) {\n throw new MissingCompsToMerge(missingDepsFromHead, uniq(missingDepsFromHistory));\n }\n\n if (depsToAdd.length) {\n // remove the version, otherwise, the uniq gives duplicate components with different versions.\n const depsWithoutVersion = depsToAdd.map((d) => d.changeVersion(undefined));\n const depsUniqWithoutVersion = BitIds.uniqFromArray(depsWithoutVersion);\n depsUniqWithoutVersion.forEach((id) => {\n const fromStatus = allComponentsStatus.find((c) => c.id.isEqualWithoutVersion(id));\n if (!fromStatus) {\n throw new Error(`filterComponentsStatus: unable to find ${id.toString()} in component-status`);\n }\n filteredComponentStatus.push(fromStatus);\n });\n }\n return filteredComponentStatus;\n}\n\nasync function getLogForSquash(otherLaneId: LaneId) {\n const basicLog = await getBasicLog();\n const log = {\n ...basicLog,\n message: `squashed during merge from ${otherLaneId.toString()}`,\n };\n return log;\n}\n\nasync function squashSnaps(allComponentsStatus: ComponentMergeStatus[], otherLaneId: LaneId, consumer: Consumer) {\n const currentLaneName = consumer.getCurrentLaneId().name;\n const succeededComponents = allComponentsStatus.filter((c) => !c.unmergedMessage);\n const log = await getLogForSquash(otherLaneId);\n\n await Promise.all(\n succeededComponents.map(async ({ id, divergeData, componentFromModel }) => {\n if (!divergeData) {\n throw new Error(`unable to squash. divergeData is missing from ${id.toString()}`);\n }\n\n const modifiedComp = await squashOneComp(\n currentLaneName,\n otherLaneId,\n id,\n divergeData,\n log,\n consumer.scope,\n componentFromModel\n );\n if (modifiedComp) {\n consumer.scope.objects.add(modifiedComp);\n const modelComponent = await consumer.scope.getModelComponent(id);\n const versionHistory = await modelComponent.updateRebasedVersionHistory(consumer.scope.objects, [modifiedComp]);\n if (versionHistory) consumer.scope.objects.add(versionHistory);\n }\n })\n );\n}\n\n/**\n * returns Version object if it was modified. otherwise, returns undefined\n */\nasync function squashOneComp(\n currentLaneName: string,\n otherLaneId: LaneId,\n id: BitId,\n divergeData: SnapsDistance,\n log: Log,\n scope: LegacyScope,\n componentFromModel?: Version,\n messageTitle?: string\n): Promise<Version | undefined> {\n if (divergeData.isDiverged()) {\n throw new BitError(`unable to squash because ${id.toString()} is diverged in history.\nconsider switching to \"${\n otherLaneId.name\n }\" first, merging \"${currentLaneName}\", then switching back to \"${currentLaneName}\" and merging \"${\n otherLaneId.name\n }\"\nalternatively, use \"--no-squash\" flag to keep the entire history of \"${otherLaneId.name}\"`);\n }\n if (divergeData.isSourceAhead()) {\n // nothing to do. current is ahead, nothing to merge. (it was probably filtered out already as a \"failedComponent\")\n return undefined;\n }\n if (!divergeData.isTargetAhead()) {\n // nothing to do. current and remote are the same, nothing to merge. (it was probably filtered out already as a \"failedComponent\")\n return undefined;\n }\n // remote is ahead and was not diverge.\n const remoteSnaps = divergeData.snapsOnTargetOnly;\n if (remoteSnaps.length === 0) {\n throw new Error(`remote is ahead but it has no snaps. it's impossible`);\n }\n const getAllMessages = async () => {\n if (!messageTitle) return [];\n await scope.scopeImporter.importManyObjects({ [otherLaneId.scope]: remoteSnaps.map((s) => s.toString()) });\n const versionObjects = (await Promise.all(remoteSnaps.map((s) => scope.objects.load(s)))) as Version[];\n return compact(versionObjects).map((v) => v.log.message);\n };\n const getFinalMessage = async (): Promise<string | undefined> => {\n if (!messageTitle) return undefined;\n const allMessage = await getAllMessages();\n const allMessageStr = compact(allMessage)\n .map((m) => `[*] ${m}`)\n .join('\\n');\n return `${messageTitle}\\n${allMessageStr}`;\n };\n // no need to check this case. even if it has only one snap ahead, we want to do the \"squash\", and run \"addAsOnlyParent\"\n // to make sure it doesn't not have two parents.\n // if (remoteSnaps.length === 1) {\n // // nothing to squash. it has only one commit.\n // return;\n // }\n if (!componentFromModel) {\n throw new Error('unable to squash, the componentFromModel is missing');\n }\n\n const currentParents = componentFromModel.parents;\n\n const doSquash = async () => {\n if (divergeData.commonSnapBeforeDiverge) {\n componentFromModel.addAsOnlyParent(divergeData.commonSnapBeforeDiverge);\n return;\n }\n if (currentLaneName !== DEFAULT_LANE) {\n // when squashing into lane, we have to take main into account\n const modelComponent = await scope.getModelComponentIfExist(id);\n if (!modelComponent) throw new Error(`missing ModelComponent for ${id.toString()}`);\n if (modelComponent.head) {\n componentFromModel.addAsOnlyParent(modelComponent.head);\n return;\n }\n }\n // there is no commonSnapBeforeDiverge. the local has no snaps, all are remote, no need for parents. keep only head.\n componentFromModel.parents.forEach((ref) => componentFromModel.removeParent(ref));\n };\n\n await doSquash();\n\n const finalMessage = await getFinalMessage();\n componentFromModel.setSquashed({ previousParents: currentParents, laneId: otherLaneId }, log, finalMessage);\n return componentFromModel;\n}\n\nMergeLanesAspect.addRuntime(MergeLanesMain);\n\nexport default MergeLanesMain;\n"],"mappings":"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"}
package/package.json CHANGED
@@ -1,36 +1,41 @@
1
1
  {
2
2
  "name": "@teambit/merge-lanes",
3
- "version": "0.0.288",
3
+ "version": "0.0.290",
4
4
  "homepage": "https://bit.cloud/teambit/lanes/merge-lanes",
5
5
  "main": "dist/index.js",
6
6
  "componentId": {
7
7
  "scope": "teambit.lanes",
8
8
  "name": "merge-lanes",
9
- "version": "0.0.288"
9
+ "version": "0.0.290"
10
10
  },
11
11
  "dependencies": {
12
12
  "chalk": "2.4.2",
13
+ "yesno": "0.4.0",
14
+ "fs-extra": "10.0.0",
13
15
  "lodash": "4.17.21",
14
16
  "p-map-series": "2.1.0",
17
+ "tempy": "1.0.1",
15
18
  "core-js": "^3.0.0",
16
19
  "@babel/runtime": "7.20.0",
17
20
  "@teambit/harmony": "0.4.6",
18
21
  "@teambit/component-id": "0.0.427",
19
22
  "@teambit/legacy-bit-id": "0.0.423",
23
+ "@teambit/checkout": "0.0.282",
24
+ "@teambit/cli": "0.0.745",
20
25
  "@teambit/bit-error": "0.0.402",
21
- "@teambit/cli": "0.0.743",
22
- "@teambit/lane-id": "0.0.259",
23
- "@teambit/merging": "0.0.426",
24
- "@teambit/export": "0.0.1111",
25
- "@teambit/importer": "0.0.540",
26
- "@teambit/lanes": "0.0.683",
27
- "@teambit/logger": "0.0.836",
28
- "@teambit/remove": "0.0.288",
29
- "@teambit/scope": "0.0.1111",
30
- "@teambit/snapping": "0.0.426",
31
- "@teambit/workspace": "0.0.1111"
26
+ "@teambit/lane-id": "0.0.261",
27
+ "@teambit/merging": "0.0.428",
28
+ "@teambit/export": "0.0.1113",
29
+ "@teambit/importer": "0.0.542",
30
+ "@teambit/lanes": "0.0.685",
31
+ "@teambit/logger": "0.0.838",
32
+ "@teambit/remove": "0.0.290",
33
+ "@teambit/scope": "0.0.1113",
34
+ "@teambit/snapping": "0.0.428",
35
+ "@teambit/workspace": "0.0.1113"
32
36
  },
33
37
  "devDependencies": {
38
+ "@types/fs-extra": "9.0.7",
34
39
  "@types/lodash": "4.14.165",
35
40
  "@types/mocha": "9.1.0",
36
41
  "@types/node": "12.20.4",
@@ -40,7 +45,7 @@
40
45
  "@types/testing-library__jest-dom": "5.9.5"
41
46
  },
42
47
  "peerDependencies": {
43
- "@teambit/legacy": "1.0.523",
48
+ "@teambit/legacy": "1.0.525",
44
49
  "react": "^16.8.0 || ^17.0.0",
45
50
  "react-dom": "^16.8.0 || ^17.0.0"
46
51
  },