@storm-software/git-tools 2.29.0 → 2.29.1

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 2.29.1 (2024-07-22)
+
+
+### Bug Fixes
+
+- **git-tools:** Resolved issue with version calculation during release ([97e23127](https://github.com/storm-software/storm-ops/commit/97e23127))
+
 ## 2.29.0 (2024-07-17)
 
 ### Features

package/README.md

@@ -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.js

@@ -230815,7 +230815,7 @@ var StormConfigSchema = z2.object({
   ci: z2.boolean().default(true).describe(
     "An indicator specifying if the current environment is a CI environment"
   ),
-  workspaceRoot: z2.string().trim().optional().describe("The root directory of the workspace"),
+  workspaceRoot: z2.string().trim().default("").describe("The root directory of the workspace"),
   packageDirectory: z2.string().trim().optional().describe("The root directory of the package"),
   externalPackagePatterns: z2.array(z2.string()).default([]).describe(
     "The build will use these package patterns to determine if they should be external to the bundle"
@@ -236506,8 +236506,14 @@ async function releaseVersion(config2, args) {
             verbose: !!args.verbose,
             generatorOptions
           });
-          for (const f7 of changedFiles3) {
-            additionalChangedFiles.add(f7);
+          if (Array.isArray(changedFiles3)) {
+            for (const f7 of changedFiles3) {
+              additionalChangedFiles.add(f7);
+            }
+          } else {
+            for (const f7 of changedFiles3.changedFiles) {
+              additionalChangedFiles.add(f7);
+            }
           }
         });
       }
@@ -236534,18 +236540,18 @@ async function releaseVersion(config2, args) {
       };
     }
     if (args.gitCommit ?? nxReleaseConfig?.version.git.commit) {
-      await commitChanges(
-        changedFiles2,
-        !!args.dryRun,
-        !!args.verbose,
-        createCommitMessageValues(
+      await commitChanges({
+        changedFiles: changedFiles2,
+        isDryRun: !!args.dryRun,
+        isVerbose: !!args.verbose,
+        gitCommitMessages: createCommitMessageValues(
           releaseGroups,
           releaseGroupToFilteredProjects,
           versionData,
           commitMessage
         ),
-        args.gitCommitArgs || nxReleaseConfig?.version.git.commitArgs
-      );
+        gitCommitArgs: args.gitCommitArgs || nxReleaseConfig?.version.git.commitArgs
+      });
     } else if (args.stageChanges ?? nxReleaseConfig?.version.git.stageChanges) {
       writeInfo("Staging changed files with git", config2);
       await gitAdd({
@@ -236613,8 +236619,14 @@ async function releaseVersion(config2, args) {
           verbose: !!args.verbose,
           generatorOptions
         });
-        for (const f7 of changedFiles2) {
-          additionalChangedFiles.add(f7);
+        if (Array.isArray(changedFiles2)) {
+          for (const f7 of changedFiles2) {
+            additionalChangedFiles.add(f7);
+          }
+        } else {
+          for (const f7 of changedFiles2.changedFiles) {
+            additionalChangedFiles.add(f7);
+          }
         }
       });
     }
@@ -236632,7 +236644,7 @@ async function releaseVersion(config2, args) {
   let workspaceVersion = void 0;
   if (releaseGroups.length === 1) {
     const releaseGroup = releaseGroups[0];
-    if (releaseGroup.projectsRelationship === "fixed") {
+    if (releaseGroup?.projectsRelationship === "fixed") {
       const releaseGroupProjectNames = Array.from(
         releaseGroupToFilteredProjects.get(releaseGroup) ?? []
       );
@@ -236652,18 +236664,18 @@ async function releaseVersion(config2, args) {
     };
   }
   if (args.gitCommit ?? nxReleaseConfig?.version.git.commit) {
-    await commitChanges(
+    await commitChanges({
       changedFiles,
-      !!args.dryRun,
-      !!args.verbose,
-      createCommitMessageValues(
+      isDryRun: !!args.dryRun,
+      isVerbose: !!args.verbose,
+      gitCommitMessages: createCommitMessageValues(
         releaseGroups,
         releaseGroupToFilteredProjects,
         versionData,
         commitMessage
       ),
-      args.gitCommitArgs || nxReleaseConfig?.version.git.commitArgs
-    );
+      gitCommitArgs: args.gitCommitArgs || nxReleaseConfig?.version.git.commitArgs
+    });
   } else if (args.stageChanges ?? nxReleaseConfig?.version.git.stageChanges) {
     writeInfo("Staging changed files with git", config2);
     await gitAdd({

package/bin/post-checkout.js

@@ -67132,7 +67132,7 @@ var StormConfigSchema = z2.object({
   ci: z2.boolean().default(true).describe(
     "An indicator specifying if the current environment is a CI environment"
   ),
-  workspaceRoot: z2.string().trim().optional().describe("The root directory of the workspace"),
+  workspaceRoot: z2.string().trim().default("").describe("The root directory of the workspace"),
   packageDirectory: z2.string().trim().optional().describe("The root directory of the package"),
   externalPackagePatterns: z2.array(z2.string()).default([]).describe(
     "The build will use these package patterns to determine if they should be external to the bundle"

package/bin/post-commit.js

@@ -67132,7 +67132,7 @@ var StormConfigSchema = z2.object({
   ci: z2.boolean().default(true).describe(
     "An indicator specifying if the current environment is a CI environment"
   ),
-  workspaceRoot: z2.string().trim().optional().describe("The root directory of the workspace"),
+  workspaceRoot: z2.string().trim().default("").describe("The root directory of the workspace"),
   packageDirectory: z2.string().trim().optional().describe("The root directory of the package"),
   externalPackagePatterns: z2.array(z2.string()).default([]).describe(
     "The build will use these package patterns to determine if they should be external to the bundle"

package/bin/post-merge.js

@@ -67132,7 +67132,7 @@ var StormConfigSchema = z2.object({
   ci: z2.boolean().default(true).describe(
     "An indicator specifying if the current environment is a CI environment"
   ),
-  workspaceRoot: z2.string().trim().optional().describe("The root directory of the workspace"),
+  workspaceRoot: z2.string().trim().default("").describe("The root directory of the workspace"),
   packageDirectory: z2.string().trim().optional().describe("The root directory of the package"),
   externalPackagePatterns: z2.array(z2.string()).default([]).describe(
     "The build will use these package patterns to determine if they should be external to the bundle"

package/bin/pre-commit.js

@@ -67132,7 +67132,7 @@ var StormConfigSchema = z2.object({
   ci: z2.boolean().default(true).describe(
     "An indicator specifying if the current environment is a CI environment"
   ),
-  workspaceRoot: z2.string().trim().optional().describe("The root directory of the workspace"),
+  workspaceRoot: z2.string().trim().default("").describe("The root directory of the workspace"),
   packageDirectory: z2.string().trim().optional().describe("The root directory of the package"),
   externalPackagePatterns: z2.array(z2.string()).default([]).describe(
     "The build will use these package patterns to determine if they should be external to the bundle"

package/bin/pre-install.js

@@ -67132,7 +67132,7 @@ var StormConfigSchema = z2.object({
   ci: z2.boolean().default(true).describe(
     "An indicator specifying if the current environment is a CI environment"
   ),
-  workspaceRoot: z2.string().trim().optional().describe("The root directory of the workspace"),
+  workspaceRoot: z2.string().trim().default("").describe("The root directory of the workspace"),
   packageDirectory: z2.string().trim().optional().describe("The root directory of the package"),
   externalPackagePatterns: z2.array(z2.string()).default([]).describe(
     "The build will use these package patterns to determine if they should be external to the bundle"

package/bin/pre-push.js

@@ -67137,7 +67137,7 @@ var StormConfigSchema = z2.object({
   ci: z2.boolean().default(true).describe(
     "An indicator specifying if the current environment is a CI environment"
   ),
-  workspaceRoot: z2.string().trim().optional().describe("The root directory of the workspace"),
+  workspaceRoot: z2.string().trim().default("").describe("The root directory of the workspace"),
   packageDirectory: z2.string().trim().optional().describe("The root directory of the package"),
   externalPackagePatterns: z2.array(z2.string()).default([]).describe(
     "The build will use these package patterns to determine if they should be external to the bundle"

package/bin/prepare.js

@@ -67132,7 +67132,7 @@ var StormConfigSchema = z2.object({
   ci: z2.boolean().default(true).describe(
     "An indicator specifying if the current environment is a CI environment"
   ),
-  workspaceRoot: z2.string().trim().optional().describe("The root directory of the workspace"),
+  workspaceRoot: z2.string().trim().default("").describe("The root directory of the workspace"),
   packageDirectory: z2.string().trim().optional().describe("The root directory of the package"),
   externalPackagePatterns: z2.array(z2.string()).default([]).describe(
     "The build will use these package patterns to determine if they should be external to the bundle"

package/bin/version-warning.js

@@ -67132,7 +67132,7 @@ var StormConfigSchema = z2.object({
   ci: z2.boolean().default(true).describe(
     "An indicator specifying if the current environment is a CI environment"
   ),
-  workspaceRoot: z2.string().trim().optional().describe("The root directory of the workspace"),
+  workspaceRoot: z2.string().trim().default("").describe("The root directory of the workspace"),
   packageDirectory: z2.string().trim().optional().describe("The root directory of the package"),
   externalPackagePatterns: z2.array(z2.string()).default([]).describe(
     "The build will use these package patterns to determine if they should be external to the bundle"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storm-software/git-tools",
-  "version": "2.29.0",
+  "version": "2.29.1",
   "type": "module",
   "description": "⚡ A package containing various git tools used in Storm workspaces.",
   "repository": {

package/src/cli/index.js

@@ -165322,7 +165322,7 @@ var StormConfigSchema = z.object({
   ci: z.boolean().default(true).describe(
     "An indicator specifying if the current environment is a CI environment"
   ),
-  workspaceRoot: z.string().trim().optional().describe("The root directory of the workspace"),
+  workspaceRoot: z.string().trim().default("").describe("The root directory of the workspace"),
   packageDirectory: z.string().trim().optional().describe("The root directory of the package"),
   externalPackagePatterns: z.array(z.string()).default([]).describe(
     "The build will use these package patterns to determine if they should be external to the bundle"
@@ -170401,8 +170401,14 @@ async function releaseVersion(config2, args) {
             verbose: !!args.verbose,
             generatorOptions
           });
-          for (const f7 of changedFiles3) {
-            additionalChangedFiles.add(f7);
+          if (Array.isArray(changedFiles3)) {
+            for (const f7 of changedFiles3) {
+              additionalChangedFiles.add(f7);
+            }
+          } else {
+            for (const f7 of changedFiles3.changedFiles) {
+              additionalChangedFiles.add(f7);
+            }
           }
         });
       }
@@ -170429,18 +170435,18 @@ async function releaseVersion(config2, args) {
       };
     }
     if (args.gitCommit ?? nxReleaseConfig?.version.git.commit) {
-      await commitChanges(
-        changedFiles2,
-        !!args.dryRun,
-        !!args.verbose,
-        createCommitMessageValues(
+      await commitChanges({
+        changedFiles: changedFiles2,
+        isDryRun: !!args.dryRun,
+        isVerbose: !!args.verbose,
+        gitCommitMessages: createCommitMessageValues(
           releaseGroups,
           releaseGroupToFilteredProjects,
           versionData,
           commitMessage
         ),
-        args.gitCommitArgs || nxReleaseConfig?.version.git.commitArgs
-      );
+        gitCommitArgs: args.gitCommitArgs || nxReleaseConfig?.version.git.commitArgs
+      });
     } else if (args.stageChanges ?? nxReleaseConfig?.version.git.stageChanges) {
       writeInfo("Staging changed files with git", config2);
       await gitAdd({
@@ -170508,8 +170514,14 @@ async function releaseVersion(config2, args) {
           verbose: !!args.verbose,
           generatorOptions
         });
-        for (const f7 of changedFiles2) {
-          additionalChangedFiles.add(f7);
+        if (Array.isArray(changedFiles2)) {
+          for (const f7 of changedFiles2) {
+            additionalChangedFiles.add(f7);
+          }
+        } else {
+          for (const f7 of changedFiles2.changedFiles) {
+            additionalChangedFiles.add(f7);
+          }
         }
       });
     }
@@ -170527,7 +170539,7 @@ async function releaseVersion(config2, args) {
   let workspaceVersion = void 0;
   if (releaseGroups.length === 1) {
     const releaseGroup = releaseGroups[0];
-    if (releaseGroup.projectsRelationship === "fixed") {
+    if (releaseGroup?.projectsRelationship === "fixed") {
       const releaseGroupProjectNames = Array.from(
         releaseGroupToFilteredProjects.get(releaseGroup) ?? []
       );
@@ -170547,18 +170559,18 @@ async function releaseVersion(config2, args) {
     };
   }
   if (args.gitCommit ?? nxReleaseConfig?.version.git.commit) {
-    await commitChanges(
+    await commitChanges({
       changedFiles,
-      !!args.dryRun,
-      !!args.verbose,
-      createCommitMessageValues(
+      isDryRun: !!args.dryRun,
+      isVerbose: !!args.verbose,
+      gitCommitMessages: createCommitMessageValues(
         releaseGroups,
         releaseGroupToFilteredProjects,
         versionData,
         commitMessage
       ),
-      args.gitCommitArgs || nxReleaseConfig?.version.git.commitArgs
-    );
+      gitCommitArgs: args.gitCommitArgs || nxReleaseConfig?.version.git.commitArgs
+    });
   } else if (args.stageChanges ?? nxReleaseConfig?.version.git.stageChanges) {
     writeInfo("Staging changed files with git", config2);
     await gitAdd({

package/src/commit/index.js

@@ -37375,7 +37375,7 @@ var StormConfigSchema = z.object({
   ci: z.boolean().default(true).describe(
     "An indicator specifying if the current environment is a CI environment"
   ),
-  workspaceRoot: z.string().trim().optional().describe("The root directory of the workspace"),
+  workspaceRoot: z.string().trim().default("").describe("The root directory of the workspace"),
   packageDirectory: z.string().trim().optional().describe("The root directory of the package"),
   externalPackagePatterns: z.array(z.string()).default([]).describe(
     "The build will use these package patterns to determine if they should be external to the bundle"

package/src/commitizen/index.js

@@ -37322,7 +37322,7 @@ var StormConfigSchema = z.object({
   ci: z.boolean().default(true).describe(
     "An indicator specifying if the current environment is a CI environment"
   ),
-  workspaceRoot: z.string().trim().optional().describe("The root directory of the workspace"),
+  workspaceRoot: z.string().trim().default("").describe("The root directory of the workspace"),
   packageDirectory: z.string().trim().optional().describe("The root directory of the package"),
   externalPackagePatterns: z.array(z.string()).default([]).describe(
     "The build will use these package patterns to determine if they should be external to the bundle"

package/src/index.js

@@ -165322,7 +165322,7 @@ var StormConfigSchema = z.object({
   ci: z.boolean().default(true).describe(
     "An indicator specifying if the current environment is a CI environment"
   ),
-  workspaceRoot: z.string().trim().optional().describe("The root directory of the workspace"),
+  workspaceRoot: z.string().trim().default("").describe("The root directory of the workspace"),
   packageDirectory: z.string().trim().optional().describe("The root directory of the package"),
   externalPackagePatterns: z.array(z.string()).default([]).describe(
     "The build will use these package patterns to determine if they should be external to the bundle"
@@ -170509,8 +170509,14 @@ async function releaseVersion(config2, args) {
             verbose: !!args.verbose,
             generatorOptions
           });
-          for (const f7 of changedFiles3) {
-            additionalChangedFiles.add(f7);
+          if (Array.isArray(changedFiles3)) {
+            for (const f7 of changedFiles3) {
+              additionalChangedFiles.add(f7);
+            }
+          } else {
+            for (const f7 of changedFiles3.changedFiles) {
+              additionalChangedFiles.add(f7);
+            }
           }
         });
       }
@@ -170537,18 +170543,18 @@ async function releaseVersion(config2, args) {
       };
     }
     if (args.gitCommit ?? nxReleaseConfig?.version.git.commit) {
-      await commitChanges(
-        changedFiles2,
-        !!args.dryRun,
-        !!args.verbose,
-        createCommitMessageValues(
+      await commitChanges({
+        changedFiles: changedFiles2,
+        isDryRun: !!args.dryRun,
+        isVerbose: !!args.verbose,
+        gitCommitMessages: createCommitMessageValues(
           releaseGroups,
           releaseGroupToFilteredProjects,
           versionData,
           commitMessage
         ),
-        args.gitCommitArgs || nxReleaseConfig?.version.git.commitArgs
-      );
+        gitCommitArgs: args.gitCommitArgs || nxReleaseConfig?.version.git.commitArgs
+      });
     } else if (args.stageChanges ?? nxReleaseConfig?.version.git.stageChanges) {
       writeInfo("Staging changed files with git", config2);
       await gitAdd({
@@ -170616,8 +170622,14 @@ async function releaseVersion(config2, args) {
           verbose: !!args.verbose,
           generatorOptions
         });
-        for (const f7 of changedFiles2) {
-          additionalChangedFiles.add(f7);
+        if (Array.isArray(changedFiles2)) {
+          for (const f7 of changedFiles2) {
+            additionalChangedFiles.add(f7);
+          }
+        } else {
+          for (const f7 of changedFiles2.changedFiles) {
+            additionalChangedFiles.add(f7);
+          }
         }
       });
     }
@@ -170635,7 +170647,7 @@ async function releaseVersion(config2, args) {
   let workspaceVersion = void 0;
   if (releaseGroups.length === 1) {
     const releaseGroup = releaseGroups[0];
-    if (releaseGroup.projectsRelationship === "fixed") {
+    if (releaseGroup?.projectsRelationship === "fixed") {
       const releaseGroupProjectNames = Array.from(
         releaseGroupToFilteredProjects.get(releaseGroup) ?? []
       );
@@ -170655,18 +170667,18 @@ async function releaseVersion(config2, args) {
     };
   }
   if (args.gitCommit ?? nxReleaseConfig?.version.git.commit) {
-    await commitChanges(
+    await commitChanges({
       changedFiles,
-      !!args.dryRun,
-      !!args.verbose,
-      createCommitMessageValues(
+      isDryRun: !!args.dryRun,
+      isVerbose: !!args.verbose,
+      gitCommitMessages: createCommitMessageValues(
         releaseGroups,
         releaseGroupToFilteredProjects,
         versionData,
         commitMessage
       ),
-      args.gitCommitArgs || nxReleaseConfig?.version.git.commitArgs
-    );
+      gitCommitArgs: args.gitCommitArgs || nxReleaseConfig?.version.git.commitArgs
+    });
   } else if (args.stageChanges ?? nxReleaseConfig?.version.git.stageChanges) {
     writeInfo("Staging changed files with git", config2);
     await gitAdd({

package/src/release/index.js

@@ -5785,7 +5785,7 @@ var StormConfigSchema = z.object({
   ci: z.boolean().default(true).describe(
     "An indicator specifying if the current environment is a CI environment"
   ),
-  workspaceRoot: z.string().trim().optional().describe("The root directory of the workspace"),
+  workspaceRoot: z.string().trim().default("").describe("The root directory of the workspace"),
   packageDirectory: z.string().trim().optional().describe("The root directory of the package"),
   externalPackagePatterns: z.array(z.string()).default([]).describe(
     "The build will use these package patterns to determine if they should be external to the bundle"
@@ -6186,8 +6186,14 @@ async function releaseVersion(config, args) {
             verbose: !!args.verbose,
             generatorOptions
           });
-          for (const f of changedFiles3) {
-            additionalChangedFiles.add(f);
+          if (Array.isArray(changedFiles3)) {
+            for (const f of changedFiles3) {
+              additionalChangedFiles.add(f);
+            }
+          } else {
+            for (const f of changedFiles3.changedFiles) {
+              additionalChangedFiles.add(f);
+            }
           }
         });
       }
@@ -6214,18 +6220,18 @@ async function releaseVersion(config, args) {
       };
     }
     if (args.gitCommit ?? nxReleaseConfig?.version.git.commit) {
-      await commitChanges(
-        changedFiles2,
-        !!args.dryRun,
-        !!args.verbose,
-        createCommitMessageValues(
+      await commitChanges({
+        changedFiles: changedFiles2,
+        isDryRun: !!args.dryRun,
+        isVerbose: !!args.verbose,
+        gitCommitMessages: createCommitMessageValues(
           releaseGroups,
           releaseGroupToFilteredProjects,
           versionData,
           commitMessage
         ),
-        args.gitCommitArgs || nxReleaseConfig?.version.git.commitArgs
-      );
+        gitCommitArgs: args.gitCommitArgs || nxReleaseConfig?.version.git.commitArgs
+      });
     } else if (args.stageChanges ?? nxReleaseConfig?.version.git.stageChanges) {
       writeInfo("Staging changed files with git", config);
       await gitAdd({
@@ -6293,8 +6299,14 @@ async function releaseVersion(config, args) {
           verbose: !!args.verbose,
           generatorOptions
         });
-        for (const f of changedFiles2) {
-          additionalChangedFiles.add(f);
+        if (Array.isArray(changedFiles2)) {
+          for (const f of changedFiles2) {
+            additionalChangedFiles.add(f);
+          }
+        } else {
+          for (const f of changedFiles2.changedFiles) {
+            additionalChangedFiles.add(f);
+          }
         }
       });
     }
@@ -6312,7 +6324,7 @@ async function releaseVersion(config, args) {
   let workspaceVersion = void 0;
   if (releaseGroups.length === 1) {
     const releaseGroup = releaseGroups[0];
-    if (releaseGroup.projectsRelationship === "fixed") {
+    if (releaseGroup?.projectsRelationship === "fixed") {
       const releaseGroupProjectNames = Array.from(
         releaseGroupToFilteredProjects.get(releaseGroup) ?? []
       );
@@ -6332,18 +6344,18 @@ async function releaseVersion(config, args) {
     };
   }
   if (args.gitCommit ?? nxReleaseConfig?.version.git.commit) {
-    await commitChanges(
+    await commitChanges({
       changedFiles,
-      !!args.dryRun,
-      !!args.verbose,
-      createCommitMessageValues(
+      isDryRun: !!args.dryRun,
+      isVerbose: !!args.verbose,
+      gitCommitMessages: createCommitMessageValues(
         releaseGroups,
         releaseGroupToFilteredProjects,
         versionData,
         commitMessage
       ),
-      args.gitCommitArgs || nxReleaseConfig?.version.git.commitArgs
-    );
+      gitCommitArgs: args.gitCommitArgs || nxReleaseConfig?.version.git.commitArgs
+    });
   } else if (args.stageChanges ?? nxReleaseConfig?.version.git.stageChanges) {
     writeInfo("Staging changed files with git", config);
     await gitAdd({