@clickview/ship-it 0.0.49 → 0.0.51

package/lib/src/tasks/ValidateTask.js

@@ -37,7 +37,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) 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]) {
@@ -216,9 +216,9 @@ var ValidateTask = /** @class */ (function () {
     };
     ValidateTask.prototype.notReadyMrsLog = function (projects, milestone, slackNotifier, nextMilestone) {
         return __awaiter(this, void 0, void 0, function () {
-            var allNotReadyMrs, emailListNotReadyMrs, _i, projects_2, project, notReadyMrs, groupedByUser, logMessageSlack, _a, _b, _c, key, name, authorEmail, _d, _e, mr, updated, threadLabel, statusCleanMessage;
-            return __generator(this, function (_f) {
-                switch (_f.label) {
+            var allNotReadyMrs, emailListNotReadyMrs, _i, projects_2, project, notReadyMrs, groupedByUser, logMessageSlack, _a, _b, _c, _d, key, name, authorEmail, _e, _f, mr, updated, threadLabel, statusCleanMessage;
+            return __generator(this, function (_g) {
+                switch (_g.label) {
                     case 0:
                         allNotReadyMrs = [];
                         emailListNotReadyMrs = [];
@@ -230,14 +230,17 @@ var ValidateTask = /** @class */ (function () {
                         }
                         groupedByUser = lodash_1.default.groupBy(allNotReadyMrs, function (mr) { return mr.author; });
                         logMessageSlack = '';
-                        _a = [];
-                        for (_b in groupedByUser)
-                            _a.push(_b);
-                        _c = 0;
-                        _f.label = 1;
+                        _a = groupedByUser;
+                        _b = [];
+                        for (_c in _a)
+                            _b.push(_c);
+                        _d = 0;
+                        _g.label = 1;
                     case 1:
-                        if (!(_c < _a.length)) return [3 /*break*/, 6];
-                        key = _a[_c];
+                        if (!(_d < _b.length)) return [3 /*break*/, 6];
+                        _c = _b[_d];
+                        if (!(_c in _a)) return [3 /*break*/, 5];
+                        key = _c;
                         name = key;
                         // Pretty sure this can't happen now 😅
                         if (!name || name === 'undefined')
@@ -246,29 +249,29 @@ var ValidateTask = /** @class */ (function () {
                         emailListNotReadyMrs.push(authorEmail);
                         utils_1.Logger.logMessage(name);
                         logMessageSlack += "".concat(name, ":\n");
-                        _d = 0, _e = groupedByUser[key];
-                        _f.label = 2;
+                        _e = 0, _f = groupedByUser[key];
+                        _g.label = 2;
                     case 2:
-                        if (!(_d < _e.length)) return [3 /*break*/, 5];
-                        mr = _e[_d];
+                        if (!(_e < _f.length)) return [3 /*break*/, 5];
+                        mr = _f[_e];
                         utils_1.Logger.logMessage("- ".concat(mr.url));
                         logMessageSlack += "- ".concat(mr.url, "\n");
                         if (!nextMilestone) return [3 /*break*/, 4];
                         return [4 /*yield*/, this.updateMrMilestone(nextMilestone.id, milestone, mr)];
                     case 3:
-                        updated = _f.sent();
+                        updated = _g.sent();
                         if (updated) {
                             logMessageSlack += "  -> MR has been rolled over from '".concat(milestone, "' to '").concat(nextMilestone.name, "' successfully\n");
                         }
                         else {
                             logMessageSlack += "  -> Failed to roll over milestone for this MR. Check logs for error.\n";
                         }
-                        _f.label = 4;
+                        _g.label = 4;
                     case 4:
-                        _d++;
+                        _e++;
                         return [3 /*break*/, 2];
                     case 5:
-                        _c++;
+                        _d++;
                         return [3 /*break*/, 1];
                     case 6:
                         if (!slackNotifier)
@@ -288,7 +291,7 @@ var ValidateTask = /** @class */ (function () {
                             })];
                     case 7:
                         // Send formated status update in slack
-                        _f.sent();
+                        _g.sent();
                         return [2 /*return*/];
                 }
             });

package/lib/src/tasks/VersionTask.js

@@ -26,7 +26,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) 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]) {

package/lib/src/tasks/configure-projects/AddApprovalRulesTask.js

@@ -46,7 +46,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) 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]) {

package/lib/src/tasks/configure-projects/CreateToolingBranchTask.js

@@ -35,7 +35,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) 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]) {

package/lib/src/tasks/configure-projects/EnsureApprovalRulesTask.js

@@ -26,7 +26,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) 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]) {

package/lib/src/tasks/configure-projects/primitives/BaseConfigureProjectsTask.js

@@ -26,7 +26,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) 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]) {
@@ -54,7 +54,7 @@ var inversify_1 = require("inversify");
 var types_1 = require("../../../types");
 var services_1 = require("../../../services");
 var GROUP_IDS = [
-    '1091',
+    '1091', // ClickView / front-end
     '1092' // ClickView / back-end
 ];
 var BaseConfigureProjectsTask = /** @class */ (function () {

package/lib/src/tasks/index.js

@@ -21,6 +21,7 @@ __exportStar(require("./CreateBranchTask"), exports);
 __exportStar(require("./CreateMergeRequestTask"), exports);
 __exportStar(require("./CreateReleaseNotesTask"), exports);
 __exportStar(require("./CreateNotesAuditTask"), exports);
+__exportStar(require("./JiraTicketsStatusTask"), exports);
 __exportStar(require("./InstallPackagesTask"), exports);
 __exportStar(require("./StartProjectBuildsTask"), exports);
 __exportStar(require("./StartMonorepoBuildTask"), exports);
@@ -32,5 +33,6 @@ __exportStar(require("./ValidateMergeRequestTask"), exports);
 __exportStar(require("./ValidateTask"), exports);
 __exportStar(require("./VersionTask"), exports);
 __exportStar(require("./PopulateTrelloBoardTask"), exports);
+__exportStar(require("./CheckReleaseReadyTask"), exports);
 __exportStar(require("./CreateHotfixTask"), exports);
 __exportStar(require("./UpdateMergeRequestDescriptionTask"), exports);

package/lib/src/types.js

@@ -3,18 +3,21 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.COMMANDS = exports.TASKS = exports.SERVICES = exports.API_CLIENTS = exports.MISC = void 0;
 exports.MISC = {
     GitLabConfig: Symbol.for('GitLabConfig'),
+    JiraConfig: Symbol.for('JiraConfig'),
     TeamCityConfig: Symbol.for('TeamCityConfig'),
     TrelloConfig: Symbol.for('TrelloConfig'),
     SlackConfig: Symbol.for('SlackConfig')
 };
 exports.API_CLIENTS = {
     GitLabApiClient: Symbol.for('GitLabApiClient'),
+    JiraApiClient: Symbol.for('JiraApiClient'),
     TeamCityApiClient: Symbol.for('TeamCityApiClient'),
     TrelloApiClient: Symbol.for('TrelloApiClient'),
     SlackApiClient: Symbol.for('SlackApiClient')
 };
 exports.SERVICES = {
     GitLabService: Symbol.for('GitLabService'),
+    JiraService: Symbol.for('JiraService'),
     TeamCityService: Symbol.for('TeamCityService'),
     TrelloService: Symbol.for('TrelloService'),
     SlackService: Symbol.for('SlackService')
@@ -29,6 +32,7 @@ exports.TASKS = {
     ValidateDescriptionsTask: Symbol.for('ValidateDescriptionsTask'),
     CreateReleaseNotesTask: Symbol.for('CreateReleaseNotesTask'),
     CreateNotesAuditTask: Symbol.for('CreateNotesAuditTask'),
+    JiraTicketsStatusTask: Symbol.for('JiraTicketsStatusTask'),
     InstallPackagesTask: Symbol.for('InstallPackagesTask'),
     BumpPackagesTask: Symbol.for('BumpPackagesTask'),
     ValidateMergeRequestTask: Symbol.for('ValidateMergeRequestTask'),
@@ -40,6 +44,7 @@ exports.TASKS = {
     AddApprovalRulesTask: Symbol.for('AddApprovalRulesTask'),
     CreateToolingBranchTask: Symbol.for('CreateToolingBranchTask'),
     EnsureApprovalRulesTask: Symbol.for('EnsureApprovalRulesTask'),
+    CheckReleaseReadyTask: Symbol.for('CheckReleaseReadyTask'),
     CreateHotfixTask: Symbol.for('CreateHotfixTask'),
     ChangeMilestoneTask: Symbol.for('ChangeMilestoneTask'),
     UpdateMergeRequestDescriptionTask: Symbol.for('UpdateMergeRequestDescriptionTask')
@@ -53,6 +58,7 @@ exports.COMMANDS = {
     CreateMergeRequestCommand: Symbol.for('CreateMergeRequestCommand'),
     CreateReleaseNotesCommand: Symbol.for('CreateReleaseNotesCommand'),
     CreateNotesAuditCommand: Symbol.for('CreateNotesAuditCommand'),
+    JiraTicketsStatusCommand: Symbol.for('JiraTicketsStatusCommand'),
     InstallPackagesCommand: Symbol.for('InstallPackagesCommand'),
     BumpPackagesCommand: Symbol.for('BumpPackagesCommand'),
     ValidateMergeRequestCommand: Symbol.for('ValidateMergeRequestCommand'),
@@ -61,6 +67,7 @@ exports.COMMANDS = {
     ListProjectsCommand: Symbol.for('ListProjectsCommand'),
     CreateTrelloCardsCommand: Symbol.for('CreateTrelloCardsCommand'),
     ConfigureProjectsCommand: Symbol.for('ConfigureProjectsCommand'),
+    CheckReleaseReadyCommand: Symbol.for('CheckReleaseReadyCommand'),
     CreateHotfixCommand: Symbol.for('CreateHotfixCommand'),
     UpdateDescriptionCommand: Symbol.for('UpdateDescriptionCommand')
 };

package/lib/src/utils/Descriptions.js

@@ -35,7 +35,7 @@ var HEADING_ORDER = [
     Headings.AfterRelease,
     Headings.CustomerChanges,
     Headings.CodeChanges,
-    '*',
+    '*', // This wildcard is where all the other headings will go
     Headings.Testing,
     Headings.Notes,
 ];
@@ -237,15 +237,43 @@ exports.Descriptions = {
         description += MERGE_REQUEST_CHECKLIST;
         return description;
     },
-    getDescriptionSection: function (heading, mergeRequest) {
-        var descriptionObj = toObject(mergeRequest.description.split('\n'), '#');
-        var obj = {};
-        Object.keys(descriptionObj).forEach(function (key) {
-            if (!obj[key])
-                obj[key] = '';
-            obj[key] += descriptionObj[key] + '\n';
-        });
-        return obj[Headings[heading]];
+    // eslint-disable-next-line max-len
+    getDescriptionSection: function (heading, mergeRequest, subHeading) {
+        if (!subHeading) {
+            var descriptionObj_1 = toObject(mergeRequest.description.split('\n'), '#');
+            var obj_1 = {};
+            Object.keys(descriptionObj_1).forEach(function (key) {
+                if (!obj_1[key])
+                    obj_1[key] = '';
+                obj_1[key] += descriptionObj_1[key] + '\n';
+            });
+            return obj_1[Headings[heading]];
+        }
+        var descriptionLines = mergeRequest.description.split('\n');
+        var mainHeadingText = "# ".concat(Headings[heading]);
+        var subHeadingText = "## ".concat(Headings[subHeading]);
+        var inMainSection = false;
+        var inSubSection = false;
+        var collectedLines = [];
+        for (var _i = 0, descriptionLines_1 = descriptionLines; _i < descriptionLines_1.length; _i++) {
+            var line = descriptionLines_1[_i];
+            if (line.trim() === mainHeadingText) {
+                inMainSection = true;
+                inSubSection = false;
+                continue;
+            }
+            if (inMainSection && line.startsWith('# ') && line.trim() !== mainHeadingText)
+                break;
+            if (inMainSection && line.trim() === subHeadingText) {
+                inSubSection = true;
+                continue;
+            }
+            if (inSubSection && line.startsWith('## ') && line.trim() !== subHeadingText)
+                break;
+            if (inSubSection)
+                collectedLines.push(line);
+        }
+        return collectedLines.length > 0 ? collectedLines.join('\n').trim() : '';
     },
     // TODO: This isn't readable, it needs to be refactored
     getMonorepoCombinedDescription: function (mergeRequests) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clickview/ship-it",
-  "version": "0.0.49",
+  "version": "0.0.51",
   "description": "Release Manager",
   "main": "./lib/index.js",
   "bin": {
@@ -19,13 +19,14 @@
   "license": "ISC",
   "dependencies": {
     "@gitbeaker/node": "35.6.0",
+    "@slack/web-api": "6.11.2",
     "@slack/webhook": "7.0.2",
-    "@slack/web-api":"6.11.2",
     "chalk": "4.1.2",
     "commander": "9.1.0",
     "fast-csv": "4.3.6",
     "fs-extra": "10.0.1",
     "inversify": "6.0.1",
+    "jira.js": "5.3.1",
     "lodash": "4.17.21",
     "reflect-metadata": "0.1.13",
     "semver": "7.3.5",
@@ -38,13 +39,13 @@
     "@types/lodash": "4.14.181",
     "@types/node": "17.0.23",
     "@types/semver": "7.3.9",
-    "@typescript-eslint/eslint-plugin": "5.17.0",
-    "@typescript-eslint/parser": "5.17.0",
+    "@typescript-eslint/eslint-plugin": "6.21.0",
+    "@typescript-eslint/parser": "6.21.0",
     "eslint": "8.12.0",
     "eslint-plugin-react-hooks": "4.4.0",
     "ts-node": "10.7.0",
     "tsc-alias": "1.6.6",
     "tsconfig-paths": "3.14.1",
-    "typescript": "4.6.3"
+    "typescript": "5.3.3"
   }
 }