@clickview/ship-it 0.0.2-dev.2 → 0.0.2

package/lib/src/tasks/BumpPackagesTask.js

@@ -47,165 +47,302 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BumpPackagesTask = void 0;
 require("reflect-metadata");
 var inversify_1 = require("inversify");
-var child_process_1 = require("child_process");
+var fs_extra_1 = __importDefault(require("fs-extra"));
+var semver_1 = __importDefault(require("semver"));
+var child_process_1 = __importDefault(require("child_process"));
 var types_1 = require("../types");
 var services_1 = require("../services");
-var MonorepoPackageJsonFiles_1 = require("../constants/MonorepoPackageJsonFiles");
 var utils_1 = require("../utils");
-var RELEASE_BRANCH_REGEX = /^release\/(\d|\.)+$/;
-var HOTFIX_BRANCH_REGEX = /^hotfix\/(\d|\.)+$/;
-var DEV_VERSION_REGEX = /-dev\.\d+$/;
-var RC_VERSION_REGEX = /-rc\.\d+$/;
-var SHARED_LERNA_OPTIONS = '--exact --no-git-tag-version --no-push --yes';
+var MONOREPO_PACKAGES_FILES = [
+    'packages/libs/analytics/package.json',
+    'packages/libs/styles/package.json',
+    'packages/libs/tooling/package.json',
+    'packages/projects/curator/package.json',
+    'packages/projects/library-editor/package.json',
+    'packages/projects/lite/package.json',
+    'packages/projects/online/package.json',
+    'packages/projects/reports/package.json'
+];
+var ROOT_DIRECTORIES = {
+    // Curator
+    62: 'src/ClickView.Curator.Web/Assets',
+    // Library Editor
+    534: 'src/ClickView.Cloud',
+    // Lite
+    822: 'src/ClickView.Lite',
+    // Online
+    109: 'src/ClickView.Web.Online.Pages',
+    // Reports
+    970: 'src/ClickView.Analytics.Web'
+};
 var BumpPackagesTask = /** @class */ (function () {
     function BumpPackagesTask(service) {
-        this.isReleaseBranch = false;
-        this.isHotfixBranch = false;
-        this.service = service;
+        this._service = service;
     }
     BumpPackagesTask.prototype.run = function (options) {
         return __awaiter(this, void 0, void 0, function () {
-            var branch, isValid, lernaVersionCmd;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            var projects, monorepo, consumingProjects, monorepoBranchName, versions, _i, consumingProjects_1, project, branchName, _a, consumingProjects_2, project, _b, consumingProjects_3, project, branchName;
+            return __generator(this, function (_c) {
+                switch (_c.label) {
                     case 0:
-                        utils_1.Logger.logTask('Bumping clickview npm package versions');
-                        this.isReleaseBranch = RELEASE_BRANCH_REGEX.test(options.branchName);
-                        this.isHotfixBranch = HOTFIX_BRANCH_REGEX.test(options.branchName);
-                        return [4 /*yield*/, this.service.getBranch(utils_1.ProjectIds.MONOREPO_PROJECT_ID, options.branchName)];
+                        utils_1.Logger.logTask('Bumping npm packages');
+                        return [4 /*yield*/, this._service.getProjects(options)];
                     case 1:
-                        branch = _a.sent();
-                        if (!branch) {
-                            utils_1.Logger.logError("Branch with name ".concat(options.branchName, " was not be found."));
+                        projects = _c.sent();
+                        monorepo = projects.find(function (p) { return p.id.toString() === utils_1.ProjectIds.MONOREPO_PROJECT_ID; });
+                        consumingProjects = projects.filter(function (p) { return p.id.toString() !== utils_1.ProjectIds.MONOREPO_PROJECT_ID; });
+                        if (!monorepo) {
+                            utils_1.Logger.logError("Monorepo was not in this release");
                             return [2 /*return*/, false];
                         }
-                        isValid = this.validateOptions(options);
-                        if (!isValid)
+                        if (!consumingProjects.length) {
+                            utils_1.Logger.logError("No projects that consume monorepo could be found");
                             return [2 /*return*/, false];
-                        return [4 /*yield*/, this.getLernaCommand(options)];
+                        }
+                        return [4 /*yield*/, this.getBranchName(monorepo.id, options.version)];
                     case 2:
-                        lernaVersionCmd = _a.sent();
-                        if (!lernaVersionCmd) {
-                            utils_1.Logger.logError('Something went wrong while trying to detect which versioning script to run with Lerna.');
+                        monorepoBranchName = _c.sent();
+                        if (!monorepoBranchName) {
+                            utils_1.Logger.logError("[".concat(monorepo.title, "] branch does not exist"));
                             return [2 /*return*/, false];
                         }
-                        (0, child_process_1.execSync)(lernaVersionCmd);
-                        return [2 /*return*/, true];
+                        return [4 /*yield*/, this.getPackageVersions(monorepoBranchName)];
+                    case 3:
+                        versions = _c.sent();
+                        utils_1.Logger.logMessage("Versions identified for ".concat(monorepoBranchName));
+                        Object.keys(versions).forEach(function (key) {
+                            utils_1.Logger.logMessage("- [".concat(key, "]: ").concat(versions[key]));
+                        });
+                        // let cont = true;
+                        utils_1.Logger.logMessage('\nBumping packages:\n');
+                        _i = 0, consumingProjects_1 = consumingProjects;
+                        _c.label = 4;
+                    case 4:
+                        if (!(_i < consumingProjects_1.length)) return [3 /*break*/, 8];
+                        project = consumingProjects_1[_i];
+                        return [4 /*yield*/, this.getBranchName(project.id, options.version)];
+                    case 5:
+                        branchName = _c.sent();
+                        // TODO: potentially add a validate branches task and removing the branch checking from this task
+                        // so that bump packages can't be run until create release is run
+                        if (!branchName) {
+                            utils_1.Logger.logError("[".concat(project.title, "]: branch does not exist"));
+                            return [3 /*break*/, 7];
+                        }
+                        return [4 /*yield*/, this.updateAndSavePackageFiles(project, options.milestone, branchName, versions)];
+                    case 6:
+                        _c.sent();
+                        _c.label = 7;
+                    case 7:
+                        _i++;
+                        return [3 /*break*/, 4];
+                    case 8:
+                        for (_a = 0, consumingProjects_2 = consumingProjects; _a < consumingProjects_2.length; _a++) {
+                            project = consumingProjects_2[_a];
+                            utils_1.Logger.logInfo("[".concat(project.title, "]: Running npm i --package-lock-only"));
+                            this.npmInstall(project, options.milestone);
+                            utils_1.Logger.logInfo('\n');
+                        }
+                        /**
+                         * TODO: Need to not commit when there's no changes
+                         */
+                        utils_1.Logger.logMessage('Committing files');
+                        _b = 0, consumingProjects_3 = consumingProjects;
+                        _c.label = 9;
+                    case 9:
+                        if (!(_b < consumingProjects_3.length)) return [3 /*break*/, 13];
+                        project = consumingProjects_3[_b];
+                        return [4 /*yield*/, this.getBranchName(project.id, options.version)];
+                    case 10:
+                        branchName = _c.sent();
+                        if (!branchName) {
+                            utils_1.Logger.logError("[".concat(project.title, "]: branch does not exist"));
+                            return [3 /*break*/, 12];
+                        }
+                        return [4 /*yield*/, this.commitUpdatedFiles(project, options.milestone, branchName)];
+                    case 11:
+                        _c.sent();
+                        utils_1.Logger.logMessage("[".concat(project.title, "]: File changes committed"));
+                        _c.label = 12;
+                    case 12:
+                        _b++;
+                        return [3 /*break*/, 9];
+                    case 13: return [2 /*return*/, true];
                 }
             });
         });
     };
-    BumpPackagesTask.prototype.validateOptions = function (options) {
-        var isValidReleaseBranch = this.isReleaseBranch || this.isHotfixBranch;
-        if (options.preId && options.preId !== 'rc' && options.preId !== 'dev') {
-            utils_1.Logger.logError("Argument for \"preId\" can only be \"rc\" or \"dev\". You entered: ".concat(options.preId));
-            return false;
-        }
-        if (options.preId === 'dev' && isValidReleaseBranch) {
-            utils_1.Logger.logError('Dev versions cannot be generated on release or hotfix branches.');
-            return false;
-        }
-        if (options.preId === 'rc' && !isValidReleaseBranch) {
-            utils_1.Logger.logError('Release Candidate versions can only be generated on release or hotfix branches.');
-            return false;
-        }
-        if (!options.preId && !isValidReleaseBranch) {
-            utils_1.Logger.logError('Production package versions can only be generated on release or hotfix branches.');
-            return false;
-        }
-        return true;
-    };
-    BumpPackagesTask.prototype.getFileText = function (projectId, branchName, fileName) {
+    BumpPackagesTask.prototype.commitUpdatedFiles = function (project, milestone, branchName) {
         return __awaiter(this, void 0, void 0, function () {
-            var file, buff;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.service.getFile(projectId, branchName, fileName)];
+            var rootDir, outputPath, commitFiles, _a;
+            var _b, _c;
+            return __generator(this, function (_d) {
+                switch (_d.label) {
+                    case 0:
+                        rootDir = ROOT_DIRECTORIES[project.id];
+                        outputPath = this.getOutputPath(project, milestone);
+                        _b = {
+                            filePath: "".concat(rootDir, "/package.json")
+                        };
+                        return [4 /*yield*/, fs_extra_1.default.readFile("".concat(outputPath, "/package.json"), 'utf8')];
                     case 1:
-                        file = _a.sent();
-                        if (!file)
-                            return [2 /*return*/, ''];
-                        buff = Buffer.from(file.content, 'base64');
-                        return [2 /*return*/, buff.toString('utf-8')];
+                        _a = [(_b.content = _d.sent(),
+                                _b)];
+                        _c = {
+                            filePath: "".concat(rootDir, "/package-lock.json")
+                        };
+                        return [4 /*yield*/, fs_extra_1.default.readFile("".concat(outputPath, "/package-lock.json"), 'utf8')];
+                    case 2:
+                        commitFiles = _a.concat([(_c.content = _d.sent(),
+                                _c)]);
+                        return [4 /*yield*/, this._service.commit(project.id, branchName, 'Bumping @clickview npm packages', commitFiles)];
+                    case 3:
+                        _d.sent();
+                        return [2 /*return*/];
                 }
             });
         });
     };
-    BumpPackagesTask.prototype.getLernaCommand = function (options) {
+    BumpPackagesTask.prototype.npmInstall = function (project, milestone) {
+        var outputPath = this.getOutputPath(project, milestone);
+        child_process_1.default.execSync('npm i --package-lock-only', {
+            cwd: outputPath,
+            // Uncomment if we want to silence
+            // stdio: 'pipe'
+        });
+    };
+    BumpPackagesTask.prototype.updateAndSavePackageFiles = function (project, milestone, branchName, versions) {
         return __awaiter(this, void 0, void 0, function () {
-            var isInPrerelease;
+            var rootDir, packageJson, packageLock, packageJsonObj, outputPath;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.isInPrerelease(options.branchName)];
+                    case 0:
+                        rootDir = ROOT_DIRECTORIES[project.id];
+                        return [4 /*yield*/, this.getFileText(project.id, branchName, "".concat(rootDir, "/package.json"))];
                     case 1:
-                        isInPrerelease = _a.sent();
-                        /**
-                         * The `lerna version prerelease` script only cares about incrementing the preId part
-                         * of the version number. That's why we run this if `isInPrerelease` is true.
-                         *
-                         * E.g. this would change 0.0.1-dev.0 to 0.0.0-dev.1
-                         */
-                        if (isInPrerelease && options.preId)
-                            return [2 /*return*/, "lerna version prerelease --preid ".concat(options.preId, " ").concat(SHARED_LERNA_OPTIONS)];
-                        // Bump the patch with the preId "dev". We currently only support dev prereleases on patch versions
-                        if (options.preId === 'dev')
-                            return [2 /*return*/, "lerna version prepatch --preid dev ".concat(SHARED_LERNA_OPTIONS)];
-                        if (options.preId === 'rc') {
-                            // Bump the minor number with the preId "rc". Release branches always bump the minor number.
-                            if (this.isReleaseBranch)
-                                return [2 /*return*/, "lerna version preminor --preid rc ".concat(SHARED_LERNA_OPTIONS)];
-                            // Bump the patch with the preId "rc". Hotfix branches always bump the patch number.
-                            if (this.isHotfixBranch)
-                                return [2 /*return*/, "lerna version prepatch --preid rc ".concat(SHARED_LERNA_OPTIONS)];
-                        }
+                        packageJson = _a.sent();
+                        return [4 /*yield*/, this.getFileText(project.id, branchName, "".concat(rootDir, "/package-lock.json"))];
+                    case 2:
+                        packageLock = _a.sent();
+                        packageJsonObj = JSON.parse(packageJson);
+                        utils_1.Logger.logMessage(project.title);
                         /**
-                         * If no preId is provided, we bump the version number to a production version.
-                         *
-                         * Release branch = minor bump
-                         * Hotfix branch = patch bump
+                         * Annoyingly some projects have clickview packages sitting in dependencies
+                         * and others have it in devDependencies
                          */
-                        if (this.isReleaseBranch)
-                            return [2 /*return*/, "lerna version minor ".concat(SHARED_LERNA_OPTIONS)];
-                        if (this.isHotfixBranch)
-                            return [2 /*return*/, "lerna version patch ".concat(SHARED_LERNA_OPTIONS)];
-                        // Should never be reached
-                        return [2 /*return*/, ''];
+                        if (packageJsonObj.dependencies)
+                            packageJson = this.replaceVersions(packageJson, versions, packageJsonObj.dependencies);
+                        if (packageJsonObj.devDependencies)
+                            packageJson = this.replaceVersions(packageJson, versions, packageJsonObj.devDependencies);
+                        outputPath = this.getOutputPath(project, milestone);
+                        return [4 /*yield*/, fs_extra_1.default.outputFile("".concat(outputPath, "/package.json"), packageJson, { encoding: 'utf8' })];
+                    case 3:
+                        _a.sent();
+                        return [4 /*yield*/, fs_extra_1.default.outputFile("".concat(outputPath, "/package-lock.json"), packageLock, { encoding: 'utf8' })];
+                    case 4:
+                        _a.sent();
+                        return [2 /*return*/];
                 }
             });
         });
     };
-    BumpPackagesTask.prototype.isInPrerelease = function (branchName) {
+    BumpPackagesTask.prototype.replaceVersions = function (packageJson, versions, deps) {
+        Object.keys(deps).forEach(function (key) {
+            if (!key.startsWith('@clickview'))
+                return;
+            if (!versions[key])
+                return;
+            var oldVersion = deps[key];
+            var newVersion = versions[key];
+            if (oldVersion === newVersion) {
+                utils_1.Logger.logWarning("- [".concat(key, "]: ").concat(versions[key], " is up to date"));
+                return;
+            }
+            if (semver_1.default.compare(oldVersion, newVersion) === 1) {
+                utils_1.Logger.logError("- [".concat(key, "]: ").concat(deps[key], " -> ").concat(versions[key], " downgrade detected"));
+                return;
+            }
+            packageJson = packageJson.replace("\"".concat(key, "\": \"").concat(deps[key], "\""), "\"".concat(key, "\": \"").concat(versions[key], "\""));
+            utils_1.Logger.logMessage("- [".concat(key, "]: ").concat(deps[key], " -> ").concat(versions[key]));
+        });
+        return packageJson;
+    };
+    BumpPackagesTask.prototype.getPackageVersions = function (branchName) {
         return __awaiter(this, void 0, void 0, function () {
-            var _i, MONOREPO_PACKAGE_JSON_FILES_1, file, text, json;
+            var monorepoPackages, _i, MONOREPO_PACKAGES_FILES_1, file, text, json;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        _i = 0, MONOREPO_PACKAGE_JSON_FILES_1 = MonorepoPackageJsonFiles_1.MONOREPO_PACKAGE_JSON_FILES;
+                        monorepoPackages = {};
+                        _i = 0, MONOREPO_PACKAGES_FILES_1 = MONOREPO_PACKAGES_FILES;
                         _a.label = 1;
                     case 1:
-                        if (!(_i < MONOREPO_PACKAGE_JSON_FILES_1.length)) return [3 /*break*/, 4];
-                        file = MONOREPO_PACKAGE_JSON_FILES_1[_i];
+                        if (!(_i < MONOREPO_PACKAGES_FILES_1.length)) return [3 /*break*/, 4];
+                        file = MONOREPO_PACKAGES_FILES_1[_i];
                         return [4 /*yield*/, this.getFileText(utils_1.ProjectIds.MONOREPO_PROJECT_ID, branchName, file)];
                     case 2:
                         text = _a.sent();
-                        json = JSON.parse(JSON.stringify(text));
-                        if (RC_VERSION_REGEX.test(json.version))
-                            return [2 /*return*/, true];
-                        if (DEV_VERSION_REGEX.test(json.version))
-                            return [2 /*return*/, true];
+                        json = JSON.parse(text);
+                        monorepoPackages[json.name] = json.version;
                         _a.label = 3;
                     case 3:
                         _i++;
                         return [3 /*break*/, 1];
-                    case 4: return [2 /*return*/, false];
+                    case 4: return [2 /*return*/, monorepoPackages];
+                }
+            });
+        });
+    };
+    BumpPackagesTask.prototype.getFileText = function (projectId, branchName, fileName) {
+        return __awaiter(this, void 0, void 0, function () {
+            var file, buff;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this._service.getFile(projectId, branchName, fileName)];
+                    case 1:
+                        file = _a.sent();
+                        if (!file)
+                            return [2 /*return*/, ''];
+                        buff = Buffer.from(file.content, 'base64');
+                        return [2 /*return*/, buff.toString('utf-8')];
+                }
+            });
+        });
+    };
+    BumpPackagesTask.prototype.getBranchName = function (projectId, version) {
+        return __awaiter(this, void 0, void 0, function () {
+            var currentVersionTag, nextVersion, branchName, branch;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this._service.getCurrentVersionTag(projectId)];
+                    case 1:
+                        currentVersionTag = _a.sent();
+                        if (!currentVersionTag)
+                            return [2 /*return*/, null];
+                        return [4 /*yield*/, utils_1.Versions.getNextVersion(currentVersionTag.name, version)];
+                    case 2:
+                        nextVersion = _a.sent();
+                        branchName = utils_1.BranchNames.getRelease(nextVersion);
+                        return [4 /*yield*/, this._service.getBranch(projectId, branchName)];
+                    case 3:
+                        branch = _a.sent();
+                        if (!branch)
+                            return [2 /*return*/, null];
+                        return [2 /*return*/, branchName];
                 }
             });
         });
     };
