@teambit/lanes.modules.diff 0.0.106 → 0.0.109
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.js +8 -12
- package/dist/lane-diff-generator.js.map +1 -1
- package/dist/lane-diff.cmd.d.ts +1 -1
- package/dist/lane-diff.cmd.js +3 -5
- package/dist/lane-diff.cmd.js.map +1 -1
- package/lane-diff-generator.ts +1 -2
- package/lane-diff.cmd.ts +3 -5
- package/package-tar/teambit-lanes.modules.diff-0.0.109.tgz +0 -0
- package/package.json +5 -4
- package/{__preview-1645365357220.js → preview-1651289072753.js} +0 -0
- package/tsconfig.json +1 -1
- package/package-tar/teambit-lanes.modules.diff-0.0.106.tgz +0 -0
|
@@ -8,14 +8,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
8
8
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
9
|
});
|
|
10
10
|
};
|
|
11
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
|
-
};
|
|
14
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
12
|
exports.LaneDiffGenerator = void 0;
|
|
16
|
-
const constants_1 = require("@teambit/legacy/dist/constants");
|
|
17
13
|
const components_diff_1 = require("@teambit/legacy/dist/consumer/component-ops/components-diff");
|
|
18
|
-
const lane_id_1 =
|
|
14
|
+
const lane_id_1 = require("@teambit/lane-id");
|
|
19
15
|
class LaneDiffGenerator {
|
|
20
16
|
constructor(workspace, scope) {
|
|
21
17
|
this.workspace = workspace;
|
|
@@ -38,8 +34,8 @@ class LaneDiffGenerator {
|
|
|
38
34
|
throw new Error(`unable to run diff between "${fromLaneName}" and "${toLaneName}", they're the same lane`);
|
|
39
35
|
}
|
|
40
36
|
const legacyScope = this.scope.legacyScope;
|
|
41
|
-
const fromLaneId = fromLaneName ? new lane_id_1.
|
|
42
|
-
const toLaneId = toLaneName ? new lane_id_1.
|
|
37
|
+
const fromLaneId = fromLaneName ? new lane_id_1.LaneId({ name: fromLaneName }) : null;
|
|
38
|
+
const toLaneId = toLaneName ? new lane_id_1.LaneId({ name: toLaneName }) : null;
|
|
43
39
|
const isFromOrToDefault = (fromLaneId === null || fromLaneId === void 0 ? void 0 : fromLaneId.isDefault()) || (toLaneId === null || toLaneId === void 0 ? void 0 : toLaneId.isDefault());
|
|
44
40
|
if (!isFromOrToDefault && !toLaneId) {
|
|
45
41
|
throw new Error(`unable to find a lane "${toLaneName}" in the scope`);
|
|
@@ -92,7 +88,7 @@ class LaneDiffGenerator {
|
|
|
92
88
|
}
|
|
93
89
|
const fromVersion = yield fromLaneHead.load(this.scope.legacyScope.objects);
|
|
94
90
|
const toVersion = yield toLaneHead.load(this.scope.legacyScope.objects);
|
|
95
|
-
const fromLaneStr = this.fromLaneData ? this.fromLaneData.name :
|
|
91
|
+
const fromLaneStr = this.fromLaneData ? this.fromLaneData.name : lane_id_1.DEFAULT_LANE;
|
|
96
92
|
diffOptions.formatDepsAsTable = false;
|
|
97
93
|
const diff = yield (0, components_diff_1.diffBetweenVersionsObjects)(modelComponent, fromVersion, toVersion, fromLaneStr, this.toLaneData.name, this.scope.legacyScope, diffOptions);
|
|
98
94
|
this.compsWithDiff.push(diff);
|
|
@@ -108,10 +104,10 @@ class LaneDiffGenerator {
|
|
|
108
104
|
if (currentLane.isDefault()) {
|
|
109
105
|
throw new Error(`you are currently on the default branch, to run diff between lanes, please specify them`);
|
|
110
106
|
}
|
|
111
|
-
return { toLaneName: currentLane.name, fromLaneName:
|
|
107
|
+
return { toLaneName: currentLane.name, fromLaneName: lane_id_1.DEFAULT_LANE };
|
|
112
108
|
}
|
|
113
109
|
if (values.length === 1) {
|
|
114
|
-
const fromLaneName = currentLane.isDefault() ?
|
|
110
|
+
const fromLaneName = currentLane.isDefault() ? lane_id_1.DEFAULT_LANE : currentLane.name;
|
|
115
111
|
return { fromLaneName, toLaneName: values[0] };
|
|
116
112
|
}
|
|
117
113
|
return { fromLaneName: values[0], toLaneName: values[1] };
|
|
@@ -120,14 +116,14 @@ class LaneDiffGenerator {
|
|
|
120
116
|
if (values.length < 1) {
|
|
121
117
|
throw new Error(`expect "values" to include at least one arg - the lane name`);
|
|
122
118
|
}
|
|
123
|
-
const fromLaneName = values.length === 2 ? values[0] :
|
|
119
|
+
const fromLaneName = values.length === 2 ? values[0] : lane_id_1.DEFAULT_LANE;
|
|
124
120
|
const toLaneName = values.length === 2 ? values[1] : values[0];
|
|
125
121
|
return { fromLaneName, toLaneName };
|
|
126
122
|
}
|
|
127
123
|
getDefaultLaneData(ids) {
|
|
128
124
|
return __awaiter(this, void 0, void 0, function* () {
|
|
129
125
|
const laneData = {
|
|
130
|
-
name:
|
|
126
|
+
name: lane_id_1.DEFAULT_LANE,
|
|
131
127
|
remote: null,
|
|
132
128
|
components: [],
|
|
133
129
|
isMerged: null,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lane-diff-generator.js","sourceRoot":"","sources":["../lane-diff-generator.ts"],"names":[],"mappings":"
|
|
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
package/dist/lane-diff.cmd.js
CHANGED
|
@@ -21,12 +21,10 @@ class LaneDiffCmd {
|
|
|
21
21
|
this.workspace = workspace;
|
|
22
22
|
this.scope = scope;
|
|
23
23
|
this.name = 'diff [values...]';
|
|
24
|
-
this.
|
|
25
|
-
this.
|
|
26
|
-
bit lane diff => diff between the current lane and default lane. (only inside workspace).
|
|
24
|
+
this.description = `show diff between lanes`;
|
|
25
|
+
this.extendedDescription = `bit lane diff => diff between the current lane and default lane. (only inside workspace).
|
|
27
26
|
bit lane diff to => diff between the current lane (or default-lane when in scope) and "to" lane.
|
|
28
|
-
bit lane diff from to => diff between "from" lane and "to" lane
|
|
29
|
-
`;
|
|
27
|
+
bit lane diff from to => diff between "from" lane and "to" lane.`;
|
|
30
28
|
this.alias = '';
|
|
31
29
|
this.options = [];
|
|
32
30
|
this.loader = true;
|
|
@@ -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;
|
|
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;IActB,YAAoB,SAAoB,EAAU,KAAgB;QAA9C,cAAS,GAAT,SAAS,CAAW;QAAU,UAAK,GAAL,KAAK,CAAW;QAblE,SAAI,GAAG,kBAAkB,CAAC;QAC1B,gBAAW,GAAG,yBAAyB,CAAC;QACxC,wBAAmB,GAAG;;iEAEyC,CAAC;QAChE,UAAK,GAAG,EAAE,CAAC;QACX,YAAO,GAAG,EAAoB,CAAC;QAC/B,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;;YACpC,MAAM,iBAAiB,GAAG,IAAI,uCAAiB,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;YAC5E,MAAM,EAAE,aAAa,EAAE,QAAQ,EAAE,UAAU,EAAE,GAAG,MAAM,iBAAiB,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;YACzF,MAAM,cAAc,GAAG,IAAA,mCAAiB,EAAC,aAAa,CAAC,CAAC;YACxD,MAAM,cAAc,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,eAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACvE,MAAM,aAAa,GAAG,+CAA+C,eAAK,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC;YACnG,MAAM,WAAW,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,eAAK,CAAC,OAAO,CAAC,aAAa,CAAC,KAAK,cAAc,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAChG,OAAO,GAAG,cAAc,KAAK,WAAW,EAAE,CAAC;QAC7C,CAAC;KAAA;CACF;AAzBD,kCAyBC"}
|
package/lane-diff-generator.ts
CHANGED
|
@@ -3,13 +3,12 @@ import { Workspace } from '@teambit/workspace';
|
|
|
3
3
|
import { Lane, Version } from '@teambit/legacy/dist/scope/models';
|
|
4
4
|
import { BitId } from '@teambit/legacy-bit-id';
|
|
5
5
|
import { Ref } from '@teambit/legacy/dist/scope/objects';
|
|
6
|
-
import { DEFAULT_LANE } from '@teambit/legacy/dist/constants';
|
|
7
6
|
import {
|
|
8
7
|
diffBetweenVersionsObjects,
|
|
9
8
|
DiffResults,
|
|
10
9
|
DiffOptions,
|
|
11
10
|
} from '@teambit/legacy/dist/consumer/component-ops/components-diff';
|
|
12
|
-
import LaneId from '@teambit/
|
|
11
|
+
import { LaneId, DEFAULT_LANE } from '@teambit/lane-id';
|
|
13
12
|
|
|
14
13
|
type LaneData = {
|
|
15
14
|
name: string;
|
package/lane-diff.cmd.ts
CHANGED
|
@@ -7,12 +7,10 @@ import { LaneDiffGenerator } from './lane-diff-generator';
|
|
|
7
7
|
|
|
8
8
|
export class LaneDiffCmd implements Command {
|
|
9
9
|
name = 'diff [values...]';
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
bit lane diff => diff between the current lane and default lane. (only inside workspace).
|
|
10
|
+
description = `show diff between lanes`;
|
|
11
|
+
extendedDescription = `bit lane diff => diff between the current lane and default lane. (only inside workspace).
|
|
13
12
|
bit lane diff to => diff between the current lane (or default-lane when in scope) and "to" lane.
|
|
14
|
-
bit lane diff from to => diff between "from" lane and "to" lane
|
|
15
|
-
`;
|
|
13
|
+
bit lane diff from to => diff between "from" lane and "to" lane.`;
|
|
16
14
|
alias = '';
|
|
17
15
|
options = [] as CommandOptions;
|
|
18
16
|
loader = true;
|
|
Binary file
|
package/package.json
CHANGED
|
@@ -1,16 +1,17 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@teambit/lanes.modules.diff",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.109",
|
|
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.109"
|
|
10
10
|
},
|
|
11
11
|
"dependencies": {
|
|
12
|
-
"chalk": "
|
|
13
|
-
"@teambit/
|
|
12
|
+
"chalk": "4.1.2",
|
|
13
|
+
"@teambit/lane-id": "0.0.1",
|
|
14
|
+
"@teambit/legacy-bit-id": "0.0.399"
|
|
14
15
|
},
|
|
15
16
|
"devDependencies": {
|
|
16
17
|
"@types/mocha": "9.1.0",
|
|
File without changes
|
package/tsconfig.json
CHANGED
|
Binary file
|