@storm-software/git-tools 2.131.8 → 2.131.10

package/bin/git.js

@@ -54,18 +54,17 @@ import { interpolate } from 'nx/src/tasks-runner/utils';
 import { execCommand } from 'nx/src/command-line/release/utils/exec-command.js';
 import { getCommitHash, getLatestGitTagForPattern, getFirstGitCommit, gitPush, gitAdd, getGitDiff, parseCommits } from 'nx/src/command-line/release/utils/git';
 import semver, { prerelease, major } from 'semver';
-import clone from 'nanoclone';
 import { ReleaseClient } from 'nx/release';
 import { readRawVersionPlans, setResolvedVersionPlansOnGroups } from 'nx/src/command-line/release/config/version-plans';
 import { printAndFlushChanges } from 'nx/src/command-line/release/utils/print-changes.js';
 import { createReleaseGraph } from 'nx/src/command-line/release/utils/release-graph';
 import { validateResolvedVersionPlansAgainstFilter } from 'nx/src/command-line/release/utils/version-plan-utils';
-import { readNxJson } from 'nx/src/config/nx-json';
 import { FsTree } from 'nx/src/generators/tree';
 import { createFileMapUsingProjectGraph } from 'nx/src/project-graph/file-map-utils';
 import importsPlugin from 'prettier-plugin-organize-imports';
 import DefaultChangelogRenderer from 'nx/release/changelog-renderer';
 import { DEFAULT_CONVENTIONAL_COMMITS_CONFIG } from 'nx/src/command-line/release/config/conventional-commits';
+import { readNxJson } from 'nx/src/config/nx-json';
 import { findMatchingProjects } from 'nx/src/utils/find-matching-projects';
 import { IMPLICIT_DEFAULT_RELEASE_GROUP } from 'nx/src/command-line/release/config/config.js';
 import { deriveSpecifierFromConventionalCommits } from 'nx/src/command-line/release/version/derive-specifier-from-conventional-commits';
@@ -3330,8 +3329,6 @@ var DEFAULT_VERSION_RELEASE_CONFIG = {
 };
 var DEFAULT_CHANGELOG_RELEASE_CONFIG = {
   createRelease: "github",
-  entryWhenNoChanges: "This was a version bump only for {projectName} to align it with other projects, there were no code changes.",
-  file: false,
   renderOptions: {
     authors: false,
     commitReferences: true,
@@ -3534,6 +3531,41 @@ function getReleaseGroupConfig(projectGraph, releaseConfig, workspaceConfig) {
     })
   );
 }
