@clickview/ship-it 0.0.2 → 0.0.3

package/lib/src/services/GitLabService.js

@@ -69,9 +69,11 @@ var lodash_1 = __importDefault(require("lodash"));
 var semver_1 = __importDefault(require("semver"));
 var types_1 = require("../types");
 var api_clients_1 = require("../api-clients");
+var errors_1 = require("../errors");
+var utils_1 = require("../utils");
 var GitLabService = /** @class */ (function () {
     function GitLabService(apiClient) {
-        this._apiClient = apiClient;
+        this.apiClient = apiClient;
     }
     GitLabService.prototype.getProjects = function (options) {
         return __awaiter(this, void 0, void 0, function () {
@@ -79,20 +81,35 @@ var GitLabService = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        if (this._projects)
-                            return [2 /*return*/, this._projects];
-                        return [4 /*yield*/, this._apiClient.getMergeRequests(options)];
+                        if (this.projects)
+                            return [2 /*return*/, this.projects];
+                        return [4 /*yield*/, this.apiClient.getMergeRequests(options)];
                     case 1:
                         mergeRequests = _a.sent();
                         if (!(mergeRequests === null || mergeRequests === void 0 ? void 0 : mergeRequests.length))
-                            throw new Error('Could not find any merge requests for the specified options');
+                            throw new errors_1.ShipItError('Could not find any merge requests for the specified options');
                         projectIds = lodash_1.default.uniqBy(mergeRequests, function (m) { return m.projectId; }).map(function (m) { return m.projectId; });
-                        return [4 /*yield*/, this._apiClient.getProjectsByIds(projectIds)];
+                        return [4 /*yield*/, this.apiClient.getProjectsByIds(projectIds)];
                     case 2:
                         projects = _a.sent();
                         if (!(projects === null || projects === void 0 ? void 0 : projects.length) || projects.length !== projectIds.length)
-                            throw new Error('Could not find all projects for the found merge requests');
-                        return [2 /*return*/, (this._projects = projects.map(function (p) { return (__assign(__assign({}, p), { mergeRequests: mergeRequests.filter(function (mr) { return mr.projectId === p.id; }) })); }))];
+                            throw new errors_1.ShipItError('Could not find all projects for the found merge requests');
+                        return [2 /*return*/, (this.projects = projects.map(function (p) { return (__assign(__assign({}, p), { mergeRequests: mergeRequests.filter(function (mr) { return mr.projectId === p.id; }) })); }))];
+                }
+            });
+        });
+    };
+    GitLabService.prototype.getProject = function (projectId) {
+        return __awaiter(this, void 0, void 0, function () {
+            var projects;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.apiClient.getProjectsByIds([projectId])];
+                    case 1:
+                        projects = _a.sent();
+                        if (!projects.length)
+                            throw new errors_1.ShipItError("Could not find project projectId: ".concat(projectId));
+                        return [2 /*return*/, projects[0]];
                 }
             });
         });
@@ -102,7 +119,7 @@ var GitLabService = /** @class */ (function () {
             var commits, lastDevCommit, title;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this._apiClient.getCommitsSince(projectId, 'dev', sinceSha)];
+                    case 0: return [4 /*yield*/, this.apiClient.getCommitsSince(projectId, 'dev', sinceSha)];
                     case 1:
                         commits = _a.sent();
                         lastDevCommit = lodash_1.default.last(commits);
@@ -113,7 +130,7 @@ var GitLabService = /** @class */ (function () {
                             commits.pop();
                         }
                         if (!(commits === null || commits === void 0 ? void 0 : commits.length))
-                            throw new Error("Could not find any commits in dev for projectId: ".concat(projectId, " since ").concat(sinceSha));
+                            throw new errors_1.ShipItError("Could not find any commits in dev for projectId: ".concat(projectId, " since ").concat(sinceSha));
                         return [2 /*return*/, commits];
                 }
             });
