New features to resolve-changelog (#9)

* features * New version 1.1.1. Read more https://github.com/V4Fire/cli/releases/tag/1.1.1
V4Fire · Jul 9, 2021 · 6326d9f · 6326d9f
1 parent 3090b34
commit 6326d9f
Show file tree

Hide file tree

Showing 7 changed files with 127 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,16 @@
 
 _Note: Gaps between patch versions are faulty, broken or test releases._
 
+## v1.1.1 (2021-07-09)
+
+#### :rocket: New Feature
+
+- `resolve-changelog` - remove duplicates from changelog.
+
+#### :nail_care: Polish
+
+- `resolve-changelog` - delete trailing spaces from empty lines.
+
 ## v1.1.0 (2021-07-05)
 
 #### :rocket: New Feature

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@v4fire/cli",
- "version": "1.1.0",
+ "version": "1.1.1",
  "description": "Tools for creating V4Fire blocks and pages from CLI",
  "main": "index.js",
  "bin": {

diff --git a/src/controllers/resolve-changelog.js b/src/controllers/resolve-changelog.js
@@ -22,7 +22,7 @@ class ResolveChangelogController extends Controller {
 
  const isValidFile = lines.every((line) => {
  if (line.startsWith('## ')) {
- return Boolean(line.match(/##\s\(\d{4}-\d{2}-\d{2}\)/));
+ return Boolean(line.match(/^##\s\(\d{4}-\d{2}-\d{2}\)/));
  }
 
  return true;
@@ -61,6 +61,7 @@ class ResolveChangelogController extends Controller {
  updateChangelogContent(text) {
  const actions = [
  this.clearConflicts,
+ this.normalizeEmptyLines,
  this.saveBoilerplate,
  this.sortRecords,
  this.returnBoilerplate
@@ -120,6 +121,26 @@ class ResolveChangelogController extends Controller {
  .join('\n');
  }
 
+ /**
+ * Replaces all lines consisting only of spaces with empty line
+ *
+ * @param {string} text
+ *
+ * @returns {string}
+ */
+ normalizeEmptyLines(text) {
+ return text
+ .split('\n')
+ .map((line) => {
+ if (line.match(/^\s+$/)) {
+ return '';
+ }
+
+ return line;
+ })
+ .join('\n');
+ }
+
  /**
  * Sort records by dates
  *
@@ -128,7 +149,7 @@ class ResolveChangelogController extends Controller {
  * @returns {string}
  */
  sortRecords(text) {
- const records = text.split(this.divider).map((el, index) => {
+ let records = text.split(this.divider).map((el, index) => {
  let elementWithNewLines = el;
 
  if (index !== 0) {
@@ -142,6 +163,8 @@ class ResolveChangelogController extends Controller {
 
  records.sort((a, b) => new Date(b.slice(0, 10)) - new Date(a.slice(0, 10)));
 
+ records = [...new Set(records)];
+
  // Last element after sort should have only one \n
  records[records.length - 1] = records[records.length - 1].slice(
  0,

diff --git a/tests/cases/resolve-changelog/complex.js b/tests/cases/resolve-changelog/complex.js
@@ -27,7 +27,17 @@ ${startOfConflict}
 
 * bar
 >>>>>>> master
+ 
+## (2021-06-11) @baz
+
+#### :boom: Breaking Change
+
+* boom
+
+#### :rocket: New Feature
 
+* rocket
+ 
 ## (2021-06-11) @baz
 
 #### :boom: Breaking Change

diff --git a/tests/cases/resolve-changelog/normalizeEmptyLines.js b/tests/cases/resolve-changelog/normalizeEmptyLines.js
@@ -0,0 +1,25 @@
+const emptyLines = `
+ foo
+ 
+bar 
+ 
+
+`;
+
+const emptyLinesResult = `
+ foo
+
+bar 
+
+
+`;
+
+module.exports = {
+ cases: [
+ {
+ description: 'Normalize empty lines',
+ input: emptyLines,
+ output: emptyLinesResult
+ }
+ ]
+};
diff --git a/tests/cases/resolve-changelog/sort.js b/tests/cases/resolve-changelog/sort.js
@@ -44,12 +44,57 @@ const sortOutput = `## (2021-06-11) @baz
 * bar
 `;
 
+const sortDupsInput = `## (2021-05-12) @foo
+
+#### :rocket: New Feature
+
+* bar
+
+## (2021-05-12) @foo
+
+#### :rocket: New Feature
+
+* bar
+
+## (2021-06-11) @baz
+
+#### :boom: Breaking Change
+
+* boom
+
+#### :rocket: New Feature
+
+* rocket
+`;
+
+const sortDupsOutput = `## (2021-06-11) @baz
+
+#### :boom: Breaking Change
+
+* boom
+
+#### :rocket: New Feature
+
+* rocket
+
+## (2021-05-12) @foo
+
+#### :rocket: New Feature
+
+* bar
+`;
+
 module.exports = {
  cases: [
  {
  description: 'Sort of records',
  input: sortInput,
  output: sortOutput
+ },
+ {
+ description: 'Remove dups',
+ input: sortDupsInput,
+ output: sortDupsOutput
  }
  ]
 };
diff --git a/tests/resolve-changelog.test.js b/tests/resolve-changelog.test.js
@@ -4,6 +4,7 @@ const complex = require('./cases/resolve-changelog/complex');
 const boilerplate = require('./cases/resolve-changelog/boilerplate');
 const sort = require('./cases/resolve-changelog/sort');
 const conflicts = require('./cases/resolve-changelog/conflicts');
+const emptyLines = require('./cases/resolve-changelog/normalizeEmptyLines');
 
 const ResolveChangelogController = require('../src/controllers/resolve-changelog');
 
@@ -47,4 +48,14 @@ describe('Resolve-changelog controller methods', () => {
  });
  });
  });
+
+ describe('normalizeEmptyLines', () => {
+ emptyLines.cases.forEach((caseEl) => {
+ it(caseEl.description, () => {
+ expect(
+ new ResolveChangelogController().normalizeEmptyLines(caseEl.input)
+ ).to.equal(caseEl.output);
+ });
+ });
+ });
 });