@storm-software/git-tools 2.115.12 → 2.115.14

package/README.md

@@ -21,7 +21,7 @@ This package is part of the <b>⚡Storm-Ops</b> monorepo. The Storm-Ops packages
 
 <h3 align="center">💻 Visit <a href="https://stormsoftware.com" target="_blank">stormsoftware.com</a> to stay up to date with this developer</h3><br />
 
-[![Version](https://img.shields.io/badge/version-2.115.10-1fb2a6.svg?style=for-the-badge&color=1fb2a6)](https://prettier.io/)&nbsp;[![Nx](https://img.shields.io/badge/Nx-17.0.2-lightgrey?style=for-the-badge&logo=nx&logoWidth=20&&color=1fb2a6)](http://nx.dev/)&nbsp;[![NextJs](https://img.shields.io/badge/Next.js-14.0.2-lightgrey?style=for-the-badge&logo=nextdotjs&logoWidth=20&color=1fb2a6)](https://nextjs.org/)&nbsp;[![Commitizen friendly](https://img.shields.io/badge/commitizen-friendly-brightgreen.svg?style=for-the-badge&logo=commitlint&color=1fb2a6)](http://commitizen.github.io/cz-cli/)&nbsp;![Semantic-Release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg?style=for-the-badge&color=1fb2a6)&nbsp;[![documented with Fumadocs](https://img.shields.io/badge/documented_with-fumadocs-success.svg?style=for-the-badge&logo=readthedocs&color=1fb2a6)](https://fumadocs.vercel.app/)&nbsp;![GitHub Workflow Status (with event)](https://img.shields.io/github/actions/workflow/status/storm-software/storm-ops/cr.yml?style=for-the-badge&logo=github-actions&color=1fb2a6)
+[![Version](https://img.shields.io/badge/version-2.115.12-1fb2a6.svg?style=for-the-badge&color=1fb2a6)](https://prettier.io/)&nbsp;[![Nx](https://img.shields.io/badge/Nx-17.0.2-lightgrey?style=for-the-badge&logo=nx&logoWidth=20&&color=1fb2a6)](http://nx.dev/)&nbsp;[![NextJs](https://img.shields.io/badge/Next.js-14.0.2-lightgrey?style=for-the-badge&logo=nextdotjs&logoWidth=20&color=1fb2a6)](https://nextjs.org/)&nbsp;[![Commitizen friendly](https://img.shields.io/badge/commitizen-friendly-brightgreen.svg?style=for-the-badge&logo=commitlint&color=1fb2a6)](http://commitizen.github.io/cz-cli/)&nbsp;![Semantic-Release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg?style=for-the-badge&color=1fb2a6)&nbsp;[![documented with Fumadocs](https://img.shields.io/badge/documented_with-fumadocs-success.svg?style=for-the-badge&logo=readthedocs&color=1fb2a6)](https://fumadocs.vercel.app/)&nbsp;![GitHub Workflow Status (with event)](https://img.shields.io/github/actions/workflow/status/storm-software/storm-ops/cr.yml?style=for-the-badge&logo=github-actions&color=1fb2a6)
 
 <!-- prettier-ignore-start -->
 <!-- markdownlint-disable -->
@@ -40,7 +40,6 @@ This package is part of the <b>⚡Storm-Ops</b> monorepo. The Storm-Ops packages
 
 <!-- START doctoc -->
 <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
-
 ## Table of Contents
 
 - [Storm Git Tools](#storm-git-tools)

package/bin/git.cjs

@@ -2326,6 +2326,40 @@ function parseChangelogMarkdown(contents) {
     releases
   };
 }
+function createGitTagValues(releaseGroups, releaseGroupToFilteredProjects, versionData) {
+  const tags = [];
+  for (const releaseGroup of releaseGroups) {
+    const releaseGroupProjectNames = Array.from(
+      releaseGroupToFilteredProjects.get(releaseGroup) ?? []
+    );
+    if (releaseGroup.projectsRelationship === "independent") {
+      for (const project of releaseGroupProjectNames) {
+        const projectVersionData = versionData[project];
+        if (projectVersionData?.newVersion) {
+          tags.push(
+            utils.interpolate(releaseGroup.releaseTagPattern, {
+              version: projectVersionData.newVersion,
+              projectName: project
+            })
+          );
+        }
+      }
+      continue;
+    }
+    if (releaseGroupProjectNames.length > 0 && releaseGroupProjectNames[0]) {
+      const projectVersionData = versionData[releaseGroupProjectNames[0]];
+      if (projectVersionData?.newVersion) {
+        tags.push(
+          utils.interpolate(releaseGroup.releaseTagPattern, {
+            version: projectVersionData.newVersion,
+            releaseGroupName: releaseGroup.name
+          })
+        );
+      }
+    }
+  }
+  return tags;
+}
 async function gitTag({
   tag,
   message,
@@ -3086,27 +3120,16 @@ function createAPI(overrideReleaseConfig) {
       );
     }
     const commitMessage = args.gitCommitMessage || nxReleaseConfig.changelog?.git?.commitMessage;
-    const actualProjectsVersionData = Object.fromEntries(
-      Object.entries(projectsVersionData).filter(
-        ([, data]) => data && semver.valid(data.newVersion)
-      )
-    );
-    chunkXH6F7XTV_cjs.writeInfo(
-      `Preparing to release the following projects:
-${Object.entries(actualProjectsVersionData).map(
-        ([project, versionData]) => `- ${project}: ${versionData.currentVersion ? `${versionData.currentVersion} -> ${versionData.newVersion}` : versionData.newVersion}`
-      ).join("\n")}`
-    );
     const commitMessageValues = shared.createCommitMessageValues(
       releaseGroups,
       releaseGroupToFilteredProjects,
-      actualProjectsVersionData,
+      projectsVersionData,
       commitMessage
     );
-    const gitTagValues = args.gitTag ?? nxReleaseConfig.changelog?.git.tag ? shared.createGitTagValues(
+    const gitTagValues = args.gitTag ?? nxReleaseConfig.changelog?.git.tag ? createGitTagValues(
       releaseGroups,
       releaseGroupToFilteredProjects,
-      actualProjectsVersionData
+      projectsVersionData
     ) : [];
     shared.handleDuplicateGitTags(gitTagValues);
     const postGitTasks = [];
@@ -3256,20 +3279,20 @@ ${contents}`);
         continue;
       }
       for (const project of releaseGroup.projects) {
-        if (!actualProjectsVersionData[project]?.newVersion) {
+        if (!projectsVersionData[project]?.newVersion) {
           continue;
         }
-        const dependentProjects = (actualProjectsVersionData[project].dependentProjects || []).map((dep) => {
+        const dependentProjects = (projectsVersionData[project].dependentProjects || []).map((dep) => {
           return {
             dependencyName: dep.source,
-            newVersion: actualProjectsVersionData[dep.source]?.newVersion
+            newVersion: projectsVersionData[dep.source]?.newVersion
           };
         }).filter((b) => b.newVersion !== null);
         for (const dependent of dependentProjects) {
           const additionalDependencyBumpsForProject = (projectToAdditionalDependencyBumps.has(dependent.dependencyName) ? projectToAdditionalDependencyBumps.get(dependent.dependencyName) : []) ?? [];
           additionalDependencyBumpsForProject.push({
             dependencyName: project,
-            newVersion: actualProjectsVersionData[project].newVersion
+            newVersion: projectsVersionData[project].newVersion
           });
           projectToAdditionalDependencyBumps.set(
             dependent.dependencyName,
@@ -3290,7 +3313,7 @@ ${contents}`);
           (project) => {
             return [
               project,
-              ...actualProjectsVersionData[project]?.dependentProjects.map(
+              ...projectsVersionData[project]?.dependentProjects.map(
                 (dep) => dep.source
               ) || []
             ];
@@ -3386,7 +3409,7 @@ ${contents}`);
             tree: tree$1,
             args,
             changes,
-            projectsVersionData: actualProjectsVersionData,
+            projectsVersionData,
             releaseGroup,
             projects: [project],
             nxReleaseConfig,
@@ -3515,7 +3538,7 @@ ${contents}`);
           tree: tree$1,
           args,
           changes,
-          projectsVersionData: actualProjectsVersionData,
+          projectsVersionData,
           releaseGroup,
           projects: projectNodes,
           nxReleaseConfig,

package/bin/git.js

@@ -38,7 +38,7 @@ import { printAndFlushChanges, printDiff } from 'nx/src/command-line/release/uti
 import { printConfigAndExit } from 'nx/src/command-line/release/utils/print-config';
 import { defaultCreateReleaseProvider, GithubRemoteReleaseClient } from 'nx/src/command-line/release/utils/remote-release-clients/github';
 import { resolveNxJsonConfigErrorMessage } from 'nx/src/command-line/release/utils/resolve-nx-json-error-message';
-import { createCommitMessageValues, createGitTagValues, handleDuplicateGitTags, ReleaseVersion, noDiffInChangelogMessage } from 'nx/src/command-line/release/utils/shared';
+import { createCommitMessageValues, handleDuplicateGitTags, ReleaseVersion, noDiffInChangelogMessage } from 'nx/src/command-line/release/utils/shared';
 import { readNxJson as readNxJson$1 } from 'nx/src/config/nx-json';
 import { FsTree } from 'nx/src/generators/tree';
 import { createProjectFileMapUsingProjectGraph, createFileMapUsingProjectGraph } from 'nx/src/project-graph/file-map-utils';
@@ -2309,6 +2309,40 @@ function parseChangelogMarkdown(contents) {
     releases
   };
 }
+function createGitTagValues(releaseGroups, releaseGroupToFilteredProjects, versionData) {
+  const tags = [];
+  for (const releaseGroup of releaseGroups) {
+    const releaseGroupProjectNames = Array.from(
+      releaseGroupToFilteredProjects.get(releaseGroup) ?? []
+    );
+    if (releaseGroup.projectsRelationship === "independent") {
+      for (const project of releaseGroupProjectNames) {
+        const projectVersionData = versionData[project];
+        if (projectVersionData?.newVersion) {
+          tags.push(
+            interpolate(releaseGroup.releaseTagPattern, {
+              version: projectVersionData.newVersion,
+              projectName: project
+            })
+          );
+        }
+      }
+      continue;
+    }
+    if (releaseGroupProjectNames.length > 0 && releaseGroupProjectNames[0]) {
+      const projectVersionData = versionData[releaseGroupProjectNames[0]];
+      if (projectVersionData?.newVersion) {
+        tags.push(
+          interpolate(releaseGroup.releaseTagPattern, {
+            version: projectVersionData.newVersion,
+            releaseGroupName: releaseGroup.name
+          })
+        );
+      }
+    }
+  }
+  return tags;
+}
 async function gitTag({
   tag,
   message,
@@ -3069,27 +3103,16 @@ function createAPI(overrideReleaseConfig) {
       );
     }
     const commitMessage = args.gitCommitMessage || nxReleaseConfig.changelog?.git?.commitMessage;
-    const actualProjectsVersionData = Object.fromEntries(
-      Object.entries(projectsVersionData).filter(
-        ([, data]) => data && valid(data.newVersion)
-      )
-    );
-    writeInfo(
-      `Preparing to release the following projects:
-${Object.entries(actualProjectsVersionData).map(
-        ([project, versionData]) => `- ${project}: ${versionData.currentVersion ? `${versionData.currentVersion} -> ${versionData.newVersion}` : versionData.newVersion}`
-      ).join("\n")}`
-    );
     const commitMessageValues = createCommitMessageValues(
       releaseGroups,
       releaseGroupToFilteredProjects,
-      actualProjectsVersionData,
+      projectsVersionData,
       commitMessage
     );
     const gitTagValues = args.gitTag ?? nxReleaseConfig.changelog?.git.tag ? createGitTagValues(
       releaseGroups,
       releaseGroupToFilteredProjects,
-      actualProjectsVersionData
+      projectsVersionData
     ) : [];
     handleDuplicateGitTags(gitTagValues);
     const postGitTasks = [];
@@ -3239,20 +3262,20 @@ ${contents}`);
         continue;
       }
       for (const project of releaseGroup.projects) {
-        if (!actualProjectsVersionData[project]?.newVersion) {
+        if (!projectsVersionData[project]?.newVersion) {
           continue;
         }
-        const dependentProjects = (actualProjectsVersionData[project].dependentProjects || []).map((dep) => {
+        const dependentProjects = (projectsVersionData[project].dependentProjects || []).map((dep) => {
           return {
             dependencyName: dep.source,
-            newVersion: actualProjectsVersionData[dep.source]?.newVersion
+            newVersion: projectsVersionData[dep.source]?.newVersion
           };
         }).filter((b) => b.newVersion !== null);
         for (const dependent of dependentProjects) {
           const additionalDependencyBumpsForProject = (projectToAdditionalDependencyBumps.has(dependent.dependencyName) ? projectToAdditionalDependencyBumps.get(dependent.dependencyName) : []) ?? [];
           additionalDependencyBumpsForProject.push({
             dependencyName: project,
-            newVersion: actualProjectsVersionData[project].newVersion
+            newVersion: projectsVersionData[project].newVersion
           });
           projectToAdditionalDependencyBumps.set(
             dependent.dependencyName,
@@ -3273,7 +3296,7 @@ ${contents}`);
           (project) => {
             return [
               project,
-              ...actualProjectsVersionData[project]?.dependentProjects.map(
+              ...projectsVersionData[project]?.dependentProjects.map(
                 (dep) => dep.source
               ) || []
             ];
@@ -3369,7 +3392,7 @@ ${contents}`);
             tree,
             args,
             changes,
-            projectsVersionData: actualProjectsVersionData,
+            projectsVersionData,
             releaseGroup,
             projects: [project],
             nxReleaseConfig,
@@ -3498,7 +3521,7 @@ ${contents}`);
           tree,
           args,
           changes,
-          projectsVersionData: actualProjectsVersionData,
+          projectsVersionData,
           releaseGroup,
           projects: projectNodes,
           nxReleaseConfig,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storm-software/git-tools",
-  "version": "2.115.12",
+  "version": "2.115.14",
   "type": "module",
   "description": "Tools for managing Git repositories within a Nx workspace.",
   "repository": {
@@ -221,8 +221,8 @@
     "@inquirer/prompts": "7.2.1",
     "@nx/devkit": "^21.4.1",
     "@nx/js": "^21.4.1",
-    "@storm-software/config": "^1.128.11",
-    "@storm-software/config-tools": "^1.180.12",
+    "@storm-software/config": "^1.128.12",
+    "@storm-software/config-tools": "^1.180.14",
     "@textlint/ast-node-types": "14.4.2",
     "@textlint/markdown-to-ast": "14.4.2",
     "anchor-markdown-header": "0.7.0",
@@ -251,5 +251,5 @@
     "tsup": "8.4.0"
   },
   "publishConfig": { "access": "public" },
-  "gitHead": "0d8944309d4a3fa08977f4b0ea61adb30596ece7"
+  "gitHead": "cdc5cfdb7984452707038e0ea688963fe49f9adf"
 }