@teambit/lanes.modules.diff 0.0.438 → 0.0.440
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/lane-diff-generator.d.ts +3 -1
- package/dist/lane-diff-generator.js +3 -3
- package/dist/lane-diff-generator.js.map +1 -1
- package/dist/lane-diff.cmd.d.ts +3 -1
- package/dist/lane-diff.cmd.js +3 -2
- package/dist/lane-diff.cmd.js.map +1 -1
- package/lane-diff-generator.ts +8 -8
- package/lane-diff.cmd.ts +3 -2
- package/package.json +4 -2
- /package/dist/{preview-1701228028835.js → preview-1704178234226.js} +0 -0
|
@@ -2,6 +2,7 @@ import { ScopeMain } from '@teambit/scope';
|
|
|
2
2
|
import { Workspace } from '@teambit/workspace';
|
|
3
3
|
import { ComponentID } from '@teambit/component-id';
|
|
4
4
|
import { DiffResults, DiffOptions } from '@teambit/legacy/dist/consumer/component-ops/components-diff';
|
|
5
|
+
import { ComponentCompareMain } from '@teambit/component-compare';
|
|
5
6
|
declare type Failure = {
|
|
6
7
|
id: ComponentID;
|
|
7
8
|
msg: string;
|
|
@@ -18,6 +19,7 @@ export declare type LaneDiffResults = {
|
|
|
18
19
|
export declare class LaneDiffGenerator {
|
|
19
20
|
private workspace;
|
|
20
21
|
private scope;
|
|
22
|
+
private componentCompare;
|
|
21
23
|
private newCompsFrom;
|
|
22
24
|
private newCompsTo;
|
|
23
25
|
private compsWithDiff;
|
|
@@ -25,7 +27,7 @@ export declare class LaneDiffGenerator {
|
|
|
25
27
|
private fromLaneData;
|
|
26
28
|
private toLaneData;
|
|
27
29
|
private failures;
|
|
28
|
-
constructor(workspace: Workspace | undefined, scope: ScopeMain);
|
|
30
|
+
constructor(workspace: Workspace | undefined, scope: ScopeMain, componentCompare: ComponentCompareMain);
|
|
29
31
|
/**
|
|
30
32
|
* the values array may include zero to two values and will be processed as following:
|
|
31
33
|
* [] => diff between the default lane (from) and the current lane (to). (only inside workspace).
|
|
@@ -11,13 +11,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.LaneDiffGenerator = void 0;
|
|
13
13
|
const component_id_1 = require("@teambit/component-id");
|
|
14
|
-
const components_diff_1 = require("@teambit/legacy/dist/consumer/component-ops/components-diff");
|
|
15
14
|
const lane_id_1 = require("@teambit/lane-id");
|
|
16
15
|
const bit_error_1 = require("@teambit/bit-error");
|
|
17
16
|
class LaneDiffGenerator {
|
|
18
|
-
constructor(workspace, scope) {
|
|
17
|
+
constructor(workspace, scope, componentCompare) {
|
|
19
18
|
this.workspace = workspace;
|
|
20
19
|
this.scope = scope;
|
|
20
|
+
this.componentCompare = componentCompare;
|
|
21
21
|
this.newCompsFrom = [];
|
|
22
22
|
this.newCompsTo = [];
|
|
23
23
|
this.compsWithDiff = [];
|
|
@@ -138,7 +138,7 @@ class LaneDiffGenerator {
|
|
|
138
138
|
const toVersion = yield toLaneHead.load(this.scope.legacyScope.objects);
|
|
139
139
|
const fromLaneStr = this.fromLaneData.name;
|
|
140
140
|
diffOptions.formatDepsAsTable = false;
|
|
141
|
-
const diff = yield
|
|
141
|
+
const diff = yield this.componentCompare.diffBetweenVersionsObjects(modelComponent, fromVersion, toVersion, fromLaneStr, this.toLaneData.name, diffOptions);
|
|
142
142
|
this.compsWithDiff.push(diff);
|
|
143
143
|
});
|
|
144
144
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lane-diff-generator.js","sourceRoot":"","sources":["../lane-diff-generator.ts"],"names":[],"mappings":";;;;;;;;;;;;AAGA,wDAAqE;
|
|
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.d.ts
CHANGED
|
@@ -1,9 +1,11 @@
|
|
|
1
1
|
import { Command, CommandOptions } from '@teambit/cli';
|
|
2
2
|
import { ScopeMain } from '@teambit/scope';
|
|
3
3
|
import { Workspace } from '@teambit/workspace';
|
|
4
|
+
import { ComponentCompareMain } from '@teambit/component-compare';
|
|
4
5
|
export declare class LaneDiffCmd implements Command {
|
|
5
6
|
private workspace;
|
|
6
7
|
private scope;
|
|
8
|
+
private componentCompare;
|
|
7
9
|
name: string;
|
|
8
10
|
description: string;
|
|
9
11
|
extendedDescription: string;
|
|
@@ -18,7 +20,7 @@ export declare class LaneDiffCmd implements Command {
|
|
|
18
20
|
migration: boolean;
|
|
19
21
|
remoteOp: boolean;
|
|
20
22
|
skipWorkspace: boolean;
|
|
21
|
-
constructor(workspace: Workspace, scope: ScopeMain);
|
|
23
|
+
constructor(workspace: Workspace, scope: ScopeMain, componentCompare: ComponentCompareMain);
|
|
22
24
|
report([values]: [string[]], { pattern }: {
|
|
23
25
|
pattern?: string;
|
|
24
26
|
}): Promise<string>;
|
package/dist/lane-diff.cmd.js
CHANGED
|
@@ -18,9 +18,10 @@ const components_diff_1 = require("@teambit/legacy/dist/consumer/component-ops/c
|
|
|
18
18
|
const constants_1 = require("@teambit/legacy/dist/constants");
|
|
19
19
|
const lane_diff_generator_1 = require("./lane-diff-generator");
|
|
20
20
|
class LaneDiffCmd {
|
|
21
|
-
constructor(workspace, scope) {
|
|
21
|
+
constructor(workspace, scope, componentCompare) {
|
|
22
22
|
this.workspace = workspace;
|
|
23
23
|
this.scope = scope;
|
|
24
|
+
this.componentCompare = componentCompare;
|
|
24
25
|
this.name = 'diff [values...]';
|
|
25
26
|
this.description = `show diff between lanes`;
|
|
26
27
|
this.extendedDescription = `bit lane diff => diff between the current lane and default lane. (only inside workspace).
|
|
@@ -53,7 +54,7 @@ component-pattern format: ${constants_1.COMPONENT_PATTERN_HELP}`,
|
|
|
53
54
|
}
|
|
54
55
|
report([values = []], { pattern }) {
|
|
55
56
|
return __awaiter(this, void 0, void 0, function* () {
|
|
56
|
-
const laneDiffGenerator = new lane_diff_generator_1.LaneDiffGenerator(this.workspace, this.scope);
|
|
57
|
+
const laneDiffGenerator = new lane_diff_generator_1.LaneDiffGenerator(this.workspace, this.scope, this.componentCompare);
|
|
57
58
|
const { compsWithDiff, newCompsFrom, newCompsTo, toLaneName, fromLaneName, failures } = yield laneDiffGenerator.generate(values, undefined, pattern);
|
|
58
59
|
const newCompsOutput = (laneName, ids) => {
|
|
59
60
|
if (!ids.length)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lane-diff.cmd.js","sourceRoot":"","sources":["../lane-diff.cmd.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"lane-diff.cmd.js","sourceRoot":"","sources":["../lane-diff.cmd.ts"],"names":[],"mappings":"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"}
|
package/lane-diff-generator.ts
CHANGED
|
@@ -3,13 +3,10 @@ import { Workspace } from '@teambit/workspace';
|
|
|
3
3
|
import { Lane, Version } from '@teambit/legacy/dist/scope/models';
|
|
4
4
|
import { ComponentID, ComponentIdList } from '@teambit/component-id';
|
|
5
5
|
import { Ref } from '@teambit/legacy/dist/scope/objects';
|
|
6
|
-
import {
|
|
7
|
-
diffBetweenVersionsObjects,
|
|
8
|
-
DiffResults,
|
|
9
|
-
DiffOptions,
|
|
10
|
-
} from '@teambit/legacy/dist/consumer/component-ops/components-diff';
|
|
6
|
+
import { DiffResults, DiffOptions } from '@teambit/legacy/dist/consumer/component-ops/components-diff';
|
|
11
7
|
import { DEFAULT_LANE } from '@teambit/lane-id';
|
|
12
8
|
import { BitError } from '@teambit/bit-error';
|
|
9
|
+
import { ComponentCompareMain } from '@teambit/component-compare';
|
|
13
10
|
|
|
14
11
|
type LaneData = {
|
|
15
12
|
name: string;
|
|
@@ -40,7 +37,11 @@ export class LaneDiffGenerator {
|
|
|
40
37
|
private fromLaneData: LaneData;
|
|
41
38
|
private toLaneData: LaneData;
|
|
42
39
|
private failures: Failure[] = [];
|
|
43
|
-
constructor(
|
|
40
|
+
constructor(
|
|
41
|
+
private workspace: Workspace | undefined,
|
|
42
|
+
private scope: ScopeMain,
|
|
43
|
+
private componentCompare: ComponentCompareMain
|
|
44
|
+
) {}
|
|
44
45
|
|
|
45
46
|
/**
|
|
46
47
|
* the values array may include zero to two values and will be processed as following:
|
|
@@ -159,13 +160,12 @@ export class LaneDiffGenerator {
|
|
|
159
160
|
const toVersion = await toLaneHead.load(this.scope.legacyScope.objects);
|
|
160
161
|
const fromLaneStr = this.fromLaneData.name;
|
|
161
162
|
diffOptions.formatDepsAsTable = false;
|
|
162
|
-
const diff = await diffBetweenVersionsObjects(
|
|
163
|
+
const diff = await this.componentCompare.diffBetweenVersionsObjects(
|
|
163
164
|
modelComponent,
|
|
164
165
|
fromVersion,
|
|
165
166
|
toVersion as Version,
|
|
166
167
|
fromLaneStr,
|
|
167
168
|
this.toLaneData.name,
|
|
168
|
-
this.scope.legacyScope,
|
|
169
169
|
diffOptions
|
|
170
170
|
);
|
|
171
171
|
this.compsWithDiff.push(diff);
|
package/lane-diff.cmd.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { Command, CommandOptions } from '@teambit/cli';
|
|
2
2
|
import { ScopeMain } from '@teambit/scope';
|
|
3
3
|
import { Workspace } from '@teambit/workspace';
|
|
4
|
+
import { ComponentCompareMain } from '@teambit/component-compare';
|
|
4
5
|
import chalk from 'chalk';
|
|
5
6
|
import { outputDiffResults } from '@teambit/legacy/dist/consumer/component-ops/components-diff';
|
|
6
7
|
import { COMPONENT_PATTERN_HELP } from '@teambit/legacy/dist/constants';
|
|
@@ -37,10 +38,10 @@ component-pattern format: ${COMPONENT_PATTERN_HELP}`,
|
|
|
37
38
|
remoteOp = true;
|
|
38
39
|
skipWorkspace = true;
|
|
39
40
|
|
|
40
|
-
constructor(private workspace: Workspace, private scope: ScopeMain) {}
|
|
41
|
+
constructor(private workspace: Workspace, private scope: ScopeMain, private componentCompare: ComponentCompareMain) {}
|
|
41
42
|
|
|
42
43
|
async report([values = []]: [string[]], { pattern }: { pattern?: string }) {
|
|
43
|
-
const laneDiffGenerator = new LaneDiffGenerator(this.workspace, this.scope);
|
|
44
|
+
const laneDiffGenerator = new LaneDiffGenerator(this.workspace, this.scope, this.componentCompare);
|
|
44
45
|
const { compsWithDiff, newCompsFrom, newCompsTo, toLaneName, fromLaneName, failures } =
|
|
45
46
|
await laneDiffGenerator.generate(values, undefined, pattern);
|
|
46
47
|
|
package/package.json
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@teambit/lanes.modules.diff",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.440",
|
|
4
4
|
"homepage": "https://bit.cloud/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.440"
|
|
10
10
|
},
|
|
11
11
|
"dependencies": {
|
|
12
12
|
"chalk": "2.4.2",
|
|
@@ -22,6 +22,8 @@
|
|
|
22
22
|
},
|
|
23
23
|
"peerDependencies": {},
|
|
24
24
|
"license": "Apache-2.0",
|
|
25
|
+
"optionalDependencies": {},
|
|
26
|
+
"peerDependenciesMeta": {},
|
|
25
27
|
"private": false,
|
|
26
28
|
"engines": {
|
|
27
29
|
"node": ">=12.22.0"
|
|
File without changes
|