+    BumpPackagesTask.prototype.getOutputPath = function (project, milestone) {
+        return "./temp/".concat(milestone, "/").concat(project.title);
+    };
     BumpPackagesTask = __decorate([
         (0, inversify_1.injectable)(),
         __param(0, (0, inversify_1.inject)(types_1.SERVICES.GitLabService)),

package/lib/src/tasks/BumpVersionTxtTask.js

@@ -54,40 +54,53 @@ var inversify_1 = require("inversify");
 var Logger_1 = require("../utils/Logger");
 var types_1 = require("../types");
 var services_1 = require("../services");
+var utils_1 = require("../utils");
 var BumpVersionTxtTask = /** @class */ (function () {
     function BumpVersionTxtTask(service) {
-        this.service = service;
+        this._service = service;
     }
     BumpVersionTxtTask.prototype.run = function (options) {
         return __awaiter(this, void 0, void 0, function () {
-            var projects, _i, projects_1, project, _a, nextVersion, branchName, versionBumped;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
+            var projects, cont, _i, projects_1, project, currentVersionTag, nextVersion, branchName, versionBumped;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
                     case 0:
                         Logger_1.Logger.logTask('Bumping version.txt');
-                        return [4 /*yield*/, this.service.getProjects(options)];
+                        return [4 /*yield*/, this._service.getProjects(options)];
                     case 1:
-                        projects = _b.sent();
+                        projects = _a.sent();
+                        if (!projects.length) {
+                            Logger_1.Logger.logError("No projects could be found with the specified options");
+                            return [2 /*return*/, false];
+                        }
+                        cont = true;
                         _i = 0, projects_1 = projects;
-                        _b.label = 2;
+                        _a.label = 2;
                     case 2:
                         if (!(_i < projects_1.length)) return [3 /*break*/, 6];
                         project = projects_1[_i];
-                        return [4 /*yield*/, this.service.getNextBranchInfo(project.id, options.version)];
+                        return [4 /*yield*/, this._service.getCurrentVersionTag(project.id)];
                     case 3:
-                        _a = _b.sent(), nextVersion = _a.nextVersion, branchName = _a.branchName;
-                        return [4 /*yield*/, this.service.bumpVersionTxt(project.id, branchName, nextVersion)];
+                        currentVersionTag = _a.sent();
+                        if (currentVersionTag === null) {
+                            Logger_1.Logger.logError("[".concat(project.title, "]: Could not find current version tag"));
+                            cont = false;
+                            return [3 /*break*/, 5];
+                        }
+                        nextVersion = utils_1.Versions.getNextVersion(currentVersionTag.name, options.version);
+                        branchName = utils_1.BranchNames.getRelease(nextVersion);
+                        return [4 /*yield*/, this._service.bumpVersionTxt(project.id, branchName, nextVersion)];
                     case 4:
-                        versionBumped = _b.sent();
+                        versionBumped = _a.sent();
                         if (versionBumped)
                             Logger_1.Logger.logMessage("[".concat(project.title, "]: Bumped to ").concat(nextVersion));
                         else
                             Logger_1.Logger.logWarning("[".concat(project.title, "]: Has already been bumped, or does not have a version.txt"));
-                        _b.label = 5;
+                        _a.label = 5;
                     case 5:
                         _i++;
                         return [3 /*break*/, 2];
-                    case 6: return [2 /*return*/, true];
+                    case 6: return [2 /*return*/, cont];
                 }
             });
         });

package/lib/src/tasks/CreateBranchTask.js

@@ -56,40 +56,55 @@ var services_1 = require("../services");
 var utils_1 = require("../utils");
 var CreateBranchTask = /** @class */ (function () {
     function CreateBranchTask(service) {
-        this.service = service;
+        this._service = service;
     }
     CreateBranchTask.prototype.run = function (options) {
         return __awaiter(this, void 0, void 0, function () {
-            var projects, _i, projects_1, project, _a, branch, branchName, branchFrom;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
+            var projects, _i, projects_1, project, currentVersionTag, nextVersion, branchName, branch, branchFrom;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
                     case 0:
                         utils_1.Logger.logTask('Creating release branches');
-                        return [4 /*yield*/, this.service.getProjects(options)];
+                        return [4 /*yield*/, this._service.getProjects(options)];
                     case 1:
-                        projects = _b.sent();
+                        projects = _a.sent();
+                        if (!projects.length) {
+                            utils_1.Logger.logError("No projects could be found with the specified options");
+                            return [2 /*return*/, false];
+                        }
                         _i = 0, projects_1 = projects;
-                        _b.label = 2;
+                        _a.label = 2;
                     case 2:
-                        if (!(_i < projects_1.length)) return [3 /*break*/, 6];
+                        if (!(_i < projects_1.length)) return [3 /*break*/, 8];
                         project = projects_1[_i];
-                        return [4 /*yield*/, this.service.getNextBranchInfo(project.id, options.version)];
+                        return [4 /*yield*/, this._service.getCurrentVersionTag(project.id)];
                     case 3:
-                        _a = _b.sent(), branch = _a.branch, branchName = _a.branchName;
+                        currentVersionTag = _a.sent();
+                        if (!currentVersionTag) {
+                            utils_1.Logger.logError("Could not find the next version for: ".concat(project.title));
+                            return [2 /*return*/, false];
+                        }
+                        return [4 /*yield*/, utils_1.Versions.getNextVersion(currentVersionTag.name, options.version)];
+                    case 4:
+                        nextVersion = _a.sent();
+                        branchName = utils_1.BranchNames.getRelease(nextVersion);
+                        return [4 /*yield*/, this._service.getBranch(project.id, branchName)];
+                    case 5:
+                        branch = _a.sent();
                         if (branch) {
                             utils_1.Logger.logWarning("[".concat(project.title, "]: [").concat(branchName, "] Already exists"));
-                            return [3 /*break*/, 5];
+                            return [3 /*break*/, 7];
                         }
                         branchFrom = options.version === 'patch' ? 'master' : 'dev';
-                        return [4 /*yield*/, this.service.createBranch(project, branchFrom, branchName, false)];
-                    case 4:
-                        _b.sent();
+                        return [4 /*yield*/, this._service.createBranch(project, branchFrom, branchName, false)];
+                    case 6:
+                        _a.sent();
                         utils_1.Logger.logMessage("[".concat(project.title, "]: [").concat(branchName, "] Has been created"));
-                        _b.label = 5;
-                    case 5:
+                        _a.label = 7;
+                    case 7:
                         _i++;
                         return [3 /*break*/, 2];
-                    case 6: return [2 /*return*/, true];
+                    case 8: return [2 /*return*/, true];
                 }
             });
         });

package/lib/src/tasks/CreateMergeRequestTask.js

@@ -56,51 +56,66 @@ var services_1 = require("../services");
 var utils_1 = require("../utils");
 var CreateMergeRequestTask = /** @class */ (function () {
     function CreateMergeRequestTask(service) {
-        this.service = service;
+        this._service = service;
     }
     CreateMergeRequestTask.prototype.run = function (options) {
         return __awaiter(this, void 0, void 0, function () {
-            var projects, _i, projects_1, project, _a, branch, branchName, mergeRequest, description;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
+            var projects, _i, projects_1, project, currentVersionTag, nextVersion, branchName, branch, mergeRequest, description;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
                     case 0:
                         utils_1.Logger.logTask('Creating Merge Requests');
-                        return [4 /*yield*/, this.service.getProjects(options)];
+                        return [4 /*yield*/, this._service.getProjects(options)];
                     case 1:
-                        projects = _b.sent();
+                        projects = _a.sent();
+                        if (!projects.length) {
+                            utils_1.Logger.logError("No projects could be found with the specified options");
+                            return [2 /*return*/, false];
+                        }
                         _i = 0, projects_1 = projects;
-                        _b.label = 2;
+                        _a.label = 2;
                     case 2:
-                        if (!(_i < projects_1.length)) return [3 /*break*/, 7];
+                        if (!(_i < projects_1.length)) return [3 /*break*/, 9];
                         project = projects_1[_i];
-                        return [4 /*yield*/, this.service.getNextBranchInfo(project.id, options.version)];
+                        return [4 /*yield*/, this._service.getCurrentVersionTag(project.id)];
                     case 3:
-                        _a = _b.sent(), branch = _a.branch, branchName = _a.branchName;
+                        currentVersionTag = _a.sent();
+                        if (!currentVersionTag) {
+                            utils_1.Logger.logError("Could not find the next version for: ".concat(project.title));
+                            return [2 /*return*/, false];
+                        }
+                        return [4 /*yield*/, utils_1.Versions.getNextVersion(currentVersionTag.name, options.version)];
+                    case 4:
+                        nextVersion = _a.sent();
+                        branchName = utils_1.BranchNames.getRelease(nextVersion);
+                        return [4 /*yield*/, this._service.getBranch(project.id, branchName)];
+                    case 5:
+                        branch = _a.sent();
                         if (!branch) {
                             utils_1.Logger.logError("[".concat(project.title, "]: [").concat(branchName, "] does not exist"));
-                            return [3 /*break*/, 6];
+                            return [3 /*break*/, 8];
                         }
-                        return [4 /*yield*/, this.service.getMergeRequest(project.id, branchName)];
-                    case 4:
-                        mergeRequest = _b.sent();
+                        return [4 /*yield*/, this._service.getMergeRequest(project.id, branchName)];
+                    case 6:
+                        mergeRequest = _a.sent();
                         if (mergeRequest) {
                             utils_1.Logger.logWarning("[".concat(project.title, "]: MR already existed"));
                             utils_1.Logger.logInfo(mergeRequest.url);
-                            return [3 /*break*/, 6];
+                            return [3 /*break*/, 8];
                         }
                         description = project.id.toString() === utils_1.ProjectIds.MONOREPO_PROJECT_ID ?
                             utils_1.Descriptions.getMonorepoCombinedDescription(project.mergeRequests) :
                             utils_1.Descriptions.getCombinedDescription(project.mergeRequests);
-                        return [4 /*yield*/, this.service.createMergeRequest(project.id, branchName, description)];
-                    case 5:
-                        mergeRequest = _b.sent();
+                        return [4 /*yield*/, this._service.createMergeRequest(project.id, branchName, description)];
+                    case 7:
+                        mergeRequest = _a.sent();
                         utils_1.Logger.logMessage("[".concat(project.title, "]: MR created"));
                         utils_1.Logger.logInfo(mergeRequest.url);
-                        _b.label = 6;
-                    case 6:
+                        _a.label = 8;
+                    case 8:
                         _i++;
                         return [3 /*break*/, 2];
-                    case 7: return [2 /*return*/, true];
+                    case 9: return [2 /*return*/, true];
                 }
             });
         });