release-please 14.5.0 → 14.6.0

package/CHANGELOG.md

@@ -4,6 +4,18 @@
 
 [1]: https://www.npmjs.com/package/release-please?activeTab=versions
 
+## [14.6.0](https://github.com/googleapis/release-please/compare/v14.5.0...v14.6.0) (2022-09-15)
+
+
+### Features
+
+* Allow nesting multiple commits that are parsed independently ([#1566](https://github.com/googleapis/release-please/issues/1566)) ([21ed59a](https://github.com/googleapis/release-please/commit/21ed59a1db32c6b9593931519bfa3b1eb456a4a7))
+
+
+### Bug Fixes
+
+* **deps:** Update dependency node-html-parser to v6 ([#1633](https://github.com/googleapis/release-please/issues/1633)) ([af213c4](https://github.com/googleapis/release-please/commit/af213c404a87754747bc3becab6b5759320d7508))
+
 ## [14.5.0](https://github.com/googleapis/release-please/compare/v14.4.0...v14.5.0) (2022-09-07)
 
 

package/build/src/commit.js

@@ -283,6 +283,21 @@ function hasExtendedContext(line) {
 function parseCommits(message) {
     return conventionalCommitsFilter(toConventionalChangelogFormat(parser.parser(message))).map(postProcessCommits);
 }
+// If someone wishes to aggregate multiple, complex commit messages into a
+// single commit, they can include one or more `BEGIN_NESTED_COMMIT`/`END_NESTED_COMMIT`
+// blocks into the body of the commit
+function splitMessages(message) {
+    const parts = message.split('BEGIN_NESTED_COMMIT');
+    const messages = [parts.shift()];
+    for (const part of parts) {
+        const [newMessage, ...rest] = part.split('END_NESTED_COMMIT');
+        messages.push(newMessage);
+        // anthing outside of the BEGIN/END annotations are added to the original
+        // commit
+        messages[0] = messages[0] + rest.join();
+    }
+    return messages;
+}
 /**
  * Given a list of raw commits, parse and expand into conventional commits.
  *
@@ -295,27 +310,28 @@ function parseCommits(message) {
 function parseConventionalCommits(commits, logger = logger_1.logger) {
     const conventionalCommits = [];
     for (const commit of commits) {
-        const commitMessage = preprocessCommitMessage(commit);
-        try {
-            for (const parsedCommit of parseCommits(commitMessage)) {
-                const breaking = parsedCommit.notes.filter(note => note.title === 'BREAKING CHANGE')
-                    .length > 0;
-                conventionalCommits.push({
-                    sha: commit.sha,
-                    message: parsedCommit.header,
-                    files: commit.files,
-                    pullRequest: commit.pullRequest,
-                    type: parsedCommit.type,
-                    scope: parsedCommit.scope,
-                    bareMessage: parsedCommit.subject,
-                    notes: parsedCommit.notes,
-                    references: parsedCommit.references,
-                    breaking,
-                });
+        for (const commitMessage of splitMessages(preprocessCommitMessage(commit))) {
+            try {
+                for (const parsedCommit of parseCommits(commitMessage)) {
+                    const breaking = parsedCommit.notes.filter(note => note.title === 'BREAKING CHANGE')
+                        .length > 0;
+                    conventionalCommits.push({
+                        sha: commit.sha,
+                        message: parsedCommit.header,
+                        files: commit.files,
+                        pullRequest: commit.pullRequest,
+                        type: parsedCommit.type,
+                        scope: parsedCommit.scope,
+                        bareMessage: parsedCommit.subject,
+                        notes: parsedCommit.notes,
+                        references: parsedCommit.references,
+                        breaking,
+                    });
+                }
+            }
+            catch (_err) {
+                logger.debug(`commit could not be parsed: ${commit.sha} ${commit.message.split('\n')[0]}`);
             }
-        }
-        catch (_err) {
-            logger.debug(`commit could not be parsed: ${commit.sha} ${commit.message.split('\n')[0]}`);
         }
     }
     return conventionalCommits;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "release-please",
-  "version": "14.5.0",
+  "version": "14.6.0",
   "description": "generate release PRs based on the conventionalcommits.org spec",
   "main": "./build/src/index.js",
   "bin": "./build/src/bin/release-please.js",
@@ -90,7 +90,7 @@
     "figures": "^3.0.0",
     "js-yaml": "^4.0.0",
     "jsonpath": "^1.1.1",
-    "node-html-parser": "^5.0.0",
+    "node-html-parser": "^6.0.0",
     "parse-github-repo-url": "^1.4.1",
     "semver": "^7.0.0",
     "type-fest": "^2.0.0",