@ohos-ports/nx 23.3.0-beta.2 → 24.0.2-beta.0

package/dist/src/command-line/migrate/sort-migrations.d.ts

@@ -5,12 +5,6 @@ interface SortableMigration {
 }
 /**
  * Sorts in place (like `Array.prototype.sort`) and returns the same array.
- *
- * `hoistHandoffGitignore` is set for agentic runs, which write scratch under
- * `.nx/migrate-runs`; see `agentic/handoff-gitignore.ts` for why the v23
- * gitignore migration must run first there.
  */
-export declare function sortMigrations<T extends SortableMigration>(migrations: T[], opts: {
-    hoistHandoffGitignore: boolean;
-}): T[];
+export declare function sortMigrations<T extends SortableMigration>(migrations: T[]): T[];
 export {};

package/dist/src/command-line/migrate/sort-migrations.js

@@ -2,23 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.sortMigrations = sortMigrations;
 const semver_1 = require("semver");
-const types_1 = require("./agentic/types");
 const version_utils_1 = require("./version-utils");
 /**
  * Sorts in place (like `Array.prototype.sort`) and returns the same array.
- *
- * `hoistHandoffGitignore` is set for agentic runs, which write scratch under
- * `.nx/migrate-runs`; see `agentic/handoff-gitignore.ts` for why the v23
- * gitignore migration must run first there.
  */
