release-please 17.9.0 → 17.10.0

package/README.md

@@ -3,7 +3,7 @@
 # [Release Please](https://github.com/googleapis/release-please)
 
 [![npm version](https://img.shields.io/npm/v/release-please.svg)](https://www.npmjs.org/package/release-please)
-[![codecov](https://img.shields.io/codecov/c/github/googleapis/release-please/main.svg?style=flat)](https://codecov.io/gh/googleapis/release-please)
+[![codecov](https://codecov.io/gh/googleapis/release-please/graph/badge.svg)](https://codecov.io/gh/googleapis/release-please)
 
 Release Please automates CHANGELOG generation, the creation of GitHub releases,
 and version bumps for your projects.

package/build/src/index.d.ts

@@ -14,4 +14,4 @@ export { Logger, setLogger } from './util/logger';
 export { GitHub } from './github';
 export declare const configSchema: any;
 export declare const manifestSchema: any;
-export declare const VERSION = "17.9.0";
+export declare const VERSION = "17.10.0";

package/build/src/index.js

@@ -36,6 +36,6 @@ Object.defineProperty(exports, "GitHub", { enumerable: true, get: function () {
 exports.configSchema = require('../../schemas/config.json');
 exports.manifestSchema = require('../../schemas/manifest.json');
 // x-release-please-start-version
-exports.VERSION = '17.9.0';
+exports.VERSION = '17.10.0';
 // x-release-please-end
 //# sourceMappingURL=index.js.map

package/build/src/manifest.js

@@ -211,26 +211,28 @@ class Manifest {
                 continue;
             }
             const component = tagName.component || exports.DEFAULT_COMPONENT_NAME;
-            const path = pathsByComponent[component];
-            if (!path) {
+            const paths = pathsByComponent[component] || [];
+            if (paths.length === 0) {
                 this.logger.warn(`Found release tag with component '${component}', but not configured in manifest`);
                 continue;
             }
-            const expectedVersion = this.releasedVersions[path];
-            if (!expectedVersion) {
-                this.logger.warn(`Unable to find expected version for path '${path}' in manifest`);
-                continue;
-            }
-            if (expectedVersion.toString() === tagName.version.toString()) {
-                this.logger.debug(`Found release for path ${path}, ${release.tagName}`);
-                releaseShasByPath[path] = release.sha;
-                releasesByPath[path] = {
-                    name: release.name,
-                    tag: tagName,
-                    sha: release.sha,
-                    notes: release.notes || '',
-                };
-                releasesFound += 1;
+            for (const path of paths) {
+                const expectedVersion = this.releasedVersions[path];
+                if (!expectedVersion) {
+                    this.logger.warn(`Unable to find expected version for path '${path}' in manifest`);
+                    continue;
+                }
+                if (expectedVersion.toString() === tagName.version.toString()) {
+                    this.logger.debug(`Found release for path ${path}, ${release.tagName}`);
+                    releaseShasByPath[path] = release.sha;
+                    releasesByPath[path] = {
+                        name: release.name,
+                        tag: tagName,
+                        sha: release.sha,
+                        notes: release.notes || '',
+                    };
+                    releasesFound += 1;
+                }
             }
             if (releasesFound >= expectedReleases) {
                 break;
@@ -793,10 +795,10 @@ class Manifest {
             for (const path in this.repositoryConfig) {
                 const strategy = strategiesByPath[path];
                 const component = (await strategy.getComponent()) || '';
-                if (this._pathsByComponent[component]) {
-                    this.logger.warn(`Multiple paths for ${component}: ${this._pathsByComponent[component]}, ${path}`);
+                if (!this._pathsByComponent[component]) {
+                    this._pathsByComponent[component] = [];
                 }
-                this._pathsByComponent[component] = path;
+                this._pathsByComponent[component].push(path);
             }
         }
         return this._pathsByComponent;

package/build/src/strategies/base.js

@@ -373,6 +373,14 @@ class BaseStrategy {
             this.logger.error(`Bad branch name: ${mergedPullRequest.headBranchName}`);
             return;
         }
+        const branchComponent = await this.getBranchComponent();
+        if (branchName.isComponent()) {
+            if (this.normalizeComponent(branchName.component) !==
+                this.normalizeComponent(branchComponent)) {
+                this.logger.info(`PR branch component: ${branchName.component} does not match configured branch component: ${branchComponent}`);
+                return;
+            }
+        }
         const pullRequestBody = await this.parsePullRequestBody(mergedPullRequest.body);
         if (!pullRequestBody) {
             this.logger.error('Could not parse pull request body as a release PR');

package/build/src/strategies/go-librarian.d.ts

@@ -4,6 +4,8 @@ import { Version } from '../version';
 export declare class GoLibrarian extends BaseStrategy {
     readonly versionFile: string;
     constructor(options: BaseStrategyOptions);
+    getComponent(): Promise<string | undefined>;
+    getBranchComponent(): Promise<string | undefined>;
     protected buildUpdates(options: BuildUpdatesOptions): Promise<Update[]>;
     protected initialReleaseVersion(): Version;
 }

package/build/src/strategies/go-librarian.js

@@ -26,6 +26,20 @@ class GoLibrarian extends base_1.BaseStrategy {
         super(options);
         this.versionFile = (_b = options.versionFile) !== null && _b !== void 0 ? _b : 'internal/version.go';
     }
+    async getComponent() {
+        const component = await super.getComponent();
+        if (component) {
+            const match = component.match(/^(.*)\/v[2-9]\d*$/);
+            if (match) {
+                return match[1];
+            }
+        }
+        return component;
+    }
+    async getBranchComponent() {
+        const component = await super.getBranchComponent();
+        return component ? component.replace(/\//g, '-') : undefined;
+    }
     async buildUpdates(options) {
         const updates = [];
         const version = options.newVersion;
@@ -63,7 +77,7 @@ class GoLibrarian extends base_1.BaseStrategy {
         if (this.initialVersion) {
             return version_1.Version.parse(this.initialVersion);
         }
-        return version_1.Version.parse('1.0.0');
+        return version_1.Version.parse('0.1.0');
     }
 }
 exports.GoLibrarian = GoLibrarian;

package/build/src/updaters/librarian-yaml.d.ts

@@ -4,11 +4,16 @@ export interface JavaModule {
     artifact_id: string;
     [key: string]: any;
 }
+export interface PreviewModule {
+    version: string;
+    [key: string]: any;
+}
 export interface LibrarianLibrary {
     name: string;
     version: string;
     output?: string;
     java?: JavaModule;
+    preview?: PreviewModule;
     [key: string]: any;
 }
 export interface LibrarianYamlSchema {
@@ -35,4 +40,6 @@ export declare class LibrarianYamlUpdater extends DefaultUpdater {
     updateContent(content: string, _logger?: Logger): string;
     private deriveOutputDirectory;
     private findArtifactID;
+    private getOrCreateSubsection;
+    private updateValue;
 }

package/build/src/updaters/librarian-yaml.js

@@ -35,6 +35,7 @@ class LibrarianYamlUpdater extends default_1.DefaultUpdater {
      * @returns {string} The updated content
      */
     updateContent(content, _logger = logger_1.logger) {
+        var _a;
         const doc = yaml.parseDocument(content);
         if (!doc || doc.errors.length > 0) {
             throw new Error(`Invalid yaml, cannot be parsed: ${doc.errors
@@ -51,6 +52,7 @@ class LibrarianYamlUpdater extends default_1.DefaultUpdater {
                 continue;
             const libraryJSON = library.toJSON();
             let newVersion = undefined;
+            let isPreview = false;
             if (this.versionsMap) {
                 // Multi-version (Java style)
                 const artifactID = this.findArtifactID(libraryJSON);
@@ -60,33 +62,42 @@ class LibrarianYamlUpdater extends default_1.DefaultUpdater {
             }
             else {
                 // Single version (Go, Python, Node style)
-                const isGoMatch = (this.packagePath && libraryJSON.name === this.packagePath) ||
-                    (this.component && libraryJSON.name === this.component);
-                const isPythonNodeMatch = this.packagePath &&
-                    this.deriveOutputDirectory(libraryJSON) === this.packagePath;
-                if (isGoMatch || isPythonNodeMatch) {
+                const isGoPreviewMatch = this.packagePath &&
+                    this.packagePath === `preview/internal/${libraryJSON.name}`;
+                const isPythonPreviewMatch = this.packagePath &&
+                    this.packagePath === `preview-packages/${libraryJSON.name}`;
+                if (isGoPreviewMatch || isPythonPreviewMatch) {
+                    isPreview = true;
                     newVersion = this.version;
                 }
+                else {
+                    const isGoMatch = (this.packagePath && libraryJSON.name === this.packagePath) ||
+                        (this.component && libraryJSON.name === this.component);
+                    const isPythonNodeMatch = this.packagePath &&
+                        this.deriveOutputDirectory(libraryJSON) === this.packagePath;
+                    if (isGoMatch || isPythonNodeMatch) {
+                        newVersion = this.version;
+                    }
+                }
             }
             if (newVersion) {
                 const newVersionStr = newVersion.toString();
-                if (library.get('version') !== newVersionStr) {
-                    library.set('version', newVersionStr);
-                    modified = true;
+                if (isPreview) {
+                    const previewNode = this.getOrCreateSubsection(library, 'preview', doc);
+                    if (this.updateValue(previewNode, 'version', newVersionStr)) {
+                        modified = true;
+                    }
                 }
-                if (this.versionsMap) {
-                    const isSnapshot = newVersion.preRelease === 'SNAPSHOT';
-                    if (!isSnapshot) {
-                        let java = library.get('java');
-                        if (!yaml.isMap(java)) {
-                            const javaNode = doc.createNode({});
-                            library.set('java', javaNode);
-                            java = javaNode;
-                            modified = true;
-                        }
-                        if (yaml.isMap(java)) {
-                            if (java.get('released_version') !== newVersionStr) {
-                                java.set('released_version', newVersionStr);
+                else {
+                    if (this.updateValue(library, 'version', newVersionStr)) {
+                        modified = true;
+                    }
+                    if (this.versionsMap) {
+                        // Multi-version (Java style): updates released_version for non-SNAPSHOTs
+                        const isSnapshot = !!((_a = newVersion.preRelease) === null || _a === void 0 ? void 0 : _a.includes('SNAPSHOT'));
+                        if (!isSnapshot) {
+                            const javaNode = this.getOrCreateSubsection(library, 'java', doc);
+                            if (this.updateValue(javaNode, 'released_version', newVersionStr)) {
                                 modified = true;
                             }
                         }
@@ -115,6 +126,21 @@ class LibrarianYamlUpdater extends default_1.DefaultUpdater {
         }
         return `google-cloud-${library.name}`;
     }
+    getOrCreateSubsection(parent, key, doc) {
+        let section = parent.get(key);
+        if (!yaml.isMap(section)) {
+            section = doc.createNode({});
+            parent.set(key, section);
+        }
+        return section;
+    }
+    updateValue(node, key, value) {
+        if (node.get(key) !== value) {
+            node.set(key, value);
+            return true;
+        }
+        return false;
+    }
 }
 exports.LibrarianYamlUpdater = LibrarianYamlUpdater;
 //# sourceMappingURL=librarian-yaml.js.map

package/build/src/util/branch-name.d.ts

@@ -16,4 +16,5 @@ export declare class BranchName {
     getComponent(): string | undefined;
     getVersion(): Version | undefined;
     toString(): string;
+    isComponent(): boolean;
 }

package/build/src/util/branch-name.js

@@ -78,6 +78,9 @@ class BranchName {
     toString() {
         return '';
     }
+    isComponent() {
+        return false;
+    }
 }
 exports.BranchName = BranchName;
 /**
@@ -156,6 +159,9 @@ class V12ComponentBranchName extends BranchName {
     toString() {
         return `${RELEASE_PLEASE}/branches/${this.targetBranch}/components/${this.component}`;
     }
+    isComponent() {
+        return true;
+    }
 }
 const DEFAULT_PATTERN = `^${RELEASE_PLEASE}--branches--(?<branch>.+)$`;
 class DefaultBranchName extends BranchName {
@@ -189,6 +195,9 @@ class ComponentBranchName extends BranchName {
     toString() {
         return `${RELEASE_PLEASE}--branches--${this.targetBranch}--components--${this.component}`;
     }
+    isComponent() {
+        return true;
+    }
 }
 const GROUP_PATTERN = `^${RELEASE_PLEASE}--branches--(?<branch>.+)--groups--(?<group>.+)$`;
 class GroupBranchName extends BranchName {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "release-please",
-  "version": "17.9.0",
+  "version": "17.10.0",
   "description": "generate release PRs based on the conventionalcommits.org spec",
   "main": "./build/src/index.js",
   "bin": "./build/src/bin/release-please.js",
@@ -47,7 +47,7 @@
     "@types/js-yaml": "^4.0.0",
     "@types/jsonpath": "^0.2.0",
     "@types/mocha": "^10.0.0",
-    "@types/node": "^18.0.0",
+    "@types/node": "^22.0.0",
     "@types/npmlog": "^7.0.0",
     "@types/semver": "^7.0.0",
     "@types/sinon": "^17.0.0",
@@ -100,7 +100,7 @@
     "yargs": "^17.0.0"
   },
   "engines": {
-    "node": ">=20.0.0"
+    "node": ">=22.0.0"
   },
   "overrides": {
     "tmp": "0.2.6",