@teambit/lanes.modules.diff 0.0.164 → 0.0.165
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.
- package/dist/index.d.ts +1 -1
- package/dist/index.js.map +1 -1
- package/dist/lane-diff-generator.d.ts +17 -11
- package/dist/lane-diff-generator.js +14 -8
- package/dist/lane-diff-generator.js.map +1 -1
- package/dist/lane-diff.cmd.js +11 -5
- package/dist/lane-diff.cmd.js.map +1 -1
- package/index.ts +1 -1
- package/lane-diff-generator.ts +30 -10
- package/lane-diff.cmd.ts +13 -9
- package/package-tar/teambit-lanes.modules.diff-0.0.165.tgz +0 -0
- package/package.json +3 -3
- /package/{preview-1659271062546.js → preview-1659456045857.js} +0 -0
- package/package-tar/teambit-lanes.modules.diff-0.0.164.tgz +0 -0
package/dist/index.d.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
export { LaneDiffCmd } from './lane-diff.cmd';
|
|
2
|
-
export { LaneDiffGenerator } from './lane-diff-generator';
|
|
2
|
+
export { LaneDiffGenerator, LaneDiffResults } from './lane-diff-generator';
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":";;;AAAA,iDAA8C;AAArC,4GAAA,WAAW,OAAA;AACpB,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":";;;AAAA,iDAA8C;AAArC,4GAAA,WAAW,OAAA;AACpB,6DAA2E;AAAlE,wHAAA,iBAAiB,OAAA"}
|
|
@@ -2,10 +2,24 @@ import { ScopeMain } from '@teambit/scope';
|
|
|
2
2
|
import { Workspace } from '@teambit/workspace';
|
|
3
3
|
import { BitId } from '@teambit/legacy-bit-id';
|
|
4
4
|
import { DiffResults, DiffOptions } from '@teambit/legacy/dist/consumer/component-ops/components-diff';
|
|
5
|
+
declare type Failure = {
|
|
6
|
+
id: BitId;
|
|
7
|
+
msg: string;
|
|
8
|
+
};
|
|
9
|
+
export declare type LaneDiffResults = {
|
|
10
|
+
newCompsFrom: string[];
|
|
11
|
+
newCompsTo: string[];
|
|
12
|
+
compsWithDiff: DiffResults[];
|
|
13
|
+
compsWithNoChanges: string[];
|
|
14
|
+
toLaneName: string;
|
|
15
|
+
fromLaneName: string;
|
|
16
|
+
failures: Failure[];
|
|
17
|
+
};
|
|
5
18
|
export declare class LaneDiffGenerator {
|
|
6
19
|
private workspace;
|
|
7
20
|
private scope;
|
|
8
|
-
private
|
|
21
|
+
private newCompsFrom;
|
|
22
|
+
private newCompsTo;
|
|
9
23
|
private compsWithDiff;
|
|
10
24
|
private compsWithNoChanges;
|
|
11
25
|
private fromLaneData;
|
|
@@ -18,18 +32,10 @@ export declare class LaneDiffGenerator {
|
|
|
18
32
|
* [to] => diff between the current lane (or default-lane when in scope) and "to" lane.
|
|
19
33
|
* [from, to] => diff between "from" lane and "to" lane.
|
|
20
34
|
*/
|
|
21
|
-
generate(values: string[], diffOptions?: DiffOptions, pattern?: string): Promise<
|
|
22
|
-
newComps: string[];
|
|
23
|
-
compsWithDiff: DiffResults[];
|
|
24
|
-
compsWithNoChanges: string[];
|
|
25
|
-
toLaneName: string;
|
|
26
|
-
failures: {
|
|
27
|
-
id: BitId;
|
|
28
|
-
msg: string;
|
|
29
|
-
}[];
|
|
30
|
-
}>;
|
|
35
|
+
generate(values: string[], diffOptions?: DiffOptions, pattern?: string): Promise<LaneDiffResults>;
|
|
31
36
|
private componentDiff;
|
|
32
37
|
private getLaneNames;
|
|
33
38
|
private getDefaultLaneData;
|
|
34
39
|
private mapToLaneData;
|
|
35
40
|
}
|
|
41
|
+
export {};
|
|
@@ -18,7 +18,8 @@ class LaneDiffGenerator {
|
|
|
18
18
|
constructor(workspace, scope) {
|
|
19
19
|
this.workspace = workspace;
|
|
20
20
|
this.scope = scope;
|
|
21
|
-
this.
|
|
21
|
+
this.newCompsFrom = [];
|
|
22
|
+
this.newCompsTo = [];
|
|
22
23
|
this.compsWithDiff = [];
|
|
23
24
|
this.compsWithNoChanges = [];
|
|
24
25
|
this.failures = [];
|
|
@@ -30,7 +31,6 @@ class LaneDiffGenerator {
|
|
|
30
31
|
* [from, to] => diff between "from" lane and "to" lane.
|
|
31
32
|
*/
|
|
32
33
|
generate(values, diffOptions = {}, pattern) {
|
|
33
|
-
var _a;
|
|
34
34
|
return __awaiter(this, void 0, void 0, function* () {
|
|
35
35
|
const { fromLaneName, toLaneName } = this.getLaneNames(values);
|
|
36
36
|
if (fromLaneName === toLaneName) {
|
|
@@ -84,21 +84,27 @@ class LaneDiffGenerator {
|
|
|
84
84
|
yield this.componentDiff(id, head, diffOptions);
|
|
85
85
|
})));
|
|
86
86
|
return {
|
|
87
|
-
|
|
87
|
+
newCompsFrom: this.newCompsFrom.map((id) => id.toString()),
|
|
88
|
+
newCompsTo: this.newCompsTo.map((id) => id.toString()),
|
|
88
89
|
compsWithDiff: this.compsWithDiff,
|
|
89
90
|
compsWithNoChanges: this.compsWithNoChanges.map((id) => id.toString()),
|
|
90
|
-
toLaneName:
|
|
91
|
+
toLaneName: this.toLaneData.name,
|
|
92
|
+
fromLaneName: this.fromLaneData.name,
|
|
91
93
|
failures: this.failures,
|
|
92
94
|
};
|
|
93
95
|
});
|
|
94
96
|
}
|
|
95
97
|
componentDiff(id, toLaneHead, diffOptions) {
|
|
96
|
-
var _a
|
|
98
|
+
var _a;
|
|
97
99
|
return __awaiter(this, void 0, void 0, function* () {
|
|
98
100
|
const modelComponent = yield this.scope.legacyScope.getModelComponent(id);
|
|
99
|
-
const fromLaneHead = ((
|
|
101
|
+
const fromLaneHead = ((_a = this.fromLaneData.components.find((c) => c.id.isEqualWithoutVersion(id))) === null || _a === void 0 ? void 0 : _a.head) || modelComponent.head;
|
|
100
102
|
if (!fromLaneHead) {
|
|
101
|
-
this.
|
|
103
|
+
this.newCompsTo.push(id);
|
|
104
|
+
return;
|
|
105
|
+
}
|
|
106
|
+
if (!toLaneHead) {
|
|
107
|
+
this.newCompsFrom.push(id);
|
|
102
108
|
return;
|
|
103
109
|
}
|
|
104
110
|
if (fromLaneHead.isEqual(toLaneHead)) {
|
|
@@ -114,7 +120,7 @@ class LaneDiffGenerator {
|
|
|
114
120
|
return;
|
|
115
121
|
}
|
|
116
122
|
const toVersion = yield toLaneHead.load(this.scope.legacyScope.objects);
|
|
117
|
-
const fromLaneStr = this.fromLaneData
|
|
123
|
+
const fromLaneStr = this.fromLaneData.name;
|
|
118
124
|
diffOptions.formatDepsAsTable = false;
|
|
119
125
|
const diff = yield (0, components_diff_1.diffBetweenVersionsObjects)(modelComponent, fromVersion, toVersion, fromLaneStr, this.toLaneData.name, this.scope.legacyScope, diffOptions);
|
|
120
126
|
this.compsWithDiff.push(diff);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lane-diff-generator.js","sourceRoot":"","sources":["../lane-diff-generator.ts"],"names":[],"mappings":";;;;;;;;;;;;AAKA,iGAIqE;AACrE,8CAAgD;AAChD,wDAAqD;AACrD,kDAA8C;
|
|
1
|
+
{"version":3,"file":"lane-diff-generator.js","sourceRoot":"","sources":["../lane-diff-generator.ts"],"names":[],"mappings":"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"}
|
package/dist/lane-diff.cmd.js
CHANGED
|
@@ -38,15 +38,21 @@ bit lane diff from to => diff between "from" lane and "to" lane.`;
|
|
|
38
38
|
report([values = []], { pattern }) {
|
|
39
39
|
return __awaiter(this, void 0, void 0, function* () {
|
|
40
40
|
const laneDiffGenerator = new lane_diff_generator_1.LaneDiffGenerator(this.workspace, this.scope);
|
|
41
|
-
const { compsWithDiff,
|
|
41
|
+
const { compsWithDiff, newCompsFrom, newCompsTo, toLaneName, fromLaneName, failures } = yield laneDiffGenerator.generate(values, undefined, pattern);
|
|
42
|
+
const newCompsOutput = (laneName, ids) => {
|
|
43
|
+
if (!ids.length)
|
|
44
|
+
return '';
|
|
45
|
+
const newCompsIdsStr = ids.map((id) => chalk_1.default.bold(id)).join('\n');
|
|
46
|
+
const newCompsTitle = `\nThe following components were introduced in ${chalk_1.default.bold(laneName)} lane`;
|
|
47
|
+
return newCompsFrom.length ? `${chalk_1.default.inverse(newCompsTitle)}\n${newCompsIdsStr}` : '';
|
|
48
|
+
};
|
|
42
49
|
const diffResultsStr = (0, components_diff_1.outputDiffResults)(compsWithDiff);
|
|
43
|
-
const newCompsIdsStr = newComps.map((id) => chalk_1.default.bold(id)).join('\n');
|
|
44
|
-
const newCompsTitle = `The following components were introduced in ${chalk_1.default.bold(toLaneName)} lane`;
|
|
45
|
-
const newCompsStr = newComps.length ? `${chalk_1.default.inverse(newCompsTitle)}\n${newCompsIdsStr}` : '';
|
|
46
50
|
const failuresTitle = `\n\nDiff failed on the following component(s)`;
|
|
47
51
|
const failuresIds = failures.map((f) => `${f.id.toString()} - ${chalk_1.default.red(f.msg)}`);
|
|
48
52
|
const failuresStr = failures.length ? `${chalk_1.default.inverse(failuresTitle)}\n${failuresIds}` : '';
|
|
49
|
-
|
|
53
|
+
const newCompsToStr = newCompsOutput(toLaneName, newCompsTo);
|
|
54
|
+
const newCompsFromStr = newCompsOutput(fromLaneName, newCompsFrom);
|
|
55
|
+
return `${diffResultsStr}${newCompsToStr}${newCompsFromStr}${failuresStr}`;
|
|
50
56
|
});
|
|
51
57
|
}
|
|
52
58
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lane-diff.cmd.js","sourceRoot":"","sources":["../lane-diff.cmd.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAGA,kDAA0B;AAC1B,iGAAgG;AAChG,+DAA0D;AAE1D,MAAa,WAAW;IAgBtB,YAAoB,SAAoB,EAAU,KAAgB;QAA9C,cAAS,GAAT,SAAS,CAAW;QAAU,UAAK,GAAL,KAAK,CAAW;QAflE,SAAI,GAAG,kBAAkB,CAAC;QAC1B,gBAAW,GAAG,yBAAyB,CAAC;QACxC,wBAAmB,GAAG;;iEAEyC,CAAC;QAChE,UAAK,GAAG,EAAE,CAAC;QACX,YAAO,GAAG;YACR,CAAC,EAAE,EAAE,6BAA6B,EAAE,uEAAuE,CAAC;SAC3F,CAAC;QACpB,WAAM,GAAG,IAAI,CAAC;QACd,YAAO,GAAG,IAAI,CAAC;QACf,cAAS,GAAG,IAAI,CAAC;QACjB,aAAQ,GAAG,IAAI,CAAC;QAChB,kBAAa,GAAG,IAAI,CAAC;IAEgD,CAAC;IAEhE,MAAM,CAAC,CAAC,MAAM,GAAG,EAAE,CAAa,EAAE,EAAE,OAAO,EAAwB;;YACvE,MAAM,iBAAiB,GAAG,IAAI,uCAAiB,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;YAC5E,MAAM,EAAE,aAAa,EAAE,
|
|
1
|
+
{"version":3,"file":"lane-diff.cmd.js","sourceRoot":"","sources":["../lane-diff.cmd.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAGA,kDAA0B;AAC1B,iGAAgG;AAChG,+DAA0D;AAE1D,MAAa,WAAW;IAgBtB,YAAoB,SAAoB,EAAU,KAAgB;QAA9C,cAAS,GAAT,SAAS,CAAW;QAAU,UAAK,GAAL,KAAK,CAAW;QAflE,SAAI,GAAG,kBAAkB,CAAC;QAC1B,gBAAW,GAAG,yBAAyB,CAAC;QACxC,wBAAmB,GAAG;;iEAEyC,CAAC;QAChE,UAAK,GAAG,EAAE,CAAC;QACX,YAAO,GAAG;YACR,CAAC,EAAE,EAAE,6BAA6B,EAAE,uEAAuE,CAAC;SAC3F,CAAC;QACpB,WAAM,GAAG,IAAI,CAAC;QACd,YAAO,GAAG,IAAI,CAAC;QACf,cAAS,GAAG,IAAI,CAAC;QACjB,aAAQ,GAAG,IAAI,CAAC;QAChB,kBAAa,GAAG,IAAI,CAAC;IAEgD,CAAC;IAEhE,MAAM,CAAC,CAAC,MAAM,GAAG,EAAE,CAAa,EAAE,EAAE,OAAO,EAAwB;;YACvE,MAAM,iBAAiB,GAAG,IAAI,uCAAiB,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;YAC5E,MAAM,EAAE,aAAa,EAAE,YAAY,EAAE,UAAU,EAAE,UAAU,EAAE,YAAY,EAAE,QAAQ,EAAE,GACnF,MAAM,iBAAiB,CAAC,QAAQ,CAAC,MAAM,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;YAE/D,MAAM,cAAc,GAAG,CAAC,QAAgB,EAAE,GAAa,EAAE,EAAE;gBACzD,IAAI,CAAC,GAAG,CAAC,MAAM;oBAAE,OAAO,EAAE,CAAC;gBAC3B,MAAM,cAAc,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,eAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBAClE,MAAM,aAAa,GAAG,iDAAiD,eAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC;gBACnG,OAAO,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,eAAK,CAAC,OAAO,CAAC,aAAa,CAAC,KAAK,cAAc,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACzF,CAAC,CAAC;YAEF,MAAM,cAAc,GAAG,IAAA,mCAAiB,EAAC,aAAa,CAAC,CAAC;YAExD,MAAM,aAAa,GAAG,+CAA+C,CAAC;YACtE,MAAM,WAAW,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,eAAK,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YACpF,MAAM,WAAW,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,eAAK,CAAC,OAAO,CAAC,aAAa,CAAC,KAAK,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC7F,MAAM,aAAa,GAAG,cAAc,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;YAC7D,MAAM,eAAe,GAAG,cAAc,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC;YACnE,OAAO,GAAG,cAAc,GAAG,aAAa,GAAG,eAAe,GAAG,WAAW,EAAE,CAAC;QAC7E,CAAC;KAAA;CACF;AAvCD,kCAuCC"}
|
package/index.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
export { LaneDiffCmd } from './lane-diff.cmd';
|
|
2
|
-
export { LaneDiffGenerator } from './lane-diff-generator';
|
|
2
|
+
export { LaneDiffGenerator, LaneDiffResults } from './lane-diff-generator';
|
package/lane-diff-generator.ts
CHANGED
|
@@ -20,13 +20,27 @@ type LaneData = {
|
|
|
20
20
|
}>;
|
|
21
21
|
remote: string | null;
|
|
22
22
|
};
|
|
23
|
+
|
|
24
|
+
type Failure = { id: BitId; msg: string };
|
|
25
|
+
|
|
26
|
+
export type LaneDiffResults = {
|
|
27
|
+
newCompsFrom: string[];
|
|
28
|
+
newCompsTo: string[];
|
|
29
|
+
compsWithDiff: DiffResults[];
|
|
30
|
+
compsWithNoChanges: string[];
|
|
31
|
+
toLaneName: string;
|
|
32
|
+
fromLaneName: string;
|
|
33
|
+
failures: Failure[];
|
|
34
|
+
};
|
|
35
|
+
|
|
23
36
|
export class LaneDiffGenerator {
|
|
24
|
-
private
|
|
37
|
+
private newCompsFrom: BitId[] = [];
|
|
38
|
+
private newCompsTo: BitId[] = [];
|
|
25
39
|
private compsWithDiff: DiffResults[] = [];
|
|
26
40
|
private compsWithNoChanges: BitId[] = [];
|
|
27
|
-
private fromLaneData: LaneData
|
|
41
|
+
private fromLaneData: LaneData;
|
|
28
42
|
private toLaneData: LaneData;
|
|
29
|
-
private failures:
|
|
43
|
+
private failures: Failure[] = [];
|
|
30
44
|
constructor(private workspace: Workspace | undefined, private scope: ScopeMain) {}
|
|
31
45
|
|
|
32
46
|
/**
|
|
@@ -35,7 +49,7 @@ export class LaneDiffGenerator {
|
|
|
35
49
|
* [to] => diff between the current lane (or default-lane when in scope) and "to" lane.
|
|
36
50
|
* [from, to] => diff between "from" lane and "to" lane.
|
|
37
51
|
*/
|
|
38
|
-
async generate(values: string[], diffOptions: DiffOptions = {}, pattern?: string) {
|
|
52
|
+
async generate(values: string[], diffOptions: DiffOptions = {}, pattern?: string): Promise<LaneDiffResults> {
|
|
39
53
|
const { fromLaneName, toLaneName } = this.getLaneNames(values);
|
|
40
54
|
if (fromLaneName === toLaneName) {
|
|
41
55
|
throw new Error(`unable to run diff between "${fromLaneName}" and "${toLaneName}", they're the same lane`);
|
|
@@ -90,20 +104,26 @@ export class LaneDiffGenerator {
|
|
|
90
104
|
);
|
|
91
105
|
|
|
92
106
|
return {
|
|
93
|
-
|
|
107
|
+
newCompsFrom: this.newCompsFrom.map((id) => id.toString()),
|
|
108
|
+
newCompsTo: this.newCompsTo.map((id) => id.toString()),
|
|
94
109
|
compsWithDiff: this.compsWithDiff,
|
|
95
110
|
compsWithNoChanges: this.compsWithNoChanges.map((id) => id.toString()),
|
|
96
|
-
toLaneName: this.toLaneData
|
|
111
|
+
toLaneName: this.toLaneData.name,
|
|
112
|
+
fromLaneName: this.fromLaneData.name,
|
|
97
113
|
failures: this.failures,
|
|
98
114
|
};
|
|
99
115
|
}
|
|
100
116
|
|
|
101
|
-
private async componentDiff(id: BitId, toLaneHead: Ref, diffOptions: DiffOptions) {
|
|
117
|
+
private async componentDiff(id: BitId, toLaneHead: Ref | null, diffOptions: DiffOptions) {
|
|
102
118
|
const modelComponent = await this.scope.legacyScope.getModelComponent(id);
|
|
103
119
|
const fromLaneHead =
|
|
104
|
-
this.fromLaneData
|
|
120
|
+
this.fromLaneData.components.find((c) => c.id.isEqualWithoutVersion(id))?.head || modelComponent.head;
|
|
105
121
|
if (!fromLaneHead) {
|
|
106
|
-
this.
|
|
122
|
+
this.newCompsTo.push(id);
|
|
123
|
+
return;
|
|
124
|
+
}
|
|
125
|
+
if (!toLaneHead) {
|
|
126
|
+
this.newCompsFrom.push(id);
|
|
107
127
|
return;
|
|
108
128
|
}
|
|
109
129
|
if (fromLaneHead.isEqual(toLaneHead)) {
|
|
@@ -118,7 +138,7 @@ export class LaneDiffGenerator {
|
|
|
118
138
|
return;
|
|
119
139
|
}
|
|
120
140
|
const toVersion = await toLaneHead.load(this.scope.legacyScope.objects);
|
|
121
|
-
const fromLaneStr = this.fromLaneData
|
|
141
|
+
const fromLaneStr = this.fromLaneData.name;
|
|
122
142
|
diffOptions.formatDepsAsTable = false;
|
|
123
143
|
const diff = await diffBetweenVersionsObjects(
|
|
124
144
|
modelComponent,
|
package/lane-diff.cmd.ts
CHANGED
|
@@ -25,19 +25,23 @@ bit lane diff from to => diff between "from" lane and "to" lane.`;
|
|
|
25
25
|
|
|
26
26
|
async report([values = []]: [string[]], { pattern }: { pattern?: string }) {
|
|
27
27
|
const laneDiffGenerator = new LaneDiffGenerator(this.workspace, this.scope);
|
|
28
|
-
const { compsWithDiff,
|
|
29
|
-
values,
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
28
|
+
const { compsWithDiff, newCompsFrom, newCompsTo, toLaneName, fromLaneName, failures } =
|
|
29
|
+
await laneDiffGenerator.generate(values, undefined, pattern);
|
|
30
|
+
|
|
31
|
+
const newCompsOutput = (laneName: string, ids: string[]) => {
|
|
32
|
+
if (!ids.length) return '';
|
|
33
|
+
const newCompsIdsStr = ids.map((id) => chalk.bold(id)).join('\n');
|
|
34
|
+
const newCompsTitle = `\nThe following components were introduced in ${chalk.bold(laneName)} lane`;
|
|
35
|
+
return newCompsFrom.length ? `${chalk.inverse(newCompsTitle)}\n${newCompsIdsStr}` : '';
|
|
36
|
+
};
|
|
33
37
|
|
|
34
38
|
const diffResultsStr = outputDiffResults(compsWithDiff);
|
|
35
|
-
|
|
36
|
-
const newCompsTitle = `The following components were introduced in ${chalk.bold(toLaneName)} lane`;
|
|
37
|
-
const newCompsStr = newComps.length ? `${chalk.inverse(newCompsTitle)}\n${newCompsIdsStr}` : '';
|
|
39
|
+
|
|
38
40
|
const failuresTitle = `\n\nDiff failed on the following component(s)`;
|
|
39
41
|
const failuresIds = failures.map((f) => `${f.id.toString()} - ${chalk.red(f.msg)}`);
|
|
40
42
|
const failuresStr = failures.length ? `${chalk.inverse(failuresTitle)}\n${failuresIds}` : '';
|
|
41
|
-
|
|
43
|
+
const newCompsToStr = newCompsOutput(toLaneName, newCompsTo);
|
|
44
|
+
const newCompsFromStr = newCompsOutput(fromLaneName, newCompsFrom);
|
|
45
|
+
return `${diffResultsStr}${newCompsToStr}${newCompsFromStr}${failuresStr}`;
|
|
42
46
|
}
|
|
43
47
|
}
|
|
Binary file
|
package/package.json
CHANGED
|
@@ -1,17 +1,17 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@teambit/lanes.modules.diff",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.165",
|
|
4
4
|
"homepage": "https://bit.dev/teambit/lanes/modules/diff",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"componentId": {
|
|
7
7
|
"scope": "teambit.lanes",
|
|
8
8
|
"name": "modules/diff",
|
|
9
|
-
"version": "0.0.
|
|
9
|
+
"version": "0.0.165"
|
|
10
10
|
},
|
|
11
11
|
"dependencies": {
|
|
12
12
|
"chalk": "2.4.2",
|
|
13
13
|
"@teambit/bit-error": "0.0.394",
|
|
14
|
-
"@teambit/lane-id": "0.0.
|
|
14
|
+
"@teambit/lane-id": "0.0.55",
|
|
15
15
|
"@teambit/legacy-bit-id": "0.0.402"
|
|
16
16
|
},
|
|
17
17
|
"devDependencies": {
|
|
File without changes
|
|
Binary file
|