@teambit/lanes.modules.diff 0.0.429 → 0.0.432
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.
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { ScopeMain } from '@teambit/scope';
|
|
2
2
|
import { Workspace } from '@teambit/workspace';
|
|
3
|
-
import {
|
|
3
|
+
import { ComponentID } from '@teambit/component-id';
|
|
4
4
|
import { DiffResults, DiffOptions } from '@teambit/legacy/dist/consumer/component-ops/components-diff';
|
|
5
5
|
declare type Failure = {
|
|
6
|
-
id:
|
|
6
|
+
id: ComponentID;
|
|
7
7
|
msg: string;
|
|
8
8
|
};
|
|
9
9
|
export declare type LaneDiffResults = {
|
|
@@ -10,9 +10,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.LaneDiffGenerator = void 0;
|
|
13
|
+
const component_id_1 = require("@teambit/component-id");
|
|
13
14
|
const components_diff_1 = require("@teambit/legacy/dist/consumer/component-ops/components-diff");
|
|
14
15
|
const lane_id_1 = require("@teambit/lane-id");
|
|
15
|
-
const bit_id_1 = require("@teambit/legacy/dist/bit-id");
|
|
16
16
|
const bit_error_1 = require("@teambit/bit-error");
|
|
17
17
|
class LaneDiffGenerator {
|
|
18
18
|
constructor(workspace, scope) {
|
|
@@ -74,19 +74,19 @@ class LaneDiffGenerator {
|
|
|
74
74
|
if (pattern) {
|
|
75
75
|
const allIds = this.toLaneData.components.map((c) => c.id);
|
|
76
76
|
const compIds = yield (this.workspace || this.scope).resolveMultipleComponentIds(allIds);
|
|
77
|
-
idsToCheckDiff =
|
|
77
|
+
idsToCheckDiff = component_id_1.ComponentIdList.fromArray(this.scope.filterIdsFromPoolIdsByPattern(pattern, compIds));
|
|
78
78
|
}
|
|
79
79
|
if (!this.toLaneData.components.length) {
|
|
80
80
|
throw new bit_error_1.BitError(`lane "${toLaneName}" is empty, nothing to show`);
|
|
81
81
|
}
|
|
82
|
-
const idsOfTo =
|
|
82
|
+
const idsOfTo = component_id_1.ComponentIdList.fromArray(this.toLaneData.components.map((c) => { var _a; return c.id.changeVersion((_a = c.head) === null || _a === void 0 ? void 0 : _a.toString()); }));
|
|
83
83
|
yield this.scope.legacyScope.scopeImporter.importWithoutDeps(idsOfTo, {
|
|
84
84
|
cache: true,
|
|
85
85
|
lane: toLane || undefined,
|
|
86
86
|
ignoreMissingHead: true,
|
|
87
87
|
reason: `for the "to" diff - ${toLane ? toLane.name : lane_id_1.DEFAULT_LANE}`,
|
|
88
88
|
});
|
|
89
|
-
const idsOfFrom =
|
|
89
|
+
const idsOfFrom = component_id_1.ComponentIdList.fromArray(this.fromLaneData.components.map((c) => { var _a; return c.id.changeVersion((_a = c.head) === null || _a === void 0 ? void 0 : _a.toString()); }));
|
|
90
90
|
yield this.scope.legacyScope.scopeImporter.importWithoutDeps(idsOfFrom, {
|
|
91
91
|
cache: true,
|
|
92
92
|
lane: fromLane || undefined,
|
|
@@ -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":";;;;;;;;;;;;AAGA,wDAAqE;AAErE,iGAIqE;AACrE,8CAAgD;AAChD,kDAA8C;AAuB9C,MAAa,iBAAiB;IAQ5B,YAAoB,SAAgC,EAAU,KAAgB;QAA1D,cAAS,GAAT,SAAS,CAAuB;QAAU,UAAK,GAAL,KAAK,CAAW;QAPtE,iBAAY,GAAkB,EAAE,CAAC;QACjC,eAAU,GAAkB,EAAE,CAAC;QAC/B,kBAAa,GAAkB,EAAE,CAAC;QAClC,uBAAkB,GAAkB,EAAE,CAAC;QAGvC,aAAQ,GAAc,EAAE,CAAC;IACgD,CAAC;IAElF;;;;;OAKG;IACG,QAAQ,CAAC,MAAgB,EAAE,cAA2B,EAAE,EAAE,OAAgB;;YAC9E,MAAM,EAAE,YAAY,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;YAE/D,IAAI,YAAY,KAAK,UAAU,EAAE;gBAC/B,MAAM,IAAI,KAAK,CAAC,+BAA+B,YAAY,UAAU,UAAU,0BAA0B,CAAC,CAAC;aAC5G;YACD,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC;YAC3C,MAAM,UAAU,GAAG,MAAM,WAAW,CAAC,KAAK,CAAC,qBAAqB,CAAC,YAAY,CAAC,CAAC;YAC/E,MAAM,QAAQ,GAAG,MAAM,WAAW,CAAC,KAAK,CAAC,qBAAqB,CAAC,UAAU,CAAC,CAAC;YAC3E,IAAI,MAA+B,CAAC;YACpC,IAAI,QAAiC,CAAC;YAEtC,IAAI,UAAU,CAAC,SAAS,EAAE,EAAE;gBAC1B,IAAI,QAAQ,CAAC,SAAS,EAAE;oBAAE,MAAM,IAAI,KAAK,CAAC,6DAA6D,CAAC,CAAC;gBACzG,MAAM,GAAG,MAAM,WAAW,CAAC,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;gBACpD,IAAI,CAAC,MAAM;oBAAE,MAAM,IAAI,KAAK,CAAC,0BAA0B,UAAU,gBAAgB,CAAC,CAAC;gBACnF,IAAI,CAAC,UAAU,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;gBACnD,MAAM,MAAM,GAAG,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;gBAClD,IAAI,CAAC,YAAY,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;aAC3D;iBAAM,IAAI,QAAQ,CAAC,SAAS,EAAE,EAAE;gBAC/B,QAAQ,GAAG,MAAM,WAAW,CAAC,KAAK,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;gBACxD,IAAI,CAAC,QAAQ;oBAAE,MAAM,IAAI,KAAK,CAAC,0BAA0B,YAAY,gBAAgB,CAAC,CAAC;gBACvF,IAAI,CAAC,YAAY,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;gBACvD,MAAM,MAAM,GAAG,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,KAAI,EAAE,CAAC;gBAC3D,IAAI,CAAC,UAAU,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;aACzD;iBAAM;gBACL,8CAA8C;gBAC9C,MAAM,GAAG,MAAM,WAAW,CAAC,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;gBACpD,IAAI,CAAC,MAAM;oBAAE,MAAM,IAAI,KAAK,CAAC,0BAA0B,UAAU,gBAAgB,CAAC,CAAC;gBACnF,QAAQ,GAAG,MAAM,WAAW,CAAC,KAAK,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;gBACxD,IAAI,CAAC,QAAQ;oBAAE,MAAM,IAAI,KAAK,CAAC,0BAA0B,YAAY,gBAAgB,CAAC,CAAC;gBACvF,IAAI,CAAC,UAAU,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;gBACnD,IAAI,CAAC,YAAY,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;aACxD;YAED,IAAI,cAA2C,CAAC;YAChD,IAAI,OAAO,EAAE;gBACX,MAAM,MAAM,GAAG,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;gBAC3D,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,2BAA2B,CAAC,MAAM,CAAC,CAAC;gBACzF,cAAc,GAAG,8BAAe,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,6BAA6B,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;aACxG;YAED,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,MAAM,EAAE;gBACtC,MAAM,IAAI,oBAAQ,CAAC,SAAS,UAAU,6BAA6B,CAAC,CAAC;aACtE;YAED,MAAM,OAAO,GAAG,8BAAe,CAAC,SAAS,CACvC,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,WAAC,OAAA,CAAC,CAAC,EAAE,CAAC,aAAa,CAAC,MAAA,CAAC,CAAC,IAAI,0CAAE,QAAQ,EAAE,CAAC,CAAA,EAAA,CAAC,CAC9E,CAAC;YACF,MAAM,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,aAAa,CAAC,iBAAiB,CAAC,OAAO,EAAE;gBACpE,KAAK,EAAE,IAAI;gBACX,IAAI,EAAE,MAAM,IAAI,SAAS;gBACzB,iBAAiB,EAAE,IAAI;gBACvB,MAAM,EAAE,uBAAuB,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,sBAAY,EAAE;aACrE,CAAC,CAAC;YACH,MAAM,SAAS,GAAG,8BAAe,CAAC,SAAS,CACzC,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,WAAC,OAAA,CAAC,CAAC,EAAE,CAAC,aAAa,CAAC,MAAA,CAAC,CAAC,IAAI,0CAAE,QAAQ,EAAE,CAAC,CAAA,EAAA,CAAC,CAChF,CAAC;YACF,MAAM,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,aAAa,CAAC,iBAAiB,CAAC,SAAS,EAAE;gBACtE,KAAK,EAAE,IAAI;gBACX,IAAI,EAAE,QAAQ,IAAI,SAAS;gBAC3B,iBAAiB,EAAE,IAAI;gBACvB,MAAM,EAAE,yBAAyB,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,sBAAY,EAAE;aAC3E,CAAC,CAAC;YAEH,MAAM,OAAO,CAAC,GAAG,CACf,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC,CAAO,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE;gBACpD,IAAI,cAAc,IAAI,CAAC,cAAc,CAAC,iBAAiB,CAAC,EAAE,CAAC,EAAE;oBAC3D,OAAO;iBACR;gBACD,MAAM,IAAI,CAAC,aAAa,CAAC,EAAE,EAAE,IAAI,EAAE,WAAW,CAAC,CAAC;YAClD,CAAC,CAAA,CAAC,CACH,CAAC;YAEF,OAAO;gBACL,YAAY,EAAE,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC;gBAC1D,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC;gBACtD,aAAa,EAAE,IAAI,CAAC,aAAa;gBACjC,kBAAkB,EAAE,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC;gBACtE,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,IAAI;gBAChC,YAAY,EAAE,IAAI,CAAC,YAAY,CAAC,IAAI;gBACpC,QAAQ,EAAE,IAAI,CAAC,QAAQ;aACxB,CAAC;QACJ,CAAC;KAAA;IAEa,aAAa,CAAC,EAAe,EAAE,UAAsB,EAAE,WAAwB;;;YAC3F,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,iBAAiB,CAAC,EAAE,CAAC,CAAC;YAC1E,MAAM,YAAY,GAChB,CAAA,MAAA,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,qBAAqB,CAAC,EAAE,CAAC,CAAC,0CAAE,IAAI,KAAI,cAAc,CAAC,IAAI,CAAC;YACxG,IAAI,CAAC,YAAY,EAAE;gBACjB,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;gBACzB,OAAO;aACR;YACD,IAAI,CAAC,UAAU,EAAE;gBACf,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;gBAC3B,OAAO;aACR;YACD,IAAI,YAAY,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;gBACpC,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;gBACjC,OAAO;aACR;YACD,IAAI,WAAoB,CAAC;YACzB,IAAI;gBACF,WAAW,GAAG,MAAM,cAAc,CAAC,WAAW,CAAC,YAAY,CAAC,QAAQ,EAAE,EAAE,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;aAC/G;YAAC,OAAO,GAAQ,EAAE;gBACjB,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;gBAC7C,OAAO;aACR;YACD,MAAM,SAAS,GAAG,MAAM,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;YACxE,MAAM,WAAW,GAAG,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC;YAC3C,WAAW,CAAC,iBAAiB,GAAG,KAAK,CAAC;YACtC,MAAM,IAAI,GAAG,MAAM,IAAA,4CAA0B,EAC3C,cAAc,EACd,WAAW,EACX,SAAoB,EACpB,WAAW,EACX,IAAI,CAAC,UAAU,CAAC,IAAI,EACpB,IAAI,CAAC,KAAK,CAAC,WAAW,EACtB,WAAW,CACZ,CAAC;YACF,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;;KAC/B;IAEO,YAAY,CAAC,MAAgB;QACnC,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;YACrB,MAAM,IAAI,KAAK,CAAC,yDAAyD,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;SAC3F;QACD,IAAI,IAAI,CAAC,SAAS,EAAE;YAClB,MAAM,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,gBAAgB,EAAE,CAAC;YACtD,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE;gBAClB,IAAI,WAAW,CAAC,SAAS,EAAE,EAAE;oBAC3B,MAAM,IAAI,KAAK,CAAC,yFAAyF,CAAC,CAAC;iBAC5G;gBACD,OAAO,EAAE,UAAU,EAAE,WAAW,CAAC,IAAI,EAAE,YAAY,EAAE,sBAAY,EAAE,CAAC;aACrE;YACD,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;gBACvB,MAAM,UAAU,GAAG,WAAW,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,sBAAY,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC;gBAC7E,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;aAChD;YACD,OAAO,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;SAC3D;QACD,yBAAyB;QACzB,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;YACrB,MAAM,IAAI,KAAK,CAAC,6DAA6D,CAAC,CAAC;SAChF;QACD,MAAM,YAAY,GAAG,MAAM,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,sBAAY,CAAC;QACpE,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QAC/D,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,CAAC;IACtC,CAAC;IAEa,kBAAkB,CAAC,GAAkB;;YACjD,MAAM,QAAQ,GAAa;gBACzB,IAAI,EAAE,sBAAY;gBAClB,MAAM,EAAE,IAAI;gBACZ,UAAU,EAAE,EAAE;aACf,CAAC;YAEF,MAAM,OAAO,CAAC,GAAG,CACf,GAAG,CAAC,GAAG,CAAC,CAAO,EAAE,EAAE,EAAE;gBACnB,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,iBAAiB,CAAC,EAAE,CAAC,CAAC;gBAC1E,MAAM,aAAa,GAAG;oBACpB,EAAE;oBACF,IAAI,EAAE,cAAc,CAAC,IAAW;oBAChC,OAAO,EAAE,cAAc,CAAC,aAAa,EAAE,EAAE,6DAA6D;iBACvG,CAAC;gBACF,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;YAC1C,CAAC,CAAA,CAAC,CACH,CAAC;YAEF,OAAO,QAAQ,CAAC;QAClB,CAAC;KAAA;IAEa,aAAa,CAAC,IAAU;;YACpC,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC;YAClC,OAAO;gBACL,IAAI;gBACJ,UAAU,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE;;oBAAC,OAAA,CAAC;wBAClC,EAAE,EAAE,EAAE,CAAC,EAAE;wBACT,IAAI,EAAE,EAAE,CAAC,IAAI;wBACb,OAAO,EAAE,MAAA,EAAE,CAAC,EAAE,CAAC,OAAO,0CAAE,QAAQ,EAAE;qBACnC,CAAC,CAAA;iBAAA,CAAC;gBACH,MAAM,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE;aACnC,CAAC;QACJ,CAAC;KAAA;CACF;AAxMD,8CAwMC"}
|
package/lane-diff-generator.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { ScopeMain } from '@teambit/scope';
|
|
2
2
|
import { Workspace } from '@teambit/workspace';
|
|
3
3
|
import { Lane, Version } from '@teambit/legacy/dist/scope/models';
|
|
4
|
-
import {
|
|
4
|
+
import { ComponentID, ComponentIdList } from '@teambit/component-id';
|
|
5
5
|
import { Ref } from '@teambit/legacy/dist/scope/objects';
|
|
6
6
|
import {
|
|
7
7
|
diffBetweenVersionsObjects,
|
|
@@ -9,19 +9,18 @@ import {
|
|
|
9
9
|
DiffOptions,
|
|
10
10
|
} from '@teambit/legacy/dist/consumer/component-ops/components-diff';
|
|
11
11
|
import { DEFAULT_LANE } from '@teambit/lane-id';
|
|
12
|
-
import { BitIds } from '@teambit/legacy/dist/bit-id';
|
|
13
12
|
import { BitError } from '@teambit/bit-error';
|
|
14
13
|
|
|
15
14
|
type LaneData = {
|
|
16
15
|
name: string;
|
|
17
16
|
components: Array<{
|
|
18
|
-
id:
|
|
17
|
+
id: ComponentID;
|
|
19
18
|
head: Ref;
|
|
20
19
|
}>;
|
|
21
20
|
remote: string | null;
|
|
22
21
|
};
|
|
23
22
|
|
|
24
|
-
type Failure = { id:
|
|
23
|
+
type Failure = { id: ComponentID; msg: string };
|
|
25
24
|
|
|
26
25
|
export type LaneDiffResults = {
|
|
27
26
|
newCompsFrom: string[];
|
|
@@ -34,10 +33,10 @@ export type LaneDiffResults = {
|
|
|
34
33
|
};
|
|
35
34
|
|
|
36
35
|
export class LaneDiffGenerator {
|
|
37
|
-
private newCompsFrom:
|
|
38
|
-
private newCompsTo:
|
|
36
|
+
private newCompsFrom: ComponentID[] = [];
|
|
37
|
+
private newCompsTo: ComponentID[] = [];
|
|
39
38
|
private compsWithDiff: DiffResults[] = [];
|
|
40
|
-
private compsWithNoChanges:
|
|
39
|
+
private compsWithNoChanges: ComponentID[] = [];
|
|
41
40
|
private fromLaneData: LaneData;
|
|
42
41
|
private toLaneData: LaneData;
|
|
43
42
|
private failures: Failure[] = [];
|
|
@@ -84,27 +83,29 @@ export class LaneDiffGenerator {
|
|
|
84
83
|
this.fromLaneData = await this.mapToLaneData(fromLane);
|
|
85
84
|
}
|
|
86
85
|
|
|
87
|
-
let idsToCheckDiff:
|
|
86
|
+
let idsToCheckDiff: ComponentIdList | undefined;
|
|
88
87
|
if (pattern) {
|
|
89
88
|
const allIds = this.toLaneData.components.map((c) => c.id);
|
|
90
89
|
const compIds = await (this.workspace || this.scope).resolveMultipleComponentIds(allIds);
|
|
91
|
-
idsToCheckDiff =
|
|
92
|
-
this.scope.filterIdsFromPoolIdsByPattern(pattern, compIds).map((c) => c._legacy)
|
|
93
|
-
);
|
|
90
|
+
idsToCheckDiff = ComponentIdList.fromArray(this.scope.filterIdsFromPoolIdsByPattern(pattern, compIds));
|
|
94
91
|
}
|
|
95
92
|
|
|
96
93
|
if (!this.toLaneData.components.length) {
|
|
97
94
|
throw new BitError(`lane "${toLaneName}" is empty, nothing to show`);
|
|
98
95
|
}
|
|
99
96
|
|
|
100
|
-
const idsOfTo =
|
|
97
|
+
const idsOfTo = ComponentIdList.fromArray(
|
|
98
|
+
this.toLaneData.components.map((c) => c.id.changeVersion(c.head?.toString()))
|
|
99
|
+
);
|
|
101
100
|
await this.scope.legacyScope.scopeImporter.importWithoutDeps(idsOfTo, {
|
|
102
101
|
cache: true,
|
|
103
102
|
lane: toLane || undefined,
|
|
104
103
|
ignoreMissingHead: true,
|
|
105
104
|
reason: `for the "to" diff - ${toLane ? toLane.name : DEFAULT_LANE}`,
|
|
106
105
|
});
|
|
107
|
-
const idsOfFrom =
|
|
106
|
+
const idsOfFrom = ComponentIdList.fromArray(
|
|
107
|
+
this.fromLaneData.components.map((c) => c.id.changeVersion(c.head?.toString()))
|
|
108
|
+
);
|
|
108
109
|
await this.scope.legacyScope.scopeImporter.importWithoutDeps(idsOfFrom, {
|
|
109
110
|
cache: true,
|
|
110
111
|
lane: fromLane || undefined,
|
|
@@ -132,7 +133,7 @@ export class LaneDiffGenerator {
|
|
|
132
133
|
};
|
|
133
134
|
}
|
|
134
135
|
|
|
135
|
-
private async componentDiff(id:
|
|
136
|
+
private async componentDiff(id: ComponentID, toLaneHead: Ref | null, diffOptions: DiffOptions) {
|
|
136
137
|
const modelComponent = await this.scope.legacyScope.getModelComponent(id);
|
|
137
138
|
const fromLaneHead =
|
|
138
139
|
this.fromLaneData.components.find((c) => c.id.isEqualWithoutVersion(id))?.head || modelComponent.head;
|
|
@@ -197,7 +198,7 @@ export class LaneDiffGenerator {
|
|
|
197
198
|
return { fromLaneName, toLaneName };
|
|
198
199
|
}
|
|
199
200
|
|
|
200
|
-
private async getDefaultLaneData(ids:
|
|
201
|
+
private async getDefaultLaneData(ids: ComponentID[]): Promise<LaneData> {
|
|
201
202
|
const laneData: LaneData = {
|
|
202
203
|
name: DEFAULT_LANE,
|
|
203
204
|
remote: null,
|
package/package.json
CHANGED
|
@@ -1,18 +1,18 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@teambit/lanes.modules.diff",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.432",
|
|
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.432"
|
|
10
10
|
},
|
|
11
11
|
"dependencies": {
|
|
12
12
|
"chalk": "2.4.2",
|
|
13
13
|
"@teambit/bit-error": "0.0.404",
|
|
14
|
-
"@teambit/
|
|
15
|
-
"@teambit/
|
|
14
|
+
"@teambit/component-id": "1.1.0",
|
|
15
|
+
"@teambit/lane-id": "0.0.311"
|
|
16
16
|
},
|
|
17
17
|
"devDependencies": {
|
|
18
18
|
"@types/mocha": "9.1.0",
|
|
File without changes
|