+function getReleaseConfig(projectGraph, releaseConfig, workspaceConfig, ignoreNxJsonConfig = false) {
+  let nxJson = {};
+  if (!ignoreNxJsonConfig && existsSync$1(joinPaths(workspaceConfig.workspaceRoot, "nx.json"))) {
+    nxJson = readNxJson();
+  }
+  const baseConfig = defu(
+    {
+      changelog: {
+        renderOptions: {
+          workspaceConfig
+        }
+      },
+      groups: {}
+    },
+    omit(releaseConfig, ["groups"]),
+    nxJson.release ? omit(nxJson.release, ["groups"]) : {},
+    omit(DEFAULT_RELEASE_CONFIG, ["groups"])
+  );
+  let groups = {};
+  if (releaseConfig?.groups && Object.keys(releaseConfig.groups).length > 0) {
+    groups = releaseConfig.groups;
+  } else if (nxJson.release?.groups && Object.keys(nxJson.release.groups).length > 0) {
+    groups = nxJson.release.groups;
+  } else {
+    groups = DEFAULT_RELEASE_CONFIG.groups;
+  }
+  return {
+    ...baseConfig,
+    groups: getReleaseGroupConfig(
+      projectGraph,
+      { ...baseConfig, groups },
+      workspaceConfig
+    )
+  };
+}
 var StormReleaseGroupProcessor = class extends ReleaseGroupProcessor {
   constructor(tree, workspaceConfig, projectGraph, nxReleaseConfig, releaseGraph, versionOptions) {
     super(tree, projectGraph, nxReleaseConfig, releaseGraph, {
@@ -4202,68 +4234,21 @@ var StormReleaseClient = class _StormReleaseClient extends ReleaseClient {
         "Failed to load the project graph. Please run `nx reset`, then run the `storm-git commit` command again."
       );
     }
-    let nxJson;
-    if (!ignoreNxJsonConfig && existsSync(joinPaths(workspaceConfig.workspaceRoot, "nx.json"))) {
-      nxJson = readNxJson();
-    }
-    const config5 = defu(
-      {
-        changelog: {
-          renderOptions: {
-            workspaceConfig
-          }
-        }
-      },
-      {
-        groups: getReleaseGroupConfig(
-          projectGraph,
-          releaseConfig,
-          workspaceConfig
-        )
-      },
-      {
-        groups: getReleaseGroupConfig(
-          projectGraph,
-          nxJson.release ?? {},
-          workspaceConfig
-        )
-      },
-      omit(releaseConfig, ["groups"]),
-      nxJson.release ? omit(nxJson.release, ["groups"]) : {},
-      omit(DEFAULT_RELEASE_CONFIG, ["groups"])
-    );
-    const normalizedConfig = clone(config5);
-    if (workspaceConfig.preid) {
-      normalizedConfig.groups = Object.fromEntries(
-        Object.entries(normalizedConfig.groups ?? {}).map(([name, group]) => {
-          return [
-            name,
-            {
-              ...group,
-              version: {
-                ...group.version,
-                preid: workspaceConfig.preid
-              }
-            }
-          ];
-        })
-      );
-    }
     return new _StormReleaseClient(
       projectGraph,
-      config5,
-      normalizedConfig,
+      getReleaseConfig(
+        projectGraph,
+        releaseConfig,
+        workspaceConfig,
+        ignoreNxJsonConfig
+      ),
       workspaceConfig
     );
   }
-  /**
-   * The release configuration used by this release client.
-   */
-  config;
   /**
    * The normalized release configuration used by this release client.
    */
-  normalizedConfig;
+  releaseConfig;
   /**
    * The workspace configuration used by this release client.
    */
@@ -4288,16 +4273,15 @@ var StormReleaseClient = class _StormReleaseClient extends ReleaseClient {
    * @param ignoreNxJsonConfig - Whether to ignore the nx.json configuration and use only the provided {@link releaseConfig}. Default is false.
    * @param workspaceConfig - Optional Storm workspace configuration object for logging purposes.
    */
-  constructor(projectGraph, config5, normalizedConfig, workspaceConfig) {
-    super(normalizedConfig, true);
+  constructor(projectGraph, releaseConfig, workspaceConfig) {
+    super(releaseConfig, true);
     writeDebug(
       "Executing release with the following configuration",
       workspaceConfig
     );
-    writeDebug(normalizedConfig, workspaceConfig);
+    writeDebug(releaseConfig, workspaceConfig);
     this.projectGraph = projectGraph;
-    this.config = config5;
-    this.normalizedConfig = normalizedConfig;
+    this.releaseConfig = releaseConfig;
     this.workspaceConfig = workspaceConfig;
     this.tree = new FsTree(workspaceConfig.workspaceRoot, false);
     this.projectConfigurations = readProjectsConfigurationFromProjectGraph$2(projectGraph);
@@ -4316,7 +4300,7 @@ var StormReleaseClient = class _StormReleaseClient extends ReleaseClient {
     const releaseGraph = options.releaseGraph ?? await createReleaseGraph({
       tree: this.tree,
       projectGraph: this.projectGraph,
-      nxReleaseConfig: this.normalizedConfig,
+      nxReleaseConfig: this.releaseConfig,
       filters: {
         projects: options.projects,
         groups: options.groups
@@ -4447,7 +4431,7 @@ var StormReleaseClient = class _StormReleaseClient extends ReleaseClient {
                 fileMap.nonProjectFiles
               ) ? "*" : getProjectsAffectedByCommit(c, fileToProjectMap)
             })),
-            this.normalizedConfig.conventionalCommits
+            this.releaseConfig.conventionalCommits
           );
           writeDebug(
             `Running changelog generation for the ${releaseGroup.name} release group`,
@@ -4461,7 +4445,7 @@ var StormReleaseClient = class _StormReleaseClient extends ReleaseClient {
             projectsVersionData: options.versionData,
             releaseGroup,
             projects: [project],
-            releaseConfig: this.config,
+            releaseConfig: this.releaseConfig,
             projectToAdditionalDependencyBumps,
             workspaceConfig: this.workspaceConfig,
             ChangelogRendererClass: StormChangelogRenderer
@@ -4521,7 +4505,7 @@ var StormReleaseClient = class _StormReleaseClient extends ReleaseClient {
               fileMap.nonProjectFiles
             ) ? "*" : getProjectsAffectedByCommit(c, fileToProjectMap)
           })),
-          this.normalizedConfig.conventionalCommits
+          this.releaseConfig.conventionalCommits
         );
         writeDebug(
           `Running changelog generation for the ${releaseGroup.name} release group`,
@@ -4535,7 +4519,7 @@ var StormReleaseClient = class _StormReleaseClient extends ReleaseClient {
           projectsVersionData: options.versionData,
           releaseGroup,
           projects: projectNodes,
-          releaseConfig: this.config,
+          releaseConfig: this.releaseConfig,
           projectToAdditionalDependencyBumps,
           workspaceConfig: this.workspaceConfig,
           ChangelogRendererClass: StormChangelogRenderer
@@ -4577,7 +4561,7 @@ ${Object.keys(allProjectChangelogs).map((p) => `  - ${p}`).join("\n")}
       options.releaseGraph.releaseGroups,
       options.releaseGraph.releaseGroupToFilteredProjects,
       options.versionData,
-      options.gitCommitMessage || this.normalizedConfig.changelog?.git?.commitMessage || DEFAULT_COMMIT_MESSAGE
+      options.gitCommitMessage || this.releaseConfig.changelog?.git?.commitMessage || DEFAULT_COMMIT_MESSAGE
     );
     const changes = this.tree.listChanges();
     if (!changes.length) {
@@ -4600,7 +4584,7 @@ ${Object.keys(allProjectChangelogs).map((p) => `  - ${p}`).join("\n")}
       isDryRun: !!options.dryRun,
       isVerbose: !!options.verbose,
       gitCommitMessages: commitMessageValues,
-      gitCommitArgs: options.gitCommitArgs || this.normalizedConfig.changelog?.git?.commitArgs
+      gitCommitArgs: options.gitCommitArgs || this.releaseConfig.changelog?.git?.commitArgs
     });
     latestCommit = await getCommitHash("HEAD");
     writeDebug(
@@ -4610,8 +4594,8 @@ ${Object.keys(allProjectChangelogs).map((p) => `  - ${p}`).join("\n")}
     for (const tag of gitTagValues) {
       await gitTag({
         tag,
-        message: options.gitTagMessage || this.normalizedConfig.changelog?.git?.tagMessage,
-        additionalArgs: options.gitTagArgs || this.normalizedConfig.changelog?.git?.tagArgs,
+        message: options.gitTagMessage || this.releaseConfig.changelog?.git?.tagMessage,
+        additionalArgs: options.gitTagArgs || this.releaseConfig.changelog?.git?.tagArgs,
         dryRun: options.dryRun,
         verbose: options.verbose
       });
@@ -4624,7 +4608,7 @@ ${Object.keys(allProjectChangelogs).map((p) => `  - ${p}`).join("\n")}
       gitRemote: options.gitRemote,
       dryRun: options.dryRun,
       verbose: options.verbose,
-      additionalArgs: options.gitPushArgs || this.normalizedConfig.changelog?.git?.pushArgs
+      additionalArgs: options.gitPushArgs || this.releaseConfig.changelog?.git?.pushArgs
     });
     for (const postGitTask of postGitTasks) {
       await postGitTask(latestCommit);
@@ -4645,7 +4629,7 @@ ${Object.keys(allProjectChangelogs).map((p) => `  - ${p}`).join("\n")}
     const releaseGraph = options.releaseGraph ?? await createReleaseGraph({
       tree: this.tree,
       projectGraph: this.projectGraph,
-      nxReleaseConfig: this.normalizedConfig,
+      nxReleaseConfig: this.releaseConfig,
       filters: {
         projects: options.projects,
         groups: options.groups
@@ -4684,15 +4668,15 @@ ${Object.keys(allProjectChangelogs).map((p) => `  - ${p}`).join("\n")}
     if (options.deleteVersionPlans === void 0) {
       options.deleteVersionPlans = false;
     }
-    if (this.normalizedConfig.version?.preVersionCommand) {
+    if (this.releaseConfig.version?.preVersionCommand) {
       writeDebug(
-        "Executing the following pre-version command: \n" + this.normalizedConfig.version.preVersionCommand,
+        "Executing the following pre-version command: \n" + this.releaseConfig.version.preVersionCommand,
         this.workspaceConfig
       );
       try {
         const childProcess2 = runAsync(
           this.workspaceConfig,
-          this.normalizedConfig.version.preVersionCommand,
+          this.releaseConfig.version.preVersionCommand,
           this.workspaceConfig.workspaceRoot,
           {
             ...process.env,
@@ -4708,7 +4692,7 @@ ${Object.keys(allProjectChangelogs).map((p) => `  - ${p}`).join("\n")}
         throw new Error(
           formatNxLog({
             title: `The pre-version command failed. See the full output above.`,
-            bodyLines: [this.normalizedConfig.version.preVersionCommand, e]
+            bodyLines: [this.releaseConfig.version.preVersionCommand, e]
           })
         );
       }
@@ -4752,14 +4736,14 @@ ${Object.keys(allProjectChangelogs).map((p) => `  - ${p}`).join("\n")}
       }
     }
     await releaseGraph.validate(this.tree);
-    const commitMessage = options.gitCommitMessage || this.normalizedConfig.version?.git?.commitMessage;
+    const commitMessage = options.gitCommitMessage || this.releaseConfig.version?.git?.commitMessage;
     const additionalChangedFiles = /* @__PURE__ */ new Set();
     const additionalDeletedFiles = /* @__PURE__ */ new Set();
     const processor = new StormReleaseGroupProcessor(
       this.tree,
       this.workspaceConfig,
       this.projectGraph,
-      this.normalizedConfig,
+      this.releaseConfig,
       releaseGraph,
       options
     );
@@ -4775,21 +4759,21 @@ ${Object.keys(allProjectChangelogs).map((p) => `  - ${p}`).join("\n")}
     await formatChangedFiles(this.tree);
     printAndFlushChanges(this.tree, !!options.dryRun);
     const { changedFiles: changed, deletedFiles: deleted } = await processor.afterAllProjectsVersioned({
-      ...this.normalizedConfig.version.versionActionsOptions,
+      ...this.releaseConfig.version.versionActionsOptions,
       ...options.versionActionsOptionsOverrides ?? {}
     });
     changed.forEach((f) => additionalChangedFiles.add(f));
     deleted.forEach((f) => additionalDeletedFiles.add(f));
-    if (this.normalizedConfig.docker && typeof this.normalizedConfig.docker === "object" && this.normalizedConfig.docker?.preVersionCommand) {
+    if (this.releaseConfig.docker && typeof this.releaseConfig.docker === "object" && this.releaseConfig.docker?.preVersionCommand) {
       writeDebug(
         `Executing the docker pre-version command: 
-` + this.normalizedConfig.docker.preVersionCommand,
+` + this.releaseConfig.docker.preVersionCommand,
         this.workspaceConfig
       );
       try {
         const childProcess2 = runAsync(
           this.workspaceConfig,
-          this.normalizedConfig.docker.preVersionCommand,
+          this.releaseConfig.docker.preVersionCommand,
           this.workspaceConfig.workspaceRoot,
           {
             ...process.env,
@@ -4805,7 +4789,7 @@ ${Object.keys(allProjectChangelogs).map((p) => `  - ${p}`).join("\n")}
         throw new Error(
           formatNxLog({
             title: `The docker pre-version command failed. See the full output above.`,
-            bodyLines: [this.normalizedConfig.docker.preVersionCommand, e]
+            bodyLines: [this.releaseConfig.docker.preVersionCommand, e]
           })
         );
       }
@@ -4848,7 +4832,7 @@ ${Object.keys(allProjectChangelogs).map((p) => `  - ${p}`).join("\n")}
         }
       }
     }
-    if (this.normalizedConfig.docker || releaseGraph.releaseGroups.some((rg) => rg.docker)) {
+    if (this.releaseConfig.docker || releaseGraph.releaseGroups.some((rg) => rg.docker)) {
       writeWarning(
         formatNxLog({
           title: "Warning",
@@ -4863,7 +4847,7 @@ ${Object.keys(allProjectChangelogs).map((p) => `  - ${p}`).join("\n")}
       options.dockerVersion
     );
     const versionData = processor.getVersionData();
-    const gitTagValues = options.gitTag ?? this.normalizedConfig.version?.git?.tag ? createGitTagValues(
+    const gitTagValues = options.gitTag ?? this.releaseConfig.version?.git?.tag ? createGitTagValues(
       releaseGraph.releaseGroups,
       releaseGraph.releaseGroupToFilteredProjects,
       versionData
@@ -4891,7 +4875,7 @@ ${Object.keys(allProjectChangelogs).map((p) => `  - ${p}`).join("\n")}
         releaseGraph
       };
     }
-    if (options.gitCommit ?? this.normalizedConfig.version?.git?.commit) {
+    if (options.gitCommit ?? this.releaseConfig.version?.git?.commit) {
       await commitChanges({
         changedFiles,
         deletedFiles,
@@ -4903,9 +4887,9 @@ ${Object.keys(allProjectChangelogs).map((p) => `  - ${p}`).join("\n")}
           versionData,
           commitMessage
         ),
-        gitCommitArgs: options.gitCommitArgs || this.normalizedConfig.version?.git?.commitArgs
+        gitCommitArgs: options.gitCommitArgs || this.releaseConfig.version?.git?.commitArgs
       });
-    } else if (options.stageChanges ?? this.normalizedConfig.version?.git?.stageChanges) {
+    } else if (options.stageChanges ?? this.releaseConfig.version?.git?.stageChanges) {
       writeDebug(`Staging changed files with git`);
       await gitAdd({
         changedFiles,
@@ -4914,25 +4898,25 @@ ${Object.keys(allProjectChangelogs).map((p) => `  - ${p}`).join("\n")}
         verbose
       });
     }
-    if (options.gitTag ?? this.normalizedConfig.version?.git?.tag) {
+    if (options.gitTag ?? this.releaseConfig.version?.git?.tag) {
       writeDebug(`Tagging commit with git`);
       for (const tag of gitTagValues) {
         await gitTag({
           tag,
-          message: options.gitTagMessage || this.normalizedConfig.version?.git?.tagMessage,
-          additionalArgs: options.gitTagArgs || this.normalizedConfig.version?.git?.tagArgs,
+          message: options.gitTagMessage || this.releaseConfig.version?.git?.tagMessage,
+          additionalArgs: options.gitTagArgs || this.releaseConfig.version?.git?.tagArgs,
           dryRun: options.dryRun,
           verbose: options.verbose
         });
       }
     }
-    if (options.gitPush ?? this.normalizedConfig.version?.git?.push) {
+    if (options.gitPush ?? this.releaseConfig.version?.git?.push) {
       writeDebug(`Pushing to git remote "${options.gitRemote ?? "origin"}"`);
       await gitPush({
         gitRemote: options.gitRemote,
         dryRun: options.dryRun,
         verbose: options.verbose,
-        additionalArgs: options.gitPushArgs || this.normalizedConfig.version?.git?.pushArgs
+        additionalArgs: options.gitPushArgs || this.releaseConfig.version?.git?.pushArgs
       });
     }
     return {