@signageos/lib 8.3.1-master.1364 → 8.3.1-master.1366

package/CHANGELOG.md

@@ -8,6 +8,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Added
 - Add object utils omitByRecursively and getObjectWithOmittedValuesBy
 
+### Fixed
+- Allow white spaces in changelog change types
+
 ## [8.2.0] - 2022-01-24
 ### Added
 - Redis connection factory creates even connection pool

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@signageos/lib",
-  "version": "8.3.1-master.1364",
+  "version": "8.3.1-master.1366",
   "main": "./dist",
   "files": [
     "tools",

package/tools/detect-semver-level.js

@@ -1,6 +1,15 @@
 
 const { getPipedInput, getGroupedChangeLog } = require('./helper');
 
+const allChangeTypes = [
+	'Changed',
+	'Removed',
+	'Added',
+	'Fixed',
+	'Security',
+	'Deprecated',
+];
+
 (async function () {
 	const changeLog = await getPipedInput();
 	const groupedLog = getGroupedChangeLog(changeLog);
@@ -18,8 +27,11 @@ const { getPipedInput, getGroupedChangeLog } = require('./helper');
 		case changedTypes.indexOf('Deprecated') !== -1:
 			process.stdout.write('patch');
 			break;
-		default:
+		case changedTypes.length === 0:
 			process.stdout.write('patch');
+			break;
+		default:
+			throw new Error(`Unknown type of change: ${changedTypes.join(', ')} Only following values are allowed: ${allChangeTypes.join(', ')}`);
 	}
 })();
 

package/tools/helper.js

@@ -1,3 +1,6 @@
+const VERSION_HEADER = '## ';
+const CHANGES_HEADER = '### ';
+const LOG_LINE = '- ';
 
 exports.getPipedInput = function () {
 	return new Promise((resolve, reject) => {
@@ -13,11 +16,11 @@ exports.getPipedInput = function () {
 exports.getGroupedChangeLog = function (changeLog) {
 	const newLines = changeLog
 		.split(/\n|\r/)
-		.filter((line) => line.startsWith('## ') || line.startsWith('### ') || line.startsWith('- '));
+		.filter((line) => line.startsWith(VERSION_HEADER) || line.startsWith(CHANGES_HEADER) || line.startsWith(LOG_LINE));
 	const { groupedLog } = newLines.reduce(
 		(reduction, line) => {
-			if (line.startsWith('## ')) {
-				const version = line.match(/^\#\# \[(([\d\w\.\-\+])+)\]/)[1];
+			if (line.startsWith(VERSION_HEADER)) {
+				const version = line.substring(VERSION_HEADER.length).match(/^\[?(([\d\w\.\-\+])+)\]?/)[1].trim();
 				if (reduction.groupedLog[version] !== undefined) {
 					throw new Error(`The version "${version}" is duplicated in CHANGELOG`);
 				}
@@ -30,8 +33,8 @@ exports.getGroupedChangeLog = function (changeLog) {
 					},
 				};
 			} else
-			if (line.startsWith('### ')) {
-				const type = line.substring('### '.length);
+			if (line.startsWith(CHANGES_HEADER)) {
+				const type = line.substring(CHANGES_HEADER.length).trim();
 				if (reduction.groupedLog[reduction.lastVersion] === undefined) {
 					throw new Error(`The type "${type}" is not under any version section in CHANGELOG`);
 				}
@@ -56,7 +59,7 @@ exports.getGroupedChangeLog = function (changeLog) {
 						...reduction.groupedLog,
 						[reduction.lastVersion]: {
 							...reduction.groupedLog[reduction.lastVersion],
-							[reduction.lastType]: [...reduction.groupedLog[reduction.lastVersion][reduction.lastType], line.substring('- '.length)],
+							[reduction.lastType]: [...reduction.groupedLog[reduction.lastVersion][reduction.lastType], line.substring(LOG_LINE.length)],
 						},
 					},
 				};