release-please 13.2.0 → 13.2.1

package/CHANGELOG.md

@@ -4,6 +4,13 @@
 
 [1]: https://www.npmjs.com/package/release-please?activeTab=versions
 
+### [13.2.1](https://github.com/googleapis/release-please/compare/v13.2.0...v13.2.1) (2022-01-12)
+
+
+### Bug Fixes
+
+* **php-yoshi:** fix parsing of pull request body ([#1213](https://github.com/googleapis/release-please/issues/1213)) ([00702ca](https://github.com/googleapis/release-please/commit/00702ca575e5d134505280b436e1348eccb2de01))
+
 ## [13.2.0](https://github.com/googleapis/release-please/compare/v13.1.1...v13.2.0) (2022-01-11)
 
 

package/build/src/strategies/base.d.ts

@@ -9,6 +9,7 @@ import { Version, VersionsMap } from '../version';
 import { TagName } from '../util/tag-name';
 import { Release } from '../release';
 import { ReleasePullRequest } from '../release-pull-request';
+import { PullRequestBody } from '../util/pull-request-body';
 import { PullRequest } from '../pull-request';
 export interface BuildUpdatesOptions {
     changelogEntry: string;
@@ -97,6 +98,7 @@ export declare abstract class BaseStrategy implements Strategy {
     protected updateVersionsMap(versionsMap: VersionsMap, conventionalCommits: ConventionalCommit[]): Promise<VersionsMap>;
     protected buildNewVersion(conventionalCommits: ConventionalCommit[], latestRelease?: Release): Promise<Version>;
     protected buildVersionsMap(_conventionalCommits: ConventionalCommit[]): Promise<VersionsMap>;
+    protected parsePullRequestBody(pullRequestBody: string): Promise<PullRequestBody | undefined>;
     /**
      * Given a merged pull request, build the candidate release.
      * @param {PullRequest} mergedPullRequest The merged release pull request.

package/build/src/strategies/base.js

@@ -188,6 +188,9 @@ class BaseStrategy {
     async buildVersionsMap(_conventionalCommits) {
         return new Map();
     }
+    async parsePullRequestBody(pullRequestBody) {
+        return pull_request_body_1.PullRequestBody.parse(pullRequestBody);
+    }
     /**
      * Given a merged pull request, build the candidate release.
      * @param {PullRequest} mergedPullRequest The merged release pull request.
@@ -213,7 +216,7 @@ class BaseStrategy {
             logger_1.logger.error(`Bad branch name: ${mergedPullRequest.headBranchName}`);
             return;
         }
-        const pullRequestBody = pull_request_body_1.PullRequestBody.parse(mergedPullRequest.body);
+        const pullRequestBody = await this.parsePullRequestBody(mergedPullRequest.body);
         if (!pullRequestBody) {
             logger_1.logger.error('Could not parse pull request body as a release PR');
             return;

package/build/src/strategies/php-yoshi.d.ts

@@ -3,8 +3,10 @@ import { Update } from '../update';
 import { Commit } from '../commit';
 import { Release } from '../release';
 import { ReleasePullRequest } from '../release-pull-request';
+import { PullRequestBody } from '../util/pull-request-body';
 export declare class PHPYoshi extends BaseStrategy {
     constructor(options: BaseStrategyOptions);
     buildReleasePullRequest(commits: Commit[], latestRelease?: Release, draft?: boolean, labels?: string[]): Promise<ReleasePullRequest>;
+    protected parsePullRequestBody(pullRequestBody: string): Promise<PullRequestBody | undefined>;
     protected buildUpdates(options: BuildUpdatesOptions): Promise<Update[]>;
 }

package/build/src/strategies/php-yoshi.js

@@ -146,6 +146,23 @@ class PHPYoshi extends base_1.BaseStrategy {
             draft: draft !== null && draft !== void 0 ? draft : false,
         };
     }
+    async parsePullRequestBody(pullRequestBody) {
+        const body = pull_request_body_1.PullRequestBody.parse(pullRequestBody);
+        if (!body) {
+            return undefined;
+        }
+        const component = await this.getComponent();
+        const notes = body.releaseData
+            .map(release => {
+            var _a;
+            return `<details><summary>${release.component}: ${(_a = release.version) === null || _a === void 0 ? void 0 : _a.toString()}</summary>\n\n${release.notes}\n</details>`;
+        })
+            .join('\n\n');
+        return new pull_request_body_1.PullRequestBody([{ component, notes }], {
+            footer: body.footer,
+            header: body.header,
+        });
+    }
     async buildUpdates(options) {
         const updates = [];
         const version = options.newVersion;

package/build/src/util/pull-request-body.js

@@ -87,7 +87,7 @@ function splitBody(body) {
         content,
     };
 }
-const SUMMARY_PATTERN = /^(?<component>.*): (?<version>\d+\.\d+\.\d+.*)$/;
+const SUMMARY_PATTERN = /^(?<component>.*[^:]):? (?<version>\d+\.\d+\.\d+.*)$/;
 function extractMultipleReleases(notes) {
     const data = [];
     const root = node_html_parser_1.parse(notes);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "release-please",
-  "version": "13.2.0",
+  "version": "13.2.1",
   "description": "generate release PRs based on the conventionalcommits.org spec",
   "main": "./build/src/index.js",
   "bin": "./build/src/bin/release-please.js",
@@ -41,7 +41,7 @@
     "@types/chai": "^4.1.7",
     "@types/iarna__toml": "^2.0.1",
     "@types/js-yaml": "^4.0.0",
-    "@types/mocha": "^8.0.0",
+    "@types/mocha": "^9.0.0",
     "@types/node": "^16.0.0",
     "@types/pino": "^7.0.0",
     "@types/semver": "^7.0.0",
@@ -51,7 +51,7 @@
     "chai": "^4.2.0",
     "cross-env": "^7.0.0",
     "gts": "^3.0.0",
-    "mocha": "^8.0.0",
+    "mocha": "^9.0.0",
     "nock": "^13.0.0",
     "sinon": "12.0.1",
     "snap-shot-it": "^7.0.0"