@@ -123,7 +140,7 @@ var GitLabService = /** @class */ (function () {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this._apiClient.getBranch(projectId, branchName)];
+                    case 0: return [4 /*yield*/, this.apiClient.getBranch(projectId, branchName)];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
             });
@@ -131,53 +148,66 @@ var GitLabService = /** @class */ (function () {
     };
     GitLabService.prototype.createBranch = function (project, branchFrom, branchName, cherryPick) {
         return __awaiter(this, void 0, void 0, function () {
-            var newBranch_1, i, mr, newBranch;
+            var newBranch, i, mr;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         if (!cherryPick) return [3 /*break*/, 6];
-                        return [4 /*yield*/, this._apiClient.createBranch(project.id, branchName, 'master')];
+                        return [4 /*yield*/, this.apiClient.createBranch(project.id, branchName, 'master')];
                     case 1:
-                        newBranch_1 = _a.sent();
-                        if (!newBranch_1)
-                            throw new Error("Failed to create branch from master for projectId: ".concat(project.id));
+                        newBranch = _a.sent();
                         i = 0;
                         _a.label = 2;
                     case 2:
                         if (!(i < project.mergeRequests.length)) return [3 /*break*/, 5];
                         mr = project.mergeRequests[i];
                         if (!mr.mergeCommit)
-                            throw new Error("Could not find the merge commit sha for MR: ".concat(mr.title, " in projectId: ").concat(project.id));
-                        return [4 /*yield*/, this._apiClient.cherryPick(project.id, mr.mergeCommit, branchName)];
+                            throw new errors_1.ShipItError("Could not find the merge commit sha for MR: ".concat(mr.title, " in projectId: ").concat(project.id));
+                        return [4 /*yield*/, this.apiClient.cherryPick(project.id, mr.mergeCommit, branchName)];
                     case 3:
                         _a.sent();
                         _a.label = 4;
                     case 4:
                         i++;
                         return [3 /*break*/, 2];
-                    case 5: return [2 /*return*/, newBranch_1];
-                    case 6: return [4 /*yield*/, this._apiClient.createBranch(project.id, branchName, branchFrom)];
-                    case 7:
-                        newBranch = _a.sent();
-                        if (!newBranch)
-                            throw new Error("Failed to create branch from master for projectId: ".concat(project.id));
-                        return [2 /*return*/, newBranch];
+                    case 5: return [2 /*return*/, newBranch];
+                    case 6: return [4 /*yield*/, this.apiClient.createBranch(project.id, branchName, branchFrom)];
+                    case 7: return [2 /*return*/, _a.sent()];
                 }
             });
         });
     };
     GitLabService.prototype.getMergeRequest = function (projectId, branchName) {
-        return this._apiClient.getMergeRequest(projectId, branchName, 'master');
+        return this.apiClient.getMergeRequest(projectId, branchName, 'master');
     };
