@clickview/ship-it 0.0.48 → 0.0.50

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.48",
+  "version": "0.0.50",
   "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"
   }
 }