-function sortMigrations(migrations, opts) {
+function sortMigrations(migrations) {
     return migrations.sort((a, b) => {
-        if (opts.hoistHandoffGitignore) {
-            if ((0, types_1.isHandoffGitignoreMigration)(a))
-                return -1;
-            if ((0, types_1.isHandoffGitignoreMigration)(b))
-                return 1;
-        }
         if (a.name === '15-7-0-split-configuration-into-project-json-files') {
             return -1;
         }

package/dist/src/command-line/nx-cloud/connect/connect-to-nx-cloud.js

@@ -155,23 +155,28 @@ async function runConnectToNxCloud(options, command) {
         installationSource: command ?? installationSource,
     });
     const connectCloudUrl = await (0, url_shorten_1.createNxCloudOnboardingURL)('nx-connect', token, undefined, options?.generateToken === true);
+    const manualConnectNote = {
+        title: `Your Nx Cloud workspace is ready.`,
+        bodyLines: [
+            `To claim it, connect it to your Nx Cloud account:`,
+            `- Go to the following URL to connect your workspace to Nx Cloud:`,
+            '',
+            `${connectCloudUrl}`,
+        ],
+    };
     try {
         const cloudConnectSpinner = ora(`Opening Nx Cloud ${connectCloudUrl} in your browser to connect your workspace.`).start();
         await sleep(2000);
-        const { default: open } = await new Function('return import("open")')();
-        await open(connectCloudUrl);
-        cloudConnectSpinner.succeed();
+        if ((0, native_1.openUrl)(connectCloudUrl)) {
+            cloudConnectSpinner.succeed();
+        }
+        else {
+            cloudConnectSpinner.fail();
+            output_1.output.note(manualConnectNote);
+        }
     }
     catch (e) {
-        output_1.output.note({
-            title: `Your Nx Cloud workspace is ready.`,
-            bodyLines: [
-                `To claim it, connect it to your Nx Cloud account:`,
-                `- Go to the following URL to connect your workspace to Nx Cloud:`,
-                '',
-                `${connectCloudUrl}`,
-            ],
-        });
+        output_1.output.note(manualConnectNote);
     }
     return true;
 }

package/dist/src/command-line/release/changelog.js

@@ -13,7 +13,7 @@ const nx_json_1 = require("../../config/nx-json");
 const tree_1 = require("../../generators/tree");
 const file_map_utils_1 = require("../../project-graph/file-map-utils");
 const project_graph_1 = require("../../project-graph/project-graph");
-const utils_1 = require("../../tasks-runner/utils");
+const interpolate_release_config_1 = require("./utils/interpolate-release-config");
 const handle_errors_1 = require("../../utils/handle-errors");
 const is_ci_1 = require("../../utils/is-ci");
 const output_1 = require("../../utils/output");
@@ -66,6 +66,9 @@ function createAPI(overrideReleaseConfig, ignoreNxJsonConfig) {
         if (configError) {
             return await (0, config_1.handleNxReleaseConfigError)(configError);
         }
+        if (args.gitCommitMessage) {
+            (0, config_1.validateCommitMessageTokens)(args.gitCommitMessage);
+        }
         // --print-config exits directly as it is not designed to be combined with any other programmatic operations
         if (args.printConfig) {
             return (0, print_config_1.printConfigAndExit)({
@@ -168,9 +171,9 @@ function createAPI(overrideReleaseConfig, ignoreNxJsonConfig) {
             }
         }
         // Set resolved version plans on groups
-        await (0, version_plans_1.setResolvedVersionPlansOnGroups)(rawVersionPlans, releaseGraph.releaseGroups, Object.keys(projectGraph.nodes), args.verbose);
+        await (0, version_plans_1.setResolvedVersionPlansOnGroups)(rawVersionPlans, releaseGraph.allReleaseGroups, Object.keys(projectGraph.nodes), args.verbose);
         // Validate version plans against the filter after resolution
-        const versionPlanValidationError = (0, version_plan_utils_2.validateResolvedVersionPlansAgainstFilter)(releaseGraph.releaseGroups, releaseGraph.releaseGroupToFilteredProjects);
+        const versionPlanValidationError = (0, version_plan_utils_2.validateResolvedVersionPlansAgainstFilter)(releaseGraph.allReleaseGroups, releaseGraph.releaseGroupToFilteredProjects);
         if (versionPlanValidationError) {
             output_1.output.error(versionPlanValidationError);
             process.exit(1);
@@ -632,7 +635,7 @@ async function generateChangelogForWorkspace({ tree, args, nxReleaseConfig, work
     const ChangelogRendererClass = (0, resolve_changelog_renderer_1.resolveChangelogRenderer)(config.renderer);
     let interpolatedTreePath = config.file || '';
     if (interpolatedTreePath) {
-        interpolatedTreePath = (0, utils_1.interpolate)(interpolatedTreePath, {
+        interpolatedTreePath = (0, interpolate_release_config_1.interpolateReleaseConfig)(interpolatedTreePath, {
             projectName: '', // n/a for the workspace changelog
             projectRoot: '', // n/a for the workspace changelog
             workspaceRoot: '', // within the tree, workspaceRoot is the root
@@ -725,7 +728,7 @@ async function generateChangelogForProjects({ tree, args, changes, projectsVersi
     for (const project of projects) {
         let interpolatedTreePath = config.file || '';
         if (interpolatedTreePath) {
-            interpolatedTreePath = (0, utils_1.interpolate)(interpolatedTreePath, {
+            interpolatedTreePath = (0, interpolate_release_config_1.interpolateReleaseConfig)(interpolatedTreePath, {
                 projectName: project.name,
                 projectRoot: project.data.root,
                 workspaceRoot: '', // within the tree, workspaceRoot is the root
@@ -761,7 +764,7 @@ async function generateChangelogForProjects({ tree, args, changes, projectsVersi
             changelogEntryVersion: releaseVersion.rawVersion,
             project: project.name,
             entryWhenNoChanges: typeof config.entryWhenNoChanges === 'string'
-                ? (0, utils_1.interpolate)(config.entryWhenNoChanges, {
+                ? (0, interpolate_release_config_1.interpolateReleaseConfig)(config.entryWhenNoChanges, {
                     projectName: project.name,
                     projectRoot: project.data.root,
                     workspaceRoot: '', // within the tree, workspaceRoot is the root

package/dist/src/command-line/release/config/config.d.ts

@@ -59,6 +59,7 @@ export declare function createNxReleaseConfig(projectGraph: ProjectGraph, projec
     nxReleaseConfig: NxReleaseConfig | null;
 }>;
 export declare function handleNxReleaseConfigError(error: CreateNxReleaseConfigError): Promise<never>;
+export declare function validateCommitMessageTokens(commitMessage: string): void;
 /**
  * Full form of the createRelease config, with the provider, hostname, and apiBaseUrl resolved.
  */

package/dist/src/command-line/release/config/config.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DEFAULT_VERSION_ACTIONS_PATH = exports.IMPLICIT_DEFAULT_RELEASE_GROUP = void 0;
 exports.createNxReleaseConfig = createNxReleaseConfig;
 exports.handleNxReleaseConfigError = handleNxReleaseConfigError;
+exports.validateCommitMessageTokens = validateCommitMessageTokens;
 /**
  * `nx release` is a powerful feature which spans many possible use cases. The possible variations
  * of configuration are therefore quite complex, particularly when you consider release groups.
@@ -25,18 +26,14 @@ const path_1 = require("../../../utils/path");
 const workspace_root_1 = require("../../../utils/workspace-root");
 const github_1 = require("../utils/remote-release-clients/github");
 const gitlab_1 = require("../utils/remote-release-clients/gitlab");
+const interpolate_release_config_1 = require("../utils/interpolate-release-config");
 const resolve_changelog_renderer_1 = require("../utils/resolve-changelog-renderer");
 const resolve_nx_json_error_message_1 = require("../utils/resolve-nx-json-error-message");
 const conventional_commits_1 = require("./conventional-commits");
 exports.IMPLICIT_DEFAULT_RELEASE_GROUP = '__default__';
 exports.DEFAULT_VERSION_ACTIONS_PATH = '@nx/js/src/release/version-actions';
-// TODO(v24): remove this helper, the call site in createNxReleaseConfig, and
-// the corresponding handleNxReleaseConfigError case. The deprecated flat
-// `releaseTagPattern*` properties were moved to the nested `releaseTag`
-// object in Nx 22 and the consolidation migration runs again in Nx 23 to
-// catch any configs added after the v22 migration. Once Nx 24 lands, configs
-// that still carry the legacy keys are expected to have been repaired via
-// `nx repair`, and we can drop this back-compat error path entirely.
+// Kept on purpose: these keys are otherwise ignored, so a stale config would
+// silently tag with the default pattern. `nx repair` fixes them (22-0-0 migration).
 const LEGACY_RELEASE_TAG_PROPERTY_NAMES = [
     'releaseTagPattern',
     'releaseTagPatternCheckAllBranchesWhen',
@@ -69,7 +66,6 @@ function detectLegacyReleaseTagProperties(userConfig) {
 }
 // Apply default configuration to any optional user configuration and handle known errors
 async function createNxReleaseConfig(projectGraph, projectFileMap, userConfig = {}) {
-    // TODO(v24): remove this back-compat error along with detectLegacyReleaseTagProperties
     const legacyReleaseTagProperties = detectLegacyReleaseTagProperties(userConfig);
     if (legacyReleaseTagProperties.length > 0) {
         return {
@@ -630,6 +626,15 @@ async function createNxReleaseConfig(projectGraph, projectFileMap, userConfig =
             }
         }
     }
+    // Before validateChangelogConfig, which reports any renderer path error as
+    // an unresolvable renderer
+    validateReleaseConfigTokens({
+        releaseTag: WORKSPACE_DEFAULTS.releaseTag,
+        git: rootGitConfig,
+        version: rootVersionConfig,
+        changelog: rootChangelogConfig,
+        groups: releaseGroups,
+    });
     const configError = validateChangelogConfig(releaseGroups, rootChangelogConfig);
     if (configError) {
         return {
@@ -775,7 +780,6 @@ async function handleNxReleaseConfigError(error) {
                 });
             }
             break;
-        // TODO(v24): remove this case along with detectLegacyReleaseTagProperties
         case 'LEGACY_RELEASE_TAG_PATTERN_PROPERTIES_DETECTED':
             {
                 const properties = error.data.properties;
@@ -1038,6 +1042,41 @@ function isProjectPublic(project, projectGraph, projectFileMap) {
         return false;
     }
 }
+const releaseTagPatternTokens = ['version', 'projectName', 'releaseGroupName'];
+const commitMessageTokens = ['version', 'projectName'];
+const changelogFileTokens = ['projectName', 'projectRoot', 'workspaceRoot'];
+const changelogRendererTokens = ['workspaceRoot'];
+/**
+ * A release can interpolate these fields after it writes files, so an invalid
+ * token has to fail when the config is loaded
+ */
+function validateReleaseConfigTokens(config) {
+    const templates = [
+        [config.releaseTag.pattern, releaseTagPatternTokens],
+        [config.git.commitMessage, commitMessageTokens],
+        [config.version.git.commitMessage, commitMessageTokens],
+        [config.changelog.git.commitMessage, commitMessageTokens],
+    ];
+    const { workspaceChangelog } = config.changelog;
+    if (workspaceChangelog) {
+        // The workspace changelog uses its entryWhenNoChanges as written
+        templates.push([workspaceChangelog.file, changelogFileTokens], [workspaceChangelog.renderer, changelogRendererTokens]);
+    }
+    for (const group of Object.values(config.groups)) {
+        templates.push([group.releaseTag.pattern, releaseTagPatternTokens]);
+        if (group.changelog) {
+            templates.push([group.changelog.file, changelogFileTokens], [group.changelog.entryWhenNoChanges, changelogFileTokens], [group.changelog.renderer, changelogRendererTokens]);
+        }
+    }
+    for (const [template, tokens] of templates) {
+        if (typeof template === 'string') {
+            (0, interpolate_release_config_1.validateReleaseConfigTemplate)(template, tokens);
+        }
+    }
+}
+function validateCommitMessageTokens(commitMessage) {
+    (0, interpolate_release_config_1.validateReleaseConfigTemplate)(commitMessage, commitMessageTokens);
+}
 /**
  * We need to ensure that changelog renderers are resolvable up front so that we do not end up erroring after performing
  * actions later, and we also make sure that any configured createRelease options are valid.

package/dist/src/command-line/release/release.js

@@ -84,9 +84,9 @@ function createAPI(overrideReleaseConfig, ignoreNxJsonConfig) {
         });
         // Suppress the filter log for the changelog command as it would have already been printed by the version command
         process.env.NX_RELEASE_INTERNAL_SUPPRESS_FILTER_LOG = 'true';
-        await (0, version_plans_1.setResolvedVersionPlansOnGroups)(rawVersionPlans, releaseGraph.releaseGroups, Object.keys(projectGraph.nodes), args.verbose);
+        await (0, version_plans_1.setResolvedVersionPlansOnGroups)(rawVersionPlans, releaseGraph.allReleaseGroups, Object.keys(projectGraph.nodes), args.verbose);
         // Validate version plans against the filter after resolution
-        const versionPlanValidationError = (0, version_plan_utils_1.validateResolvedVersionPlansAgainstFilter)(releaseGraph.releaseGroups, releaseGraph.releaseGroupToFilteredProjects);
+        const versionPlanValidationError = (0, version_plan_utils_1.validateResolvedVersionPlansAgainstFilter)(releaseGraph.allReleaseGroups, releaseGraph.releaseGroupToFilteredProjects);
         if (versionPlanValidationError) {
             output_1.output.error(versionPlanValidationError);
             process.exit(1);

package/dist/src/command-line/release/utils/git.js

@@ -22,7 +22,7 @@ exports.getFirstProjectCommit = getFirstProjectCommit;
  */
 const node_path_1 = require("node:path");
 const semver_1 = require("semver");
-const utils_1 = require("../../../tasks-runner/utils");
+const interpolate_release_config_1 = require("./interpolate-release-config");
 const workspace_root_1 = require("../../../utils/workspace-root");
 const exec_command_1 = require("./exec-command");
 const shared_1 = require("./shared");
@@ -103,17 +103,18 @@ function extractTagAndVersion(tag, tagRegexp, options) {
  */
 async function getLatestGitTagForPattern(releaseTagPattern, additionalInterpolationData = {}, resolveTags, options) {
     const { requireSemver, strictPreid, preid, checkAllBranchesWhen } = options;
+    // Outside the try: an invalid pattern must fail, not read as "no tags"
+    const interpolatedTagPattern = (0, interpolate_release_config_1.interpolateReleaseConfig)(releaseTagPattern, {
+        version: '%v%',
+        projectName: '%p%',
+        releaseGroupName: '%rg%',
+        ...additionalInterpolationData,
+    });
     try {
         let tags = await resolveTags(checkAllBranchesWhen);
         if (!tags.length) {
             return null;
         }
-        const interpolatedTagPattern = (0, utils_1.interpolate)(releaseTagPattern, {
-            version: '%v%',
-            projectName: '%p%',
-            releaseGroupName: '%rg%',
-            ...additionalInterpolationData,
-        });
         const tagRegexp = `^${escapeRegExp(interpolatedTagPattern)
             .replace('%v%', '(.+)')
             .replace('%p%', '(.+)')

package/dist/src/command-line/release/utils/interpolate-release-config.d.ts

@@ -0,0 +1,6 @@
+export declare function interpolateReleaseConfig(template: string, data: Record<string, unknown>): string;
+/**
+ * Throws what `interpolateReleaseConfig` throws for `template` when it gets
+ * values for `tokens`, so a release can fail before it writes anything
+ */
+export declare function validateReleaseConfigTemplate(template: string, tokens: readonly string[]): void;

package/dist/src/command-line/release/utils/interpolate-release-config.js

@@ -0,0 +1,39 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.interpolateReleaseConfig = interpolateReleaseConfig;
+exports.validateReleaseConfigTemplate = validateReleaseConfigTemplate;
+const tokens_1 = require("../../../tasks-runner/tokens");
+const utils_1 = require("../../../tasks-runner/utils");
+// A call site passes only the values it has, so a fallback is found by name
+const releaseTokens = new Set([
+    'version',
+    'projectName',
+    'releaseGroupName',
+    'projectRoot',
+    'workspaceRoot',
+]);
+function interpolateReleaseConfig(template, data) {
+    rejectFallbacks(template);
+    return (0, utils_1.interpolate)(template, data, {
+        envNotAllowed: (template) => `Release configuration '${template}' is invalid. It can't read environment variables, because every release run must resolve it the same way.`,
+    });
+}
+/**
+ * Throws what `interpolateReleaseConfig` throws for `template` when it gets
+ * values for `tokens`, so a release can fail before it writes anything
+ */
+function validateReleaseConfigTemplate(template, tokens) {
+    interpolateReleaseConfig(template, Object.fromEntries(tokens.map((token) => [token, ''])));
+}
+// Tags, commit messages and the previous-tag lookup fill in different values,
+// so a fallback wouldn't resolve the same way in each
+function rejectFallbacks(template) {
+    const nodes = (0, tokens_1.parseTokens)(template, {
+        isToken: (name) => name === 'env' || releaseTokens.has(name),
+        read: () => undefined,
+        noValue: (token) => token,
+    });
+    if (nodes.some((node) => node.kind === 'token' && node.parts.length > 1)) {
+        throw new Error(`Release configuration '${template}' is invalid. It can't use ?? fallbacks.`);
+    }
+}

package/dist/src/command-line/release/utils/release-graph.d.ts

@@ -107,6 +107,11 @@ export declare class ReleaseGraph {
         title: string;
         bodyLines: string[];
     } | null;
+    /**
+     * Every configured release group, regardless of filters. Version plans must be resolved
+     * against these, as pending plans may target projects outside the current filter.
+     */
+    readonly allReleaseGroups: ReleaseGroupWithName[];
     constructor(releaseGroups: ReleaseGroupWithName[], filters: {
         projects?: string[];
         groups?: string[];

package/dist/src/command-line/release/utils/release-graph.js

@@ -57,6 +57,7 @@ class ReleaseGraph {
          * Null if no filters were applied.
          */
         this.filterLog = null;
+        this.allReleaseGroups = [...releaseGroups];
     }
     /**
      * Initialize the graph by building all relationships and caches

package/dist/src/command-line/release/utils/remote-release-clients/github.js

@@ -5,6 +5,7 @@ const tslib_1 = require("tslib");
 const pc = tslib_1.__importStar(require("picocolors"));
 const prompt_helpers_1 = require("../../../../utils/prompt-helpers");
 const node_child_process_1 = require("node:child_process");
+const native_1 = require("../../../../native");
 const node_fs_1 = require("node:fs");
 const node_os_1 = require("node:os");
 const output_1 = require("../../../../utils/output");
@@ -238,18 +239,16 @@ class GithubRemoteReleaseClient extends remote_release_client_1.RemoteReleaseCli
         if (!shouldContinueInGitHub) {
             return;
         }
-        const { default: open } = await new Function('return import("open")')();
-        await open(result.url)
-            .then(() => {
+        if ((0, native_1.openUrl)(result.url)) {
             console.info(`\nFollow up in the browser to manually create the release:\n\n` +
                 pc.underline(pc.cyan(result.url)) +
                 `\n`);
-        })
-            .catch(() => {
+        }
+        else {
             console.info(`Open this link to manually create a release: \n` +
                 pc.underline(pc.cyan(result.url)) +
                 '\n');
-        });
+        }
     }
     async promptForContinueInGitHub() {
         try {

package/dist/src/command-line/release/utils/remote-release-clients/gitlab.js

@@ -5,6 +5,7 @@ const tslib_1 = require("tslib");
 const pc = tslib_1.__importStar(require("picocolors"));
 const prompt_helpers_1 = require("../../../../utils/prompt-helpers");
 const node_child_process_1 = require("node:child_process");
+const native_1 = require("../../../../native");
 const output_1 = require("../../../../utils/output");
 const extract_repo_slug_1 = require("./extract-repo-slug");
 const remote_release_client_1 = require("./remote-release-client");
@@ -157,18 +158,16 @@ class GitLabRemoteReleaseClient extends remote_release_client_1.RemoteReleaseCli
         if (!shouldContinueInGitLab) {
             return;
         }
-        const { default: open } = await new Function('return import("open")')();
-        await open(result.url)
-            .then(() => {
+        if ((0, native_1.openUrl)(result.url)) {
             console.info(`\nFollow up in the browser to manually create the release:\n\n` +
                 pc.underline(pc.cyan(result.url)) +
                 `\n`);
-        })
-            .catch(() => {
+        }
+        else {
             console.info(`Open this link to manually create a release: \n` +
                 pc.underline(pc.cyan(result.url)) +
                 '\n');
-        });
+        }
     }
     async promptForContinueInGitLab() {
         try {

package/dist/src/command-line/release/utils/resolve-changelog-renderer.js

@@ -2,14 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveChangelogRenderer = resolveChangelogRenderer;
 const register_1 = require("../../../plugins/js/utils/register");
-const utils_1 = require("../../../tasks-runner/utils");
+const interpolate_release_config_1 = require("./interpolate-release-config");
 const workspace_root_1 = require("../../../utils/workspace-root");
 function resolveChangelogRenderer(changelogRendererPathOrImplementation) {
     // An implementation was provided directly via the programmatic API
     if (typeof changelogRendererPathOrImplementation === 'function') {
         return changelogRendererPathOrImplementation;
     }
-    const interpolatedChangelogRendererPath = (0, utils_1.interpolate)(changelogRendererPathOrImplementation, {
+    const interpolatedChangelogRendererPath = (0, interpolate_release_config_1.interpolateReleaseConfig)(changelogRendererPathOrImplementation, {
         workspaceRoot: workspace_root_1.workspaceRoot,
     });
     // TS renderers go through loadTsFile (native-strip -> swc/ts-node + paths).

package/dist/src/command-line/release/utils/shared.js

@@ -12,7 +12,7 @@ exports.getCommitsRelevantToProjects = getCommitsRelevantToProjects;
 const tslib_1 = require("tslib");
 const pc = tslib_1.__importStar(require("picocolors"));
 const semver_1 = require("semver");
-const utils_1 = require("../../../tasks-runner/utils");
+const interpolate_release_config_1 = require("./interpolate-release-config");
 const output_1 = require("../../../utils/output");
 const git_1 = require("./git");
 const find_matching_projects_1 = require("../../../utils/find-matching-projects");
@@ -34,7 +34,7 @@ class ReleaseVersion {
     releaseGroupName, // optional release group name to interpolate into the releaseTagPattern
      }) {
         this.rawVersion = version;
-        this.gitTag = (0, utils_1.interpolate)(releaseTagPattern, {
+        this.gitTag = (0, interpolate_release_config_1.interpolateReleaseConfig)(releaseTagPattern, {
             version,
             projectName: projectName
                 ? (0, git_1.sanitizeProjectNameForGitTag)(projectName)
@@ -83,7 +83,7 @@ function createCommitMessageValues(releaseGroups, releaseGroupToFilteredProjects
             releaseTagPattern: releaseGroup.releaseTag.pattern,
             releaseGroupName: releaseGroup.name,
         });
-        commitMessageValues[0] = (0, utils_1.interpolate)(commitMessageValues[0], {
+        commitMessageValues[0] = (0, interpolate_release_config_1.interpolateReleaseConfig)(commitMessageValues[0], {
             version: releaseVersion.rawVersion,
         }).trim();
         return commitMessageValues;
@@ -106,7 +106,7 @@ function createCommitMessageValues(releaseGroups, releaseGroupToFilteredProjects
                 projectName: releaseGroupProjectNames[0],
                 releaseGroupName: releaseGroup.name,
             });
-            commitMessageValues[0] = (0, utils_1.interpolate)(commitMessageValues[0], {
+            commitMessageValues[0] = (0, interpolate_release_config_1.interpolateReleaseConfig)(commitMessageValues[0], {
                 version: releaseVersion.rawVersion,
                 projectName: releaseGroupProjectNames[0],
             }).trim();
@@ -199,14 +199,14 @@ function createGitTagValues(releaseGroups, releaseGroupToFilteredProjects, versi
                     if (preferDockerVersion === 'both') {
                         // Create tags for both docker and semver versions
                         if (projectVersionData.dockerVersion) {
-                            tags.push((0, utils_1.interpolate)(releaseGroup.releaseTag.pattern, {
+                            tags.push((0, interpolate_release_config_1.interpolateReleaseConfig)(releaseGroup.releaseTag.pattern, {
                                 version: projectVersionData.dockerVersion,
                                 projectName: (0, git_1.sanitizeProjectNameForGitTag)(project),
                                 releaseGroupName: releaseGroup.name,
                             }));
                         }
                         if (projectVersionData.newVersion) {
-                            tags.push((0, utils_1.interpolate)(releaseGroup.releaseTag.pattern, {
+                            tags.push((0, interpolate_release_config_1.interpolateReleaseConfig)(releaseGroup.releaseTag.pattern, {
                                 version: projectVersionData.newVersion,
                                 projectName: (0, git_1.sanitizeProjectNameForGitTag)(project),
                                 releaseGroupName: releaseGroup.name,
@@ -221,7 +221,7 @@ function createGitTagValues(releaseGroups, releaseGroupToFilteredProjects, versi
                             : (projectVersionData.newVersion ??
                                 projectVersionData.dockerVersion);
                         if (version) {
-                            tags.push((0, utils_1.interpolate)(releaseGroup.releaseTag.pattern, {
+                            tags.push((0, interpolate_release_config_1.interpolateReleaseConfig)(releaseGroup.releaseTag.pattern, {
                                 version,
                                 projectName: (0, git_1.sanitizeProjectNameForGitTag)(project),
                                 releaseGroupName: releaseGroup.name,
@@ -241,13 +241,13 @@ function createGitTagValues(releaseGroups, releaseGroupToFilteredProjects, versi
             if (preferDockerVersion === 'both') {
                 // Create tags for both docker and semver versions
                 if (projectVersionData.dockerVersion) {
-                    tags.push((0, utils_1.interpolate)(releaseGroup.releaseTag.pattern, {
+                    tags.push((0, interpolate_release_config_1.interpolateReleaseConfig)(releaseGroup.releaseTag.pattern, {
                         version: projectVersionData.dockerVersion,
                         releaseGroupName: releaseGroup.name,
                     }));
                 }
                 if (projectVersionData.newVersion) {
-                    tags.push((0, utils_1.interpolate)(releaseGroup.releaseTag.pattern, {
+                    tags.push((0, interpolate_release_config_1.interpolateReleaseConfig)(releaseGroup.releaseTag.pattern, {
                         version: projectVersionData.newVersion,
                         releaseGroupName: releaseGroup.name,
                     }));
@@ -259,7 +259,7 @@ function createGitTagValues(releaseGroups, releaseGroupToFilteredProjects, versi
                     ? (projectVersionData.dockerVersion ?? projectVersionData.newVersion)
                     : (projectVersionData.newVersion ?? projectVersionData.dockerVersion);
                 if (version) {
-                    tags.push((0, utils_1.interpolate)(releaseGroup.releaseTag.pattern, {
+                    tags.push((0, interpolate_release_config_1.interpolateReleaseConfig)(releaseGroup.releaseTag.pattern, {
                         version,
                         releaseGroupName: releaseGroup.name,
                     }));

package/dist/src/command-line/release/utils/version-plan-utils.d.ts

@@ -1,10 +1,10 @@
 import { GroupVersionPlan, ProjectsVersionPlan } from '../config/version-plans';
 import { ReleaseGroupWithName } from '../config/filter-release-groups';
 /**
- * Validates that all projects in resolved version plans are included in the filtered projects.
- * This validation ensures that version plans don't contain projects that aren't being released.
+ * Validates that no version plan mixes projects being released with projects outside the release filter,
+ * as such a plan could neither be fully applied nor safely deleted.
  *
- * @param releaseGroups - The release groups to validate
+ * @param releaseGroups - All configured release groups, so that plans spanning groups outside the filter are caught
  * @param releaseGroupToFilteredProjects - Map of release groups to their filtered projects
  * @returns An error object if validation fails, null otherwise
  */
@@ -29,12 +29,3 @@ export declare function getProjectsAffectedByVersionPlan(plan: GroupVersionPlan
  * @returns True if ALL projects in the version plan are being filtered/released
  */
 export declare function areAllVersionPlanProjectsFiltered(plan: GroupVersionPlan | ProjectsVersionPlan, releaseGroup: ReleaseGroupWithName, filteredProjects: Set<string> | undefined): boolean;
-/**
- * Finds projects in a version plan that are NOT included in the filtered projects set.
- *
- * @param plan - The version plan to check
- * @param releaseGroup - The release group containing the version plan
- * @param filteredProjects - Set of projects that are being released (filtered)
- * @returns Array of project names that are in the version plan but not in the filter
- */
-export declare function getVersionPlanProjectsOutsideFilter(plan: GroupVersionPlan | ProjectsVersionPlan, releaseGroup: ReleaseGroupWithName, filteredProjects: Set<string> | undefined): string[];