-    GitLabService.prototype.createMergeRequest = function (projectId, branchName, description) {
-        return this._apiClient.createMergeRequest(projectId, branchName, 'master', branchName, description);
+    GitLabService.prototype.getMergeRequestById = function (projectId, mergeRequestId) {
+        var idAsNumber = lodash_1.default.toNumber(mergeRequestId);
+        if (!lodash_1.default.isNumber(idAsNumber))
+            throw new errors_1.ShipItError("MergeRequest Id must be a number: ".concat(mergeRequestId));
+        return this.apiClient.getMergeRequestById(projectId, idAsNumber);
+    };
+    GitLabService.prototype.createMergeRequest = function (projectId, branchName, description, milestoneName) {
+        return __awaiter(this, void 0, void 0, function () {
+            var milestone;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.getMilestone(projectId, milestoneName)];
+                    case 1:
+                        milestone = _a.sent();
+                        return [2 /*return*/, this.apiClient.createMergeRequest(projectId, branchName, 'master', branchName, description, milestone)];
+                }
+            });
+        });
+    };
+    GitLabService.prototype.getMilestone = function (projectId, milestoneName) {
+        return this.apiClient.getMilestone(projectId, milestoneName);
     };
     GitLabService.prototype.bumpVersionTxt = function (projectId, branchName, newVersion) {
         return __awaiter(this, void 0, void 0, function () {
             var versionTxt, buff, text;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this._apiClient.getFile(projectId, 'version.txt', branchName)];
+                    case 0: return [4 /*yield*/, this.apiClient.getFile(projectId, 'version.txt', branchName)];
                     case 1:
                         versionTxt = _a.sent();
                         if (!versionTxt)
@@ -186,7 +216,7 @@ var GitLabService = /** @class */ (function () {
                         text = buff.toString('utf-8');
                         if (text === newVersion)
                             return [2 /*return*/, false];
-                        return [4 /*yield*/, this._apiClient.updateFile(projectId, 'version.txt', branchName, newVersion, 'Bumping version.txt')];
+                        return [4 /*yield*/, this.apiClient.updateFile(projectId, 'version.txt', branchName, newVersion, 'Bumping version.txt')];
                     case 2:
                         _a.sent();
                         return [2 /*return*/, true];
@@ -198,20 +228,20 @@ var GitLabService = /** @class */ (function () {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this._apiClient.getFile(projectId, file, branchName)];
+                    case 0: return [4 /*yield*/, this.apiClient.getFile(projectId, file, branchName)];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
             });
         });
     };
     GitLabService.prototype.updateFile = function (projectId, filePath, branchName, content, commit) {
-        return this._apiClient.updateFile(projectId, filePath, branchName, content, commit);
+        return this.apiClient.updateFile(projectId, filePath, branchName, content, commit);
     };
     GitLabService.prototype.commit = function (projectId, branchName, commitMessage, files) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this._apiClient.commit(projectId, branchName, files, commitMessage)];
+                    case 0: return [4 /*yield*/, this.apiClient.commit(projectId, branchName, files, commitMessage)];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -219,12 +249,16 @@ var GitLabService = /** @class */ (function () {
             });
         });
     };
+    /**
+     * We use the latest valid semver tag in master to determine what the current version
+     * of a project is
+     */
     GitLabService.prototype.getCurrentVersionTag = function (projectId) {
         return __awaiter(this, void 0, void 0, function () {
             var tags, tagNames, sortedTagNames, currentVersion, currentTag;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this._apiClient.getLatestTags(projectId)];
+                    case 0: return [4 /*yield*/, this.apiClient.getLatestTags(projectId)];
                     case 1:
                         tags = _a.sent();
                         if (!(tags === null || tags === void 0 ? void 0 : tags.length))
@@ -242,6 +276,33 @@ var GitLabService = /** @class */ (function () {
             });
         });
     };
+    GitLabService.prototype.getNextBranchInfo = function (projectId, version) {
+        return __awaiter(this, void 0, void 0, function () {
+            var tag, nextVersion, branchName, branch;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.getCurrentVersionTag(projectId)];
+                    case 1:
+                        tag = _a.sent();
+                        if (!tag)
+                            throw new errors_1.ShipItError("Could not find the latest semver tag for projectId: ".concat(projectId));
+                        nextVersion = utils_1.Versions.getNextVersion(tag.name, version);
+                        branchName = version === 'patch' ?
+                            utils_1.BranchNames.getHotfix(nextVersion) :
+                            utils_1.BranchNames.getRelease(nextVersion);
+                        return [4 /*yield*/, this.getBranch(projectId, branchName)];
+                    case 2:
+                        branch = _a.sent();
+                        return [2 /*return*/, {
+                                nextVersion: nextVersion,
+                                branchName: branchName,
+                                branch: branch,
+                                tag: tag
+                            }];
+                }
+            });
+        });
+    };
     GitLabService = __decorate([
         (0, inversify_1.injectable)(),
         __param(0, (0, inversify_1.inject)(types_1.API_CLIENTS.GitLabApiClient)),

package/lib/src/startup/AddMilestoneCommand.js

@@ -0,0 +1,75 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getAddMilestoneCommand = void 0;
+var CommandTypeMapping_1 = require("../constants/CommandTypeMapping");
+var utils_1 = require("../utils");
+function processOptions(options) {
+    var opts = {
+        milestone: options.milestone,
+        version: 'minor'
+    };
+    if (options.projectIds)
+        opts.projectIds = utils_1.ProjectIds.getProjectIds(options.projectIds);
+    if (options.hotfix && options.major)
+        throw new Error('Cannot pass both --hotfix and --major options');
+    if (options.major)
+        opts.version = 'major';
+    if (options.hotfix)
+        opts.version = 'patch';
+    return opts;
+}
+var getAddMilestoneCommand = function (program, container) {
+    return function addMilestoneCommand(name, description) {
+        var _this = this;
+        program.command(name)
+            .description(description)
+            .requiredOption('-m, --milestone <milestone>')
+            .option('-p, --projectIds <projectIds...>')
+            .option('--hotfix')
+            .option('--major')
+            .action(function (options) { return __awaiter(_this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                container.get(CommandTypeMapping_1.CommandTypeMapping[name])
+                    .run(processOptions(options));
+                return [2 /*return*/];
+            });
+        }); });
+    };
+};
+exports.getAddMilestoneCommand = getAddMilestoneCommand;

package/lib/src/startup/SetupCommands.js

@@ -0,0 +1,92 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.setupCommands = void 0;
+var CommandTypeMapping_1 = require("../constants/CommandTypeMapping");
+var errors_1 = require("../errors");
+var AddMilestoneCommand_1 = require("./AddMilestoneCommand");
+function setupCommands(program, container) {
+    var addMilestoneCommand = (0, AddMilestoneCommand_1.getAddMilestoneCommand)(program, container);
+    // All commands below accept the same options
+    addMilestoneCommand('status', 'Get the status of all MRs in a milestone');
+    addMilestoneCommand('version', 'Display the versions that will be used for the release');
+    addMilestoneCommand('create-branches', 'Create release branches for all projects that are part of a milestone');
+    addMilestoneCommand('create-mrs', 'Create merge requests for all projects that are part of a milestone');
+    addMilestoneCommand('create-notes', 'Builds descriptions for all projects that are part of a milestone');
+    addMilestoneCommand('release', 'Create releases for all projects that are part of a milestone');
+    program.command('bump-packages')
+        .description('Bump clickview npm package versions in monorepo to their next version')
+        .requiredOption('-b, --branchName <branchName>')
+        .option('-p, --preId <preId>')
+        .action(getAction('bump-packages'));
+    program.command('install-packages')
+        .description('Install the latest clickview npm packages in all consuming projects that are part of a milestone')
+        .option('-m, --milestone <milestone>')
+        .option('-b, --branchName <branchName>')
+        .option('-p, --projectIds <projectIds...>')
+        .action(getAction('install-packages'));
+    program.command('validate-mr')
+        .description('Validate a merge request in a single project, ensuring it has a milestone and valid description')
+        .option('-p, --projectId <projectId>')
+        .option('-b, --branchName <branchName>')
+        .action(getAction('validate-mr'));
+    function getAction(command) {
+        var _this = this;
+        return function (options) { return __awaiter(_this, void 0, void 0, function () {
+            var err_1;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        _a.trys.push([0, 2, , 3]);
+                        return [4 /*yield*/, container.get(CommandTypeMapping_1.CommandTypeMapping[command]).run(options)];
+                    case 1:
+                        _a.sent();
+                        return [3 /*break*/, 3];
+                    case 2:
+                        err_1 = _a.sent();
+                        if (!(err_1 instanceof errors_1.ShipItError))
+                            throw err_1;
+                        program.error(err_1.message);
+                        return [3 /*break*/, 3];
+                    case 3: return [2 /*return*/];
+                }
+            });
+        }); };
+    }
+}
+exports.setupCommands = setupCommands;